@hasna/todos 0.11.93 → 0.11.95

package/dist/cli/index.js

@@ -2104,7 +2104,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@hasna/todos",
-    version: "0.11.93",
+    version: "0.11.95",
     description: "Universal task management for AI coding agents - CLI + MCP server + interactive TUI",
     type: "module",
     main: "dist/index.js",
@@ -2826,6 +2826,48 @@ async function cloudDeleteTask(client, id) {
     throw error;
   }
 }
+function unwrapTemplate(raw) {
+  if (raw && typeof raw === "object" && "template" in raw) {
+    return raw.template;
+  }
+  return raw;
+}
+async function cloudListTemplates(client, projectId) {
+  const result = await requiredRemoteRoute(client, "/v1/templates", () => client.list("templates", { query: projectId ? { project_id: projectId } : undefined }));
+  const envelope = result.raw;
+  return Array.isArray(envelope?.templates) ? envelope.templates : result.items;
+}
+async function cloudCreateTemplate(client, input) {
+  return unwrapTemplate(await requiredRemoteRoute(client, "/v1/templates", () => client.create("templates", input)));
+}
+async function cloudGetTemplate(client, id) {
+  try {
+    return unwrapTemplate(await client.get("templates", id));
+  } catch (error) {
+    if (error && typeof error === "object" && error.status === 404)
+      return null;
+    throw error;
+  }
+}
+async function cloudUpdateTemplate(client, id, patch) {
+  try {
+    return unwrapTemplate(await client.update("templates", id, patch));
+  } catch (error) {
+    if (error && typeof error === "object" && error.status === 404)
+      return null;
+    throw error;
+  }
+}
+async function cloudDeleteTemplate(client, id) {
+  try {
+    await client.transport.del(`/templates/${encodeURIComponent(id)}`);
+    return true;
+  } catch (error) {
+    if (error && typeof error === "object" && error.status === 404)
+      return false;
+    throw error;
+  }
+}
 async function cloudTaskAction(client, id, action, body = {}) {
   const raw = await client.transport.post(`/tasks/${encodeURIComponent(id)}/${action}`, body);
   return unwrapTask(raw);
@@ -9928,6 +9970,50 @@ var init_recurrence = __esm(() => {
   };
 });
 
+// src/lib/template-semantics.ts
+function resolveTemplateVariables(templateVars, provided) {
+  const merged = { ...provided };
+  for (const variable of templateVars) {
+    if (merged[variable.name] === undefined && variable.default !== undefined) {
+      merged[variable.name] = variable.default;
+    }
+  }
+  const missing = templateVars.filter((variable) => variable.required && merged[variable.name] === undefined).map((variable) => variable.name);
+  if (missing.length > 0) {
+    throw new Error(`Missing required template variable(s): ${missing.join(", ")}`);
+  }
+  return merged;
+}
+function substituteTemplateVariables(text, variables) {
+  let result = text;
+  for (const [key, value] of Object.entries(variables)) {
+    result = result.replace(new RegExp(`\\{${key}\\}`, "g"), value);
+  }
+  return result;
+}
+function evaluateTemplateCondition(condition, variables) {
+  if (!condition || condition.trim() === "")
+    return true;
+  const trimmed = condition.trim();
+  const equal = trimmed.match(/^\{([^}]+)\}\s*==\s*(.+)$/);
+  if (equal)
+    return (variables[equal[1]] ?? "") === equal[2].trim();
+  const unequal = trimmed.match(/^\{([^}]+)\}\s*!=\s*(.+)$/);
+  if (unequal)
+    return (variables[unequal[1]] ?? "") !== unequal[2].trim();
+  const falsy = trimmed.match(/^!\{([^}]+)\}$/);
+  if (falsy) {
+    const value = variables[falsy[1]];
+    return !value || value === "" || value === "false";
+  }
+  const truthy = trimmed.match(/^\{([^}]+)\}$/);
+  if (truthy) {
+    const value = variables[truthy[1]];
+    return !!value && value !== "" && value !== "false";
+  }
+  return true;
+}
+
 // src/db/templates.ts
 var exports_templates = {};
 __export(exports_templates, {
@@ -10023,6 +10109,14 @@ function deleteTemplate(id, db) {
     payload: template,
     version: template.version
   }, d);
+  for (const task of getTemplateTasks(resolved, d)) {
+    recordStorageTombstone({
+      object_type: "template_tasks",
+      object_id: task.id,
+      payload: task,
+      version: 1
+    }, d);
+  }
   return d.run("DELETE FROM task_templates WHERE id = ?", [resolved]).changes > 0;
 }
 function updateTemplate(id, updates, db) {
@@ -10154,34 +10248,7 @@ function getTemplateTasks(templateId, db) {
   return rows.map(rowToTemplateTask);
 }
 function evaluateCondition(condition, variables) {
-  if (!condition || condition.trim() === "")
-    return true;
-  const trimmed = condition.trim();
-  const eqMatch = trimmed.match(/^\{([^}]+)\}\s*==\s*(.+)$/);
-  if (eqMatch) {
-    const varName = eqMatch[1];
-    const expected = eqMatch[2].trim();
-    return (variables[varName] ?? "") === expected;
-  }
-  const neqMatch = trimmed.match(/^\{([^}]+)\}\s*!=\s*(.+)$/);
-  if (neqMatch) {
-    const varName = neqMatch[1];
-    const expected = neqMatch[2].trim();
-    return (variables[varName] ?? "") !== expected;
-  }
-  const falsyMatch = trimmed.match(/^!\{([^}]+)\}$/);
-  if (falsyMatch) {
-    const varName = falsyMatch[1];
-    const val = variables[varName];
-    return !val || val === "" || val === "false";
-  }
-  const truthyMatch = trimmed.match(/^\{([^}]+)\}$/);
-  if (truthyMatch) {
-    const varName = truthyMatch[1];
-    const val = variables[varName];
-    return !!val && val !== "" && val !== "false";
-  }
-  return true;
+  return evaluateTemplateCondition(condition, variables);
 }
 function exportTemplate(id, db) {
   const d = db || getDatabase();
@@ -10254,29 +10321,10 @@ function listTemplateVersions(id, db) {
   return d.query("SELECT * FROM template_versions WHERE template_id = ? ORDER BY version DESC").all(resolved);
 }
 function resolveVariables(templateVars, provided) {
-  const merged = { ...provided };
-  for (const v of templateVars) {
-    if (merged[v.name] === undefined && v.default !== undefined) {
-      merged[v.name] = v.default;
-    }
-  }
-  const missing = [];
-  for (const v of templateVars) {
-    if (v.required && merged[v.name] === undefined) {
-      missing.push(v.name);
-    }
-  }
-  if (missing.length > 0) {
-    throw new Error(`Missing required template variable(s): ${missing.join(", ")}`);
-  }
-  return merged;
+  return resolveTemplateVariables(templateVars, provided);
 }
 function substituteVars(text, variables) {
-  let result = text;
-  for (const [key, val] of Object.entries(variables)) {
-    result = result.replace(new RegExp(`\\{${key}\\}`, "g"), val);
-  }
-  return result;
+  return substituteTemplateVariables(text, variables);
 }
 function tasksFromTemplate(templateId, projectId, variables, taskListId, db, _visitedTemplateIds) {
   const d = db || getDatabase();
@@ -15027,6 +15075,46 @@ function resolveTaskListRef(ref, projectId) {
     return { id: bySlug.id };
   return { error: `Could not resolve task list "${ref}" to a UUID${projectId ? " within the task's project" : ""}. Pass an exact task-list UUID.` };
 }
+async function computeCloudReparent(cloud, current, opts) {
+  const targetProjectId = opts.projectRef ? await cloudResolveProjectRef(cloud, opts.projectRef) : undefined;
+  const scope = targetProjectId ?? current.project_id ?? undefined;
+  let taskListId;
+  if (opts.listRef)
+    taskListId = await cloudResolveTaskListRef(cloud, opts.listRef, scope);
+  else if (opts.clearList)
+    taskListId = null;
+  else if (targetProjectId && targetProjectId !== current.project_id)
+    taskListId = null;
+  const patch = {};
+  if (targetProjectId !== undefined)
+    patch.project_id = targetProjectId;
+  if (taskListId !== undefined)
+    patch.task_list_id = taskListId;
+  return patch;
+}
+function computeLocalReparent(current, opts) {
+  const targetProjectId = opts.projectRef ? resolveProjectIdOrSlug(opts.projectRef) : undefined;
+  const scope = targetProjectId ?? current.project_id ?? null;
+  let taskListId;
+  if (opts.listRef) {
+    const resolved = resolveTaskListRef(opts.listRef, scope);
+    if ("error" in resolved) {
+      console.error(chalk2.red(resolved.error));
+      process.exit(1);
+    }
+    taskListId = resolved.id;
+  } else if (opts.clearList) {
+    taskListId = null;
+  } else if (targetProjectId && targetProjectId !== current.project_id) {
+    taskListId = null;
+  }
+  const patch = {};
+  if (targetProjectId !== undefined)
+    patch.project_id = targetProjectId;
+  if (taskListId !== undefined)
+    patch.task_list_id = taskListId;
+  return patch;
+}
 function registerTaskCommands(program2) {
   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("--sla-minutes <minutes>", "SLA minutes before unfinished work is escalated").option("--sla <minutes>", "Alias for --sla-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").option("--project <id>", "Assign to project by ID or slug (overrides auto-detect)").action(async (title, opts) => {
     const globalOpts = program2.opts();
@@ -15731,7 +15819,7 @@ ${chalk2.cyan(sid)} ${statusColor(task2.status)} ${prioColor(task2.priority)} ${
       console.log(`  ${chalk2.dim(h.created_at)} ${chalk2.bold(h.action)}${field}${change}${agent}`);
     }
   });
-  program2.command("update <id>").description("Update a task").option("--title <text>", "New title").option("-d, --description <text>", "New description").option("-s, --status <status>", "New status").option("-p, --priority <priority>", "New priority").option("--assign <agent>", "Assign to agent").option("--tags <tags>", "New tags (comma-separated)").option("--tag <tags>", "New tags (alias for --tags)").option("--list <id>", "Move to a task list (UUID authoritative; project-scoped slug accepted)").option("--task-list <id>", "Move to a task list (alias for --list)").option("--clear-list", "Detach from its task list (reset task_list_id to null)").option("--working-dir <path>", "Repair the task's working_dir to a specific path (routing metadata)").option("--clear-working-dir", "Reset the task's working_dir to null (undo path for routing repairs)").option("--plan <id>", "Move to a plan").option("--clear-plan", "Remove from its current plan").option("--estimated <minutes>", "Estimated time in minutes").option("--sla-minutes <minutes>", "SLA minutes before unfinished work is escalated").option("--sla <minutes>", "Alias for --sla-minutes").option("--due <date>", "Due date (ISO string or YYYY-MM-DD), empty to clear").option("--recurrence <rule>", "Recurrence rule, empty to clear").option("--approval", "Require approval before completion").option("--clear-approval", "Remove the approval requirement").action(async (id, opts) => {
+  program2.command("update <id>").description("Update a task").option("--title <text>", "New title").option("-d, --description <text>", "New description").option("-s, --status <status>", "New status").option("-p, --priority <priority>", "New priority").option("--assign <agent>", "Assign to agent").option("--tags <tags>", "New tags (comma-separated)").option("--tag <tags>", "New tags (alias for --tags)").option("--list <id>", "Move to a task list (UUID authoritative; project-scoped slug accepted)").option("--task-list <id>", "Move to a task list (alias for --list)").option("--clear-list", "Detach from its task list (reset task_list_id to null)").option("--project <id>", "Re-parent the task to another project (by ID, slug, or path); see also `todos move`").option("--working-dir <path>", "Repair the task's working_dir to a specific path (routing metadata)").option("--clear-working-dir", "Reset the task's working_dir to null (undo path for routing repairs)").option("--plan <id>", "Move to a plan").option("--clear-plan", "Remove from its current plan").option("--estimated <minutes>", "Estimated time in minutes").option("--sla-minutes <minutes>", "SLA minutes before unfinished work is escalated").option("--sla <minutes>", "Alias for --sla-minutes").option("--due <date>", "Due date (ISO string or YYYY-MM-DD), empty to clear").option("--recurrence <rule>", "Recurrence rule, empty to clear").option("--approval", "Require approval before completion").option("--clear-approval", "Remove the approval requirement").action(async (id, opts) => {
     const globalOpts = program2.opts();
     opts.tags = opts.tags || opts.tag;
     opts.list = opts.list || opts.taskList;
@@ -15758,7 +15846,11 @@ ${chalk2.cyan(sid)} ${statusColor(task2.status)} ${prioColor(task2.priority)} ${
         const plan = opts.plan ? await cloudResolvePlan(cloud, opts.plan, current2.project_id ?? undefined) : null;
         if (opts.plan && !plan)
           throw new Error(`Plan not found: ${opts.plan}`);
-        const taskListId2 = opts.list ? await cloudResolveTaskListRef(cloud, opts.list, current2.project_id ?? undefined) : opts.clearList ? null : undefined;
+        const reparent2 = await computeCloudReparent(cloud, current2, {
+          projectRef: opts.project || globalOpts.project,
+          listRef: opts.list,
+          clearList: opts.clearList
+        });
         task3 = await cloudUpdateTask(cloud, currentId, {
           title: opts.title,
           description: opts.description,
@@ -15767,7 +15859,7 @@ ${chalk2.cyan(sid)} ${statusColor(task2.status)} ${prioColor(task2.priority)} ${
           assigned_to: opts.assign,
           tags: opts.tags ? opts.tags.split(",").map((t) => t.trim()) : undefined,
           plan_id: plan?.id ?? (opts.clearPlan ? null : undefined),
-          task_list_id: taskListId2,
+          ...reparent2,
           working_dir: opts.workingDir ? resolve9(opts.workingDir) : opts.clearWorkingDir ? null : undefined,
           estimated_minutes: opts.estimated !== undefined ? parseIntOption(opts.estimated, "--estimated") : undefined,
           sla_minutes: opts.slaMinutes !== undefined || opts.sla !== undefined ? parseIntOption(opts.slaMinutes ?? opts.sla, "--sla-minutes") : undefined,
@@ -15792,14 +15884,11 @@ ${chalk2.cyan(sid)} ${statusColor(task2.status)} ${prioColor(task2.priority)} ${
       console.error(chalk2.red(`Task not found: ${id}`));
       process.exit(1);
     }
-    const taskListId = opts.list ? (() => {
-      const resolved = resolveTaskListRef(opts.list, current.project_id);
-      if ("error" in resolved) {
-        console.error(chalk2.red(resolved.error));
-        process.exit(1);
-      }
-      return resolved.id;
-    })() : opts.clearList ? null : undefined;
+    const reparent = computeLocalReparent(current, {
+      projectRef: opts.project || globalOpts.project,
+      listRef: opts.list,
+      clearList: opts.clearList
+    });
     const planId = opts.plan ? resolvePlanId(opts.plan) : opts.clearPlan ? null : undefined;
     let task2;
     try {
@@ -15812,7 +15901,7 @@ ${chalk2.cyan(sid)} ${statusColor(task2.status)} ${prioColor(task2.priority)} ${
         assigned_to: opts.assign,
         tags: opts.tags ? opts.tags.split(",").map((t) => t.trim()) : undefined,
         plan_id: planId,
-        task_list_id: taskListId,
+        ...reparent,
         working_dir: opts.workingDir ? resolve9(opts.workingDir) : opts.clearWorkingDir ? null : undefined,
         estimated_minutes: opts.estimated !== undefined ? parseIntOption(opts.estimated, "--estimated") : undefined,
         sla_minutes: opts.slaMinutes !== undefined || opts.sla !== undefined ? parseIntOption(opts.slaMinutes ?? opts.sla, "--sla-minutes") : undefined,
@@ -15830,6 +15919,68 @@ ${chalk2.cyan(sid)} ${statusColor(task2.status)} ${prioColor(task2.priority)} ${
       console.log(formatTaskLine(task2));
     }
   });
+  program2.command("move <id>").description("Move a task to another project and/or task list (keeps its id and history)").option("--to-project <id>", "Destination project (by ID, slug, or path)").option("--to-list <id>", "Destination task list (UUID authoritative; slug resolved in the destination project)").option("--clear-list", "Detach from its task list (reset task_list_id to null)").action(async (id, opts) => {
+    const globalOpts = program2.opts();
+    const projectRef = opts.toProject ?? globalOpts.project;
+    const listRef = opts.toList;
+    if (!projectRef && !listRef && !opts.clearList) {
+      handleError(new Error("Nothing to move: pass --to-project, --to-list, or --clear-list."));
+    }
+    if (listRef && opts.clearList) {
+      handleError(new Error("Use either --to-list or --clear-list, not both."));
+    }
+    const cloud = getTodosCloudClient();
+    if (cloud) {
+      let task3;
+      try {
+        const currentId = await resolveTaskIdForCommand(id, cloud);
+        const current2 = await cloudGetTask(cloud, currentId);
+        if (!current2)
+          throw new Error(`Task not found: ${id}`);
+        const reparent2 = await computeCloudReparent(cloud, current2, {
+          projectRef,
+          listRef,
+          clearList: opts.clearList
+        });
+        if (reparent2.project_id === undefined && reparent2.task_list_id === undefined) {
+          throw new Error("Nothing to move: the task is already in the requested project/list.");
+        }
+        task3 = await cloudUpdateTask(cloud, currentId, reparent2);
+      } catch (e) {
+        handleError(e);
+      }
+      if (globalOpts.json) {
+        output(task3, true);
+      } else {
+        console.log(chalk2.green("Task moved:"));
+        console.log(formatTaskLine(task3));
+      }
+      return;
+    }
+    const resolvedId = resolveTaskId(id);
+    const current = getTask(resolvedId);
+    if (!current) {
+      console.error(chalk2.red(`Task not found: ${id}`));
+      process.exit(1);
+    }
+    const reparent = computeLocalReparent(current, { projectRef, listRef, clearList: opts.clearList });
+    if (reparent.project_id === undefined && reparent.task_list_id === undefined) {
+      console.error(chalk2.red("Nothing to move: the task is already in the requested project/list."));
+      process.exit(1);
+    }
+    let task2;
+    try {
+      task2 = updateTask(resolvedId, { version: current.version, ...reparent });
+    } catch (e) {
+      handleError(e);
+    }
+    if (globalOpts.json) {
+      output(task2, true);
+    } else {
+      console.log(chalk2.green("Task moved:"));
+      console.log(formatTaskLine(task2));
+    }
+  });
   program2.command("done <id>").description("Mark a task as completed").option("--attach-ids <ids>", "Comma-separated @hasna/attachments IDs to link as evidence").option("--files-changed <files>", "Comma-separated list of files changed").option("--test-results <results>", "Test results summary").option("--commit-hash <hash>", "Git commit hash").option("--notes <notes>", "Completion notes").option("--confidence <0-1>", "Agent's confidence 0.0-1.0 that the task is fully complete (default: 1.0, <0.7 flagged for review)").action(async (id, opts) => {
     const globalOpts = program2.opts();
     const attachmentIds = opts.attachIds ? opts.attachIds.split(",").map((s) => s.trim()).filter(Boolean) : undefined;
@@ -16807,6 +16958,80 @@ __export(exports_plan_template_commands, {
   registerPlanTemplateCommands: () => registerPlanTemplateCommands
 });
 import chalk3 from "chalk";
+async function createRemoteTemplateTasks(cloud, template, projectId, variables, agentId, overrides, visited = new Set) {
+  if (visited.has(template.id)) {
+    throw new Error(`Circular template reference detected: ${template.id}`);
+  }
+  visited.add(template.id);
+  try {
+    const resolved = resolveTemplateVariables(template.variables ?? [], variables);
+    const render = (value) => value === null || value === undefined ? value : substituteTemplateVariables(value, resolved);
+    if (template.tasks.length === 0) {
+      const task = await cloudCreateTask(cloud, {
+        title: render(overrides?.title || template.title_pattern),
+        ...render(overrides?.description ?? template.description) ? { description: render(overrides?.description ?? template.description) } : {},
+        priority: overrides?.priority ?? template.priority,
+        tags: template.tags,
+        ...projectId ? { project_id: projectId } : {},
+        ...template.plan_id ? { plan_id: template.plan_id } : {},
+        ...agentId ? { agent_id: agentId } : {},
+        ...Object.keys(template.metadata ?? {}).length > 0 ? { metadata: template.metadata } : {}
+      });
+      return { tasks: [task] };
+    }
+    const created = [];
+    const positionToTaskId = new Map;
+    const skippedPositions = new Set;
+    for (const step of template.tasks) {
+      if (step.include_template_id) {
+        const included = await cloudGetTemplate(cloud, step.include_template_id);
+        if (!included)
+          throw new Error(`Included template not found: ${step.include_template_id}`);
+        const result = await createRemoteTemplateTasks(cloud, included, projectId, resolved, agentId, undefined, visited);
+        created.push(...result.tasks);
+        if (result.tasks.length > 0)
+          positionToTaskId.set(step.position, result.tasks[0].id);
+        else
+          skippedPositions.add(step.position);
+        continue;
+      }
+      if (step.condition && !evaluateTemplateCondition(step.condition, resolved)) {
+        skippedPositions.add(step.position);
+        continue;
+      }
+      const task = await cloudCreateTask(cloud, {
+        title: render(step.title_pattern),
+        ...render(step.description) ? { description: render(step.description) } : {},
+        priority: step.priority,
+        tags: step.tags,
+        ...step.task_type ? { task_type: step.task_type } : {},
+        ...projectId ? { project_id: projectId } : {},
+        ...template.plan_id ? { plan_id: template.plan_id } : {},
+        ...agentId ? { agent_id: agentId } : {},
+        ...Object.keys(step.metadata ?? {}).length > 0 ? { metadata: step.metadata } : {}
+      });
+      created.push(task);
+      positionToTaskId.set(step.position, task.id);
+    }
+    for (const step of template.tasks) {
+      if (skippedPositions.has(step.position) || step.include_template_id)
+        continue;
+      const taskId = positionToTaskId.get(step.position);
+      if (!taskId)
+        continue;
+      for (const dependencyPosition of step.depends_on_positions) {
+        if (skippedPositions.has(dependencyPosition))
+          continue;
+        const dependencyId = positionToTaskId.get(dependencyPosition);
+        if (dependencyId)
+          await cloudAddDependency(cloud, taskId, dependencyId);
+      }
+    }
+    return { tasks: created };
+  } finally {
+    visited.delete(template.id);
+  }
+}
 function resolvePlanCliRef(ref, projectId) {
   const db = getDatabase();
   const resolved = resolvePlanRefDetailed(ref, db, projectId);
@@ -17051,6 +17276,117 @@ function registerPlanTemplateCommands(program2) {
   });
   program2.command("templates").description("List and manage task templates").option("--add <name>", "Create a template").option("--title <pattern>", "Title pattern (with --add)").option("-d, --description <text>", "Default description").option("-p, --priority <level>", "Default priority").option("-t, --tags <tags>", "Default tags (comma-separated)").option("--delete <id>", "Delete a template").option("--update <id>", "Update a template").option("--use <id>", "Create a task from a template").option("--var <vars...>", "Variable substitutions: key=value (e.g. --var feature=login)").action(async (opts) => {
     const globalOpts = program2.opts();
+    const cloud = getTodosCloudClient();
+    if (cloud) {
+      try {
+        const projectId = globalOpts.project ? await cloudResolveProjectRef(cloud, globalOpts.project) : undefined;
+        if (opts.add) {
+          if (!opts.title) {
+            console.error(chalk3.red("--title is required with --add"));
+            process.exit(1);
+          }
+          const template = await cloudCreateTemplate(cloud, {
+            name: opts.add,
+            title_pattern: opts.title,
+            description: opts.description,
+            priority: opts.priority || "medium",
+            tags: opts.tags ? opts.tags.split(",").map((tag) => tag.trim()).filter(Boolean) : [],
+            project_id: projectId
+          });
+          if (globalOpts.json) {
+            output(template, true);
+          } else {
+            console.log(chalk3.green(`Template created: ${template.id.slice(0, 8)} | ${template.name} | "${template.title_pattern}"`));
+          }
+          return;
+        }
+        if (opts.delete) {
+          const deleted = await cloudDeleteTemplate(cloud, opts.delete);
+          if (globalOpts.json) {
+            output({ deleted }, true);
+          } else if (deleted) {
+            console.log(chalk3.green("Template deleted."));
+          } else {
+            console.error(chalk3.red("Template not found."));
+            process.exit(1);
+          }
+          return;
+        }
+        if (opts.update) {
+          const updates = {};
+          if (opts.title)
+            updates.title_pattern = opts.title;
+          if (opts.description)
+            updates.description = opts.description;
+          if (opts.priority)
+            updates.priority = opts.priority;
+          if (opts.tags)
+            updates.tags = opts.tags.split(",").map((tag) => tag.trim()).filter(Boolean);
+          if (Object.keys(updates).length === 0) {
+            console.error(chalk3.red("Provide --title, --description, --priority, or --tags with --update"));
+            process.exit(1);
+          }
+          const updated = await cloudUpdateTemplate(cloud, opts.update, updates);
+          if (!updated) {
+            console.error(chalk3.red("Template not found."));
+            process.exit(1);
+          }
+          if (globalOpts.json) {
+            output(updated, true);
+          } else {
+            console.log(chalk3.green(`Template updated: ${updated.id.slice(0, 8)} | ${updated.name} | "${updated.title_pattern}"`));
+          }
+          return;
+        }
+        if (opts.use) {
+          const variables = {};
+          for (const value of opts.var ?? []) {
+            const separator = value.indexOf("=");
+            if (separator === -1) {
+              console.error(chalk3.red(`Invalid variable format: ${value} (expected key=value)`));
+              process.exit(1);
+            }
+            variables[value.slice(0, separator)] = value.slice(separator + 1);
+          }
+          const template = await cloudGetTemplate(cloud, opts.use);
+          if (!template) {
+            console.error(chalk3.red("Template not found."));
+            process.exit(1);
+          }
+          const targetProjectId = template.project_id ?? projectId;
+          const { tasks: created } = await createRemoteTemplateTasks(cloud, template, targetProjectId, variables, globalOpts.agent, {
+            title: opts.title,
+            description: opts.description,
+            priority: opts.priority
+          });
+          if (globalOpts.json) {
+            output(created, true);
+          } else {
+            console.log(chalk3.green(`${created.length} task(s) created from template:`));
+            for (const task of created)
+              console.log(formatTaskLine(task));
+          }
+          return;
+        }
+        const templates2 = await cloudListTemplates(cloud, projectId);
+        if (globalOpts.json) {
+          output(templates2, true);
+          return;
+        }
+        if (templates2.length === 0) {
+          console.log(chalk3.dim("No templates."));
+          return;
+        }
+        console.log(chalk3.bold(`${templates2.length} template(s):
+`));
+        for (const template of templates2) {
+          console.log(`  ${chalk3.dim(template.id.slice(0, 8))} ${chalk3.bold(template.name)} ${chalk3.cyan(`"${template.title_pattern}"`)} ${chalk3.yellow(template.priority)}`);
+        }
+      } catch (error) {
+        handleError(error);
+      }
+      return;
+    }
     const {
       createTemplate: createTemplate2,
       getTemplateWithTasks: getTemplateWithTasks2,
@@ -17303,7 +17639,6 @@ function registerPlanTemplateCommands(program2) {
   });
   program2.command("template-import [file]").alias("templates-import").description("Import a template from a JSON file").option("--file <path>", "Path to template JSON file (alternative to positional arg)").action(async (file, opts) => {
     const globalOpts = program2.opts();
-    const { importTemplate: importTemplate2 } = await Promise.resolve().then(() => (init_templates(), exports_templates));
     const { readFileSync: readFileSync5 } = await import("fs");
     try {
       const filePath = file || opts.file;
@@ -17313,7 +17648,8 @@ function registerPlanTemplateCommands(program2) {
       }
       const content = readFileSync5(filePath, "utf-8");
       const json = JSON.parse(content);
-      const template = importTemplate2(json);
+      const cloud = getTodosCloudClient();
+      const template = cloud ? await cloudCreateTemplate(cloud, json) : (await Promise.resolve().then(() => (init_templates(), exports_templates))).importTemplate(json);
       if (globalOpts.json) {
         output(template, true);
       } else {
@@ -26208,6 +26544,7 @@ function exportSqliteTodosStorageSnapshot(db) {
     agents: listAgents({ include_archived: true }, d),
     taskLists: listTaskLists(undefined, d),
     templates: listTemplates(d),
+    templateTasks: listTemplates(d).flatMap((template) => getTemplateTasks(template.id, d)),
     auditHistory: getRecentActivity(Number.MAX_SAFE_INTEGER, d),
     tombstones: listStorageTombstones(d)
   };
@@ -26257,6 +26594,7 @@ function importSqliteTodosStorageSnapshot(snapshot, db) {
   applyRows("task_lists", "task_lists", TASK_LIST_COLUMNS, snapshot.taskLists, "updated_at");
   applyRows("plans", "plans", PLAN_COLUMNS, snapshot.plans, "updated_at");
   applyRows("templates", "task_templates", TEMPLATE_COLUMNS, snapshot.templates);
+  applyRows("template_tasks", "template_tasks", TEMPLATE_TASK_COLUMNS, snapshot.templateTasks ?? []);
   applyRows("tasks", "tasks", TASK_COLUMNS, sortedTasks2(snapshot.tasks), "updated_at", (row, changed) => {
     if (changed && Array.isArray(row["tags"]) && typeof row["id"] === "string") {
       replaceTaskTags(row["id"], row["tags"].filter((tag) => typeof tag === "string"), d);
@@ -26361,6 +26699,8 @@ function tableForTombstone(objectType) {
     return "task_lists";
   if (objectType === "templates")
     return "task_templates";
+  if (objectType === "template_tasks")
+    return "template_tasks";
   return "task_history";
 }
 function listRows(db, table, columns) {
@@ -26397,7 +26737,7 @@ function clockColumnsForTable(table) {
     return ["created_at"];
   return ["updated_at", "created_at"];
 }
-var PROJECT_COLUMNS, PROJECT_MACHINE_PATH_COLUMNS, TASK_LIST_COLUMNS, PLAN_COLUMNS, AGENT_COLUMNS, TEMPLATE_COLUMNS, TASK_COLUMNS, AUDIT_COLUMNS, JSON_COLUMNS, BOOLEAN_COLUMNS;
+var PROJECT_COLUMNS, PROJECT_MACHINE_PATH_COLUMNS, TASK_LIST_COLUMNS, PLAN_COLUMNS, AGENT_COLUMNS, TEMPLATE_COLUMNS, TEMPLATE_TASK_COLUMNS, TASK_COLUMNS, AUDIT_COLUMNS, JSON_COLUMNS, BOOLEAN_COLUMNS;
 var init_sqlite_snapshot = __esm(() => {
   init_database();
   init_agents();
@@ -26491,6 +26831,21 @@ var init_sqlite_snapshot = __esm(() => {
     "machine_id",
     "synced_at"
   ];
+  TEMPLATE_TASK_COLUMNS = [
+    "id",
+    "template_id",
+    "position",
+    "title_pattern",
+    "description",
+    "priority",
+    "tags",
+    "task_type",
+    "condition",
+    "include_template_id",
+    "depends_on_positions",
+    "metadata",
+    "created_at"
+  ];
   TASK_COLUMNS = [
     "id",
     "short_id",
@@ -26559,7 +26914,7 @@ var init_sqlite_snapshot = __esm(() => {
     "created_at",
     "machine_id"
   ];
-  JSON_COLUMNS = new Set(["tags", "metadata", "permissions", "capabilities", "variables"]);
+  JSON_COLUMNS = new Set(["tags", "metadata", "permissions", "capabilities", "variables", "depends_on_positions"]);
   BOOLEAN_COLUMNS = new Set(["requires_approval"]);
 });
 
@@ -26949,6 +27304,7 @@ function snapshotEntries(snapshot) {
     ...snapshot.agents.map((payload) => entry("agents", payload, snapshot.exportedAt)),
     ...snapshot.taskLists.map((payload) => entry("task_lists", payload, snapshot.exportedAt)),
     ...snapshot.templates.map((payload) => entry("templates", payload, snapshot.exportedAt)),
+    ...(snapshot.templateTasks ?? []).map((payload) => entry("template_tasks", payload, snapshot.exportedAt)),
     ...snapshot.auditHistory.map((payload) => entry("audit_history", payload, snapshot.exportedAt)),
     ...(snapshot.tombstones ?? []).map((tombstone) => ({
       type: tombstone.object_type,
@@ -27000,6 +27356,7 @@ function rowsToSnapshot(rows) {
     agents: [],
     taskLists: [],
     templates: [],
+    templateTasks: [],
     auditHistory: [],
     tombstones: []
   };
@@ -27034,6 +27391,8 @@ function rowsToSnapshot(rows) {
       snapshot.taskLists.push(payload);
     else if (row.object_type === "templates")
       snapshot.templates.push(payload);
+    else if (row.object_type === "template_tasks")
+      snapshot.templateTasks.push(payload);
     else if (row.object_type === "audit_history")
       snapshot.auditHistory.push(payload);
   }
@@ -27251,6 +27610,9 @@ class TodosShadowOutbox {
       case "templates":
         snapshot.templates.push(record);
         break;
+      case "template_tasks":
+        snapshot.templateTasks.push(record);
+        break;
       case "audit_history":
         snapshot.auditHistory.push(record);
         break;
@@ -27317,6 +27679,7 @@ function emptySnapshot() {
     agents: [],
     taskLists: [],
     templates: [],
+    templateTasks: [],
     auditHistory: [],
     tombstones: []
   };
@@ -27513,10 +27876,13 @@ function createPostgresTodosStorageAdapter(options) {
       get: (id) => store.get("templates", id),
       list: async () => (await store.list("templates")).sort((a, b) => a.name.localeCompare(b.name)),
       update: (id, input) => updateTemplate2(id, input, store),
-      delete: (id, context) => store.delete("templates", id, context),
+      delete: (id, context) => deleteTemplate2(id, store, context),
       getWithTasks: async (id) => {
         const template = await store.get("templates", id);
-        return template ? { ...template, tasks: [] } : null;
+        if (!template)
+          return null;
+        const tasks = (await store.list("template_tasks")).filter((task) => task.template_id === id).sort((left, right) => left.position - right.position || left.id.localeCompare(right.id));
+        return { ...template, tasks };
       }
     },
     audit: {
@@ -27804,6 +28170,57 @@ class PostgresJsonRecordStore {
     }
     return value;
   }
+  async createTemplateWithTasks(template, tasks, context = {}) {
+    await this.ensureSchema();
+    const records = [
+      { object_type: "templates", object_id: template.id, payload: template, updated_at: template.created_at, version: template.version },
+      ...tasks.map((task) => ({ object_type: "template_tasks", object_id: task.id, payload: task, updated_at: task.created_at, version: 1 }))
+    ];
+    const result = await this.options.client.query(`/* todos:create-template-with-tasks-atomic */ WITH input AS (
+         SELECT value->>'object_type' AS object_type,
+           value->>'object_id' AS object_id,
+           value->'payload' AS payload,
+           value->>'updated_at' AS updated_at,
+           COALESCE((value->>'version')::integer, 1) AS version
+         FROM jsonb_array_elements($2::jsonb) AS value
+       ) INSERT INTO ${this.tableName} (
+         service, object_type, object_id, payload, updated_at,
+         deleted_at, source_machine_id, version
+       ) SELECT $1, object_type, object_id, payload, updated_at::timestamptz,
+         NULL, $3, version
+       FROM input
+       ON CONFLICT (service, object_type, object_id) DO UPDATE SET
+         payload = EXCLUDED.payload,
+         updated_at = EXCLUDED.updated_at,
+         deleted_at = NULL,
+         source_machine_id = EXCLUDED.source_machine_id,
+         version = EXCLUDED.version
+       WHERE ${this.tableName}.updated_at IS NULL
+          OR ${this.tableName}.updated_at < EXCLUDED.updated_at
+          OR (${this.tableName}.updated_at = EXCLUDED.updated_at
+              AND COALESCE(${this.tableName}.version, 0) <= COALESCE(EXCLUDED.version, 0))
+       RETURNING object_type, object_id`, [this.service, jsonbParam(records), this.machineId(context)]);
+    if (result.rows.length !== records.length) {
+      throw new Error("Template checklist write was rejected before completion; no partial template was committed");
+    }
+  }
+  async deleteTemplateWithTasks(id, context = {}) {
+    await this.ensureSchema();
+    const timestamp = new Date().toISOString();
+    const result = await this.options.client.query(`/* todos:delete-template-with-tasks-atomic */ WITH target AS (
+         SELECT 1 FROM ${this.tableName}
+         WHERE service = $1 AND object_type = 'templates' AND object_id = $2 AND deleted_at IS NULL
+       ) UPDATE ${this.tableName} AS record SET
+         deleted_at = $3::timestamptz,
+         updated_at = $3::timestamptz,
+         source_machine_id = COALESCE($4, record.source_machine_id),
+         version = COALESCE(record.version, 0) + 1
+       WHERE record.service = $1 AND record.deleted_at IS NULL AND EXISTS (SELECT 1 FROM target)
+         AND (record.object_type = 'templates' AND record.object_id = $2
+           OR record.object_type = 'template_tasks' AND record.payload->>'template_id' = $2)
+       RETURNING record.object_type`, [this.service, id, timestamp, this.machineId(context)]);
+    return result.rows.some((row) => row.object_type === "templates");
+  }
   async completeTask(id, agentId, options) {
     await this.ensureSchema();
     const operationTimestamp = new Date().toISOString();
@@ -28144,7 +28561,7 @@ async function updateTask2(id, input, store) {
     tags: input.tags ?? existing.tags,
     metadata: input.metadata ?? existing.metadata,
     requires_approval: input.requires_approval ?? existing.requires_approval,
-    task_list_id: input.task_list_id ?? existing.task_list_id
+    task_list_id: input.task_list_id !== undefined ? input.task_list_id : existing.task_list_id
   };
   await store.upsert("tasks", task);
   return task;
@@ -28566,7 +28983,7 @@ async function updateTaskList2(id, input, store) {
 }
 async function createTemplate2(input, store, context) {
   const timestamp = new Date().toISOString();
-  return store.upsert("templates", {
+  const template = {
     id: randomUUID3(),
     name: input.name,
     title_pattern: input.title_pattern,
@@ -28581,7 +28998,30 @@ async function createTemplate2(input, store, context) {
     created_at: timestamp,
     machine_id: store.machineId(context),
     synced_at: null
-  }, context);
+  };
+  const tasks = buildTemplateTasks(template.id, input.tasks ?? [], timestamp);
+  await store.createTemplateWithTasks(template, tasks, context);
+  return template;
+}
+function buildTemplateTasks(templateId, inputs, timestamp) {
+  return inputs.map((input, position) => ({
+    id: randomUUID3(),
+    template_id: templateId,
+    position,
+    title_pattern: input.title_pattern,
+    description: input.description ?? null,
+    priority: input.priority ?? "medium",
+    tags: input.tags ?? [],
+    task_type: input.task_type ?? null,
+    condition: input.condition ?? null,
+    include_template_id: input.include_template_id ?? null,
+    depends_on_positions: input.depends_on ?? [],
+    metadata: input.metadata ?? {},
+    created_at: timestamp
+  }));
+}
+async function deleteTemplate2(id, store, context) {
+  return store.deleteTemplateWithTasks(id, context);
 }
 async function updateTemplate2(id, input, store) {
   const template = await store.get("templates", id);
@@ -28637,6 +29077,7 @@ async function exportSnapshot(store) {
     agents: await store.list("agents"),
     taskLists: await store.list("task_lists"),
     templates: await store.list("templates"),
+    templateTasks: await store.list("template_tasks"),
     auditHistory: await store.list("audit_history"),
     tombstones: await store.listTombstones()
   };
@@ -28661,6 +29102,7 @@ async function importSnapshot(snapshot, store, context) {
     ...snapshot.agents.map((row) => ["agents", row]),
     ...snapshot.taskLists.map((row) => ["task_lists", row]),
     ...snapshot.templates.map((row) => ["templates", row]),
+    ...(snapshot.templateTasks ?? []).map((row) => ["template_tasks", row]),
     ...snapshot.auditHistory.map((row) => ["audit_history", row])
   ];
   for (const [type, row] of entries) {
@@ -29070,12 +29512,16 @@ function buildV1OpenApiDocument(version = getPackageVersion()) {
         TaskList: taskListSchema,
         TaskComment: taskCommentSchema,
         Plan: planSchema,
+        Template: templateSchema,
+        TemplateTask: templateTaskSchema,
+        TemplateVariable: templateVariableSchema,
+        CreateTemplateTaskInput: createTemplateTaskInputSchema,
         CreateTaskInput: {
           type: "object",
           required: ["title"],
           properties: {
             title: { type: "string" },
-            description: { type: "string" },
+            description: { type: "string", nullable: true },
             status: { type: "string" },
             priority: { type: "string" },
             project_id: { type: "string" },
@@ -29092,6 +29538,8 @@ function buildV1OpenApiDocument(version = getPackageVersion()) {
             status: { type: "string" },
             priority: { type: "string" },
             assigned_to: { type: "string" },
+            project_id: { type: "string", nullable: true },
+            task_list_id: { type: "string", nullable: true },
             version: { type: "number" }
           }
         },
@@ -29208,6 +29656,39 @@ function buildV1OpenApiDocument(version = getPackageVersion()) {
             agent_id: { type: "string", minLength: 1 },
             status: { type: "string", enum: ["active", "completed", "archived"] }
           }
+        },
+        CreateTemplateInput: {
+          type: "object",
+          additionalProperties: false,
+          required: ["name", "title_pattern"],
+          properties: {
+            name: { type: "string", minLength: 1 },
+            title_pattern: { type: "string", minLength: 1 },
+            description: { type: "string", nullable: true },
+            priority: { type: "string", enum: ["low", "medium", "high", "critical"] },
+            tags: { type: "array", items: { type: "string", minLength: 1 } },
+            variables: { type: "array", items: { $ref: "#/components/schemas/TemplateVariable" } },
+            project_id: { type: "string", minLength: 1, nullable: true },
+            plan_id: { type: "string", minLength: 1, nullable: true },
+            metadata: { type: "object", additionalProperties: true },
+            tasks: { type: "array", items: { $ref: "#/components/schemas/CreateTemplateTaskInput" } }
+          }
+        },
+        UpdateTemplateInput: {
+          type: "object",
+          additionalProperties: false,
+          minProperties: 1,
+          properties: {
+            name: { type: "string", minLength: 1 },
+            title_pattern: { type: "string", minLength: 1 },
+            description: { type: "string", nullable: true },
+            priority: { type: "string", enum: ["low", "medium", "high", "critical"] },
+            tags: { type: "array", items: { type: "string", minLength: 1 } },
+            variables: { type: "array", items: { type: "object" } },
+            project_id: { type: "string", nullable: true },
+            plan_id: { type: "string", nullable: true },
+            metadata: { type: "object", additionalProperties: true }
+          }
         }
       }
     },
@@ -29510,6 +29991,41 @@ function buildV1OpenApiDocument(version = getPackageVersion()) {
           responses: { "200": { content: { "application/json": { schema: { type: "object", properties: { deleted: { type: "boolean" }, id: { type: "string" } } } } } } }
         }
       },
+      "/v1/templates": {
+        get: {
+          operationId: "listTemplates",
+          summary: "List reusable task templates",
+          parameters: [{ name: "project_id", in: "query", schema: { type: "string" } }],
+          responses: { "200": { content: { "application/json": { schema: { type: "object", properties: { templates: { type: "array", items: { $ref: "#/components/schemas/Template" } }, count: { type: "number" } } } } } } }
+        },
+        post: {
+          operationId: "createTemplate",
+          summary: "Create a reusable task template",
+          requestBody: { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/CreateTemplateInput" } } } },
+          responses: { "201": { content: { "application/json": { schema: { type: "object", properties: { template: { $ref: "#/components/schemas/Template" } } } } } } }
+        }
+      },
+      "/v1/templates/{id}": {
+        get: {
+          operationId: "getTemplate",
+          summary: "Get one reusable task template with its checklist steps",
+          parameters: [{ name: "id", in: "path", required: true, schema: { type: "string" } }],
+          responses: { "200": { content: { "application/json": { schema: { type: "object", properties: { template: { $ref: "#/components/schemas/Template" } } } } } } }
+        },
+        patch: {
+          operationId: "updateTemplate",
+          summary: "Update reusable template metadata and defaults",
+          parameters: [{ name: "id", in: "path", required: true, schema: { type: "string" } }],
+          requestBody: { required: true, content: { "application/json": { schema: { $ref: "#/components/schemas/UpdateTemplateInput" } } } },
+          responses: { "200": { content: { "application/json": { schema: { type: "object", properties: { template: { $ref: "#/components/schemas/Template" } } } } } } }
+        },
+        delete: {
+          operationId: "deleteTemplate",
+          summary: "Delete a reusable task template and its checklist steps",
+          parameters: [{ name: "id", in: "path", required: true, schema: { type: "string" } }],
+          responses: { "200": { content: { "application/json": { schema: { type: "object", properties: { deleted: { type: "boolean" }, id: { type: "string" } } } } } } }
+        }
+      },
       "/v1/task-lists": {
         get: {
           operationId: "listTaskLists",
@@ -29587,6 +30103,7 @@ function buildV1OpenApiDocument(version = getPackageVersion()) {
                     agents: { type: "array", items: { type: "object" } },
                     taskLists: { type: "array", items: { type: "object" } },
                     templates: { type: "array", items: { type: "object" } },
+                    templateTasks: { type: "array", items: { $ref: "#/components/schemas/TemplateTask" } },
                     auditHistory: { type: "array", items: { type: "object" } },
                     tombstones: { type: "array", items: { type: "object" } }
                   }
@@ -29623,7 +30140,7 @@ function buildV1OpenApiDocument(version = getPackageVersion()) {
     }
   };
 }
-var taskSchema, projectSchema, taskListSchema, taskCommentSchema, planSchema;
+var taskSchema, projectSchema, taskListSchema, taskCommentSchema, planSchema, templateTaskSchema, templateSchema, templateVariableSchema, createTemplateTaskInputSchema;
 var init_openapi = __esm(() => {
   init_package_version();
   taskSchema = {
@@ -29700,6 +30217,72 @@ var init_openapi = __esm(() => {
       updated_at: { type: "string", format: "date-time" }
     }
   };
+  templateTaskSchema = {
+    type: "object",
+    required: ["id", "template_id", "position", "title_pattern", "priority", "tags", "depends_on_positions", "metadata", "created_at"],
+    properties: {
+      id: { type: "string" },
+      template_id: { type: "string" },
+      position: { type: "integer", minimum: 0 },
+      title_pattern: { type: "string" },
+      description: { type: "string", nullable: true },
+      priority: { type: "string", enum: ["low", "medium", "high", "critical"] },
+      tags: { type: "array", items: { type: "string" } },
+      task_type: { type: "string", nullable: true },
+      condition: { type: "string", nullable: true },
+      include_template_id: { type: "string", nullable: true },
+      depends_on_positions: { type: "array", items: { type: "integer", minimum: 0 } },
+      metadata: { type: "object", additionalProperties: true },
+      created_at: { type: "string", format: "date-time" }
+    }
+  };
+  templateSchema = {
+    type: "object",
+    required: ["id", "name", "title_pattern", "priority", "tags", "variables", "version", "metadata", "created_at"],
+    properties: {
+      id: { type: "string" },
+      name: { type: "string" },
+      title_pattern: { type: "string" },
+      description: { type: "string", nullable: true },
+      priority: { type: "string", enum: ["low", "medium", "high", "critical"] },
+      tags: { type: "array", items: { type: "string" } },
+      variables: { type: "array", items: { type: "object", properties: { name: { type: "string" }, required: { type: "boolean" }, default: { type: "string" }, description: { type: "string" } } } },
+      version: { type: "integer", minimum: 1 },
+      project_id: { type: "string", nullable: true },
+      plan_id: { type: "string", nullable: true },
+      metadata: { type: "object", additionalProperties: true },
+      created_at: { type: "string", format: "date-time" },
+      tasks: { type: "array", items: { $ref: "#/components/schemas/TemplateTask" } }
+    }
+  };
+  templateVariableSchema = {
+    type: "object",
+    required: ["name", "required"],
+    properties: {
+      name: { type: "string" },
+      required: { type: "boolean" },
+      default: { type: "string" },
+      description: { type: "string" }
+    }
+  };
+  createTemplateTaskInputSchema = {
+    type: "object",
+    additionalProperties: false,
+    required: ["title_pattern"],
+    properties: {
+      position: { type: "integer", minimum: 0 },
+      title_pattern: { type: "string", minLength: 1 },
+      description: { type: "string", nullable: true },
+      priority: { type: "string", enum: ["low", "medium", "high", "critical"] },
+      tags: { type: "array", items: { type: "string", minLength: 1 } },
+      task_type: { type: "string", nullable: true },
+      condition: { type: "string", nullable: true },
+      include_template_id: { type: "string", nullable: true },
+      depends_on: { type: "array", items: { type: "integer", minimum: 0 } },
+      depends_on_positions: { type: "array", items: { type: "integer", minimum: 0 } },
+      metadata: { type: "object", additionalProperties: true }
+    }
+  };
 });
 
 // src/server/v1.ts
@@ -29839,6 +30422,122 @@ function validatePlanCreate(value) {
     }
   };
 }
+function validateTemplateTask(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    return null;
+  const body = value;
+  const allowed = new Set(["position", "title_pattern", "description", "priority", "tags", "task_type", "condition", "include_template_id", "depends_on", "depends_on_positions", "metadata"]);
+  if (Object.keys(body).some((key) => !allowed.has(key)))
+    return null;
+  if (typeof body.title_pattern !== "string" || !body.title_pattern.trim())
+    return null;
+  if (body.position !== undefined && (typeof body.position !== "number" || !Number.isSafeInteger(body.position) || body.position < 0))
+    return null;
+  if (body.description !== undefined && body.description !== null && typeof body.description !== "string")
+    return null;
+  if (body.priority !== undefined && (typeof body.priority !== "string" || !["low", "medium", "high", "critical"].includes(body.priority)))
+    return null;
+  if (body.tags !== undefined && (!Array.isArray(body.tags) || body.tags.some((tag) => typeof tag !== "string" || !tag.trim())))
+    return null;
+  for (const field of ["task_type", "condition", "include_template_id"]) {
+    if (body[field] !== undefined && body[field] !== null && (typeof body[field] !== "string" || !body[field].trim()))
+      return null;
+  }
+  if (body.depends_on !== undefined && body.depends_on_positions !== undefined)
+    return null;
+  const dependencies = body.depends_on ?? body.depends_on_positions;
+  if (dependencies !== undefined && (!Array.isArray(dependencies) || dependencies.some((position) => !Number.isSafeInteger(position) || position < 0)))
+    return null;
+  if (body.metadata !== undefined && (!body.metadata || typeof body.metadata !== "object" || Array.isArray(body.metadata)))
+    return null;
+  return {
+    title_pattern: body.title_pattern,
+    ...typeof body.description === "string" ? { description: body.description } : {},
+    ...typeof body.priority === "string" ? { priority: body.priority } : {},
+    ...Array.isArray(body.tags) ? { tags: body.tags } : {},
+    ...typeof body.task_type === "string" ? { task_type: body.task_type } : {},
+    ...typeof body.condition === "string" ? { condition: body.condition } : {},
+    ...typeof body.include_template_id === "string" ? { include_template_id: body.include_template_id } : {},
+    ...Array.isArray(dependencies) ? { depends_on: dependencies } : {},
+    ...body.metadata && typeof body.metadata === "object" && !Array.isArray(body.metadata) ? { metadata: body.metadata } : {}
+  };
+}
+function validateTemplateCreate(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    return { ok: false, message: "template body must be an object" };
+  const body = value;
+  const allowed = new Set(["name", "title_pattern", "description", "priority", "tags", "variables", "project_id", "plan_id", "metadata", "tasks"]);
+  const unknown = Object.keys(body).find((key) => !allowed.has(key));
+  if (unknown)
+    return { ok: false, message: `unknown template field: ${unknown}` };
+  if (typeof body.name !== "string" || !body.name.trim())
+    return { ok: false, message: "name must be a non-empty string" };
+  if (typeof body.title_pattern !== "string" || !body.title_pattern.trim())
+    return { ok: false, message: "title_pattern must be a non-empty string" };
+  if (body.description !== undefined && body.description !== null && typeof body.description !== "string")
+    return { ok: false, message: "description must be a string or null" };
+  if (body.priority !== undefined && (typeof body.priority !== "string" || !["low", "medium", "high", "critical"].includes(body.priority)))
+    return { ok: false, message: "priority must be low, medium, high, or critical" };
+  if (body.tags !== undefined && (!Array.isArray(body.tags) || body.tags.some((tag) => typeof tag !== "string" || !tag.trim())))
+    return { ok: false, message: "tags must be an array of non-empty strings" };
+  if (body.variables !== undefined && (!Array.isArray(body.variables) || body.variables.some((variable) => !variable || typeof variable !== "object" || Array.isArray(variable) || typeof variable.name !== "string" || !variable.name || typeof variable.required !== "boolean" || variable.default !== undefined && typeof variable.default !== "string" || variable.description !== undefined && typeof variable.description !== "string"))) {
+    return { ok: false, message: "variables must be valid template variable objects" };
+  }
+  for (const field of ["project_id", "plan_id"]) {
+    if (body[field] !== undefined && body[field] !== null && (typeof body[field] !== "string" || !body[field].trim()))
+      return { ok: false, message: `${field} must be a non-empty string or null` };
+  }
+  if (body.metadata !== undefined && (!body.metadata || typeof body.metadata !== "object" || Array.isArray(body.metadata)))
+    return { ok: false, message: "metadata must be an object" };
+  const tasks = body.tasks === undefined ? [] : Array.isArray(body.tasks) ? body.tasks.map(validateTemplateTask) : null;
+  if (tasks === null || tasks.some((task) => task === null))
+    return { ok: false, message: "tasks must be valid template task objects" };
+  const taskInputs = tasks;
+  for (const [position, task] of taskInputs.entries()) {
+    if ((task.depends_on ?? []).some((dependency) => dependency >= position)) {
+      return { ok: false, message: "template task dependencies must reference earlier task positions" };
+    }
+  }
+  return {
+    ok: true,
+    input: {
+      name: body.name,
+      title_pattern: body.title_pattern,
+      ...typeof body.description === "string" ? { description: body.description } : {},
+      ...typeof body.priority === "string" ? { priority: body.priority } : {},
+      ...Array.isArray(body.tags) ? { tags: body.tags } : {},
+      ...Array.isArray(body.variables) ? { variables: body.variables } : {},
+      ...typeof body.project_id === "string" ? { project_id: body.project_id } : {},
+      ...typeof body.plan_id === "string" ? { plan_id: body.plan_id } : {},
+      ...body.metadata && typeof body.metadata === "object" && !Array.isArray(body.metadata) ? { metadata: body.metadata } : {},
+      tasks: taskInputs
+    }
+  };
+}
+function validateTemplatePatch(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    return { ok: false, message: "template patch must be an object" };
+  const body = value;
+  const allowed = new Set(["name", "title_pattern", "description", "priority", "tags", "variables", "project_id", "plan_id", "metadata"]);
+  const unknown = Object.keys(body).find((key) => !allowed.has(key));
+  if (unknown)
+    return { ok: false, message: `unknown template field: ${unknown}` };
+  if (Object.keys(body).length === 0)
+    return { ok: false, message: "template patch must not be empty" };
+  const templateLike = { name: body.name ?? "template", title_pattern: body.title_pattern ?? "template", ...body };
+  const validated = validateTemplateCreate(templateLike);
+  if (!validated.ok)
+    return validated;
+  const { name: _name, title_pattern: _title, tasks: _tasks, ...patch } = validated.input;
+  return { ok: true, patch: {
+    ...body.name !== undefined ? { name: validated.input.name } : {},
+    ...body.title_pattern !== undefined ? { title_pattern: validated.input.title_pattern } : {},
+    ...patch,
+    ...body.description === null ? { description: null } : {},
+    ...body.project_id === null ? { project_id: null } : {},
+    ...body.plan_id === null ? { plan_id: null } : {}
+  } };
+}
 async function readJson(req) {
   try {
     const text = await req.text();
@@ -29899,12 +30598,13 @@ function normalizeImportSnapshot(raw) {
     agents: arr(body["agents"]),
     taskLists: arr(body["taskLists"]),
     templates: arr(body["templates"]),
+    templateTasks: arr(body["templateTasks"]),
     auditHistory: arr(body["auditHistory"]),
     tombstones: arr(body["tombstones"])
   };
 }
 function countSnapshotRecords(s) {
-  return s.tasks.length + s.projects.length + (s.projectMachinePaths?.length ?? 0) + s.plans.length + s.agents.length + s.taskLists.length + s.templates.length + s.auditHistory.length + (s.tombstones?.length ?? 0);
+  return s.tasks.length + s.projects.length + (s.projectMachinePaths?.length ?? 0) + s.plans.length + s.agents.length + s.taskLists.length + s.templates.length + s.templateTasks.length + s.auditHistory.length + (s.tombstones?.length ?? 0);
 }
 async function handleV1Request(req, url, dependencies = {}) {
   const path = url.pathname;
@@ -30474,6 +31174,40 @@ async function handleV1Request(req, url, dependencies = {}) {
       if (id)
         return error(405, `method ${method} not allowed on /v1/plans/:id`);
     }
+    if (resource === "templates") {
+      if (!id && method === "GET") {
+        const projectId = url.searchParams.get("project_id");
+        const templates = (await store.templates.list()).filter((template) => projectId === null || template.project_id === projectId);
+        return json2({ templates, count: templates.length });
+      }
+      if (!id && method === "POST") {
+        const body = await readJson(req);
+        const validated = validateTemplateCreate(body);
+        if (!validated.ok)
+          return error(400, validated.message);
+        const template = await store.templates.create(validated.input, contextFromPrincipal(principal));
+        return json2({ template: await store.templates.getWithTasks(template.id) }, 201);
+      }
+      if (!id)
+        return error(405, `method ${method} not allowed on /v1/templates`);
+      if (method === "GET") {
+        const template = await store.templates.getWithTasks(id);
+        return template ? json2({ template }) : error(404, "template not found");
+      }
+      if (method === "PATCH" || method === "PUT") {
+        const body = await readJson(req);
+        const validated = validateTemplatePatch(body);
+        if (!validated.ok)
+          return error(400, validated.message);
+        const template = await store.templates.update(id, validated.patch, contextFromPrincipal(principal));
+        return template ? json2({ template: await store.templates.getWithTasks(id) }) : error(404, "template not found");
+      }
+      if (method === "DELETE") {
+        const deleted = await store.templates.delete(id, contextFromPrincipal(principal));
+        return deleted ? json2({ deleted: true, id }) : error(404, "template not found");
+      }
+      return error(405, `method ${method} not allowed on /v1/templates/:id`);
+    }
     if (resource === "agents") {
       if (!id && method === "GET") {
         const agents = await store.agents.list();
@@ -35450,6 +36184,17 @@ ${task.description}` : null
             patch.estimated_minutes = estimate;
           if (deadline !== undefined)
             patch.due_at = deadline;
+          if (typeof patch.project_id === "string" && patch.project_id) {
+            patch.project_id = await cloudResolveProjectRef(cloud, patch.project_id);
+          }
+          if (typeof patch.task_list_id === "string" && patch.task_list_id) {
+            let scope = typeof patch.project_id === "string" ? patch.project_id : undefined;
+            if (!scope) {
+              const current = await cloudGetTask(cloud, task_id2);
+              scope = current?.project_id ?? undefined;
+            }
+            patch.task_list_id = await cloudResolveTaskListRef(cloud, patch.task_list_id, scope);
+          }
           if (version2 !== undefined)
             patch.version = version2;
           const updated = await cloudUpdateTask(cloud, task_id2, patch);
@@ -39667,6 +40412,63 @@ function registerTaskProjectTools(server, ctx) {
       }
     });
   }
+  if (shouldRegisterTool("move_task")) {
+    server.tool("move_task", "Re-parent a task to another project and/or task list, preserving its id and history. " + "A task list is project-scoped, so moving to a new project detaches the old list unless to_list is given.", {
+      task_id: exports_external.string().describe("Task ID"),
+      to_project: exports_external.string().optional().describe("Destination project ID, slug, or path"),
+      to_list: exports_external.string().optional().describe("Destination task list (UUID, or slug resolved in the destination project)"),
+      clear_list: exports_external.boolean().optional().describe("Detach from its task list (set task_list_id to null)"),
+      version: exports_external.number().optional().describe("Expected version for optimistic locking")
+    }, async ({ task_id, to_project, to_list, clear_list, version }) => {
+      try {
+        if (!to_project && !to_list && !clear_list) {
+          throw new Error("Nothing to move: pass to_project, to_list, or clear_list.");
+        }
+        if (to_list && clear_list) {
+          throw new Error("Use either to_list or clear_list, not both.");
+        }
+        const cloud = getTodosCloudClient();
+        if (cloud) {
+          const current2 = await cloudGetTask(cloud, task_id);
+          if (!current2)
+            throw new Error(`Task not found: ${task_id}`);
+          const targetProjectId2 = to_project ? await cloudResolveProjectRef(cloud, to_project) : undefined;
+          const scope = targetProjectId2 ?? current2.project_id ?? undefined;
+          const patch = {};
+          if (targetProjectId2 !== undefined)
+            patch.project_id = targetProjectId2;
+          if (to_list)
+            patch.task_list_id = await cloudResolveTaskListRef(cloud, to_list, scope);
+          else if (clear_list)
+            patch.task_list_id = null;
+          else if (targetProjectId2 && targetProjectId2 !== current2.project_id)
+            patch.task_list_id = null;
+          if (version !== undefined)
+            patch.version = version;
+          const task2 = await cloudUpdateTask(cloud, task_id, patch);
+          return { content: [{ type: "text", text: formatTask(task2) }] };
+        }
+        const resolvedId = resolveId(task_id);
+        const current = getTask(resolvedId);
+        if (!current)
+          throw new Error(`Task not found: ${task_id}`);
+        const targetProjectId = to_project ? resolveId(to_project, "projects") : undefined;
+        const updates = {};
+        if (targetProjectId !== undefined)
+          updates.project_id = targetProjectId;
+        if (to_list)
+          updates.task_list_id = resolveId(to_list, "task_lists");
+        else if (clear_list)
+          updates.task_list_id = null;
+        else if (targetProjectId && targetProjectId !== current.project_id)
+          updates.task_list_id = null;
+        const task = updateWithOptionalVersion(resolvedId, updates, version);
+        return { content: [{ type: "text", text: formatTask(task) }] };
+      } catch (e) {
+        return { content: [{ type: "text", text: formatError(e) }], isError: true };
+      }
+    });
+  }
   if (shouldRegisterTool("reschedule_task")) {
     server.tool("reschedule_task", "Update a task's deadline.", {
       task_id: exports_external.string().describe("Task ID"),
@@ -43595,6 +44397,7 @@ function registerTaskMetaTools(server, ctx) {
           complete_task: "complete_task \u2014 Mark task completed. Params: task_id, confidence, completed_at, version",
           cancel_task: "cancel_task \u2014 Cancel a task. Params: task_id, version",
           reassign_task: "reassign_task \u2014 Change task assignee. Params: task_id, new_assignee, version",
+          move_task: "move_task \u2014 Re-parent a task to another project and/or task list (keeps its id and history). Params: task_id (required), to_project, to_list, clear_list, version",
           reschedule_task: "reschedule_task \u2014 Update deadline. Params: task_id, deadline, version",
           prioritize_task: "prioritize_task \u2014 Set priority. Params: task_id, priority, version",
           search_tasks: "search_tasks \u2014 Full-text search. Params: query, project_id, status, limit",
@@ -53634,9 +54437,9 @@ ${task2.id.slice(0, 8)} | ${task2.priority} | ${task2.title}` }] };
   if (shouldRegisterTool("delete_template")) {
     server.tool("delete_template", "Delete a task template by ID.", { id: exports_external.string() }, async ({ id }) => {
       try {
-        const { deleteTemplate: deleteTemplate2 } = await Promise.resolve().then(() => (init_templates(), exports_templates));
+        const { deleteTemplate: deleteTemplate3 } = await Promise.resolve().then(() => (init_templates(), exports_templates));
         const resolvedId = resolveId(id, "task_templates");
-        const deleted = deleteTemplate2(resolvedId);
+        const deleted = deleteTemplate3(resolvedId);
         return { content: [{ type: "text", text: deleted ? "Template deleted." : "Template not found." }] };
       } catch (e) {
         return { content: [{ type: "text", text: formatError(e) }], isError: true };
@@ -69084,6 +69887,7 @@ function emptySnapshot2() {
     agents: [],
     taskLists: [],
     templates: [],
+    templateTasks: [],
     auditHistory: [],
     tombstones: []
   };
@@ -69272,6 +70076,7 @@ var init_shadow = __esm(() => {
     agents: "agents",
     taskLists: "task_lists",
     templates: "templates",
+    templateTasks: "template_tasks",
     auditHistory: "audit_history"
   };
 });
@@ -71150,6 +71955,7 @@ var REGISTERED_CANONICAL_COMMANDS = [
   "manual",
   "mcp",
   "mine",
+  "move",
   "next",
   "notifications",
   "onboarding",
@@ -71285,6 +72091,7 @@ var REMOTE_COMMANDS = new Set([
   "lists",
   "lock",
   "log-progress",
+  "move",
   "next",
   "plans",
   "project-rename",
@@ -71300,6 +72107,8 @@ var REMOTE_COMMANDS = new Set([
   "task",
   "task-lists",
   "timeline",
+  "template-import",
+  "templates",
   "tl",
   "unlock",
   "update"