@hasna/todos 0.15.18 → 0.15.19

package/dist/contracts.js

@@ -3662,7 +3662,7 @@ function isBlockingDependencyStatus(status) {
 function isTerminalStatus(status) {
   return status === "completed" || status === "failed" || status === "cancelled";
 }
-var TASK_STATUSES, TASK_PRIORITIES, PLAN_STATUSES, VersionConflictError, TaskNotFoundError, TaskNotStartableError, TaskReferenceAmbiguousError, ProjectNotFoundError, ResourceConflictError, PlanNotFoundError, LockError, AgentNotFoundError, IdentityAliasAmbiguousError, IdentityIdImmutableError, TaskListNotFoundError, DependencyCycleError, CompletionGuardError, DISPATCH_STATUSES, DispatchNotFoundError;
+var TASK_STATUSES, TASK_PRIORITIES, PLAN_STATUSES, VersionConflictError, TaskNotFoundError, TaskNotStartableError, TaskReferenceAmbiguousError, ProjectNotFoundError, ResourceConflictError, PlanRevisionConflictError, PlanNotFoundError, LockError, AgentNotFoundError, IdentityAliasAmbiguousError, IdentityIdImmutableError, TaskListNotFoundError, DependencyCycleError, CompletionGuardError, DISPATCH_STATUSES, DispatchNotFoundError;
 var init_types = __esm(() => {
   TASK_STATUSES = [
     "pending",
@@ -3750,6 +3750,19 @@ var init_types = __esm(() => {
       this.name = "ResourceConflictError";
     }
   };
+  PlanRevisionConflictError = class PlanRevisionConflictError extends Error {
+    planId;
+    expectedUpdatedAt;
+    currentUpdatedAt;
+    static code = "PLAN_REVISION_CONFLICT";
+    constructor(planId, expectedUpdatedAt, currentUpdatedAt) {
+      super(`Plan revision conflict for ${planId}: expected ${expectedUpdatedAt}, current ${currentUpdatedAt}`);
+      this.planId = planId;
+      this.expectedUpdatedAt = expectedUpdatedAt;
+      this.currentUpdatedAt = currentUpdatedAt;
+      this.name = "PlanRevisionConflictError";
+    }
+  };
   PlanNotFoundError = class PlanNotFoundError extends Error {
     planId;
     static code = "PLAN_NOT_FOUND";
@@ -10521,6 +10534,48 @@ function updatePlan(id, input, db) {
     return updatePlanStored(id, input, d);
   })();
 }
+function nextPlanCompletionTimestamp(expectedUpdatedAt) {
+  const expected = Date.parse(expectedUpdatedAt);
+  const minimum = Number.isNaN(expected) ? Date.now() : expected + 2;
+  return new Date(Math.max(Date.now(), minimum)).toISOString();
+}
+function completePlanAtRevision(id, expectedUpdatedAt, db) {
+  const d = db || getDatabase();
+  return d.transaction(() => {
+    guardPlanRowsSqlite([id], d);
+    const plan = getPlan(id, d);
+    if (!plan)
+      throw new PlanNotFoundError(id);
+    if (plan.updated_at !== expectedUpdatedAt) {
+      throw new PlanRevisionConflictError(id, expectedUpdatedAt, plan.updated_at);
+    }
+    if (plan.status === "completed")
+      return { plan, applied: false };
+    const updatedAt = nextPlanCompletionTimestamp(expectedUpdatedAt);
+    const result = d.run(`UPDATE plans
+       SET status = 'completed', updated_at = ?
+       WHERE id = ? AND updated_at = ? AND status <> 'completed'`, [updatedAt, id, expectedUpdatedAt]);
+    if (result.changes !== 1) {
+      const current = getPlan(id, d);
+      if (!current)
+        throw new PlanNotFoundError(id);
+      throw new PlanRevisionConflictError(id, expectedUpdatedAt, current.updated_at);
+    }
+    const completed = getPlan(id, d);
+    emitLocalEventHooksQuiet({
+      type: "plan.updated",
+      payload: {
+        id,
+        old_status: plan.status,
+        new_status: completed.status,
+        name: completed.name,
+        project_id: completed.project_id
+      },
+      databasePath: databasePathFromDatabase(d)
+    });
+    return { plan: completed, applied: true };
+  })();
+}
 function deletePlan(id, db) {
   const d = db || getDatabase();
   const plan = getPlan(id, d);
@@ -12380,7 +12435,7 @@ var init_tasks = __esm(() => {
 // package.json
 var package_default = {
   name: "@hasna/todos",
-  version: "0.15.18",
+  version: "0.15.19",
   description: "Universal task management for AI coding agents - CLI + MCP server + interactive TUI",
   type: "module",
   main: "dist/index.js",

package/dist/db/plans.d.ts

@@ -12,5 +12,9 @@ export declare function createPlan(input: CreatePlanInput, db?: Database): Plan;
 export declare function getPlan(id: string, db?: Database): Plan | null;
 export declare function listPlans(projectId?: string, db?: Database): Plan[];
 export declare function updatePlan(id: string, input: UpdatePlanInput, db?: Database): Plan;
+export declare function completePlanAtRevision(id: string, expectedUpdatedAt: string, db?: Database): {
+    plan: Plan;
+    applied: boolean;
+};
 export declare function deletePlan(id: string, db?: Database): boolean;
 //# sourceMappingURL=plans.d.ts.map

package/dist/db/plans.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plans.d.ts","sourceRoot":"","sources":["../../src/db/plans.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAoB,MAAM,YAAY,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAShF,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAClB,MAAM,EAAE,IAAI,GAAG,MAAM,GAAG,WAAW,GAAG,WAAW,CAAC;IAClD,OAAO,EAAE,IAAI,EAAE,CAAC;CACjB;AAMD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIvD;AAsCD,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,oBAAoB,CAalH;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAEnG;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,IAAI,CA2BtE;AAED,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI,CAI9D;AAED,wBAAgB,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,IAAI,EAAE,CAUnE;AAuDD,wBAAgB,UAAU,CACxB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,eAAe,EACtB,EAAE,CAAC,EAAE,QAAQ,GACZ,IAAI,CAMN;AAED,wBAAgB,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAW7D"}
+{"version":3,"file":"plans.d.ts","sourceRoot":"","sources":["../../src/db/plans.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAoB,MAAM,YAAY,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAShF,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAClB,MAAM,EAAE,IAAI,GAAG,MAAM,GAAG,WAAW,GAAG,WAAW,CAAC;IAClD,OAAO,EAAE,IAAI,EAAE,CAAC;CACjB;AAMD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIvD;AAsCD,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,oBAAoB,CAalH;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAEnG;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,IAAI,CA2BtE;AAED,wBAAgB,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI,CAI9D;AAED,wBAAgB,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,IAAI,EAAE,CAUnE;AAuDD,wBAAgB,UAAU,CACxB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,eAAe,EACtB,EAAE,CAAC,EAAE,QAAQ,GACZ,IAAI,CAMN;AAQD,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,MAAM,EACV,iBAAiB,EAAE,MAAM,EACzB,EAAE,CAAC,EAAE,QAAQ,GACZ;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAqClC;AAED,wBAAgB,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAW7D"}

package/dist/index.js

@@ -3662,7 +3662,7 @@ function isBlockingDependencyStatus(status) {
 function isTerminalStatus(status) {
   return status === "completed" || status === "failed" || status === "cancelled";
 }
-var TASK_STATUSES, TASK_PRIORITIES, PLAN_STATUSES, VersionConflictError, TaskNotFoundError, TaskNotStartableError, TaskReferenceAmbiguousError, ProjectNotFoundError, ResourceConflictError, PlanNotFoundError, LockError, AgentNotFoundError, IdentityAliasAmbiguousError, IdentityIdImmutableError, TaskListNotFoundError, DependencyCycleError, CompletionGuardError, DISPATCH_STATUSES, DispatchNotFoundError;
+var TASK_STATUSES, TASK_PRIORITIES, PLAN_STATUSES, VersionConflictError, TaskNotFoundError, TaskNotStartableError, TaskReferenceAmbiguousError, ProjectNotFoundError, ResourceConflictError, PlanRevisionConflictError, PlanNotFoundError, LockError, AgentNotFoundError, IdentityAliasAmbiguousError, IdentityIdImmutableError, TaskListNotFoundError, DependencyCycleError, CompletionGuardError, DISPATCH_STATUSES, DispatchNotFoundError;
 var init_types = __esm(() => {
   TASK_STATUSES = [
     "pending",
@@ -3750,6 +3750,19 @@ var init_types = __esm(() => {
       this.name = "ResourceConflictError";
     }
   };
+  PlanRevisionConflictError = class PlanRevisionConflictError extends Error {
+    planId;
+    expectedUpdatedAt;
+    currentUpdatedAt;
+    static code = "PLAN_REVISION_CONFLICT";
+    constructor(planId, expectedUpdatedAt, currentUpdatedAt) {
+      super(`Plan revision conflict for ${planId}: expected ${expectedUpdatedAt}, current ${currentUpdatedAt}`);
+      this.planId = planId;
+      this.expectedUpdatedAt = expectedUpdatedAt;
+      this.currentUpdatedAt = currentUpdatedAt;
+      this.name = "PlanRevisionConflictError";
+    }
+  };
   PlanNotFoundError = class PlanNotFoundError extends Error {
     planId;
     static code = "PLAN_NOT_FOUND";
@@ -10521,6 +10534,48 @@ function updatePlan(id, input, db) {
     return updatePlanStored(id, input, d);
   })();
 }
+function nextPlanCompletionTimestamp(expectedUpdatedAt) {
+  const expected = Date.parse(expectedUpdatedAt);
+  const minimum = Number.isNaN(expected) ? Date.now() : expected + 2;
+  return new Date(Math.max(Date.now(), minimum)).toISOString();
+}
+function completePlanAtRevision(id, expectedUpdatedAt, db) {
+  const d = db || getDatabase();
+  return d.transaction(() => {
+    guardPlanRowsSqlite([id], d);
+    const plan = getPlan(id, d);
+    if (!plan)
+      throw new PlanNotFoundError(id);
+    if (plan.updated_at !== expectedUpdatedAt) {
+      throw new PlanRevisionConflictError(id, expectedUpdatedAt, plan.updated_at);
+    }
+    if (plan.status === "completed")
+      return { plan, applied: false };
+    const updatedAt = nextPlanCompletionTimestamp(expectedUpdatedAt);
+    const result = d.run(`UPDATE plans
+       SET status = 'completed', updated_at = ?
+       WHERE id = ? AND updated_at = ? AND status <> 'completed'`, [updatedAt, id, expectedUpdatedAt]);
+    if (result.changes !== 1) {
+      const current = getPlan(id, d);
+      if (!current)
+        throw new PlanNotFoundError(id);
+      throw new PlanRevisionConflictError(id, expectedUpdatedAt, current.updated_at);
+    }
+    const completed = getPlan(id, d);
+    emitLocalEventHooksQuiet({
+      type: "plan.updated",
+      payload: {
+        id,
+        old_status: plan.status,
+        new_status: completed.status,
+        name: completed.name,
+        project_id: completed.project_id
+      },
+      databasePath: databasePathFromDatabase(d)
+    });
+    return { plan: completed, applied: true };
+  })();
+}
 function deletePlan(id, db) {
   const d = db || getDatabase();
   const plan = getPlan(id, d);
@@ -12493,7 +12548,7 @@ var init_dispatches = __esm(() => {
 // package.json
 var package_default = {
   name: "@hasna/todos",
-  version: "0.15.18",
+  version: "0.15.19",
   description: "Universal task management for AI coding agents - CLI + MCP server + interactive TUI",
   type: "module",
   main: "dist/index.js",
@@ -25766,7 +25821,7 @@ function importSqliteTodosStorageSnapshot(snapshot, db) {
   }
   if (result.errors.length > 0)
     return result;
-  const applyRows = (objectType, table, columns, rows, updateClockColumn, afterUpsert) => {
+  const applyRows = (objectType, table, columns, rows, updateClockColumn, acceptEqualClock = true, afterUpsert) => {
     for (const row of rows) {
       try {
         const record = asRecord2(row);
@@ -25775,7 +25830,7 @@ function importSqliteTodosStorageSnapshot(snapshot, db) {
           result.skipped += 1;
           continue;
         }
-        const state = upsertById(d, table, columns, record, updateClockColumn);
+        const state = upsertById(d, table, columns, record, updateClockColumn, acceptEqualClock);
         if (state === "inserted")
           result.inserted += 1;
         else if (state === "updated")
@@ -25792,10 +25847,10 @@ function importSqliteTodosStorageSnapshot(snapshot, db) {
   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");
-  applyRows("plans", "plans", PLAN_COLUMNS, snapshot.plans, "updated_at");
+  applyRows("plans", "plans", PLAN_COLUMNS, snapshot.plans, "updated_at", false);
   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) => {
+  applyRows("tasks", "tasks", TASK_COLUMNS, sortedTasks2(snapshot.tasks), "updated_at", true, (row, changed) => {
     if (changed && Array.isArray(row["tags"]) && typeof row["id"] === "string") {
       replaceTaskTags(row["id"], row["tags"].filter((tag) => typeof tag === "string"), d);
     }
@@ -25804,7 +25859,7 @@ function importSqliteTodosStorageSnapshot(snapshot, db) {
   applyTombstones(d, snapshot.tombstones ?? [], result);
   return result;
 }
-function upsertById(db, table, columns, row, updateClockColumn) {
+function upsertById(db, table, columns, row, updateClockColumn, acceptEqualClock = true) {
   const id = row["id"];
   if (typeof id !== "string" || !id)
     throw new Error(`${table} row is missing id`);
@@ -25816,7 +25871,7 @@ function upsertById(db, table, columns, row, updateClockColumn) {
   const values = presentColumns.map((column) => valueForColumn(column, row[column]));
   const updateColumns = presentColumns.filter((column) => column !== "id");
   const updateSet = updateColumns.map((column) => column === "version" ? `version = MAX(COALESCE(${table}.version, 0), excluded.version)` : `${column} = excluded.${column}`).join(", ");
-  const clockGuard = updateClockColumn && presentColumns.includes(updateClockColumn) ? ` WHERE ${table}.${updateClockColumn} IS NULL OR ${table}.${updateClockColumn} <= excluded.${updateClockColumn}` : "";
+  const clockGuard = updateClockColumn && presentColumns.includes(updateClockColumn) ? ` WHERE ${table}.${updateClockColumn} IS NULL OR ${table}.${updateClockColumn} ${acceptEqualClock ? "<=" : "<"} excluded.${updateClockColumn}` : "";
   const sql = updateSet ? `INSERT INTO ${table} (${presentColumns.join(", ")}) VALUES (${placeholders})
        ON CONFLICT(id) DO UPDATE SET ${updateSet}${clockGuard}` : `INSERT OR IGNORE INTO ${table} (${presentColumns.join(", ")}) VALUES (${placeholders})`;
   const changes = db.run(sql, values).changes;
@@ -26056,6 +26111,7 @@ function createLocalSqliteTodosStorageAdapter(options = {}) {
       get: (id) => getPlan(id, database()),
       list: (projectId) => listPlans(projectId, database()),
       update: (id, input) => updatePlan(id, input, database()),
+      completeAtRevision: (id, expectedUpdatedAt) => completePlanAtRevision(id, expectedUpdatedAt, database()),
       delete: (id) => deletePlan(id, database())
     },
     planProjectLinks: {
@@ -26600,6 +26656,7 @@ function createPostgresTodosStorageAdapter(options) {
       get: (id) => store.get("plans", id),
       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)
     },
     planProjectLinks: {
@@ -27087,6 +27144,54 @@ class PostgresJsonRecordStore {
       throw new PlanNotFoundError(value.id);
     return payloadRecord2(row.payload);
   }
+  async completePlanAtRevision(id, expectedUpdatedAt, context = {}) {
+    await this.ensureSchema();
+    const result = await this.options.client.query(`/* todos:complete-plan-revision-cas */ WITH next_clock AS (
+         SELECT date_trunc(
+           'milliseconds',
+           GREATEST(clock_timestamp(), ($3::text)::timestamptz + interval '2 milliseconds')
+         ) AS completed_at
+       ), stored AS (
+         UPDATE ${this.tableName} AS record SET
+           payload = record.payload || jsonb_build_object(
+             'status', 'completed',
+             'updated_at', to_char(
+               next_clock.completed_at AT TIME ZONE 'UTC',
+               'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
+             )
+           ),
+           updated_at = next_clock.completed_at,
+           deleted_at = NULL,
+           source_machine_id = COALESCE($4, record.source_machine_id),
+           version = COALESCE(record.version, 0) + 1
+         FROM next_clock
+         WHERE record.service = $1
+           AND record.object_type = 'plans'
+           AND record.object_id = $2
+           AND record.deleted_at IS NULL
+           AND record.payload->>'updated_at' = $3::text
+           AND record.payload->>'status' IS DISTINCT FROM 'completed'
+         RETURNING record.payload
+       )
+       SELECT payload FROM stored`, [
+      this.service,
+      id,
+      expectedUpdatedAt,
+      context.requestId ?? this.sourceMachineId ?? null
+    ]);
+    const payload = result.rows[0]?.payload;
+    if (payload)
+      return { plan: payloadRecord2(payload), applied: true };
+    const current = await this.get("plans", id);
+    if (!current)
+      throw new PlanNotFoundError(id);
+    if (current.updated_at !== expectedUpdatedAt) {
+      throw new PlanRevisionConflictError(id, expectedUpdatedAt, current.updated_at);
+    }
+    if (current.status === "completed")
+      return { plan: current, applied: false };
+    throw new PlanRevisionConflictError(id, expectedUpdatedAt, current.updated_at);
+  }
   async createTemplateWithTasks(template, tasks, context = {}) {
     await this.ensureSchema();
     const records = [
@@ -28865,6 +28970,15 @@ function createShadowTodosStorageAdapter(options) {
         mirror.enqueueUpsert("plans", plan, context);
         return plan;
       },
+      async completeAtRevision(id, expectedUpdatedAt, context) {
+        if (typeof local.plans.completeAtRevision !== "function") {
+          throw new Error("Atomic plan completion is not supported by the local shadow adapter");
+        }
+        const completed = await local.plans.completeAtRevision(id, expectedUpdatedAt, context);
+        if (completed.applied)
+          mirror.enqueueUpsert("plans", completed.plan, context);
+        return completed;
+      },
       async delete(id, context) {
         const deleted = await local.plans.delete(id, context);
         if (deleted)