@nmakarov/cli-toolkit 0.61.0 → 0.65.0

package/dist/index.cjs

@@ -1125,6 +1125,7 @@ __export(src_exports, {
   controlLaneTaskNames: () => controlLaneTaskNames,
   convertPattern: () => convertPattern,
   createRelease: () => createRelease,
+  createTaskProgressReporter: () => createTaskProgressReporter,
   defaultFileSynopsisFunction: () => defaultFileSynopsisFunction,
   defaultTasksRegistry: () => defaultTasksRegistry,
   defaultVersionSynopsisFunction: () => defaultVersionSynopsisFunction,
@@ -2642,8 +2643,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) {
@@ -2651,19 +2657,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;
@@ -3693,13 +3702,15 @@ var CONNECTION_ERROR_CODES = /* @__PURE__ */ new Set([
   "57P02",
   "57P03"
 ]);
-var CONNECTION_ERROR_MESSAGE_RE = /connection (terminated|ended|closed|destroyed|reset|refused|not open)|Connection terminated unexpectedly|Client has encountered a connection error|server closed the connection|Cannot use a pool after calling end|This socket has been ended|connect ECONNRESET|Timeout acquiring a connection/i;
+var CONNECTION_ERROR_MESSAGE_RE = /connection (terminated|ended|closed|destroyed|reset|refused|not open)|Connection terminated unexpectedly|Client has encountered a connection error|server closed the connection|Cannot use a pool after calling end|This socket has been ended|connect ECONNRESET/i;
 var Db = class _Db {
   static async init(context, options = {}) {
     const buildConfig = async () => {
       const defs = {
         dbName: "string",
-        dbProfile: "boolean default false"
+        dbProfile: "boolean default false",
+        /** Cap knex pool size (default 10). Size ≈ expected concurrency + headroom. */
+        dbPoolMax: "number"
       };
       const discovered = context?.params?.getAllForModule?.("db", defs) ?? {};
       const merged = { ...discovered, ...options };
@@ -3758,12 +3769,23 @@ var Db = class _Db {
         context?.args?.env,
         merged.name
       );
+      const poolMaxRaw = merged.dbPoolMax ?? merged.pool?.max;
+      const poolMax = Number(poolMaxRaw);
+      const pool = {
+        ...KNEX_DEFAULTS.pool,
+        ...merged.pool && typeof merged.pool === "object" ? merged.pool : {}
+      };
+      if (Number.isFinite(poolMax) && poolMax >= 1) {
+        pool.max = Math.floor(poolMax);
+      }
       return {
         ...KNEX_DEFAULTS,
         connectionString: dbConnectionString,
         name: displayName,
         profile: !!dbProfile,
-        logger: context.logger
+        logger: context.logger,
+        pool,
+        ...merged.acquireConnectionTimeout != null ? { acquireConnectionTimeout: merged.acquireConnectionTimeout } : {}
       };
     };
     const config2 = context?.params?.runWithModuleAsync ? await context.params.runWithModuleAsync("db", buildConfig) : await buildConfig();
@@ -5190,6 +5212,9 @@ var Logger = class _Logger {
     const message = this.inspectChunks([operation, ...chunks]);
     this.out({ level: "response", message });
   }
+  /**
+   * @returns {boolean} true when the progress line was emitted (not throttled)
+   */
   progress(message, opts) {
     const { prefix, count, total } = opts;
     const paddedTotal = String(total).length;
@@ -5223,7 +5248,9 @@ var Logger = class _Logger {
       if (this.options.progressThrottle && prefix) {
         this.lastProgressTimes[prefix] = Date.now();
       }
+      return true;
     }
+    return false;
   }
   shouldOutputProgress(prefix, count, total) {
     if (!this.options.progressThrottle) {
@@ -7063,6 +7090,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) {
@@ -8914,7 +8969,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) {
@@ -9462,6 +9518,7 @@ var TasksManager = class _TasksManager {
   controlLaneTaskNames,
   convertPattern,
   createRelease,
+  createTaskProgressReporter,
   defaultFileSynopsisFunction,
   defaultTasksRegistry,
   defaultVersionSynopsisFunction,