@hasna/todos 0.15.34 → 0.15.41

package/dist/storage.js

@@ -42,20 +42,16 @@ var __require = import.meta.require;
 // src/storage/config.ts
 var exports_config = {};
 __export(exports_config, {
-  parseStorageMode: () => parseStorageMode,
   parseStorageBackend: () => parseStorageBackend,
   loadTodosStorageConfig: () => loadTodosStorageConfig,
   loadStorageConfig: () => loadStorageConfig,
   isTodosShadowEnabled: () => isTodosShadowEnabled,
-  isTodosRemoteStorageEnabled: () => isTodosRemoteStorageEnabled,
   isTodosPostgresBackend: () => isTodosPostgresBackend,
   getTodosStorageShadowEnvName: () => getTodosStorageShadowEnvName,
-  getTodosStorageMode: () => getTodosStorageMode,
   getTodosStorageEnvName: () => getTodosStorageEnvName,
   getTodosStorageDatabaseUrl: () => getTodosStorageDatabaseUrl,
   getTodosStorageDatabaseEnv: () => getTodosStorageDatabaseEnv,
   getTodosStorageBackend: () => getTodosStorageBackend,
-  getStorageMode: () => getStorageMode,
   getStorageDatabaseUrl: () => getStorageDatabaseUrl,
   getStorageDatabaseEnv: () => getStorageDatabaseEnv,
   getCanonicalTodosRdsConfig: () => getCanonicalTodosRdsConfig,
@@ -65,7 +61,6 @@ __export(exports_config, {
   TODOS_STORAGE_FALLBACK_ENV: () => TODOS_STORAGE_FALLBACK_ENV,
   TODOS_STORAGE_ENV: () => TODOS_STORAGE_ENV,
   STORAGE_TABLES: () => STORAGE_TABLES,
-  REMOVED_STORAGE_MODE_ENV_KEYS: () => REMOVED_STORAGE_MODE_ENV_KEYS,
   CANONICAL_TODOS_RDS_RUNTIME_PATH_ENV: () => CANONICAL_TODOS_RDS_RUNTIME_PATH_ENV,
   CANONICAL_TODOS_RDS_DATABASE: () => CANONICAL_TODOS_RDS_DATABASE,
   CANONICAL_TODOS_RDS_CLUSTER_ENV: () => CANONICAL_TODOS_RDS_CLUSTER_ENV
@@ -120,9 +115,6 @@ function loadStorageConfig(env = process.env) {
 function isTodosPostgresBackend(config) {
   return config.mode === "postgres";
 }
-function isTodosRemoteStorageEnabled(config) {
-  return isTodosPostgresBackend(config);
-}
 function assertTodosRemoteStorageConfig(config) {
   if (!isTodosPostgresBackend(config))
     return;
@@ -138,32 +130,15 @@ function parseStorageBackend(value) {
     return "sqlite";
   if (normalized === "postgres" || normalized === "postgresql")
     return "postgres";
-  if (["local", "remote", "cloud", "hybrid", "self_hosted"].includes(normalized)) {
-    throw new Error(`${TODOS_STORAGE_ENV.databaseUrl} selects the backend. Deployment modes no longer exist: ` + `delete the storage-mode variable and set ${TODOS_STORAGE_ENV.databaseUrl} to select the ` + `postgresql backend, or leave it unset for sqlite.`);
-  }
   throw new Error(`Storage backend must be sqlite or postgres`);
 }
-function parseStorageMode(value) {
-  return parseStorageBackend(value);
-}
 function getTodosStorageBackend(env = process.env) {
-  for (const key of REMOVED_STORAGE_MODE_ENV_KEYS) {
-    if (Object.hasOwn(env, key) && env[key] !== undefined) {
-      throw new Error(`${key} was removed. Deployment modes no longer exist: delete the storage-mode variable. ` + `Set ${TODOS_STORAGE_ENV.databaseUrl} to select the postgresql backend, ` + `or leave it unset for sqlite.`);
-    }
-  }
   if (!getTodosStorageDatabaseUrl(env))
     return "sqlite";
   if (isTodosShadowEnabled(env))
     return "sqlite";
   return "postgres";
 }
-function getTodosStorageMode(env = process.env) {
-  return getTodosStorageBackend(env);
-}
-function getStorageMode(env = process.env) {
-  return getTodosStorageBackend(env);
-}
 function isTodosShadowEnabled(env = process.env) {
   return parseBoolean(readStorageEnv(env, "shadow").value, false);
 }
@@ -230,7 +205,7 @@ function parsePositiveInteger(value, fallback) {
   }
   return parsed;
 }
-var TODOS_STORAGE_TABLES, STORAGE_TABLES, TODOS_STORAGE_ENV, TODOS_STORAGE_FALLBACK_ENV, REMOVED_STORAGE_MODE_ENV_KEYS, CANONICAL_TODOS_RDS_CLUSTER_ENV = "HASNA_TODOS_RDS_CLUSTER", CANONICAL_TODOS_RDS_RUNTIME_PATH_ENV = "HASNA_TODOS_RDS_RUNTIME_PATH", CANONICAL_TODOS_RDS_DATABASE = "todos";
+var TODOS_STORAGE_TABLES, STORAGE_TABLES, TODOS_STORAGE_ENV, TODOS_STORAGE_FALLBACK_ENV, CANONICAL_TODOS_RDS_CLUSTER_ENV = "HASNA_TODOS_RDS_CLUSTER", CANONICAL_TODOS_RDS_RUNTIME_PATH_ENV = "HASNA_TODOS_RDS_RUNTIME_PATH", CANONICAL_TODOS_RDS_DATABASE = "todos";
 var init_config = __esm(() => {
   TODOS_STORAGE_TABLES = [
     "todos_sync_records",
@@ -269,12 +244,6 @@ var init_config = __esm(() => {
     syncBatchSize: "TODOS_SYNC_BATCH_SIZE",
     syncDryRun: "TODOS_SYNC_DRY_RUN"
   };
-  REMOVED_STORAGE_MODE_ENV_KEYS = [
-    "HASNA_TODOS_STORAGE_MODE",
-    "HASNA_TODOS_MODE",
-    "TODOS_STORAGE_MODE",
-    "TODOS_MODE"
-  ];
 });
 
 // src/types/index.ts
@@ -2335,6 +2304,10 @@ var init_migrations = __esm(() => {
   );
   INSERT OR IGNORE INTO _migrations (id) VALUES (70);
   COMMIT;
+  `,
+    `BEGIN;
+  INSERT OR IGNORE INTO _migrations (id) VALUES (71);
+  COMMIT;
   `
   ];
 });
@@ -3008,6 +2981,8 @@ function ensureSchema(db) {
   ensureColumn("projects", "task_list_id", "TEXT");
   ensureColumn("projects", "task_prefix", "TEXT");
   ensureColumn("projects", "task_counter", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn("projects", "parent_id", "TEXT REFERENCES projects(id) ON DELETE SET NULL");
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_projects_parent_id ON projects(parent_id)");
   ensureColumn("tasks", "plan_id", "TEXT REFERENCES plans(id) ON DELETE SET NULL");
   ensureColumn("tasks", "task_list_id", "TEXT REFERENCES task_lists(id) ON DELETE SET NULL");
   ensureColumn("tasks", "short_id", "TEXT");
@@ -3121,6 +3096,20 @@ function ensureSchema(db) {
   ensureIndex("CREATE INDEX IF NOT EXISTS idx_webhook_deliveries_event ON webhook_deliveries(event)");
   ensureColumn("task_comments", "type", "TEXT DEFAULT 'comment'");
   ensureColumn("task_comments", "progress_pct", "INTEGER");
+  ensureTable("plan_comments", `
+    CREATE TABLE plan_comments (
+      id TEXT PRIMARY KEY,
+      plan_id TEXT NOT NULL REFERENCES plans(id) ON DELETE CASCADE,
+      agent_id TEXT,
+      session_id TEXT,
+      content TEXT NOT NULL,
+      type TEXT DEFAULT 'comment' CHECK(type IN ('comment', 'progress', 'note')),
+      progress_pct INTEGER CHECK(progress_pct IS NULL OR (progress_pct >= 0 AND progress_pct <= 100)),
+      created_at TEXT NOT NULL DEFAULT (datetime('now')),
+      machine_id TEXT,
+      synced_at TEXT
+    )`);
+  ensureIndex("CREATE INDEX IF NOT EXISTS idx_plan_comments_plan ON plan_comments(plan_id)");
   ensureColumn("projects", "machine_id", "TEXT");
   ensureColumn("projects", "synced_at", "TEXT");
   ensureColumn("tasks", "machine_id", "TEXT");
@@ -4102,6 +4091,7 @@ var init_machines = __esm(() => {
     "task_lists",
     "plans",
     "task_comments",
+    "plan_comments",
     "sessions",
     "task_history",
     "webhooks",
@@ -5045,17 +5035,24 @@ function createProject(input, db) {
     const id = uuid();
     const timestamp2 = now();
     const derivedSlug = slugify(input.name);
-    const taskListId = input.task_list_id === undefined ? `todos-${derivedSlug}` : slugify(input.task_list_id);
+    const taskListId = input.task_list_id === undefined ? derivedSlug : slugify(input.task_list_id);
     if (!derivedSlug || !taskListId)
       throw new Error("Project name and task-list slug must be non-empty");
     const slugConflict = d.query("SELECT id FROM projects WHERE task_list_id = ? LIMIT 1").get(taskListId);
     if (slugConflict || !claimCanonicalSlug("project", "global", taskListId, id, d)) {
       throw new ResourceConflictError("PROJECT_SLUG_CONFLICT", `Project slug "${taskListId}" already exists`);
     }
+    const parentId = input.parent_id ?? null;
+    if (parentId !== null) {
+      const parent = getProject(parentId, d);
+      if (!parent)
+        throw new ProjectNotFoundError(parentId);
+      assertNotProjectAncestor(id, parentId, d);
+    }
     const taskPrefix = input.task_prefix || generatePrefix(input.name, d);
     const machineId = currentStorageMachineId(d);
-    d.run(`INSERT INTO projects (id, name, path, description, task_list_id, task_prefix, task_counter, created_at, updated_at, machine_id)
-       VALUES (?, ?, ?, ?, ?, ?, 0, ?, ?, ?)`, [id, input.name, input.path, input.description || null, taskListId, taskPrefix, timestamp2, timestamp2, machineId]);
+    d.run(`INSERT INTO projects (id, name, path, description, task_list_id, task_prefix, task_counter, parent_id, created_at, updated_at, machine_id)
+       VALUES (?, ?, ?, ?, ?, ?, 0, ?, ?, ?, ?)`, [id, input.name, input.path, input.description || null, taskListId, taskPrefix, parentId, timestamp2, timestamp2, machineId]);
     return getProject(id, d);
   })();
 }
@@ -5080,6 +5077,60 @@ function listProjects(db) {
   const d = db || getDatabase();
   return d.query("SELECT * FROM projects ORDER BY name").all();
 }
+function orderProjectsParentFirst(projects) {
+  const projectId = (project) => {
+    const id = project.id;
+    return typeof id === "string" && id.length > 0 ? id : null;
+  };
+  const parentId = (project) => {
+    const parent = project.parent_id;
+    return parent == null ? null : String(parent);
+  };
+  const byId = new Set;
+  for (const project of projects) {
+    const id = projectId(project);
+    if (id !== null)
+      byId.add(id);
+  }
+  const ordered = [];
+  const emitted = new Set;
+  let remaining = [...projects];
+  let progress = true;
+  while (progress && remaining.length > 0) {
+    progress = false;
+    const deferred = [];
+    for (const project of remaining) {
+      const parent = parentId(project);
+      if (parent === null || emitted.has(parent) || !byId.has(parent)) {
+        ordered.push(project);
+        const id = projectId(project);
+        if (id !== null)
+          emitted.add(id);
+        progress = true;
+      } else {
+        deferred.push(project);
+      }
+    }
+    remaining = deferred;
+  }
+  ordered.push(...remaining);
+  return ordered;
+}
+function assertNotProjectAncestor(projectId, ancestorId, db) {
+  const d = db || getDatabase();
+  let cursor = ancestorId;
+  const seen = new Set;
+  while (cursor !== null) {
+    if (cursor === projectId) {
+      throw new ResourceConflictError("PROJECT_PARENT_CYCLE", `Project "${projectId}" cannot be placed under its own descendant`);
+    }
+    if (seen.has(cursor))
+      break;
+    seen.add(cursor);
+    const row = d.query("SELECT parent_id FROM projects WHERE id = ?").get(cursor);
+    cursor = row?.parent_id ?? null;
+  }
+}
 function updateProject(id, input, db) {
   const d = db || getDatabase();
   const project = getProject(id, d);
@@ -5102,6 +5153,16 @@ function updateProject(id, input, db) {
     sets.push("path = ?");
     params.push(input.path);
   }
+  if (input.parent_id !== undefined) {
+    if (input.parent_id !== null) {
+      const parent = getProject(input.parent_id, d);
+      if (!parent)
+        throw new ProjectNotFoundError(input.parent_id);
+      assertNotProjectAncestor(id, input.parent_id, d);
+    }
+    sets.push("parent_id = ?");
+    params.push(input.parent_id);
+  }
   params.push(id);
   d.run(`UPDATE projects SET ${sets.join(", ")} WHERE id = ?`, params);
   return getProject(id, d);
@@ -6780,22 +6841,31 @@ function updateTaskList(id, input, db) {
       throw new TaskListNotFoundError(id);
     const sets = ["updated_at = ?"];
     const params = [now()];
-    if (input.slug !== undefined) {
-      const slug = slugify(input.slug);
-      if (!slug)
-        throw new Error("Invalid task-list slug \u2014 must be non-empty kebab-case");
-      const duplicate = existing.project_id ? d.query("SELECT id FROM task_lists WHERE project_id = ? AND slug = ? AND id != ?").get(existing.project_id, slug, id) : d.query("SELECT id FROM task_lists WHERE project_id IS NULL AND slug = ? AND id != ?").get(slug, id);
+    const projectId = input.project_id === "" || input.project_id === null ? null : input.project_id === undefined ? existing.project_id : input.project_id;
+    const scopeChanged = projectId !== existing.project_id;
+    const effectiveSlug = input.slug !== undefined ? slugify(input.slug) : existing.slug;
+    if (input.slug !== undefined && !effectiveSlug) {
+      throw new Error("Invalid task-list slug \u2014 must be non-empty kebab-case");
+    }
+    if (scopeChanged || input.slug !== undefined && effectiveSlug !== existing.slug) {
+      const duplicate = projectId ? d.query("SELECT id FROM task_lists WHERE project_id = ? AND slug = ? AND id != ?").get(projectId, effectiveSlug, id) : d.query("SELECT id FROM task_lists WHERE project_id IS NULL AND slug = ? AND id != ?").get(effectiveSlug, id);
       if (duplicate) {
-        throw new ResourceConflictError("TASK_LIST_SLUG_CONFLICT", `Task list with slug "${slug}" already exists in this scope`);
+        throw new ResourceConflictError("TASK_LIST_SLUG_CONFLICT", `Task list with slug "${effectiveSlug}" already exists in this scope`);
       }
-      if (slug !== existing.slug) {
+      if (scopeChanged || effectiveSlug !== existing.slug) {
         releaseCanonicalSlugClaims("task_list", id, d);
-        if (!claimCanonicalSlug("task_list", taskListSlugScopeKey(existing.project_id), slug, id, d)) {
-          throw new ResourceConflictError("TASK_LIST_SLUG_CONFLICT", `Task list with slug "${slug}" already exists in this scope`);
+        if (!claimCanonicalSlug("task_list", taskListSlugScopeKey(projectId), effectiveSlug, id, d)) {
+          throw new ResourceConflictError("TASK_LIST_SLUG_CONFLICT", `Task list with slug "${effectiveSlug}" already exists in this scope`);
         }
       }
+    }
+    if (input.slug !== undefined) {
       sets.push("slug = ?");
-      params.push(slug);
+      params.push(effectiveSlug);
+    }
+    if (projectId !== existing.project_id) {
+      sets.push("project_id = ?");
+      params.push(projectId);
     }
     if (input.name !== undefined) {
       sets.push("name = ?");
@@ -9244,8 +9314,8 @@ function failTask(id, agentId, reason, options, db) {
   const safeMeta = sanitizePreWriteValue(meta, "task.failure.metadata");
   const timestamp2 = now();
   const failTx = d.transaction(() => {
-    const res = d.run(`UPDATE tasks SET status = 'failed', reason = ?, locked_by = NULL, locked_at = NULL, metadata = ?, version = version + 1, updated_at = ?
-       WHERE id = ? AND version = ?`, [safeReason, JSON.stringify(safeMeta), timestamp2, id, task.version]);
+    const res = d.run(`UPDATE tasks SET status = 'failed', reason = ?, locked_by = NULL, locked_at = NULL, completed_at = COALESCE(completed_at, ?), metadata = ?, version = version + 1, updated_at = ?
+       WHERE id = ? AND version = ?`, [safeReason, timestamp2, JSON.stringify(safeMeta), timestamp2, id, task.version]);
     if (res.changes === 0) {
       const current = getTask(id, d);
       throw new VersionConflictError(id, task.version, current?.version ?? -1);
@@ -9257,6 +9327,7 @@ function failTask(id, agentId, reason, options, db) {
     status: "failed",
     locked_by: null,
     locked_at: null,
+    completed_at: task.completed_at ?? timestamp2,
     reason: safeReason,
     metadata: safeMeta,
     version: task.version + 1,
@@ -9905,13 +9976,20 @@ function updateTaskStored(id, input, db) {
     if (isTerminalStatus(input.status)) {
       sets.push("locked_by = NULL");
       sets.push("locked_at = NULL");
-    }
-    if (input.status === "completed") {
-      sets.push("completed_at = ?");
-      params.push(completionTimestamp);
+      if (input.status === "completed") {
+        sets.push("completed_at = ?");
+        params.push(completionTimestamp);
+      } else {
+        sets.push("completed_at = COALESCE(completed_at, ?)");
+        params.push(completionTimestamp);
+      }
     } else if (task.status === "completed" && input.completed_at === undefined) {
       sets.push("completed_at = NULL");
     }
+    if (input.status === "in_progress") {
+      sets.push("started_at = COALESCE(started_at, ?)");
+      params.push(timestamp2);
+    }
   }
   if (input.priority !== undefined) {
     sets.push("priority = ?");
@@ -10049,7 +10127,6 @@ function updateTaskStored(id, input, db) {
   if (input.approved_by !== undefined)
     logTaskChange(id, "approve", "approved_by", null, input.approved_by, agentId, d);
   const reopened = input.status !== undefined && input.status !== "completed" && task.status === "completed" && input.completed_at === undefined;
-  const completedNow = input.status === "completed";
   const terminalNow = input.status !== undefined && isTerminalStatus(input.status);
   const updatedTask = {
     ...task,
@@ -10060,7 +10137,8 @@ function updateTaskStored(id, input, db) {
     updated_at: timestamp2,
     locked_by: terminalNow ? null : task.locked_by,
     locked_at: terminalNow ? null : task.locked_at,
-    completed_at: completedNow ? completionTimestamp : reopened ? null : input.completed_at !== undefined ? input.completed_at : task.completed_at,
+    completed_at: input.status === "completed" ? completionTimestamp : input.completed_at !== undefined ? input.completed_at : terminalNow ? task.completed_at ?? completionTimestamp : reopened ? null : task.completed_at,
+    started_at: input.status === "in_progress" ? task.started_at ?? timestamp2 : task.started_at,
     sla_minutes: input.sla_minutes !== undefined ? input.sla_minutes : task.sla_minutes,
     actual_minutes: input.actual_minutes ?? task.actual_minutes,
     confidence: input.confidence !== undefined ? input.confidence : task.confidence,
@@ -10121,6 +10199,9 @@ function deleteTask(id, db) {
     version: row.version
   }, d);
   const result = d.run("DELETE FROM tasks WHERE id = ?", [id]);
+  if (result.changes > 0) {
+    d.run("DELETE FROM task_dependencies WHERE task_id = ? OR depends_on = ?", [id, id]);
+  }
   return result.changes > 0;
 }
 var init_task_crud = __esm(() => {
@@ -12890,6 +12971,40 @@ init_tasks();
 init_projects();
 init_plans();
 
+// src/db/plan-comments.ts
+init_types();
+init_database();
+init_plans();
+init_prewrite_secrets();
+function addPlanComment(input, db) {
+  const d = db || getDatabase();
+  if (!getPlan(input.plan_id, d)) {
+    throw new PlanNotFoundError(input.plan_id);
+  }
+  const id = uuid();
+  const timestamp2 = now();
+  d.run(`INSERT INTO plan_comments (id, plan_id, agent_id, session_id, content, type, progress_pct, created_at)
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?)`, [
+    id,
+    input.plan_id,
+    input.agent_id || null,
+    input.session_id || null,
+    sanitizePreWriteText(input.content, "comment.content"),
+    input.type || "comment",
+    input.progress_pct ?? null,
+    timestamp2
+  ]);
+  return getPlanComment(id, d);
+}
+function getPlanComment(id, db) {
+  const d = db || getDatabase();
+  return d.query("SELECT * FROM plan_comments WHERE id = ?").get(id);
+}
+function listPlanComments(planId, db) {
+  const d = db || getDatabase();
+  return d.query("SELECT * FROM plan_comments WHERE plan_id = ? ORDER BY created_at, rowid").all(planId);
+}
+
 // src/db/agents.ts
 init_types();
 init_database();
@@ -13547,6 +13662,20 @@ init_task_lists();
 init_templates();
 init_audit();
 init_comments();
+
+// src/lib/comment-cursor.ts
+function isStrictlyOlder(comment, before) {
+  return comment.created_at < before.created_at || comment.created_at === before.created_at && comment.id < before.id;
+}
+function compareCommentKeyset(left, right) {
+  if (isStrictlyOlder(left, right))
+    return -1;
+  if (isStrictlyOlder(right, left))
+    return 1;
+  return 0;
+}
+
+// src/storage/local-sqlite.ts
 init_database();
 
 // src/db/integrity.ts
@@ -14091,6 +14220,7 @@ var PROJECT_COLUMNS = [
   "task_list_id",
   "task_prefix",
   "task_counter",
+  "parent_id",
   "created_at",
   "updated_at",
   "machine_id",
@@ -14310,7 +14440,7 @@ function importSqliteTodosStorageSnapshot(snapshot, db) {
       }
     }
   };
-  applyRows("projects", "projects", PROJECT_COLUMNS, snapshot.projects, "updated_at");
+  applyRows("projects", "projects", PROJECT_COLUMNS, orderProjectsParentFirst(snapshot.projects), "updated_at");
   applyRows("project_machine_paths", "project_machine_paths", PROJECT_MACHINE_PATH_COLUMNS, snapshot.projectMachinePaths ?? [], "updated_at");
   applyRows("agents", "agents", AGENT_COLUMNS, snapshot.agents, "last_seen_at");
   applyRows("task_lists", "task_lists", TASK_LIST_COLUMNS, snapshot.taskLists, "updated_at");
@@ -14642,7 +14772,22 @@ function createLocalSqliteTodosStorageAdapter(options = {}) {
       list: (projectId) => listPlans(projectId, database()),
       update: (id, input) => updatePlan(id, input, database()),
       completeAtRevision: (id, expectedUpdatedAt) => completePlanAtRevision(id, expectedUpdatedAt, database()),
-      delete: (id) => deletePlan(id, database())
+      delete: (id) => deletePlan(id, database()),
+      addComment: (input) => addPlanComment(input, database()),
+      getComments: (planId) => listPlanComments(planId, database()),
+      getCommentsPage: (planId, options2) => {
+        if (options2?.limit !== undefined && (!Number.isSafeInteger(options2.limit) || options2.limit < 1 || options2.limit > 1001)) {
+          throw new Error("Plan comment limit must be an integer between 1 and 1001");
+        }
+        let comments = listPlanComments(planId, database());
+        comments = comments.sort(compareCommentKeyset);
+        if (options2?.before) {
+          const before = options2.before;
+          comments = comments.filter((comment) => isStrictlyOlder(comment, before));
+        }
+        const limit = options2?.limit ?? 100;
+        return comments.slice(-limit);
+      }
     },
     planProjectLinks: {
       apply: (input) => applyPlanProjectLinkSqlite(input, database()),
@@ -14683,10 +14828,10 @@ function createLocalSqliteTodosStorageAdapter(options = {}) {
           throw new Error("Comment limit must be an integer between 1 and 1001");
         }
         let comments = listComments(taskId, database());
-        comments = comments.sort((left, right) => left.created_at.localeCompare(right.created_at) || left.id.localeCompare(right.id));
+        comments = comments.sort(compareCommentKeyset);
         if (options2?.before) {
           const before = options2.before;
-          comments = comments.filter((comment) => comment.created_at < before.created_at || comment.created_at === before.created_at && comment.id < before.id);
+          comments = comments.filter((comment) => isStrictlyOlder(comment, before));
         }
         if (options2?.limit !== undefined)
           comments = comments.slice(-options2.limit);
@@ -15216,7 +15361,26 @@ function createPostgresTodosStorageAdapter(options) {
       list: async (projectId) => (await store.list("plans")).filter((plan) => projectId === undefined || plan.project_id === projectId).sort((a, b) => a.name.localeCompare(b.name)),
       update: (id, input) => updatePlan2(id, input, store),
       completeAtRevision: (id, expectedUpdatedAt, context) => store.completePlanAtRevision(id, expectedUpdatedAt, context),
-      delete: (id, context) => store.deletePlan(id, context)
+      delete: (id, context) => store.deletePlan(id, context),
+      addComment: (input, context) => addPlanComment2(input, store, context),
+      getComments: async (planId) => {
+        const pages = [];
+        let before;
+        while (true) {
+          const page = await store.listPlanComments(planId, { limit: 1000, ...before ? { before } : {} });
+          if (page.length === 0)
+            break;
+          pages.unshift(page);
+          if (page.length < 1000)
+            break;
+          const oldest = page[0];
+          before = { created_at: oldest.created_at, id: oldest.id };
+        }
+        return pages.flat().map(redactPlanComment).sort((a, b) => a.created_at.localeCompare(b.created_at) || a.id.localeCompare(b.id));
+      },
+      getCommentsPage: async (planId, options2) => {
+        return (await store.listPlanComments(planId, options2)).map(redactPlanComment).sort((a, b) => a.created_at.localeCompare(b.created_at) || a.id.localeCompare(b.id));
+      }
     },
     planProjectLinks: {
       apply: (input, context) => store.applyPlanProjectLink(input, context),
@@ -15434,6 +15598,27 @@ class PostgresJsonRecordStore {
        LIMIT $${params.length}`, params);
     return result.rows.map((row) => payloadRecord2(row.payload)).reverse();
   }
+  async listPlanComments(planId, options = {}) {
+    await this.ensureSchema();
+    const limit = options.limit ?? 100;
+    if (!Number.isSafeInteger(limit) || limit < 1 || limit > 1001) {
+      throw new Error("Postgres plan comment limit must be an integer between 1 and 1001");
+    }
+    const params = [this.service, planId];
+    let cursorPredicate = "";
+    if (options.before) {
+      params.push(options.before.created_at, options.before.id);
+      cursorPredicate = `AND (payload->>'created_at', object_id) < ($3, $4)`;
+    }
+    params.push(limit);
+    const result = await this.options.client.query(`/* todos:list-plan-comments */ SELECT payload FROM ${this.tableName}
+       WHERE service = $1 AND object_type = 'plan_comments' AND deleted_at IS NULL
+         AND payload->>'plan_id' = $2
+         ${cursorPredicate}
+       ORDER BY payload->>'created_at' DESC, object_id DESC
+       LIMIT $${params.length}`, params);
+    return result.rows.map((row) => payloadRecord2(row.payload)).reverse();
+  }
   async listRecords(type) {
     await this.ensureSchema();
     const result = await this.options.client.query(`SELECT object_type, object_id, payload, updated_at
@@ -15765,8 +15950,12 @@ class PostgresJsonRecordStore {
              OR ($11::text <> $2
                AND NOT EXISTS (SELECT 1 FROM parent_chain WHERE object_id = $2)
                AND NOT EXISTS (SELECT 1 FROM parent_chain WHERE cycle))) AS parent_acyclic,
-           (SELECT count(*) FROM locked_plans) = jsonb_array_length($7::jsonb) AS all_plans_found,
-           ($8::text IS NULL OR EXISTS (SELECT 1 FROM locked_plans WHERE object_id = $8)) AS target_plan_found,
+           (COALESCE((SELECT payload->>'plan_id' FROM locked_task), '')
+              IS DISTINCT FROM COALESCE($3::jsonb->>'plan_id', '')) AS membership_changed,
+           (NOT (COALESCE((SELECT payload->>'plan_id' FROM locked_task), '')
+                   IS DISTINCT FROM COALESCE($3::jsonb->>'plan_id', ''))
+             OR $8::text IS NULL
+             OR EXISTS (SELECT 1 FROM locked_plans WHERE object_id = $8)) AS target_plan_found,
            (SELECT payload->>'project_id' FROM locked_plans WHERE object_id = $8) AS target_project_id
        ), guarded AS (
          SELECT
@@ -15789,7 +15978,6 @@ class PostgresJsonRecordStore {
            AND guarded.version_matches
            AND guarded.parent_found
            AND guarded.parent_acyclic
-           AND guarded.all_plans_found
            AND guarded.target_plan_found
            AND NOT guarded.project_conflict
          ON CONFLICT (service, object_type, object_id) DO UPDATE SET
@@ -15805,7 +15993,7 @@ class PostgresJsonRecordStore {
          RETURNING payload
        )
        SELECT guarded.task_found, guarded.version_matches, guarded.parent_found, guarded.parent_acyclic,
-              guarded.all_plans_found, guarded.target_plan_found, guarded.project_conflict,
+              guarded.membership_changed, guarded.target_plan_found, guarded.project_conflict,
               (SELECT payload FROM stored) AS payload,
               (SELECT payload FROM locked_task) AS current_payload
        FROM guarded`, [
@@ -15837,7 +16025,7 @@ class PostgresJsonRecordStore {
     if (parentGuard && !row?.parent_acyclic && parentGuard.parentId) {
       throw new ResourceConflictError("TASK_PARENT_CYCLE", `TASK_PARENT_CYCLE: assigning parent ${parentGuard.parentId} to task ${value.id} would create or retain a parent cycle`);
     }
-    if (!row?.all_plans_found || !row.target_plan_found) {
+    if (!row?.target_plan_found) {
       throw new PlanProjectLinkError("PLAN_PROJECT_LINK_PLAN_NOT_FOUND", `Plan membership changed through a missing plan: ${targetPlanId ?? planIds.join(", ")}`, { plan_ids: planIds, target_plan_id: targetPlanId });
     }
     if (row.project_conflict) {
@@ -16592,6 +16780,15 @@ class PostgresJsonRecordStore {
         WHERE r.service = $1 AND r.object_type = 'tasks' AND r.deleted_at IS NULL
           AND r.payload->>'plan_id' = $2 AND EXISTS (SELECT 1 FROM target)
         RETURNING 1
+      ), deleted_plan_comments AS (
+        UPDATE ${this.tableName} r SET
+          deleted_at = $3::timestamptz,
+          updated_at = $3::timestamptz,
+          source_machine_id = COALESCE($4, r.source_machine_id),
+          version = COALESCE(r.version, 0) + 1
+        WHERE r.service = $1 AND r.object_type = 'plan_comments' AND r.deleted_at IS NULL
+          AND r.payload->>'plan_id' = $2 AND EXISTS (SELECT 1 FROM target)
+        RETURNING 1
       ), deleted_plan AS (
         UPDATE ${this.tableName} r SET
           deleted_at = $3::timestamptz,
@@ -16767,7 +16964,8 @@ async function updateTask2(id, input, store, context) {
     task_list_id: input.task_list_id !== undefined ? input.task_list_id : existing.task_list_id,
     parent_id: input.parent_id !== undefined ? input.parent_id : existing.parent_id,
     created_by: existing.created_by,
-    completed_at: reopened ? null : input.completed_at !== undefined ? input.completed_at : existing.completed_at
+    completed_at: input.status === "completed" ? input.completed_at ?? new Date().toISOString() : input.completed_at !== undefined ? input.completed_at : input.status !== undefined && isTerminalStatus(input.status) ? existing.completed_at ?? new Date().toISOString() : reopened ? null : existing.completed_at,
+    started_at: input.status === "in_progress" ? existing.started_at ?? new Date().toISOString() : existing.started_at
   };
   const storedTask = await store.upsertTaskWithPlanMembershipGuard(task, [existing.plan_id, effectivePlanId].filter((planId) => Boolean(planId)), input.project_id !== undefined, context, {
     operation: "update",
@@ -16812,7 +17010,8 @@ async function failTask2(id, agentId, reason, options, store) {
     status: "failed",
     assigned_to: task.assigned_to ?? agentId ?? null,
     reason: reason ?? task.reason,
-    retry_after: options?.retry_after ?? task.retry_after
+    retry_after: options?.retry_after ?? task.retry_after,
+    completed_at: task.completed_at ?? new Date().toISOString()
   }, store);
   if (!options?.retry)
     return { task: failed };
@@ -17049,17 +17248,26 @@ async function getChangedSince(since, filters, store) {
 async function createProject2(input, store, context) {
   const timestamp2 = new Date().toISOString();
   const derivedSlug = slugifyRaw(input.name);
-  const taskListId = input.task_list_id === undefined ? `todos-${derivedSlug}` : slugifyRaw(input.task_list_id);
+  const taskListId = input.task_list_id === undefined ? derivedSlug : slugifyRaw(input.task_list_id);
   if (!derivedSlug || !taskListId)
     throw new Error("Project name and task-list slug must be non-empty");
+  const parentId = input.parent_id ?? null;
+  const id = randomUUID3();
+  if (parentId !== null) {
+    const parent = await store.get("projects", parentId);
+    if (!parent)
+      throw new ProjectNotFoundError(parentId);
+    await assertNotProjectAncestorPostgres(id, parentId, store);
+  }
   const project = {
-    id: randomUUID3(),
+    id,
     name: input.name,
     path: input.path,
     description: input.description ?? null,
     task_list_id: taskListId,
     task_prefix: input.task_prefix ?? await generateProjectPrefix(input.name, store),
     task_counter: 0,
+    parent_id: parentId,
     created_at: timestamp2,
     updated_at: timestamp2,
     machine_id: store.machineId(context),
@@ -17067,12 +17275,38 @@ async function createProject2(input, store, context) {
   };
   return store.upsert("projects", project, context);
 }
+async function assertNotProjectAncestorPostgres(projectId, candidateParentId, store) {
+  const all = await store.list("projects");
+  const byId = new Map(all.map((project) => [project.id, project.parent_id ?? null]));
+  let cursor = candidateParentId;
+  const seen = new Set;
+  while (cursor !== null) {
+    if (cursor === projectId) {
+      throw new ResourceConflictError("PROJECT_PARENT_CYCLE", `Project "${projectId}" cannot be placed under its own descendant`);
+    }
+    if (seen.has(cursor))
+      break;
+    seen.add(cursor);
+    cursor = byId.get(cursor) ?? null;
+  }
+}
 async function updateProject2(id, input, store) {
   if ("task_list_id" in input) {
     throw new Error("task_list_id cannot be changed by updateProject; use renameProject for an atomic canonical rename");
   }
   const project = await requireRecord("projects", id, store);
-  const updated = { ...project, ...definedPatch(input), updated_at: new Date().toISOString() };
+  if (input.parent_id !== undefined && input.parent_id !== null) {
+    const parent = await store.get("projects", input.parent_id);
+    if (!parent)
+      throw new ProjectNotFoundError(input.parent_id);
+    await assertNotProjectAncestorPostgres(id, input.parent_id, store);
+  }
+  const updated = {
+    ...project,
+    ...definedPatch(input),
+    ...input.parent_id !== undefined ? { parent_id: input.parent_id } : {},
+    updated_at: new Date().toISOString()
+  };
   return store.upsert("projects", updated);
 }
 async function createPlan2(input, store, context) {
@@ -17225,16 +17459,22 @@ async function createTaskList2(input, store, context) {
 async function updateTaskList2(id, input, store) {
   const list = await requireRecord("task_lists", id, store);
   const patch = definedPatch(input);
+  const projectId = input.project_id === "" || input.project_id === null ? null : input.project_id === undefined ? list.project_id : input.project_id;
   if (input.slug !== undefined) {
     const slug = slugifyRaw(input.slug);
     if (!slug)
       throw new Error("Invalid task-list slug \u2014 must be non-empty kebab-case");
-    const duplicate = (await store.list("task_lists")).find((candidate) => candidate.id !== id && candidate.project_id === list.project_id && candidate.slug === slug);
+    patch.slug = slug;
+  }
+  const effectiveSlug = patch.slug ?? list.slug;
+  if (projectId !== list.project_id || effectiveSlug !== list.slug) {
+    const duplicate = (await store.list("task_lists")).find((candidate) => candidate.id !== id && candidate.project_id === projectId && candidate.slug === effectiveSlug);
     if (duplicate) {
-      throw new ResourceConflictError("TASK_LIST_SLUG_CONFLICT", `Task list with slug "${slug}" already exists in this scope`);
+      throw new ResourceConflictError("TASK_LIST_SLUG_CONFLICT", `Task list with slug "${effectiveSlug}" already exists in this scope`);
     }
-    patch.slug = slug;
   }
+  if (projectId !== list.project_id)
+    patch.project_id = projectId;
   return store.upsert("task_lists", {
     ...list,
     ...patch,
@@ -17327,6 +17567,22 @@ async function addComment2(input, store, context) {
 function redactComment(comment) {
   return { ...comment, content: redactEvidenceText(comment.content) };
 }
+async function addPlanComment2(input, store, context) {
+  const comment = {
+    id: randomUUID3(),
+    plan_id: input.plan_id,
+    agent_id: input.agent_id ?? context?.agentId ?? null,
+    session_id: input.session_id ?? context?.sessionId ?? null,
+    content: redactEvidenceText(input.content),
+    type: input.type ?? "comment",
+    progress_pct: input.progress_pct ?? null,
+    created_at: new Date().toISOString()
+  };
+  return store.upsert("plan_comments", comment, context);
+}
+function redactPlanComment(comment) {
+  return { ...comment, content: redactEvidenceText(comment.content) };
+}
 async function exportSnapshot(store) {
   return {
     exportedAt: new Date().toISOString(),
@@ -18935,24 +19191,20 @@ export {
   postgresTodosScopedSlugIndexStatusSql,
   postgresTodosCommentCursorIndexSql,
   planRunArtifactsS3Sync,
-  parseStorageMode,
   parseStorageBackend,
   maybeInstallShadowCapture2 as maybeInstallShadowCapture,
   loadTodosStorageConfig,
   loadStorageConfig,
   isTodosShadowEnabled,
-  isTodosRemoteStorageEnabled,
   isTodosPostgresBackend,
   isCommentRedactionBackfillComplete,
   installShadowOutboxSchema,
   importSqliteTodosStorageSnapshot,
   getTodosStorageShadowEnvName,
-  getTodosStorageMode,
   getTodosStorageEnvName,
   getTodosStorageDatabaseUrl,
   getTodosStorageDatabaseEnv,
   getTodosStorageBackend,
-  getStorageMode,
   getStorageDatabaseUrl,
   getStorageDatabaseEnv,
   getRuntimeShadowOutbox,