plugin-cluster-manager 1.1.15 → 1.1.17

package/dist/locale/vi-VN.json

@@ -157,10 +157,16 @@
   "Deprecated multi-app share collection is active. Avoid schema/table sharing for new cluster deployments.": "Deprecated multi-app share collection is active. Avoid schema/table sharing for new cluster deployments.",
   "{count} legacy application record(s) were found in the applications collection.": "{count} legacy application record(s) were found in the applications collection.",
   "App Supervisor is not enabled. Use it for new multi-application management instead of deprecated multi-app plugins.": "App Supervisor is not enabled. Use it for new multi-application management instead of deprecated multi-app plugins.",
-  "Queue Assignment": "Gán hàng đợi",
-  "Queue Name": "Tên hàng đợi",
-  "Map queues to worker stacks. Unassigned queues run on all workers.": "Gán hàng đợi vào worker stack. Hàng đợi chưa gán sẽ chạy trên tất cả worker.",
-  "Scan Queues": "Quét hàng đợi",
+  "Queue Assignment": "Gán hàng đợi",
+  "Queue Name": "Tên hàng đợi",
+  "Map queues to worker stacks. Unassigned queues run on all workers.": "Gán hàng đợi vào worker stack. Hàng đợi chưa gán sẽ chạy trên tất cả worker.",
+  "Fallback mapping for legacy stacks without explicit Processes / queues.": "Mapping dự phòng cho các stack cũ chưa cấu hình Processes / queues rõ ràng.",
+  "Processes / queues": "Processes / queues",
+  "Saved as WORKER_MODE. Use tags for custom process keys that are not discovered yet.": "Được lưu thành WORKER_MODE. Có thể nhập tag cho process key tùy chỉnh chưa được phát hiện.",
+  "Select at least one process or queue": "Chọn ít nhất một process hoặc queue",
+  "WORKER_MODE=* makes this stack consume every queue. Prefer explicit queues in HA.": "WORKER_MODE=* khiến stack này tiêu thụ mọi queue. Nên chọn queue rõ ràng trong HA.",
+  "WORKER_MODE is managed by Processes / queues above.": "WORKER_MODE được quản lý bởi Processes / queues ở trên.",
+  "Scan Queues": "Quét hàng đợi",
   "Auto-map ({count})": "Tự động gán ({count})",
   "Register": "Đăng ký",
   "Unregister": "Hủy đăng ký",
@@ -202,5 +208,9 @@
   "Log Files": "Log Files",
   "Package": "Package",
   "DB Version": "DB Version",
-  "Runtime Versions": "Runtime Versions"
-}
+  "Runtime Versions": "Runtime Versions",
+  "Cluster registry has no worker heartbeats": "Registry cụm chưa có heartbeat từ worker",
+  "Cluster registry Redis is not configured": "Chưa cấu hình Redis cho registry cụm",
+  "Cluster Nodes reads Redis heartbeats, not the container runtime. Check worker boot, plugin-cluster-manager, and shared Redis configuration.": "Cluster Nodes đọc heartbeat trong Redis, không đọc trực tiếp container runtime. Hãy kiểm tra worker đã boot, plugin-cluster-manager đã load, và cấu hình Redis dùng chung.",
+  "Set REDIS_URL or CLUSTER_MANAGER_REDIS_URL on every app and worker to enable cluster node discovery.": "Thiết lập REDIS_URL hoặc CLUSTER_MANAGER_REDIS_URL trên mọi app và worker để bật khám phá node trong cụm."
+}

package/dist/locale/zh-CN.json

@@ -190,10 +190,16 @@
   "Package": "Package",
   "DB Version": "DB Version",
   "Runtime Versions": "Runtime Versions",
-  "Queue Assignment": "队列分配",
-  "Queue Name": "队列名称",
-  "Map queues to worker stacks. Unassigned queues run on all workers.": "将队列映射到工作节点栈。未分配的队列将在所有工作节点上运行。",
-  "Scan Queues": "扫描队列",
+  "Queue Assignment": "队列分配",
+  "Queue Name": "队列名称",
+  "Map queues to worker stacks. Unassigned queues run on all workers.": "将队列映射到工作节点栈。未分配的队列将在所有工作节点上运行。",
+  "Fallback mapping for legacy stacks without explicit Processes / queues.": "用于没有显式进程/队列配置的旧工作栈的兜底映射。",
+  "Processes / queues": "进程 / 队列",
+  "Saved as WORKER_MODE. Use tags for custom process keys that are not discovered yet.": "保存为 WORKER_MODE。可用标签输入尚未发现的自定义进程键。",
+  "Select at least one process or queue": "请至少选择一个进程或队列",
+  "WORKER_MODE=* makes this stack consume every queue. Prefer explicit queues in HA.": "WORKER_MODE=* 会让此工作栈消费所有队列。HA 环境建议显式选择队列。",
+  "WORKER_MODE is managed by Processes / queues above.": "WORKER_MODE 由上方的进程 / 队列配置管理。",
+  "Scan Queues": "扫描队列",
   "Auto-map ({count})": "自动映射 ({count})",
   "Register": "注册",
   "Unregister": "注销",
@@ -203,5 +209,9 @@
   "No queues discovered. Click \"Scan Queues\" to detect registered queues.": "未发现队列。点击\"扫描队列\"以检测已注册的队列。",
   "Auto-mapped {count} queue(s)": "已自动映射 {count} 个队列",
   "Queue Assignment updated": "队列分配已更新",
-  "Unassigned (worker runs all queues)": "未分配（工作节点运行所有队列）"
-}
+  "Unassigned (worker runs all queues)": "未分配（工作节点运行所有队列）",
+  "Cluster registry has no worker heartbeats": "集群注册表没有 worker 心跳",
+  "Cluster registry Redis is not configured": "未配置集群注册表 Redis",
+  "Cluster Nodes reads Redis heartbeats, not the container runtime. Check worker boot, plugin-cluster-manager, and shared Redis configuration.": "Cluster Nodes 读取 Redis 心跳，而不是直接读取容器运行时。请检查 worker 启动、plugin-cluster-manager 加载以及共享 Redis 配置。",
+  "Set REDIS_URL or CLUSTER_MANAGER_REDIS_URL on every app and worker to enable cluster node discovery.": "请在每个 app 和 worker 上设置 REDIS_URL 或 CLUSTER_MANAGER_REDIS_URL，以启用集群节点发现。"
+}

package/dist/server/actions/cluster-nodes.js

@@ -130,7 +130,7 @@ function getErrorMessage(error) {
   return error instanceof Error ? error.message : String(error);
 }
 function getNodeRole(node) {
-  return (0, import_node.getNodeRoleFrom)({ workerMode: node.workerMode, isSandbox: node.isSandbox });
+  return (0, import_node.getNodeRoleFrom)({ workerMode: node.workerMode, appRole: node.appRole, isSandbox: node.isSandbox });
 }
 function getReferenceVersion(nodes) {
   var _a;
@@ -145,11 +145,13 @@ function getReferenceVersion(nodes) {
   }
   return ((_a = [...counts.entries()].sort((a, b) => b[1] - a[1])[0]) == null ? void 0 : _a[0]) || null;
 }
-async function getClusterNodes(ctx) {
+function getClusterRegistry(ctx) {
   var _a, _b;
   const plugin = (_b = (_a = ctx.app.pm) == null ? void 0 : _a.get) == null ? void 0 : _b.call(_a, "plugin-cluster-manager");
-  const registry = (plugin == null ? void 0 : plugin.nodeRegistry) ?? new import_redis_node_registry.RedisNodeRegistry(ctx.app);
-  return registry.getNodes();
+  return (plugin == null ? void 0 : plugin.nodeRegistry) ?? new import_redis_node_registry.RedisNodeRegistry(ctx.app);
+}
+async function getClusterNodes(ctx) {
+  return getClusterRegistry(ctx).getNodes();
 }
 async function getExpectedPackages(ctx) {
   var _a;
@@ -212,7 +214,9 @@ async function readLocalLogs(app, maxLines) {
   const nodeInfo = {
     hostname: import_os.default.hostname(),
     pid: process.pid,
-    workerMode: process.env.WORKER_MODE || "main"
+    workerMode: process.env.WORKER_MODE || "main",
+    appRole: process.env.APP_ROLE || "",
+    isSandbox: process.env.SKILL_HUB_SANDBOX === "true"
   };
   if (logFiles.length === 0) {
     return { node: nodeInfo, lines: [], file: null };
@@ -242,7 +246,11 @@ const clusterActions = {
   async current(ctx, next) {
     var _a, _b;
     const currentMode = process.env.WORKER_MODE || "main";
-    const isApp = !(0, import_node.isWorkerMode)(process.env.WORKER_MODE);
+    const isApp = (0, import_node.getNodeRoleFrom)({
+      workerMode: process.env.WORKER_MODE,
+      appRole: process.env.APP_ROLE,
+      isSandbox: process.env.SKILL_HUB_SANDBOX === "true"
+    }) === "app";
     if (isApp) {
       const mem = process.memoryUsage();
       ctx.body = {
@@ -254,6 +262,8 @@ const clusterActions = {
           arch: process.arch,
           uptime: process.uptime(),
           workerMode: currentMode,
+          appRole: process.env.APP_ROLE || "",
+          isSandbox: process.env.SKILL_HUB_SANDBOX === "true",
           appPort: process.env.APP_PORT || "",
           clusterMode: process.env.CLUSTER_MODE || ""
         },
@@ -275,7 +285,9 @@ const clusterActions = {
       const plugin = (_b = (_a = ctx.app.pm) == null ? void 0 : _a.get) == null ? void 0 : _b.call(_a, "plugin-cluster-manager");
       const registry = (plugin == null ? void 0 : plugin.nodeRegistry) ?? new import_redis_node_registry.RedisNodeRegistry(ctx.app);
       const nodes = await registry.getNodes();
-      const appNode = nodes.find((n) => n.workerMode === "main" || n.workerMode === "" || n.workerMode === "app");
+      const appNode = nodes.find(
+        (n) => (0, import_node.getNodeRoleFrom)({ workerMode: n.workerMode, appRole: n.appRole, isSandbox: n.isSandbox }) === "app"
+      );
       if (appNode == null ? void 0 : appNode.nodeDetails) {
         ctx.body = appNode.nodeDetails;
       } else {
@@ -289,6 +301,8 @@ const clusterActions = {
             arch: process.arch,
             uptime: process.uptime(),
             workerMode: currentMode,
+            appRole: process.env.APP_ROLE || "",
+            isSandbox: process.env.SKILL_HUB_SANDBOX === "true",
             appPort: process.env.APP_PORT || "",
             clusterMode: process.env.CLUSTER_MODE || ""
           },
@@ -318,7 +332,10 @@ const clusterActions = {
    */
   async list(ctx, next) {
     const environments = [];
-    const nodes = await getClusterNodes(ctx);
+    const registry = getClusterRegistry(ctx);
+    const nodes = await registry.getNodes();
+    const registryStatus = registry.getStatus();
+    let fallback = false;
     if (nodes && nodes.length > 0) {
       for (const env of nodes) {
         environments.push({
@@ -331,23 +348,39 @@ const clusterActions = {
           lastHeartbeatAt: env.lastHeartbeatAt ? new Date(env.lastHeartbeatAt).toISOString() : null,
           status: env.status || "online",
           workerMode: env.workerMode,
+          appRole: env.appRole,
           isSandbox: env.isSandbox,
           pid: env.pid
         });
       }
     }
     if (environments.length === 0) {
+      fallback = true;
+      const currentMode = process.env.WORKER_MODE || "main";
+      const appName = process.env.APP_NAME || ctx.app.name || "main";
       environments.push({
-        name: import_os.default.hostname(),
+        id: (0, import_node.getLocalNodeId)(ctx.app),
+        name: `${appName} (${import_os.default.hostname()})`,
         hostname: import_os.default.hostname(),
         url: null,
         available: true,
         appVersion: null,
         lastHeartbeatAt: (/* @__PURE__ */ new Date()).toISOString(),
-        status: "online"
+        status: "online",
+        workerMode: currentMode,
+        appRole: process.env.APP_ROLE || "",
+        isSandbox: process.env.SKILL_HUB_SANDBOX === "true",
+        pid: process.pid
       });
     }
-    ctx.body = { data: environments, meta: { count: environments.length } };
+    ctx.body = {
+      data: environments,
+      meta: {
+        count: environments.length,
+        fallback,
+        registry: registryStatus
+      }
+    };
     await next();
   },
   /**

package/dist/server/actions/doctor.js

@@ -48,6 +48,7 @@ var import_redis_node_registry = require("../adapters/redis-node-registry");
 var import_node = require("../utils/node");
 var import_redis = require("../utils/redis");
 var import_packages = require("../../shared/packages");
+var import_worker_processes = require("../../shared/worker-processes");
 const ACTIVE_RUN_KEY = "cluster-manager:doctor:active";
 const RESPONSE_KEY_PREFIX = "cluster-manager:doctor-response:";
 const FINISH_LOCK_PREFIX = "cluster-manager:doctor:finish-lock:";
@@ -154,7 +155,7 @@ function countPackages(packages) {
   return packages.apt.length + packages.npm.length + packages.python.length;
 }
 function getNodeRole(node) {
-  return (0, import_node.getNodeRoleFrom)({ workerMode: node.workerMode, isSandbox: node.isSandbox });
+  return (0, import_node.getNodeRoleFrom)({ workerMode: node.workerMode, appRole: node.appRole, isSandbox: node.isSandbox });
 }
 function getSafeEnv() {
   return {
@@ -354,11 +355,12 @@ async function getLocalPluginSnapshot(app) {
 }
 async function collectLocalDoctorSnapshot(app, options = {}) {
   const workerMode = process.env.WORKER_MODE || "main";
+  const appRole = process.env.APP_ROLE;
   const node = {
     hostname: import_os.default.hostname(),
     pid: process.pid,
     workerMode,
-    role: getNodeRole({ workerMode, isSandbox: process.env.SKILL_HUB_SANDBOX === "true" }),
+    role: getNodeRole({ workerMode, appRole, isSandbox: process.env.SKILL_HUB_SANDBOX === "true" }),
     appVersion: process.env.NOCOBASE_VERSION || process.version,
     nodeVersion: process.version,
     platform: process.platform,
@@ -557,7 +559,7 @@ async function collectNodeSnapshots(app, nodes, options) {
             hostname: node.hostname || "unknown",
             pid: Number(node.pid || 0),
             workerMode,
-            role: getNodeRole({ workerMode, isSandbox: node.isSandbox }),
+            role: getNodeRole({ workerMode, appRole: node.appRole, isSandbox: node.isSandbox }),
             appVersion: node.appVersion || "",
             nodeVersion: "",
             platform: "",
@@ -852,34 +854,88 @@ async function getRedisDiagnostics(app) {
   }
 }
 async function getQueueDiagnostics(app) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e;
   const eventQueue = getApp(app).eventQueue;
   if (!eventQueue) {
     return { available: false };
   }
   const adapter = eventQueue.adapter;
   const channels = [];
+  const requiredProcesses = /* @__PURE__ */ new Set();
   for (const [channel, options] of eventQueue.events || /* @__PURE__ */ new Map()) {
     let pending = null;
     if ((adapter == null ? void 0 : adapter.queues) && eventQueue.getFullChannel) {
       const fullChannel = eventQueue.getFullChannel(channel, options.shared);
       pending = ((_a = adapter.queues.get(fullChannel)) == null ? void 0 : _a.length) || 0;
     }
+    const processName = (0, import_worker_processes.resolveWorkerProcessName)(channel);
+    const definition = (0, import_worker_processes.getWorkerProcessDefinition)(processName);
+    if (definition && !definition.sandbox) {
+      requiredProcesses.add(definition.name);
+    }
     channels.push({
       channel,
+      workerProcessName: definition == null ? void 0 : definition.name,
       concurrency: options.concurrency || 1,
       interval: options.interval || 250,
       pending
     });
   }
+  for (const definition of import_worker_processes.WORKER_PROCESS_DEFINITIONS) {
+    if (definition.common && definition.pluginName) {
+      try {
+        if ((_c = (_b = app.pm) == null ? void 0 : _b.get) == null ? void 0 : _c.call(_b, definition.pluginName)) {
+          requiredProcesses.add(definition.name);
+        }
+      } catch {
+      }
+    }
+  }
+  const coverage = await getWorkerProcessCoverage(app, Array.from(requiredProcesses));
   return {
     available: true,
-    connected: ((_b = eventQueue.isConnected) == null ? void 0 : _b.call(eventQueue)) || false,
-    adapter: ((_c = adapter == null ? void 0 : adapter.constructor) == null ? void 0 : _c.name) || "unknown",
+    connected: ((_d = eventQueue.isConnected) == null ? void 0 : _d.call(eventQueue)) || false,
+    adapter: ((_e = adapter == null ? void 0 : adapter.constructor) == null ? void 0 : _e.name) || "unknown",
     channels,
+    coverage,
     totalPending: channels.reduce((sum, item) => sum + (item.pending || 0), 0)
   };
 }
+async function getWorkerProcessCoverage(app, requiredProcesses) {
+  var _a, _b, _c, _d;
+  const result = {
+    required: requiredProcesses,
+    covered: [],
+    missing: [],
+    wildcard: false,
+    stacks: []
+  };
+  try {
+    const repo = app.db.getRepository("orchestratorStacks");
+    const stacks = await repo.find({ filter: { enabled: true } });
+    const covered = /* @__PURE__ */ new Set();
+    for (const stack of stacks) {
+      const envVars = (_a = stack.get) == null ? void 0 : _a.call(stack, "envVars");
+      const workerMode = (0, import_worker_processes.normalizeWorkerMode)(((_b = stack.get) == null ? void 0 : _b.call(stack, "workerMode")) || (envVars == null ? void 0 : envVars.WORKER_MODE)) || "*";
+      result.stacks.push({
+        id: (_c = stack.get) == null ? void 0 : _c.call(stack, "id"),
+        name: (_d = stack.get) == null ? void 0 : _d.call(stack, "name"),
+        workerMode
+      });
+      if (workerMode === "*") {
+        result.wildcard = true;
+      }
+      for (const token of workerMode.split(",").filter(Boolean)) {
+        covered.add(token);
+      }
+    }
+    result.covered = Array.from(covered);
+    result.missing = result.wildcard ? [] : requiredProcesses.filter((processName) => !covered.has(processName));
+  } catch {
+    result.missing = requiredProcesses;
+  }
+  return result;
+}
 async function getOrchestratorDiagnostics(app, options) {
   var _a;
   const plugin = (_a = getApp(app).pm) == null ? void 0 : _a.get("plugin-cluster-manager");
@@ -936,6 +992,7 @@ async function getOrchestratorDiagnostics(app, options) {
   };
 }
 function buildRecommendations(params) {
+  var _a;
   const recommendations = [];
   if (!params.redisAvailable) {
     recommendations.push({
@@ -979,6 +1036,13 @@ function buildRecommendations(params) {
       message: "One or more worker nodes are missing configured packages or have failed package initialization."
     });
   }
+  if ((_a = params.queueCoverageMissing) == null ? void 0 : _a.length) {
+    recommendations.push({
+      level: "warning",
+      code: "worker_process_coverage_missing",
+      message: `No explicit worker stack covers: ${params.queueCoverageMissing.join(", ")}.`
+    });
+  }
   if (params.topErrors > 0) {
     recommendations.push({
       level: "warning",
@@ -989,6 +1053,7 @@ function buildRecommendations(params) {
   return recommendations;
 }
 async function buildDoctorReport(app, run, finishReason) {
+  var _a;
   const runId = String(run.runId);
   const startedAt = new Date(String(run.startedAt));
   const finishedAt = /* @__PURE__ */ new Date();
@@ -1020,7 +1085,8 @@ async function buildDoctorReport(app, run, finishReason) {
     pluginLoadDrifts: pluginDiagnostics.loadDrifts.length,
     packageDrifts: packageDiagnostics.packageDrifts.length,
     redisAvailable: Boolean(redisDiagnostics.available),
-    databaseOk: Boolean(databaseDiagnostics.ping.ok)
+    databaseOk: Boolean(databaseDiagnostics.ping.ok),
+    queueCoverageMissing: ((_a = queueDiagnostics.coverage) == null ? void 0 : _a.missing) || []
   });
   const criticalFindings = recommendations.filter((item) => item.level === "critical").length;
   const warningFindings = recommendations.filter((item) => item.level === "warning").length;

package/dist/server/actions/event-queue-monitor.js

@@ -31,7 +31,13 @@ __export(event_queue_monitor_exports, {
 module.exports = __toCommonJS(event_queue_monitor_exports);
 var import_redis = require("../utils/redis");
 const REDIS_QUEUE_CONNECTION = "cluster-manager:queue-monitor";
-const REDIS_QUEUE_PATTERNS = ["*:plugin-git-manager:review:queue", "*:plugin-build-guide-block:build:queue"];
+const REDIS_QUEUE_PATTERNS = [
+  "*:plugin-git-manager:review:queue",
+  "*:plugin-build-guide-block:build:queue",
+  "*:plugin-build-visualization-block:build:queue",
+  "file-preview-auth.ocr.queue",
+  "nocobase:event-queue:*"
+];
 function getQueueRedisUrl() {
   return process.env.QUEUE_ADAPTER_REDIS_URL || process.env.REDIS_URL;
 }
@@ -45,15 +51,38 @@ async function getQueueRedis(ctx) {
 }
 function knownRedisQueueKeys(ctx) {
   const appName = ctx.app.name || process.env.APP_NAME || "main";
-  return [`${appName}:plugin-git-manager:review:queue`, `${appName}:plugin-build-guide-block:build:queue`];
+  return [
+    `${appName}:plugin-git-manager:review:queue`,
+    `${appName}:plugin-build-guide-block:build:queue`,
+    `${appName}:plugin-build-visualization-block:build:queue`,
+    "file-preview-auth.ocr.queue"
+  ];
 }
 function isKnownRedisQueueKey(key) {
+  if (key.startsWith("nocobase:event-queue:")) return true;
   return REDIS_QUEUE_PATTERNS.some((pattern) => {
     const suffix = pattern.replace("*:", "");
     return key === suffix || key.endsWith(`:${suffix}`);
   });
 }
 function describeRedisQueueKey(key) {
+  if (key === "file-preview-auth.ocr.queue") {
+    return {
+      appName: "main",
+      plugin: "plugin-file-preview-auth",
+      queue: "ocr",
+      channel: key
+    };
+  }
+  if (key.startsWith("nocobase:event-queue:")) {
+    const channel = key.slice("nocobase:event-queue:".length);
+    return {
+      appName: channel.split(".")[0] || "main",
+      plugin: "event-queue",
+      queue: channel,
+      channel
+    };
+  }
   const parts = String(key).split(":");
   const queue = parts[parts.length - 2] || key;
   const plugin = parts[parts.length - 3] || "unknown";
@@ -108,12 +137,13 @@ async function getRedisQueues(ctx) {
   };
 }
 function parseRedisQueueMessage(raw, key, index) {
+  var _a;
   let content = raw;
   try {
     content = JSON.parse(raw);
   } catch {
   }
-  const queuedAt = (content == null ? void 0 : content.queuedAt) ? Date.parse(content.queuedAt) : null;
+  const queuedAt = (content == null ? void 0 : content.queuedAt) ? Date.parse(content.queuedAt) : ((_a = content == null ? void 0 : content.options) == null ? void 0 : _a.timestamp) || null;
   return {
     id: `${key}:${index}`,
     index,

package/dist/server/actions/orchestrator.js

@@ -30,6 +30,7 @@ __export(orchestrator_exports, {
 });
 module.exports = __toCommonJS(orchestrator_exports);
 var import_redis = require("../utils/redis");
+var import_worker_processes = require("../../shared/worker-processes");
 function getAdapter(ctx) {
   const plugin = ctx.app.pm.get("plugin-cluster-manager");
   if (!(plugin == null ? void 0 : plugin.orchestrator)) {
@@ -63,6 +64,28 @@ async function assertManagedContainer(ctx, adapter, stack, containerId) {
     ctx.throw(403, err.message || `Container ${containerId} is not managed by stack "${stack.name}"`);
   }
 }
+function applyWorkerMode(stack, workerMode) {
+  var _a, _b;
+  stack.workerMode = workerMode;
+  stack.envVars = {
+    ...stack.envVars || {},
+    APP_ROLE: ((_a = stack.envVars) == null ? void 0 : _a.APP_ROLE) || "worker",
+    WORKER_MODE: workerMode,
+    SKILL_HUB_SANDBOX: ((_b = stack.envVars) == null ? void 0 : _b.SKILL_HUB_SANDBOX) || "false"
+  };
+}
+async function resolveMappedWorkerMode(ctx, stack) {
+  const mappingsRepo = ctx.db.getRepository("workerQueueMappings");
+  const assigned = await mappingsRepo.find({
+    filter: {
+      stackId: stack.id,
+      enabled: true
+    }
+  });
+  return (0, import_worker_processes.normalizeWorkerMode)(
+    assigned.map((mapping) => String(mapping.get("queueName") || "")).filter(Boolean).join(",")
+  );
+}
 const orchestratorActions = {
   /**
    * GET /workerOrchestrator:ping
@@ -123,49 +146,42 @@ const orchestratorActions = {
    * Body: { stackId: 1, replicas: 3 }
    * Leader-only
    *
-   * Before scaling, resolves queue-to-stack mappings and injects
-   * WORKER_MODE into the stack's envVars so new containers only
-   * process assigned queues.
+   * Before scaling, resolves the stack-level worker mode and injects
+   * WORKER_MODE into envVars so new containers process only selected queues.
+   * Queue mappings remain as a fallback for legacy stacks.
    */
   async scale(ctx, next) {
+    var _a;
     assertLeader(ctx);
     const adapter = getAdapter(ctx);
     const { stackId, replicas } = ctx.action.params.values || ctx.action.params;
     if (replicas === void 0 || replicas === null) ctx.throw(400, "replicas is required");
     if (replicas < 0 || replicas > 20) ctx.throw(400, "replicas must be between 0 and 20");
     const stack = await getStack(ctx, stackId);
-    try {
-      const mappingsRepo = ctx.db.getRepository("workerQueueMappings");
-      if (mappingsRepo) {
-        const assigned = await mappingsRepo.find({
-          filter: {
-            stackId: stack.id,
-            enabled: true
-          }
-        });
-        const queueNames = assigned.map((m) => m.get("queueName")).filter(Boolean);
-        if (queueNames.length > 0) {
-          const workerMode = queueNames.join(",");
-          ctx.app.logger.info(
-            `[Orchestrator] Injecting WORKER_MODE=${workerMode} for stack "${stack.name}" (${queueNames.length} queue(s) assigned)`
-          );
-          stack.envVars = {
-            ...stack.envVars || {},
-            WORKER_MODE: workerMode
-          };
+    const stackWorkerMode = (0, import_worker_processes.normalizeWorkerMode)(stack.workerMode);
+    const envWorkerMode = (0, import_worker_processes.normalizeWorkerMode)((_a = stack.envVars) == null ? void 0 : _a.WORKER_MODE);
+    if (stackWorkerMode) {
+      applyWorkerMode(stack, stackWorkerMode);
+      ctx.app.logger.info(`[Orchestrator] Using stack WORKER_MODE=${stackWorkerMode} for "${stack.name}"`);
+    } else if (envWorkerMode && envWorkerMode !== "*") {
+      applyWorkerMode(stack, envWorkerMode);
+      ctx.app.logger.info(`[Orchestrator] Using env WORKER_MODE=${envWorkerMode} for "${stack.name}"`);
+    } else {
+      try {
+        const mappedWorkerMode = await resolveMappedWorkerMode(ctx, stack);
+        if (mappedWorkerMode) {
+          applyWorkerMode(stack, mappedWorkerMode);
+          ctx.app.logger.info(`[Orchestrator] Using mapped WORKER_MODE=${mappedWorkerMode} for "${stack.name}"`);
         } else {
-          stack.envVars = {
-            ...stack.envVars || {},
-            WORKER_MODE: "*"
-          };
+          const fallbackWorkerMode = envWorkerMode || "*";
+          applyWorkerMode(stack, fallbackWorkerMode);
+          ctx.app.logger.info(`[Orchestrator] Using fallback WORKER_MODE=${fallbackWorkerMode} for "${stack.name}"`);
         }
+      } catch (err) {
+        const fallbackWorkerMode = envWorkerMode || "*";
+        ctx.app.logger.debug(`[Orchestrator] Queue mappings not available: ${err.message}`);
+        applyWorkerMode(stack, fallbackWorkerMode);
       }
-    } catch (err) {
-      ctx.app.logger.debug(`[Orchestrator] Queue mappings not available: ${err.message}`);
-      stack.envVars = {
-        ...stack.envVars || {},
-        WORKER_MODE: "*"
-      };
     }
     const result = await adapter.scale(stack, Number(replicas));
     const repo = ctx.db.getRepository("orchestratorStacks");

package/dist/server/actions/queue-mappings.js

@@ -57,6 +57,7 @@ const queueMappingsActions = {
       })),
       unmapped: result.queues.filter((q) => !mappedNames.has(q.name)).map((q) => ({
         name: q.name,
+        workerProcessName: q.workerProcessName,
         type: q.type,
         label: q.label,
         description: q.description

package/dist/server/actions/tasks.js

@@ -69,9 +69,12 @@ const tasksActions = {
     ctx.app.logger.info(`[cluster-manager] Canceling task ${filterByTk} by user ${user}`);
     const pluginName = "@nocobase/plugin-async-task-manager";
     try {
-      await ctx.app.pubSubManager.publish(`${pluginName}.task.cancel`, JSON.stringify({
-        taskId: filterByTk
-      }));
+      await ctx.app.pubSubManager.publish(
+        `${pluginName}.task.cancel`,
+        JSON.stringify({
+          taskId: filterByTk
+        })
+      );
     } catch {
     }
     await repo.update({
@@ -116,7 +119,7 @@ const tasksActions = {
     const pluginName = "@nocobase/plugin-async-task-manager";
     try {
       await ctx.app.eventQueue.publish(`${pluginName}.task`, {
-        taskId: filterByTk
+        id: filterByTk
       });
     } catch {
     }
@@ -130,10 +133,7 @@ const tasksActions = {
     ctx.app.logger.info(`[cluster-manager] Purging tasks (days=${days}) by user ${user}`);
     const repo = ctx.db.getRepository("asyncTasks");
     const filter = {
-      $and: [
-        { status: { $ne: 0 } },
-        { status: { $ne: null } }
-      ]
+      $and: [{ status: { $ne: 0 } }, { status: { $ne: null } }]
     };
     if (days && Number(days) > 0) {
       const date = /* @__PURE__ */ new Date();