@open-mercato/ai-assistant 0.6.5-develop.5382.1.f542de69af → 0.6.5

package/src/modules/ai_assistant/lib/mcp-server.ts

@@ -17,7 +17,14 @@ import type { RbacService } from '@open-mercato/core/modules/auth/services/rbacS
  * Create and configure an MCP server instance.
  */
 export async function createMcpServer(options: McpServerOptions): Promise<Server> {
-  const { config, container, context, apiKeySecret } = options
+  const { config, container, context, allowUnauthenticatedSuperadmin } = options
+
+  // Treat empty / whitespace-only secrets as missing so a blank api key cannot
+  // fall through into an unauthenticated branch.
+  const apiKeySecret =
+    typeof options.apiKeySecret === 'string' && options.apiKeySecret.trim().length > 0
+      ? options.apiKeySecret
+      : undefined
 
   let tenantId: string | null = null
   let organizationId: string | null = null
@@ -37,41 +44,48 @@ export async function createMcpServer(options: McpServerOptions): Promise<Server
     userFeatures = authResult.features
     isSuperAdmin = authResult.isSuperAdmin
     console.error(`[MCP Server] Authenticated via API key: ${authResult.keyName}`)
-  } else if (context) {
-    // Manual context provided
+  } else if (context && context.userId) {
+    // Manual context with a real user — load that user's ACL.
     tenantId = context.tenantId
     organizationId = context.organizationId
     userId = context.userId
 
-    if (userId) {
-      try {
-        const rbacService = container.resolve('rbacService') as {
-          loadAcl: (
-            userId: string,
-            scope: { tenantId: string | null; organizationId: string | null }
-          ) => Promise<{
-            isSuperAdmin: boolean
-            features: string[]
-          }>
-        }
-        const acl = await rbacService.loadAcl(userId, {
-          tenantId,
-          organizationId,
-        })
-        userFeatures = acl.features
-        isSuperAdmin = acl.isSuperAdmin
-      } catch (error) {
-        console.error('[MCP Server] Failed to load user ACL:', error)
+    try {
+      const rbacService = container.resolve('rbacService') as {
+        loadAcl: (
+          userId: string,
+          scope: { tenantId: string | null; organizationId: string | null }
+        ) => Promise<{
+          isSuperAdmin: boolean
+          features: string[]
+        }>
       }
-    } else {
-      // No user specified - grant superadmin access for development/testing
-      isSuperAdmin = true
-      console.error('[MCP Server] No user specified, running with superadmin access')
+      const acl = await rbacService.loadAcl(userId, {
+        tenantId,
+        organizationId,
+      })
+      userFeatures = acl.features
+      isSuperAdmin = acl.isSuperAdmin
+    } catch (error) {
+      console.error('[MCP Server] Failed to load user ACL:', error)
+    }
+  } else if (allowUnauthenticatedSuperadmin) {
+    // Explicit, loud dev/testing opt-in. Without a user there is no ACL to load,
+    // so the server runs as superadmin with no tenant scoping beyond whatever the
+    // caller pinned via `context`. NEVER enable this in production.
+    if (context) {
+      tenantId = context.tenantId
+      organizationId = context.organizationId
     }
-  } else {
-    // No context and no API key - superadmin for dev/testing
     isSuperAdmin = true
-    console.error('[MCP Server] No auth context, running with superadmin access')
+    console.error(
+      '[MCP Server] WARNING: allowUnauthenticatedSuperadmin is enabled — running with UNAUTHENTICATED SUPERADMIN access and no per-user ACL. Do not use this outside local development/testing.'
+    )
+  } else {
+    // Fail closed: refuse to start rather than silently escalating to superadmin.
+    throw new Error(
+      '[internal] MCP server refused to start: no authentication provided. Supply a valid apiKeySecret, a context with a non-empty userId, or explicitly set allowUnauthenticatedSuperadmin: true for local development.'
+    )
   }
 
   const toolContext: McpToolContext = {
@@ -200,14 +214,14 @@ export async function runMcpServer(options: McpServerOptions): Promise<void> {
 
   console.error(`[MCP Server] Starting ${options.config.name} v${options.config.version}`)
 
-  if (options.apiKeySecret) {
+  if (options.apiKeySecret && options.apiKeySecret.trim().length > 0) {
     console.error(`[MCP Server] Authentication: API key`)
-  } else if (options.context) {
+  } else if (options.context && options.context.userId) {
     console.error(`[MCP Server] Tenant: ${options.context.tenantId ?? '(none)'}`)
     console.error(`[MCP Server] Organization: ${options.context.organizationId ?? '(none)'}`)
-    console.error(`[MCP Server] User: ${options.context.userId ?? '(superadmin)'}`)
+    console.error(`[MCP Server] User: ${options.context.userId}`)
   } else {
-    console.error(`[MCP Server] Authentication: none (superadmin mode)`)
+    console.error(`[MCP Server] Authentication: none (unauthenticated superadmin opt-in)`)
   }
 
   console.error(`[MCP Server] Tools registered: ${toolCount}`)

package/src/modules/ai_assistant/lib/types.ts

@@ -217,6 +217,13 @@ export interface McpServerOptions {
   }
   /** API key secret for authentication (alternative to manual context) */
   apiKeySecret?: string
+  /**
+   * Explicit, loud opt-in for running without authentication as a superadmin
+   * (development/testing only). When false/unset and no `apiKeySecret` or
+   * `context.userId` is supplied, the server fails closed and refuses to start
+   * instead of silently escalating to superadmin. NEVER enable in production.
+   */
+  allowUnauthenticatedSuperadmin?: boolean
 }
 
 /**

package/src/modules/ai_assistant/setup.ts

@@ -1,7 +1,16 @@
+import { createHash } from 'node:crypto'
 import type { ModuleSetupConfig } from '@open-mercato/shared/modules/setup'
 
-const PENDING_ACTION_CLEANUP_SCHEDULE_ID = 'ai_assistant:pending-action-cleanup'
-const TOKEN_USAGE_PRUNE_SCHEDULE_ID = 'ai_assistant:token-usage-prune'
+const PENDING_ACTION_CLEANUP_SCHEDULE_KEY = 'ai_assistant:pending-action-cleanup'
+const TOKEN_USAGE_PRUNE_SCHEDULE_KEY = 'ai_assistant:token-usage-prune'
+
+function stableScheduleUuid(stableKey: string): string {
+  const hex = createHash('sha256').update(stableKey).digest('hex')
+  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20, 32)}`
+}
+
+const PENDING_ACTION_CLEANUP_SCHEDULE_ID = stableScheduleUuid(PENDING_ACTION_CLEANUP_SCHEDULE_KEY)
+const TOKEN_USAGE_PRUNE_SCHEDULE_ID = stableScheduleUuid(TOKEN_USAGE_PRUNE_SCHEDULE_KEY)
 
 /**
  * System-scoped recurring schedule: every 5 minutes, enqueue a job to the