@open-mercato/core 0.6.7-develop.6580.1.39ab1d9e62 → 0.6.7-develop.6582.1.04cac61287

package/src/modules/workflows/lib/workflow-executor.ts

@@ -64,6 +64,24 @@ export interface WorkflowEventSummary {
   data?: any
 }
 
+function normalizeWorkflowUserId(value: unknown): string | null {
+  if (typeof value !== 'string') return null
+  const trimmed = value.trim()
+  if (!trimmed || trimmed.startsWith('trigger:')) return null
+  return trimmed
+}
+
+function resolveWorkflowExecutionUserId(
+  context: ExecutionContext | undefined,
+  instance: WorkflowInstance,
+): string | undefined {
+  return (
+    normalizeWorkflowUserId(context?.userId) ??
+    normalizeWorkflowUserId(instance.metadata?.initiatedBy) ??
+    undefined
+  )
+}
+
 export class WorkflowExecutionError extends Error {
   constructor(
     message: string,
@@ -290,6 +308,7 @@ export async function executeWorkflow(
 
       const maxIterations = 100
       let iterations = 0
+      const executionUserId = resolveWorkflowExecutionUserId(context, instance)
 
       while (iterations < maxIterations) {
         iterations++
@@ -307,7 +326,7 @@ export async function executeWorkflow(
         if (currentInstance.status === 'FORKED') {
           const { advanceBranches } = await import('./parallel-handler')
           const branchResult = await advanceBranches(trx, container, currentInstance, definition, {
-            userId: context?.userId,
+            userId: executionUserId,
           })
 
           if (branchResult.outcome === 'joined') {
@@ -393,7 +412,7 @@ export async function executeWorkflow(
         const transitionHandler = await import('./transition-handler')
         const evalContext: any = {
           workflowContext: currentInstance.context,
-          userId: context?.userId,
+          userId: executionUserId,
         }
 
         const validTransitions = await transitionHandler.findValidTransitions(
@@ -882,7 +901,7 @@ export async function resumeWorkflowAfterActivities(
       pendingTransition.toStepId,
       {
         workflowContext: instance.context || {},
-        userId: undefined,
+        userId: resolveWorkflowExecutionUserId(undefined, instance),
       },
       container
     )

package/src/modules/workflows/lib/workflow-safe-commands.ts

@@ -0,0 +1,48 @@
+export type WorkflowSafeCommandDefinition = {
+  commandId: string
+  requiredFeatures: readonly [string, ...string[]]
+}
+
+const workflowSafeCommands = new Map<string, WorkflowSafeCommandDefinition>()
+
+function normalizeCommandId(commandId: unknown): string | null {
+  if (typeof commandId !== 'string') return null
+  const trimmed = commandId.trim()
+  return trimmed.length > 0 ? trimmed : null
+}
+
+function normalizeFeatures(features: readonly string[]): [string, ...string[]] | null {
+  const normalized = features
+    .map((feature) => feature.trim())
+    .filter((feature) => feature.length > 0)
+  if (normalized.length === 0) return null
+  return normalized as [string, ...string[]]
+}
+
+export function registerWorkflowSafeCommands(commands: readonly WorkflowSafeCommandDefinition[]): void {
+  for (const command of commands) {
+    const commandId = normalizeCommandId(command.commandId)
+    const requiredFeatures = normalizeFeatures(command.requiredFeatures)
+    if (!commandId || !requiredFeatures) {
+      throw new Error('[internal] Workflow-safe commands require a commandId and requiredFeatures')
+    }
+    workflowSafeCommands.set(commandId, { commandId, requiredFeatures })
+  }
+}
+
+export function getWorkflowSafeCommand(commandId: unknown): WorkflowSafeCommandDefinition | null {
+  const normalized = normalizeCommandId(commandId)
+  if (!normalized) return null
+  return workflowSafeCommands.get(normalized) ?? null
+}
+
+export function isWorkflowSafeCommandId(commandId: unknown): boolean {
+  return getWorkflowSafeCommand(commandId) !== null
+}
+
+export function clearWorkflowSafeCommandsForTests(): void {
+  if (process.env.NODE_ENV !== 'test') {
+    throw new Error('[internal] clearWorkflowSafeCommandsForTests is test-only')
+  }
+  workflowSafeCommands.clear()
+}