@nmakarov/cli-toolkit 0.70.0 → 0.72.0

package/dist/tasks.cjs

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var tasks_exports = {};
 __export(tasks_exports, {
   AbstractTask: () => AbstractTask,
+  DEFAULT_RUNTIME_PARAM_SPECS: () => DEFAULT_RUNTIME_PARAM_SPECS,
   LOGGER_RUNTIME_KEYS: () => LOGGER_RUNTIME_KEYS,
   LOOP_RUNTIME_KEYS: () => LOOP_RUNTIME_KEYS,
   SERVICE_TASK_NAMES: () => SERVICE_TASK_NAMES,
@@ -64,6 +65,7 @@ __export(tasks_exports, {
   listServicesRegistry: () => listServicesRegistry,
   matchesParsedPattern: () => matchesParsedPattern,
   mergeAllowedTasksWithServiceTasks: () => mergeAllowedTasksWithServiceTasks,
+  mergeRuntimeParamSpecs: () => mergeRuntimeParamSpecs,
   nextTimeMatch: () => nextTimeMatch,
   normalizeAllowedTasks: () => normalizeAllowedTasks,
   queueToTableNames: () => queueToTableNames,
@@ -77,6 +79,8 @@ __export(tasks_exports, {
   resolveSteps: () => resolveSteps,
   runNodeTaskScript: () => runNodeTaskScript,
   runTasksLoop: () => runTasksLoop,
+  runtimeParamSpecsFromMetadata: () => runtimeParamSpecsFromMetadata,
+  runtimeValuesForSpecs: () => runtimeValuesForSpecs,
   taskHistoryInsertFromQueueRow: () => taskHistoryInsertFromQueueRow,
   timeMatcher: () => timeMatcher,
   touchRunnerHeartbeat: () => touchServicesRegistry,
@@ -608,6 +612,9 @@ var DEFAULT_GROUP_MAX_INSTANCES = {
   harvest: 1,
   harvester: 0,
   loader: 0,
+  toolkit: 0,
+  photocare: 0,
+  /** @deprecated use photocare */
   photos: 0,
   photosprocessor: 0,
   ingest: 0
@@ -2789,6 +2796,67 @@ var LOGGER_RUNTIME_KEYS = [
   "progressWithTimes",
   "progressThrottleMs"
 ];
+var DEFAULT_RUNTIME_PARAM_SPECS = [
+  {
+    key: "maxParallel",
+    type: "number",
+    label: "Max parallel",
+    description: "Worker-lane concurrency (how many tasks claim at once)"
+  },
+  {
+    key: "pollMs",
+    type: "number",
+    label: "Poll ms",
+    description: "Idle poll interval between claim attempts"
+  },
+  {
+    key: "claimJitterMs",
+    type: "number",
+    label: "Claim jitter ms",
+    description: "Random delay before worker claims (0 = off)"
+  },
+  {
+    key: "scanLimit",
+    type: "number",
+    label: "Scan limit",
+    description: "Max idle rows scanned per claim attempt"
+  }
+];
+function mergeRuntimeParamSpecs(extra) {
+  const byKey = new Map(DEFAULT_RUNTIME_PARAM_SPECS.map((s) => [s.key, { ...s }]));
+  if (Array.isArray(extra)) {
+    for (const raw of extra) {
+      if (!raw || typeof raw !== "object") continue;
+      const key = String(raw.key ?? "").trim();
+      if (!key) continue;
+      const prev = byKey.get(key) ?? {};
+      const type = ["number", "boolean", "string"].includes(raw.type) ? raw.type : prev.type ?? "string";
+      byKey.set(key, {
+        key,
+        type,
+        label: String(raw.label ?? prev.label ?? key),
+        description: raw.description != null ? String(raw.description) : prev.description != null ? String(prev.description) : void 0
+      });
+    }
+  }
+  return Array.from(byKey.values());
+}
+function runtimeValuesForSpecs(context, specs = DEFAULT_RUNTIME_PARAM_SPECS) {
+  const rt = ensureTasksRuntime(context);
+  const out = {};
+  for (const s of specs) {
+    if (rt[s.key] !== void 0) out[s.key] = rt[s.key];
+  }
+  return out;
+}
+function runtimeParamSpecsFromMetadata(metadata) {
+  const meta = metadata && typeof metadata === "object" ? metadata : null;
+  const raw = meta?.runtimeParams;
+  if (!Array.isArray(raw) || raw.length === 0) {
+    return mergeRuntimeParamSpecs();
+  }
+  return mergeRuntimeParamSpecs(raw);
+}
 var CONTROL_LANE_TASK_NAMES = [
   "stopRunner",
   "stop",
@@ -2885,12 +2953,15 @@ async function applyRuntimeParam(context, key, value) {
   const reg = context.servicesRegistry;
   if (reg?.rowId && reg?.registryTable) {
     try {
-      const loopSnapshot = {};
+      const specs = Array.isArray(context.tasksRuntimeParamSpecs) ? context.tasksRuntimeParamSpecs : DEFAULT_RUNTIME_PARAM_SPECS;
+      const runtimeSnapshot = runtimeValuesForSpecs(context, specs);
       for (const lk of LOOP_RUNTIME_KEYS) {
-        if (runtime[lk] !== void 0) loopSnapshot[lk] = runtime[lk];
+        if (runtime[lk] !== void 0 && runtimeSnapshot[lk] === void 0) {
+          runtimeSnapshot[lk] = runtime[lk];
+        }
       }
       await updateServicesRegistryMetadata(context, reg, {
-        runtime: loopSnapshot,
+        runtime: runtimeSnapshot,
         runtimeUpdatedAt: (/* @__PURE__ */ new Date()).toISOString()
       });
       applied.push("servicesRegistry");
@@ -3783,18 +3854,25 @@ async function runTasksLoop(context, options) {
   if (hbGroup) {
     const hbIntervalMs = options.runnerHeartbeatIntervalMs ?? 1e4;
     const staleMs = options.runnerHeartbeatStaleMs ?? 45e3;
-    const loop0 = readLoopRuntime(context);
+    const runtimeParamSpecs = mergeRuntimeParamSpecs(options.runnerRuntimeParams);
+    context.tasksRuntimeParamSpecs = runtimeParamSpecs;
     const defaultMeta = {
       component: "tasks-runner",
       allowedTasks: allowedTasks?.length ? allowedTasks.join(",") : "all",
       paused: false,
-      runtime: {
-        maxParallel: loop0.maxParallel,
-        pollMs: loop0.pollMs,
-        claimJitterMs: loop0.claimJitterMs,
-        scanLimit: loop0.scanLimit
-      }
+      runtimeParams: runtimeParamSpecs,
+      runtime: runtimeValuesForSpecs(context, runtimeParamSpecs)
+    };
+    const metadata = {
+      ...defaultMeta,
+      ...options.runnerMetadata && typeof options.runnerMetadata === "object" ? options.runnerMetadata : {}
     };
+    if (!Array.isArray(metadata.runtimeParams) || metadata.runtimeParams.length === 0) {
+      metadata.runtimeParams = defaultMeta.runtimeParams;
+    }
+    if (!metadata.runtime || typeof metadata.runtime !== "object") {
+      metadata.runtime = defaultMeta.runtime;
+    }
     registryReg = await registerInServicesRegistry(context, {
       queueName,
       target,
@@ -3804,7 +3882,7 @@ async function runTasksLoop(context, options) {
       staleMs,
       groupMaxInstances: options.runnerGroupMaxInstances,
       enforceMaxInstances: options.runnerEnforceMaxInstances ?? true,
-      metadata: options.runnerMetadata ?? defaultMeta
+      metadata
     });
     context.servicesRegistry = registryReg;
     runnerIdentity = {
@@ -4119,6 +4197,7 @@ var TasksManager = class _TasksManager {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AbstractTask,
+  DEFAULT_RUNTIME_PARAM_SPECS,
   LOGGER_RUNTIME_KEYS,
   LOOP_RUNTIME_KEYS,
   SERVICE_TASK_NAMES,
@@ -4153,6 +4232,7 @@ var TasksManager = class _TasksManager {
   listServicesRegistry,
   matchesParsedPattern,
   mergeAllowedTasksWithServiceTasks,
+  mergeRuntimeParamSpecs,
   nextTimeMatch,
   normalizeAllowedTasks,
   queueToTableNames,
@@ -4166,6 +4246,8 @@ var TasksManager = class _TasksManager {
   resolveSteps,
   runNodeTaskScript,
   runTasksLoop,
+  runtimeParamSpecsFromMetadata,
+  runtimeValuesForSpecs,
   taskHistoryInsertFromQueueRow,
   timeMatcher,
   touchRunnerHeartbeat,