plugin-cluster-manager 1.1.11 → 1.1.15

package/src/locale/zh-CN.json

@@ -1,5 +1,5 @@
 {
-  "Cluster Manager": "集群管理",
+  "Cluster Manager": "集群管理",
   "Async Tasks": "异步任务",
   "Workflow Executions": "工作流执行",
   "Redis Monitor": "Redis 监控",
@@ -66,127 +66,142 @@
   "This will clear all cached data across all stores.": "这将清除所有存储中的缓存数据。",
   "All caches flushed": "所有缓存已清空",
   "Failed to flush caches": "清空缓存失败",
-  "Sync Messages": "同步消息",
-  "Subscribers": "订阅者",
-  "Plugins": "插件",
-  "Plugin": "插件",
-  "Enabled": "已启用",
-  "Disabled": "已禁用",
-  "Installed": "已安装",
-  "Not installed": "未安装",
-  "Loaded": "已加载",
-  "Not loaded": "未加载",
-  "Protected": "受保护",
-  "Description": "描述",
-  "Force disable": "强制禁用",
-  "Force remove": "强制移除",
-  "Force disable this plugin?": "强制禁用此插件？",
-  "Force remove this plugin?": "强制移除此插件？",
-  "This updates the plugin registry directly. Restart or reload is required to fully unload runtime hooks.": "此操作会直接更新插件注册表。需要重启或重新加载后才能完全卸载运行时钩子。",
-  "This removes the plugin registry record. Package files are not deleted. Restart or reload is required.": "此操作会移除插件注册记录。不会删除 package 文件。需要重启或重新加载。",
-  "Force operations bypass plugin lifecycle hooks": "强制操作会绕过插件生命周期钩子",
-  "Use this only when the normal plugin manager cannot disable or remove a broken plugin. Restart or reload the app after a successful operation.": "仅在普通插件管理器无法禁用或移除异常插件时使用。操作成功后请重启或重新加载应用。",
-  "Search plugins": "搜索插件",
-  "Plugin force disabled": "插件已强制禁用",
-  "Plugin force removed": "插件已强制移除",
-  "Failed to load plugins": "加载插件失败",
-  "Failed to force disable plugin": "强制禁用插件失败",
-  "Failed to force remove plugin": "强制移除插件失败",
-  "Nginx Cache": "Nginx 缓存",
-  "Nginx configuration file found at": "已找到 Nginx 配置文件于",
-  "Nginx cache paths detected": "检测到的 Nginx 缓存路径",
-  "Nginx is not detected on this node. You can still input a custom cache directory.": "此节点未检测到 Nginx。您仍可以输入自定义缓存目录。",
-  "Clearing Method": "清除方式",
-  "Physical Files": "物理文件",
-  "HTTP Purge Request": "HTTP Purge 请求",
-  "Select Cache Path": "选择缓存路径",
-  "Custom Path": "自定义路径",
-  "Purge URL": "Purge URL",
-  "Headers (JSON)": "Headers (JSON)",
-  "Clear Nginx Cache": "清除 Nginx 缓存",
-  "Are you sure you want to clear Nginx cache? This will permanently delete all files in this directory.": "确定要清除 Nginx 缓存吗？这将永久删除该目录下的所有文件。",
-  "Cache cleared successfully. Cleared {count} items.": "缓存清除成功。已清除 {count} 项。",
-  "HTTP Purge request completed. Status: {status}": "HTTP Purge 请求已完成。状态：{status}",
-  "Custom Cache Path": "自定义缓存路径",
-  "HTTP Method": "HTTP 方法",
-  "Send Purge Request": "发送 Purge 请求",
-  "Please select or enter a cache path": "请选择或输入缓存路径",
-  "Please enter a valid Purge URL": "请输入有效的 Purge URL",
-  "Nginx cache path is required": "必须提供 Nginx 缓存路径",
-  "Invalid headers JSON structure": "Headers JSON 结构无效",
-  "Nginx Cache Status": "Nginx 缓存状态",
-  "Nginx is installed": "Nginx 已安装",
-  "Nginx is NOT installed": "Nginx 未安装",
-  "Nginx cache clearing method": "Nginx 缓存清除方式",
-  "Execution Logs": "执行日志",
-  "Clear Nginx Cache?": "清除 Nginx 缓存？"
-,
-  "Rolling Restart": "Rolling Restart",
-  "Worker nodes only": "Worker nodes only",
-  "App nodes only": "App nodes only",
-  "Sandbox nodes only": "Sandbox nodes only",
-  "All nodes": "All nodes",
-  "Soft restart": "Soft restart",
-  "Hard restart": "Hard restart",
-  "Start rolling restart?": "Start rolling restart?",
-  "Nodes will receive restart commands one-by-one with the configured delay.": "Nodes will receive restart commands one-by-one with the configured delay.",
-  "Start": "Start",
-  "Rolling restart dispatched for {count} node(s)": "Rolling restart dispatched for {count} node(s)",
-  "Failed to dispatch rolling restart": "Failed to dispatch rolling restart",
-  "Cluster Drift": "Cluster Drift",
-  "No cluster drift detected": "No cluster drift detected",
-  "Cluster drift detected": "Cluster drift detected",
-  "Reference version": "Reference version",
-  "No reference version available": "No reference version available",
-  "Checked Nodes": "Checked Nodes",
-  "Version Drift": "Version Drift",
-  "Runtime Drift": "Runtime Drift",
-  "Package Drift": "Package Drift",
-  "Runtime": "Runtime",
-  "Role": "Role",
-  "Expected": "Expected",
-  "Actual": "Actual",
-  "Package Status": "Package Status",
-  "Missing Packages": "Missing Packages",
-  "No missing packages": "No missing packages",
-  "Legacy Multi-app Diagnostics": "Legacy Multi-app Diagnostics",
-  "No legacy multi-app risk detected": "No legacy multi-app risk detected",
-  "Legacy multi-app risk detected": "Legacy multi-app risk detected",
-  "Legacy app records": "Legacy app records",
-  "Deprecated multi-app manager is active. It runs apps in shared process memory and should not be used for production cluster isolation.": "Deprecated multi-app manager is active. It runs apps in shared process memory and should not be used for production cluster isolation.",
-  "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.",
-  "Doctor": "Doctor",
-  "Duration": "Duration",
-  "Start Doctor": "Start Doctor",
-  "Stop Doctor": "Stop Doctor",
-  "Download Report": "Download Report",
-  "Diagnostic session started": "Diagnostic session started",
-  "Diagnostic report is ready": "Diagnostic report is ready",
-  "Failed to load diagnostic status": "Failed to load diagnostic status",
-  "Failed to start diagnostic session": "Failed to start diagnostic session",
-  "Failed to stop diagnostic session": "Failed to stop diagnostic session",
-  "Failed to download diagnostic report": "Failed to download diagnostic report",
-  "Running": "Running",
-  "Run ID": "Run ID",
-  "Started At": "Started At",
-  "Finished At": "Finished At",
-  "Finish Reason": "Finish Reason",
-  "Report Status": "Report Status",
-  "Nodes": "Nodes",
-  "Errors": "Errors",
-  "Warnings": "Warnings",
-  "Plugin Drift": "Plugin Drift",
-  "Findings": "Findings",
-  "Node Log Distribution": "Node Log Distribution",
-  "Top Error Signatures": "Top Error Signatures",
-  "Level": "Level",
-  "Count": "Count",
-  "Signature": "Signature",
-  "Node": "Node",
-  "Log Files": "Log Files",
-  "Package": "Package",
-  "DB Version": "DB Version",
-  "Runtime Versions": "Runtime Versions"
-}
+  "Sync Messages": "同步消息",
+  "Subscribers": "订阅者",
+  "Plugins": "插件",
+  "Plugin": "插件",
+  "Enabled": "已启用",
+  "Disabled": "已禁用",
+  "Installed": "已安装",
+  "Not installed": "未安装",
+  "Loaded": "已加载",
+  "Not loaded": "未加载",
+  "Protected": "受保护",
+  "Description": "描述",
+  "Force disable": "强制禁用",
+  "Force remove": "强制移除",
+  "Force disable this plugin?": "强制禁用此插件？",
+  "Force remove this plugin?": "强制移除此插件？",
+  "This updates the plugin registry directly. Restart or reload is required to fully unload runtime hooks.": "此操作会直接更新插件注册表。需要重启或重新加载后才能完全卸载运行时钩子。",
+  "This removes the plugin registry record. Package files are not deleted. Restart or reload is required.": "此操作会移除插件注册记录。不会删除 package 文件。需要重启或重新加载。",
+  "Force operations bypass plugin lifecycle hooks": "强制操作会绕过插件生命周期钩子",
+  "Use this only when the normal plugin manager cannot disable or remove a broken plugin. Restart or reload the app after a successful operation.": "仅在普通插件管理器无法禁用或移除异常插件时使用。操作成功后请重启或重新加载应用。",
+  "Search plugins": "搜索插件",
+  "Plugin force disabled": "插件已强制禁用",
+  "Plugin force removed": "插件已强制移除",
+  "Failed to load plugins": "加载插件失败",
+  "Failed to force disable plugin": "强制禁用插件失败",
+  "Failed to force remove plugin": "强制移除插件失败",
+  "Nginx Cache": "Nginx 缓存",
+  "Nginx configuration file found at": "已找到 Nginx 配置文件于",
+  "Nginx cache paths detected": "检测到的 Nginx 缓存路径",
+  "Nginx is not detected on this node. You can still input a custom cache directory.": "此节点未检测到 Nginx。您仍可以输入自定义缓存目录。",
+  "Clearing Method": "清除方式",
+  "Physical Files": "物理文件",
+  "HTTP Purge Request": "HTTP Purge 请求",
+  "Select Cache Path": "选择缓存路径",
+  "Custom Path": "自定义路径",
+  "Purge URL": "Purge URL",
+  "Headers (JSON)": "Headers (JSON)",
+  "Clear Nginx Cache": "清除 Nginx 缓存",
+  "Are you sure you want to clear Nginx cache? This will permanently delete all files in this directory.": "确定要清除 Nginx 缓存吗？这将永久删除该目录下的所有文件。",
+  "Cache cleared successfully. Cleared {count} items.": "缓存清除成功。已清除 {count} 项。",
+  "HTTP Purge request completed. Status: {status}": "HTTP Purge 请求已完成。状态：{status}",
+  "Custom Cache Path": "自定义缓存路径",
+  "HTTP Method": "HTTP 方法",
+  "Send Purge Request": "发送 Purge 请求",
+  "Please select or enter a cache path": "请选择或输入缓存路径",
+  "Please enter a valid Purge URL": "请输入有效的 Purge URL",
+  "Nginx cache path is required": "必须提供 Nginx 缓存路径",
+  "Invalid headers JSON structure": "Headers JSON 结构无效",
+  "Nginx Cache Status": "Nginx 缓存状态",
+  "Nginx is installed": "Nginx 已安装",
+  "Nginx is NOT installed": "Nginx 未安装",
+  "Nginx cache clearing method": "Nginx 缓存清除方式",
+  "Execution Logs": "执行日志",
+  "Clear Nginx Cache?": "清除 Nginx 缓存？"
+,
+  "Rolling Restart": "Rolling Restart",
+  "Worker nodes only": "Worker nodes only",
+  "App nodes only": "App nodes only",
+  "Sandbox nodes only": "Sandbox nodes only",
+  "All nodes": "All nodes",
+  "Soft restart": "Soft restart",
+  "Hard restart": "Hard restart",
+  "Start rolling restart?": "Start rolling restart?",
+  "Nodes will receive restart commands one-by-one with the configured delay.": "Nodes will receive restart commands one-by-one with the configured delay.",
+  "Start": "Start",
+  "Rolling restart dispatched for {count} node(s)": "Rolling restart dispatched for {count} node(s)",
+  "Failed to dispatch rolling restart": "Failed to dispatch rolling restart",
+  "Cluster Drift": "Cluster Drift",
+  "No cluster drift detected": "No cluster drift detected",
+  "Cluster drift detected": "Cluster drift detected",
+  "Reference version": "Reference version",
+  "No reference version available": "No reference version available",
+  "Checked Nodes": "Checked Nodes",
+  "Version Drift": "Version Drift",
+  "Runtime Drift": "Runtime Drift",
+  "Package Drift": "Package Drift",
+  "Runtime": "Runtime",
+  "Role": "Role",
+  "Expected": "Expected",
+  "Actual": "Actual",
+  "Package Status": "Package Status",
+  "Missing Packages": "Missing Packages",
+  "No missing packages": "No missing packages",
+  "Legacy Multi-app Diagnostics": "Legacy Multi-app Diagnostics",
+  "No legacy multi-app risk detected": "No legacy multi-app risk detected",
+  "Legacy multi-app risk detected": "Legacy multi-app risk detected",
+  "Legacy app records": "Legacy app records",
+  "Deprecated multi-app manager is active. It runs apps in shared process memory and should not be used for production cluster isolation.": "Deprecated multi-app manager is active. It runs apps in shared process memory and should not be used for production cluster isolation.",
+  "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.",
+  "License": "License",
+  "Doctor": "诊断",
+  "Duration": "Duration",
+  "Start Doctor": "Start Doctor",
+  "Stop Doctor": "Stop Doctor",
+  "Download Report": "Download Report",
+  "Diagnostic session started": "Diagnostic session started",
+  "Diagnostic report is ready": "Diagnostic report is ready",
+  "Failed to load diagnostic status": "Failed to load diagnostic status",
+  "Failed to start diagnostic session": "Failed to start diagnostic session",
+  "Failed to stop diagnostic session": "Failed to stop diagnostic session",
+  "Failed to download diagnostic report": "Failed to download diagnostic report",
+  "Running": "Running",
+  "Run ID": "Run ID",
+  "Started At": "Started At",
+  "Finished At": "Finished At",
+  "Finish Reason": "Finish Reason",
+  "Report Status": "Report Status",
+  "Nodes": "Nodes",
+  "Errors": "Errors",
+  "Warnings": "Warnings",
+  "Plugin Drift": "Plugin Drift",
+  "Findings": "Findings",
+  "Node Log Distribution": "Node Log Distribution",
+  "Top Error Signatures": "Top Error Signatures",
+  "Level": "Level",
+  "Count": "Count",
+  "Signature": "Signature",
+  "Node": "Node",
+  "Log Files": "Log Files",
+  "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": "扫描队列",
+  "Auto-map ({count})": "自动映射 ({count})",
+  "Register": "注册",
+  "Unregister": "注销",
+  "Assigned Stack": "分配栈",
+  "All (default)": "全部（默认）",
+  "Delete this mapping?": "删除此映射？",
+  "No queues discovered. Click \"Scan Queues\" to detect registered queues.": "未发现队列。点击\"扫描队列\"以检测已注册的队列。",
+  "Auto-mapped {count} queue(s)": "已自动映射 {count} 个队列",
+  "Queue Assignment updated": "队列分配已更新",
+  "Unassigned (worker runs all queues)": "未分配（工作节点运行所有队列）"
+}

package/src/server/actions/cluster-nodes.ts

@@ -5,7 +5,7 @@ import path from 'path';
 import crypto from 'crypto';
 import { RedisNodeRegistry } from '../adapters/redis-node-registry';
 import { getRedis } from '../utils/redis';
-import { getLocalNodeId } from '../utils/node';
+import { getLocalNodeId, getNodeRoleFrom, isWorkerMode } from '../utils/node';
 import { packagesFromConfig, type CustomPackageMap, type WorkerPackageMap } from '../../shared/packages';
 
 const LOG_RESPONSE_KEY_PREFIX = 'cluster-manager:log-response:';
@@ -17,6 +17,7 @@ interface ClusterNodeRecord {
   hostname?: string;
   appVersion?: string;
   workerMode?: string;
+  appRole?: string;
   isSandbox?: boolean;
   status?: string;
   url?: string | null;
@@ -162,11 +163,7 @@ function getErrorMessage(error: unknown) {
 }
 
 function getNodeRole(node: ClusterNodeRecord): 'app' | 'worker' | 'sandbox' {
-  if (node.isSandbox) {
-    return 'sandbox';
-  }
-  const workerMode = node.workerMode || 'main';
-  return workerMode === 'worker' || workerMode === 'task' || workerMode === '*' ? 'worker' : 'app';
+  return getNodeRoleFrom({ workerMode: node.workerMode, appRole: node.appRole, isSandbox: node.isSandbox });
 }
 
 function getReferenceVersion(nodes: ClusterNodeRecord[]) {
@@ -304,7 +301,7 @@ export const clusterActions = {
    */
   async current(ctx: Context, next: () => Promise<void>) {
     const currentMode = process.env.WORKER_MODE || 'main';
-    const isApp = currentMode === 'main' || currentMode === '' || currentMode === 'app';
+    const isApp = !isWorkerMode(process.env.WORKER_MODE);
 
     if (isApp) {
       // This process IS the APP node — return local data directly

package/src/server/actions/doctor.ts

@@ -6,7 +6,7 @@ import os from 'os';
 import path from 'path';
 import { RedisNodeRegistry } from '../adapters/redis-node-registry';
 import type { ContainerInfo, StackConfig } from '../orchestrator/types';
-import { getLocalNodeId } from '../utils/node';
+import { getLocalNodeId, getNodeRoleFrom } from '../utils/node';
 import { getRedisClient, scanKeys } from '../utils/redis';
 import { packagesFromConfig, type CustomPackageMap, type WorkerPackageMap } from '../../shared/packages';
 
@@ -83,6 +83,7 @@ interface DoctorNodeRecord {
   hostname?: string;
   appVersion?: string;
   workerMode?: string;
+  appRole?: string;
   isSandbox?: boolean;
   status?: string;
   lastHeartbeatAt?: number;
@@ -281,12 +282,12 @@ function countPackages(packages: NormalizedPackages) {
   return packages.apt.length + packages.npm.length + packages.python.length;
 }
 
-function getNodeRole(node: { workerMode?: string; isSandbox?: boolean }): 'app' | 'worker' | 'sandbox' {
-  if (node.isSandbox) {
-    return 'sandbox';
-  }
-  const workerMode = node.workerMode || 'main';
-  return workerMode === 'worker' || workerMode === 'task' || workerMode === '*' ? 'worker' : 'app';
+function getNodeRole(node: {
+  workerMode?: string;
+  appRole?: string;
+  isSandbox?: boolean;
+}): 'app' | 'worker' | 'sandbox' {
+  return getNodeRoleFrom({ workerMode: node.workerMode, appRole: node.appRole, isSandbox: node.isSandbox });
 }
 
 function getSafeEnv() {
@@ -539,11 +540,12 @@ export async function collectLocalDoctorSnapshot(
   options: DoctorSnapshotOptions = {},
 ): Promise<DoctorNodeSnapshot> {
   const workerMode = process.env.WORKER_MODE || 'main';
+  const appRole = process.env.APP_ROLE;
   const node = {
     hostname: os.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,
@@ -773,7 +775,7 @@ async function collectNodeSnapshots(
             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: '',

package/src/server/actions/orchestrator.ts

@@ -41,7 +41,12 @@ async function getStack(ctx: Context, stackId?: number | string): Promise<StackC
   return stack.toJSON() as StackConfig;
 }
 
-async function assertManagedContainer(ctx: Context, adapter: IOrchestratorAdapter, stack: StackConfig, containerId: string) {
+async function assertManagedContainer(
+  ctx: Context,
+  adapter: IOrchestratorAdapter,
+  stack: StackConfig,
+  containerId: string,
+) {
   try {
     await adapter.assertManagedByStack(stack, containerId);
   } catch (err: any) {
@@ -87,7 +92,9 @@ export const orchestratorActions = {
           if (rawStatus && typeof rawStatus === 'string') {
             (c as any).packageStatus = JSON.parse(rawStatus);
           }
-        } catch {}
+        } catch {
+          // Redis may not be configured — skip package status
+        }
       }
     }
 
@@ -114,6 +121,10 @@ export const orchestratorActions = {
    * POST /workerOrchestrator:scale
    * 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.
    */
   async scale(ctx: Context, next: () => Promise<void>) {
     assertLeader(ctx);
@@ -124,6 +135,47 @@ export const orchestratorActions = {
     if (replicas < 0 || replicas > 20) ctx.throw(400, 'replicas must be between 0 and 20');
 
     const stack = await getStack(ctx, stackId);
+
+    // ── Resolve queue assignments for this stack ──
+    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: any) => m.get('queueName') as string).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)`,
+          );
+          // Merge into envVars; adapter code merges envVars over inherited env
+          stack.envVars = {
+            ...(stack.envVars || {}),
+            WORKER_MODE: workerMode,
+          };
+        } else {
+          // No specific assignment → default to all queues (backwards compatible)
+          stack.envVars = {
+            ...(stack.envVars || {}),
+            WORKER_MODE: '*',
+          };
+        }
+      }
+    } catch (err: any) {
+      // If workerQueueMappings table doesn't exist yet, fall back gracefully
+      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));
 
     // Update DB

package/src/server/actions/queue-mappings.ts

@@ -0,0 +1,94 @@
+/**
+ * Queue Mappings Actions
+ *
+ * CRUD for workerQueueMappings + scanQueues action that discovers
+ * all registered queues via QueueScanner.
+ */
+
+import { Context } from '@nocobase/actions';
+import { scanQueues } from '../queue-scanner';
+
+export const queueMappingsActions = {
+  /**
+   * GET /workerQueueMappings:scanQueues
+   * Scans all registered queues (EventQueue + Redis) and merges with existing mappings.
+   */
+  async scanQueues(ctx: Context, next: () => Promise<void>) {
+    const result = await scanQueues(ctx.app);
+
+    // Load existing mappings from DB
+    const repo = ctx.db.getRepository('workerQueueMappings');
+    let existingMappings: any[] = [];
+    try {
+      existingMappings = await repo.find();
+    } catch {
+      // Table may not exist yet
+    }
+
+    const mappedNames = new Set(existingMappings.map((m) => m.get('queueName') as string));
+
+    ctx.body = {
+      discovered: result.queues,
+      total: result.total,
+      registered: existingMappings.map((m) => ({
+        id: m.get('id'),
+        queueName: m.get('queueName'),
+        label: m.get('label'),
+        stackId: m.get('stackId'),
+        enabled: m.get('enabled'),
+        type: m.get('type'),
+      })),
+      unmapped: result.queues
+        .filter((q) => !mappedNames.has(q.name))
+        .map((q) => ({
+          name: q.name,
+          type: q.type,
+          label: q.label,
+          description: q.description,
+        })),
+    };
+    await next();
+  },
+
+  /**
+   * POST /workerQueueMappings:autoMap
+   * Auto-create mappings for any discovered queues that don't have one yet.
+   * Body: { stackId?: number } — optional default stack for new mappings
+   */
+  async autoMap(ctx: Context, next: () => Promise<void>) {
+    const { stackId } = ctx.action.params.values || {};
+    const result = await scanQueues(ctx.app);
+    const repo = ctx.db.getRepository('workerQueueMappings');
+
+    let existingMappings: any[] = [];
+    try {
+      existingMappings = await repo.find();
+    } catch {
+      // Table may not exist yet
+    }
+
+    const mappedNames = new Set(existingMappings.map((m) => m.get('queueName') as string));
+    const created: string[] = [];
+
+    for (const q of result.queues) {
+      if (mappedNames.has(q.name)) continue;
+      await repo.create({
+        values: {
+          queueName: q.name,
+          label: q.label,
+          description: q.description,
+          type: q.type,
+          stackId: stackId || null,
+          enabled: true,
+        },
+      });
+      created.push(q.name);
+    }
+
+    ctx.body = {
+      created,
+      count: created.length,
+    };
+    await next();
+  },
+};