@nmakarov/cli-toolkit 0.61.0 → 0.65.0

package/dist/tasks.cjs

@@ -49,6 +49,7 @@ __export(tasks_exports, {
   coerceRuntimeValue: () => coerceRuntimeValue,
   controlLaneTaskNames: () => controlLaneTaskNames,
   convertPattern: () => convertPattern,
+  createTaskProgressReporter: () => createTaskProgressReporter,
   defaultTasksRegistry: () => defaultTasksRegistry,
   enqueueStopTask: () => enqueueStopTask,
   enqueueTask: () => enqueueTask,
@@ -548,6 +549,34 @@ async function updateTaskProgress(context, tasksTable, taskId, progress) {
     progress: typeof progress === "string" ? progress : JSON.stringify(progress)
   });
 }
+function createTaskProgressReporter(context, tasksTable, taskId) {
+  let pump = null;
+  let pending = void 0;
+  let hasPending = false;
+  return (progress) => {
+    pending = progress;
+    hasPending = true;
+    if (pump) return pump;
+    pump = (async () => {
+      try {
+        while (hasPending) {
+          hasPending = false;
+          const value = pending;
+          try {
+            await updateTaskProgress(context, tasksTable, taskId, value);
+          } catch (err) {
+            context.logger?.warn?.(
+              `[tasks] progress update failed for ${taskId}: ${err?.message ?? err}`
+            );
+          }
+        }
+      } finally {
+        pump = null;
+      }
+    })();
+    return pump;
+  };
+}
 
 // src/tasks/servicesRegistry.js
 function getDb2(context) {
@@ -961,8 +990,13 @@ var FileDatabase = class _FileDatabase {
     this.currentVersionFolder = await ensurePath(this.getDestinationPath(), version);
   }
   /**
-   * Create a new version folder with comprehensive timestamp logic
-   * Only works in versioned mode
+   * Create a new version folder named with the current UTC second.
+   * Only works in versioned mode.
+   *
+   * Clash protection: if that name already exists (two writers in the same
+   * second, or wall clock behind the latest version), advance +1s until free.
+   * Do NOT always derive from max(existing)+1s — that made successive harvests
+   * hours apart still land one second apart on disk.
    */
   async makeNewVersion() {
     if (!this.versioned) {
@@ -970,19 +1004,22 @@ var FileDatabase = class _FileDatabase {
     }
     this.metadata = this.getDefaultMetadata();
     const existingVersions = await this.getVersions();
-    let versionName;
+    const existingSet = new Set(existingVersions);
+    let candidateMs = Date.now();
     if (existingVersions.length > 0) {
-      const maxTimestamp = existingVersions.reduce((max, version) => {
-        const versionDate = new Date(version.replace("Z", ""));
-        const maxDate2 = new Date(max.replace("Z", ""));
-        return versionDate > maxDate2 ? version : max;
-      });
-      const maxDate = new Date(maxTimestamp.replace("Z", ""));
-      const nextDate = new Date(maxDate.getTime() + 1e3);
-      versionName = nextDate.toISOString().split(".")[0] + "Z";
-    } else {
-      const now = /* @__PURE__ */ new Date();
-      versionName = now.toISOString().split(".")[0] + "Z";
+      let maxMs = 0;
+      for (const version of existingVersions) {
+        const ms = new Date(version).getTime();
+        if (Number.isFinite(ms) && ms > maxMs) maxMs = ms;
+      }
+      if (candidateMs <= maxMs) {
+        candidateMs = maxMs + 1e3;
+      }
+    }
+    let versionName = new Date(candidateMs).toISOString().split(".")[0] + "Z";
+    while (existingSet.has(versionName)) {
+      candidateMs += 1e3;
+      versionName = new Date(candidateMs).toISOString().split(".")[0] + "Z";
     }
     await this.setCurrentVersion(versionName);
     this.currentFileNumber = 0;
@@ -3461,7 +3498,8 @@ async function executeClaimedTask(context, tasksTable, historyTable, row, regist
   try {
     taskInstance = new TaskClass(context, row);
     runningTaskInstances.set(row.id, taskInstance);
-    const runResult = await taskInstance.run((progress) => updateTaskProgress(context, tasksTable, row.id, progress));
+    const reportProgress = createTaskProgressReporter(context, tasksTable, row.id);
+    const runResult = await taskInstance.run(reportProgress);
     success = !!runResult?.success;
     results = runResult?.results ?? null;
   } catch (error) {
@@ -3974,6 +4012,7 @@ var TasksManager = class _TasksManager {
   coerceRuntimeValue,
   controlLaneTaskNames,
   convertPattern,
+  createTaskProgressReporter,
   defaultTasksRegistry,
   enqueueStopTask,
   enqueueTask,