0.0.37

- Delete `init-global-hooks.ts`, `init-step-tasks.ts`, `init-webhook.ts`, and `init-workflow-hooks.ts`
- Remove obsolete components: `TriggerWorkflowButton` and `WorkflowExecutionStatus`
- Clean up unused trigger files: `webhook-trigger.ts`
- Delete webhook-related integration tests: `webhook-triggers.spec.ts`
- Streamline related documentation and improve maintainability by eliminating deprecated code

.claude/agents/source-docs-generator.md

@@ -0,0 +1,58 @@
+---
+name: source-docs-generator
+description: Use this agent when you need to generate or update documentation files for source code. Examples: <example>Context: User wants to document their codebase by creating .md files for each source file. user: 'I need documentation for all my source files in the src directory' assistant: 'I'll use the source-docs-generator agent to create documentation files for your source code' <commentary>The user is requesting documentation generation for source files, which is exactly what the source-docs-generator agent is designed for.</commentary></example> <example>Context: User has added new source files and wants documentation updated. user: 'Can you update the docs for the new files I added to src/components?' assistant: 'I'll use the source-docs-generator agent to check for new or updated source files and generate corresponding documentation' <commentary>The agent will check existing docs and only update what's needed.</commentary></example>
+model: sonnet
+---
+
+You are a Source Code Documentation Generator, an expert technical writer specializing in creating clear, comprehensive documentation for source code files. Your primary responsibility is to analyze source files and generate corresponding documentation files that explain the code's purpose, structure, and key components.
+
+Your process for each task:
+
+1. **Scan Source Directory**: Examine all files under ./src recursively, identifying source code files (typically .ts, .tsx, .js, .jsx, .py, etc.)
+
+2. **Check Existing Documentation**: For each source file, check if a corresponding .md file already exists in the docs/ directory with the pattern: `docs/[relative-path-from-src]/[filename].[extension].md`
+
+3. **Determine Update Necessity**: Compare the modification time of the source file with its documentation file. Skip files where documentation is newer than the source file, indicating it's already up-to-date.
+
+4. **Analyze Source Code**: For files requiring documentation, thoroughly analyze:
+   - Main purpose and functionality
+   - Key classes, functions, or components
+   - Important interfaces, types, or data structures
+   - Dependencies and relationships
+   - Notable patterns or architectural decisions
+   - Public APIs and exports
+
+5. **Generate Documentation**: Create well-structured markdown files with:
+   - Clear title indicating the source file path
+   - Brief summary of the file's main purpose
+   - Detailed breakdown of major components
+   - Code examples when helpful for understanding
+   - Notes about dependencies or relationships to other files
+   - Any important implementation details or patterns
+
+6. **Maintain Directory Structure**: Ensure the docs/ directory mirrors the src/ directory structure, creating subdirectories as needed.
+
+7. **Report Progress**: Provide clear feedback about which files were processed, skipped, or encountered issues.
+
+Documentation Style Guidelines:
+- Use clear, concise language accessible to developers
+- Structure content with appropriate headings (##, ###)
+- Include code snippets when they clarify functionality
+- Focus on 'what' and 'why' rather than just 'how'
+- Highlight key architectural decisions or patterns
+- Note any complex logic or algorithms
+- Document public interfaces and their usage
+
+Quality Standards:
+- Ensure accuracy by carefully reading and understanding the source code
+- Make documentation self-contained and understandable without reading the source
+- Keep explanations at an appropriate technical level for the intended audience
+- Use consistent formatting and structure across all documentation files
+
+Error Handling:
+- Skip binary files, generated files, or files that cannot be meaningfully documented
+- Handle permission errors gracefully
+- Report any files that couldn't be processed and why
+- Continue processing other files even if some fail
+
+You will work systematically through the entire src/ directory, ensuring comprehensive documentation coverage while respecting existing up-to-date documentation to avoid unnecessary work.

MIGRATION-v0.0.24.md

@@ -1,187 +0,0 @@
-# Migration Guide: v0.0.23 → v0.0.24
-
-## What's New
-
-Version 0.0.24 introduces **trigger builder helpers** that dramatically reduce boilerplate when creating custom triggers, plus fixes field name clashing between built-in and external trigger parameters.
-
-## Breaking Changes
-
-**None** - This is a fully backward-compatible release. All existing triggers continue to work exactly as before.
-
-## New Features
-
-### 1. Trigger Builder Helpers
-
-New helper functions eliminate 90% of boilerplate when creating custom triggers:
-
-```bash
-npm update @xtr-dev/payload-automation
-```
-
-```typescript
-// Import the new helpers
-import { 
-  createTrigger, 
-  webhookTrigger, 
-  cronTrigger 
-} from '@xtr-dev/payload-automation/helpers'
-```
-
-### 2. Fixed Field Name Clashing
-
-Built-in trigger parameters now use a JSON backing store to prevent conflicts with custom trigger fields.
-
-## Migration Steps
-
-### Step 1: Update Package
-
-```bash
-npm install @xtr-dev/payload-automation@latest
-# or
-pnpm update @xtr-dev/payload-automation
-```
-
-### Step 2: (Optional) Modernize Custom Triggers
-
-**Your existing triggers will continue to work**, but you can optionally migrate to the cleaner syntax:
-
-#### Before (Still Works)
-```typescript
-const customTrigger = {
-  slug: 'order-webhook',
-  inputs: [
-    {
-      name: 'webhookSecret',
-      type: 'text',
-      required: true,
-      virtual: true,
-      admin: {
-        condition: (_, siblingData) => siblingData?.type === 'order-webhook',
-        description: 'Secret for webhook validation'
-      },
-      hooks: {
-        afterRead: [({ siblingData }) => siblingData?.parameters?.webhookSecret],
-        beforeChange: [({ value, siblingData }) => {
-          if (!siblingData.parameters) siblingData.parameters = {}
-          siblingData.parameters.webhookSecret = value
-          return undefined
-        }]
-      }
-    }
-    // ... more boilerplate
-  ]
-}
-```
-
-#### After (Recommended)
-```typescript
-import { createTrigger } from '@xtr-dev/payload-automation/helpers'
-
-const orderWebhook = createTrigger('order-webhook').parameters({
-  webhookSecret: {
-    type: 'text',
-    required: true,
-    admin: {
-      description: 'Secret for webhook validation'
-    }
-  }
-  // Add more parameters easily
-})
-```
-
-### Step 3: (Optional) Use Preset Builders
-
-For common trigger patterns:
-
-```typescript
-import { webhookTrigger, cronTrigger } from '@xtr-dev/payload-automation/helpers'
-
-// Webhook trigger with built-in path, secret, headers parameters
-const paymentWebhook = webhookTrigger('payment-webhook')
-  .parameter('currency', {
-    type: 'select',
-    options: ['USD', 'EUR', 'GBP']
-  })
-  .build()
-
-// Cron trigger with built-in expression, timezone parameters  
-const dailyReport = cronTrigger('daily-report')
-  .parameter('format', {
-    type: 'select',
-    options: ['pdf', 'csv']
-  })
-  .build()
-```
-
-## Quick Migration Examples
-
-### Simple Trigger Migration
-
-```typescript
-// OLD WAY (still works)
-{
-  slug: 'user-signup',
-  inputs: [/* 20+ lines of boilerplate per field */]
-}
-
-// NEW WAY (recommended)
-import { createTrigger } from '@xtr-dev/payload-automation/helpers'
-
-const userSignup = createTrigger('user-signup').parameters({
-  source: {
-    type: 'select',
-    options: ['web', 'mobile', 'api'],
-    required: true
-  },
-  userType: {
-    type: 'select', 
-    options: ['regular', 'premium'],
-    defaultValue: 'regular'
-  }
-})
-```
-
-### Webhook Trigger Migration
-
-```typescript
-// OLD WAY
-{
-  slug: 'payment-webhook',
-  inputs: [/* Manual webhookPath field + lots of boilerplate */]
-}
-
-// NEW WAY  
-import { webhookTrigger } from '@xtr-dev/payload-automation/helpers'
-
-const paymentWebhook = webhookTrigger('payment-webhook')
-  .parameter('minimumAmount', { 
-    type: 'number', 
-    min: 0 
-  })
-  .build()
-```
-
-## Benefits of Migration
-
-- **90% less code** - Eliminate virtual field boilerplate
-- **No field name conflicts** - Built-in parameters isolated
-- **Better TypeScript support** - Full type inference
-- **Preset patterns** - Common trigger types ready-to-use
-- **Composable API** - Easy to extend and customize
-
-## Compatibility
-
-- ✅ **Existing triggers** continue to work unchanged
-- ✅ **Mix old and new** trigger styles in same config
-- ✅ **No database changes** required
-- ✅ **PayloadCMS field compatibility** maintained
-
-## Need Help?
-
-- [View examples](./examples/trigger-builders.ts)
-- [Read documentation](./examples/README-trigger-builders.md)
-- [Report issues](https://github.com/xtr-dev/payload-automation/issues)
-
----
-
-**TL;DR**: Update the package, optionally migrate custom triggers to use the new helpers for cleaner code. All existing triggers continue to work without changes.

NOT-IMPLEMENTING.md

@@ -1,68 +0,0 @@
-# Steps and Triggers Not Implementing
-
-This document lists workflow steps and triggers that are intentionally **not** being implemented in the core plugin. These are either better suited as custom user implementations or fall outside the plugin's scope.
-
-## Steps Not Implementing
-
-### Workflow Orchestration
-- **Stop Workflow** - Can be achieved through conditional logic
-- **Run Workflow** - Adds complexity to execution tracking and circular dependency management
-- **Parallel Fork/Join** - Current dependency system already enables parallel execution
-
-### External Service Integrations
-- **GraphQL Query** - Better as custom HTTP request step
-- **S3/Cloud Storage** - Too provider-specific
-- **Message Queue** (Kafka, RabbitMQ, SQS) - Infrastructure-specific
-- **SMS** (Twilio, etc.) - Requires external accounts
-- **Push Notifications** - Platform-specific implementation
-- **Slack/Discord/Teams** - Better as custom HTTP webhooks
-- **Calendar Integration** - Too many providers to support
-
-### AI/ML Operations
-- **AI Prompt** (OpenAI, Claude, etc.) - Requires API keys, better as custom implementation
-- **Text Analysis** - Too many variations and providers
-- **Image Processing** - Better handled by dedicated services
-
-### Specialized Data Operations
-- **Database Query** (Direct SQL/NoSQL) - Security concerns, bypasses Payload
-- **File Operations** - Complex permission and security implications
-- **Hash/Encrypt** - Security-sensitive, needs careful implementation
-- **RSS/Feed Processing** - Too specific for core plugin
-
-## Triggers Not Implementing
-
-### Workflow Events
-- **Workflow Complete/Failed** - Adds circular dependency complexity
-- **Step Failed** - Complicates error handling flow
-
-### System Events
-- **File Upload** - Can use collection hooks on media collections
-- **User Authentication** (Login/Logout) - Security implications
-- **Server Start/Stop** - Lifecycle management complexity
-- **Cache Clear** - Too implementation-specific
-- **Migration/Backup Events** - Infrastructure-specific
-
-### External Monitoring
-- **Email Received** (IMAP/POP3) - Requires mail server setup
-- **Git Webhooks** - Better as standard webhook triggers
-- **Performance Alerts** - Requires monitoring infrastructure
-- **Error Events** - Better handled by dedicated error tracking
-
-### Advanced Time-Based
-- **Recurring Patterns** (e.g., "every 2nd Tuesday") - Complex parsing and timezone handling
-- **Date Range Triggers** - Can be achieved with conditional logic in workflows
-
-## Why These Aren't Core Features
-
-1. **Maintainability**: Each external integration requires ongoing maintenance as APIs change
-2. **Security**: Many features have security implications that are better handled by users who understand their specific requirements
-3. **Flexibility**: Users can implement these as custom steps/triggers tailored to their needs
-4. **Scope**: The plugin focuses on being a solid workflow engine, not an everything-integration platform
-5. **Dependencies**: Avoiding external service dependencies keeps the plugin lightweight
-
-## What Users Can Do Instead
-
-- Implement custom steps using the plugin's TaskConfig interface
-- Use HTTP Request step for most external integrations  
-- Create custom triggers through Payload hooks
-- Build specialized workflow packages on top of this plugin

README.md

@@ -9,6 +9,7 @@ A comprehensive workflow automation plugin for PayloadCMS 3.x that enables visua
 - 🔄 **Visual Workflow Builder** - Create complex workflows with drag-and-drop interface
 - ⚡ **Parallel Execution** - Smart dependency resolution for optimal performance
 - 🎯 **Multiple Triggers** - Collection hooks, webhooks, manual execution
+- ⏰ **Scheduled Workflows** - Use webhook triggers with external cron services
 - 📊 **Execution Tracking** - Complete history and monitoring of workflow runs
 - 🔧 **Extensible Steps** - HTTP requests, document CRUD, email notifications
 - 🔍 **JSONPath Integration** - Dynamic data interpolation and transformation
@@ -155,6 +156,66 @@ Use JSONPath to access workflow data:
 - Node.js ^18.20.2 || >=20.9.0
 - pnpm ^9 || ^10
 
+## Environment Variables
+
+Control plugin logging with these environment variables:
+
+### `PAYLOAD_AUTOMATION_LOG_LEVEL`
+Controls both configuration-time and runtime logging. 
+- **Values**: `silent`, `error`, `warn`, `info`, `debug`, `trace`
+- **Default**: `warn`
+- **Example**: `PAYLOAD_AUTOMATION_LOG_LEVEL=debug`
+
+### `PAYLOAD_AUTOMATION_CONFIG_LOG_LEVEL` (optional)
+Override log level specifically for configuration-time logs (plugin setup).
+- **Values**: Same as above
+- **Default**: Falls back to `PAYLOAD_AUTOMATION_LOG_LEVEL` or `warn`
+- **Example**: `PAYLOAD_AUTOMATION_CONFIG_LOG_LEVEL=silent`
+
+### Production Usage
+For production, keep the default (`warn`) or use `error` or `silent`:
+```bash
+PAYLOAD_AUTOMATION_LOG_LEVEL=error npm start
+```
+
+### Development Usage
+For debugging, use `debug` or `info`:
+```bash
+PAYLOAD_AUTOMATION_LOG_LEVEL=debug npm run dev
+```
+
+## Scheduled Workflows
+
+For scheduled workflows, use **webhook triggers** with external cron services instead of built-in cron triggers:
+
+### GitHub Actions (Free)
+```yaml
+# .github/workflows/daily-report.yml
+on:
+  schedule:
+    - cron: '0 9 * * *'  # Daily at 9 AM UTC
+jobs:
+  trigger-workflow:
+    runs-on: ubuntu-latest
+    steps:
+      - run: curl -X POST https://your-app.com/api/workflows-webhook/daily-report
+```
+
+### Vercel Cron (Serverless)
+```js
+// api/cron/daily.js
+export default async function handler(req, res) {
+  await fetch('https://your-app.com/api/workflows-webhook/daily-report', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ source: 'vercel-cron' })
+  });
+  res.status(200).json({ success: true });
+}
+```
+
+**Benefits**: Better reliability, proper process isolation, easier debugging, and leverages existing infrastructure.
+
 ## Documentation
 
 Full documentation coming soon. For now, explore the development environment in the repository for examples and patterns.

dev/app/(payload)/admin/importMap.js

@@ -1,5 +1,7 @@
-
+import { StatusCell as StatusCell_6f365a93b6cb4b34ad564b391e21db6f } from '@xtr-dev/payload-automation/client'
+import { ErrorDisplay as ErrorDisplay_6f365a93b6cb4b34ad564b391e21db6f } from '@xtr-dev/payload-automation/client'
 
 export const importMap = {
-
+  "@xtr-dev/payload-automation/client#StatusCell": StatusCell_6f365a93b6cb4b34ad564b391e21db6f,
+  "@xtr-dev/payload-automation/client#ErrorDisplay": ErrorDisplay_6f365a93b6cb4b34ad564b391e21db6f
 }

dev/payload-types.ts

@@ -92,7 +92,7 @@ export interface Config {
     'payload-migrations': PayloadMigrationsSelect<false> | PayloadMigrationsSelect<true>;
   };
   db: {
-    defaultIDType: number;
+    defaultIDType: string;
   };
   globals: {};
   globalsSelect: {};
@@ -136,7 +136,7 @@ export interface UserAuthOperations {
  * via the `definition` "posts".
  */
 export interface Post {
-  id: number;
+  id: string;
   content?: string | null;
   updatedAt: string;
   createdAt: string;
@@ -146,7 +146,7 @@ export interface Post {
  * via the `definition` "media".
  */
 export interface Media {
-  id: number;
+  id: string;
   updatedAt: string;
   createdAt: string;
   url?: string | null;
@@ -164,9 +164,9 @@ export interface Media {
  * via the `definition` "auditLog".
  */
 export interface AuditLog {
-  id: number;
-  post?: (number | null) | Post;
-  user?: (number | null) | User;
+  id: string;
+  post?: (string | null) | Post;
+  user?: (string | null) | User;
   message?: string | null;
   updatedAt: string;
   createdAt: string;
@@ -176,7 +176,7 @@ export interface AuditLog {
  * via the `definition` "users".
  */
 export interface User {
-  id: number;
+  id: string;
   updatedAt: string;
   createdAt: string;
   email: string;
@@ -202,7 +202,7 @@ export interface User {
  * via the `definition` "workflows".
  */
 export interface Workflow {
-  id: number;
+  id: string;
   /**
    * Human-readable name for the workflow
    */
@@ -214,36 +214,45 @@ export interface Workflow {
   triggers?:
     | {
         type?: ('collection-trigger' | 'webhook-trigger' | 'global-trigger' | 'cron-trigger') | null;
+        parameters?:
+          | {
+              [k: string]: unknown;
+            }
+          | unknown[]
+          | string
+          | number
+          | boolean
+          | null;
         /**
          * Collection that triggers the workflow
          */
-        collectionSlug?: ('posts' | 'media') | null;
+        __builtin_collectionSlug?: ('posts' | 'media') | null;
         /**
          * Collection operation that triggers the workflow
          */
-        operation?: ('create' | 'delete' | 'read' | 'update') | null;
+        __builtin_operation?: ('create' | 'delete' | 'read' | 'update') | null;
         /**
-         * URL path for the webhook (e.g., "my-webhook"). Full URL will be /api/workflows/webhook/my-webhook
+         * URL path for the webhook (e.g., "my-webhook"). Full URL will be /api/workflows-webhook/my-webhook
          */
-        webhookPath?: string | null;
+        __builtin_webhookPath?: string | null;
         /**
          * Global that triggers the workflow
          */
-        global?: string | null;
+        __builtin_global?: string | null;
         /**
          * Global operation that triggers the workflow
          */
-        globalOperation?: 'update' | null;
+        __builtin_globalOperation?: 'update' | null;
         /**
          * Cron expression for scheduled execution (e.g., "0 0 * * *" for daily at midnight)
          */
-        cronExpression?: string | null;
+        __builtin_cronExpression?: string | null;
         /**
          * Timezone for cron execution (e.g., "America/New_York", "Europe/London"). Defaults to UTC.
          */
-        timezone?: string | null;
+        __builtin_timezone?: string | null;
         /**
-         * JSONPath expression that must evaluate to true for this trigger to execute the workflow (e.g., "$.doc.status == 'published'")
+         * JSONPath expression that must evaluate to true for this trigger to execute the workflow (e.g., "$.trigger.doc.status == 'published'")
          */
         condition?: string | null;
         id?: string | null;
@@ -253,7 +262,18 @@ export interface Workflow {
     | {
         step?: ('http-request-step' | 'create-document') | null;
         name?: string | null;
-        input?:
+        /**
+         * The URL to make the HTTP request to
+         */
+        url?: string | null;
+        /**
+         * HTTP method to use
+         */
+        method?: ('GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH') | null;
+        /**
+         * HTTP headers as JSON object (e.g., {"Content-Type": "application/json"})
+         */
+        headers?:
           | {
               [k: string]: unknown;
             }
@@ -262,6 +282,80 @@ export interface Workflow {
           | number
           | boolean
           | null;
+        /**
+         * Request body data. Use JSONPath to reference values (e.g., {"postId": "$.trigger.doc.id", "title": "$.trigger.doc.title"})
+         */
+        body?:
+          | {
+              [k: string]: unknown;
+            }
+          | unknown[]
+          | string
+          | number
+          | boolean
+          | null;
+        /**
+         * Request timeout in milliseconds (default: 30000)
+         */
+        timeout?: number | null;
+        authentication?: {
+          /**
+           * Authentication method
+           */
+          type?: ('none' | 'bearer' | 'basic' | 'apikey') | null;
+          /**
+           * Bearer token value
+           */
+          token?: string | null;
+          /**
+           * Basic auth username
+           */
+          username?: string | null;
+          /**
+           * Basic auth password
+           */
+          password?: string | null;
+          /**
+           * API key header name (e.g., "X-API-Key")
+           */
+          headerName?: string | null;
+          /**
+           * API key value
+           */
+          headerValue?: string | null;
+        };
+        /**
+         * Number of retry attempts on failure (max: 5)
+         */
+        retries?: number | null;
+        /**
+         * Delay between retries in milliseconds
+         */
+        retryDelay?: number | null;
+        /**
+         * The collection slug to create a document in
+         */
+        collectionSlug?: string | null;
+        /**
+         * The document data to create. Use JSONPath to reference trigger data (e.g., {"title": "$.trigger.doc.title", "author": "$.trigger.doc.author"})
+         */
+        data?:
+          | {
+              [k: string]: unknown;
+            }
+          | unknown[]
+          | string
+          | number
+          | boolean
+          | null;
+        /**
+         * Create as draft (if collection has drafts enabled)
+         */
+        draft?: boolean | null;
+        /**
+         * Locale for the document (if localization is enabled)
+         */
+        locale?: string | null;
         /**
          * Step names that must complete before this step can run
          */
@@ -282,11 +376,11 @@ export interface Workflow {
  * via the `definition` "workflow-runs".
  */
 export interface WorkflowRun {
-  id: number;
+  id: string;
   /**
    * Reference to the workflow that was executed
    */
-  workflow: number | Workflow;
+  workflow: string | Workflow;
   /**
    * Version of the workflow that was executed
    */
@@ -380,7 +474,7 @@ export interface WorkflowRun {
  * via the `definition` "payload-jobs".
  */
 export interface PayloadJob {
-  id: number;
+  id: string;
   /**
    * Input data provided to the job
    */
@@ -472,40 +566,40 @@ export interface PayloadJob {
  * via the `definition` "payload-locked-documents".
  */
 export interface PayloadLockedDocument {
-  id: number;
+  id: string;
   document?:
     | ({
         relationTo: 'posts';
-        value: number | Post;
+        value: string | Post;
       } | null)
     | ({
         relationTo: 'media';
-        value: number | Media;
+        value: string | Media;
       } | null)
     | ({
         relationTo: 'auditLog';
-        value: number | AuditLog;
+        value: string | AuditLog;
       } | null)
     | ({
         relationTo: 'workflows';
-        value: number | Workflow;
+        value: string | Workflow;
       } | null)
     | ({
         relationTo: 'workflow-runs';
-        value: number | WorkflowRun;
+        value: string | WorkflowRun;
       } | null)
     | ({
         relationTo: 'users';
-        value: number | User;
+        value: string | User;
       } | null)
     | ({
         relationTo: 'payload-jobs';
-        value: number | PayloadJob;
+        value: string | PayloadJob;
       } | null);
   globalSlug?: string | null;
   user: {
     relationTo: 'users';
-    value: number | User;
+    value: string | User;
   };
   updatedAt: string;
   createdAt: string;
@@ -515,10 +609,10 @@ export interface PayloadLockedDocument {
  * via the `definition` "payload-preferences".
  */
 export interface PayloadPreference {
-  id: number;
+  id: string;
   user: {
     relationTo: 'users';
-    value: number | User;
+    value: string | User;
   };
   key?: string | null;
   value?:
@@ -538,7 +632,7 @@ export interface PayloadPreference {
  * via the `definition` "payload-migrations".
  */
 export interface PayloadMigration {
-  id: number;
+  id: string;
   name?: string | null;
   batch?: number | null;
   updatedAt: string;
@@ -592,13 +686,14 @@ export interface WorkflowsSelect<T extends boolean = true> {
     | T
     | {
         type?: T;
-        collectionSlug?: T;
-        operation?: T;
-        webhookPath?: T;
-        global?: T;
-        globalOperation?: T;
-        cronExpression?: T;
-        timezone?: T;
+        parameters?: T;
+        __builtin_collectionSlug?: T;
+        __builtin_operation?: T;
+        __builtin_webhookPath?: T;
+        __builtin_global?: T;
+        __builtin_globalOperation?: T;
+        __builtin_cronExpression?: T;
+        __builtin_timezone?: T;
         condition?: T;
         id?: T;
       };
@@ -607,7 +702,27 @@ export interface WorkflowsSelect<T extends boolean = true> {
     | {
         step?: T;
         name?: T;
-        input?: T;
+        url?: T;
+        method?: T;
+        headers?: T;
+        body?: T;
+        timeout?: T;
+        authentication?:
+          | T
+          | {
+              type?: T;
+              token?: T;
+              username?: T;
+              password?: T;
+              headerName?: T;
+              headerValue?: T;
+            };
+        retries?: T;
+        retryDelay?: T;
+        collectionSlug?: T;
+        data?: T;
+        draft?: T;
+        locale?: T;
         dependencies?: T;
         condition?: T;
         id?: T;
@@ -736,10 +851,118 @@ export interface TaskWorkflowCronExecutor {
  */
 export interface TaskHttpRequestStep {
   input: {
-    url?: string | null;
+    /**
+     * The URL to make the HTTP request to
+     */
+    url: string;
+    /**
+     * HTTP method to use
+     */
+    method?: ('GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH') | null;
+    /**
+     * HTTP headers as JSON object (e.g., {"Content-Type": "application/json"})
+     */
+    headers?:
+      | {
+          [k: string]: unknown;
+        }
+      | unknown[]
+      | string
+      | number
+      | boolean
+      | null;
+    /**
+     * Request body data. Use JSONPath to reference values (e.g., {"postId": "$.trigger.doc.id", "title": "$.trigger.doc.title"})
+     */
+    body?:
+      | {
+          [k: string]: unknown;
+        }
+      | unknown[]
+      | string
+      | number
+      | boolean
+      | null;
+    /**
+     * Request timeout in milliseconds (default: 30000)
+     */
+    timeout?: number | null;
+    authentication?: {
+      /**
+       * Authentication method
+       */
+      type?: ('none' | 'bearer' | 'basic' | 'apikey') | null;
+      /**
+       * Bearer token value
+       */
+      token?: string | null;
+      /**
+       * Basic auth username
+       */
+      username?: string | null;
+      /**
+       * Basic auth password
+       */
+      password?: string | null;
+      /**
+       * API key header name (e.g., "X-API-Key")
+       */
+      headerName?: string | null;
+      /**
+       * API key value
+       */
+      headerValue?: string | null;
+    };
+    /**
+     * Number of retry attempts on failure (max: 5)
+     */
+    retries?: number | null;
+    /**
+     * Delay between retries in milliseconds
+     */
+    retryDelay?: number | null;
   };
   output: {
-    response?: string | null;
+    /**
+     * HTTP status code
+     */
+    status?: number | null;
+    /**
+     * HTTP status text
+     */
+    statusText?: string | null;
+    /**
+     * Response headers
+     */
+    headers?:
+      | {
+          [k: string]: unknown;
+        }
+      | unknown[]
+      | string
+      | number
+      | boolean
+      | null;
+    /**
+     * Response body
+     */
+    body?: string | null;
+    /**
+     * Parsed response data (if JSON)
+     */
+    data?:
+      | {
+          [k: string]: unknown;
+        }
+      | unknown[]
+      | string
+      | number
+      | boolean
+      | null;
+    /**
+     * Request duration in milliseconds
+     */
+    duration?: number | null;
   };
 }
 /**
@@ -753,7 +976,7 @@ export interface TaskCreateDocument {
      */
     collectionSlug: string;
     /**
-     * The document data to create
+     * The document data to create. Use JSONPath to reference trigger data (e.g., {"title": "$.trigger.doc.title", "author": "$.trigger.doc.author"})
      */
     data:
       | {

dev/payload.config.ts

@@ -24,13 +24,24 @@ if (!process.env.ROOT_DIR) {
 const buildConfigWithMemoryDB = async () => {
   // Use MongoDB adapter for testing instead of SQLite
   const { mongooseAdapter } = await import('@payloadcms/db-mongodb')
-  
+
   return buildConfig({
     admin: {
       importMap: {
         baseDir: path.resolve(dirname, '..'),
       },
     },
+    globals: [
+      {
+        slug: 'settings',
+        fields: [
+          {
+            name: 'siteName',
+            type: 'text'
+          }
+        ]
+      }
+    ],
     collections: [
       {
         slug: 'posts',
@@ -96,14 +107,13 @@ const buildConfigWithMemoryDB = async () => {
           posts: true,
           media: true
         },
+        globalTriggers: {
+          settings: true
+        },
         steps: [
           HttpRequestStepTask,
           CreateDocumentStepTask
         ],
-        triggers: [
-
-        ],
-        webhookPrefix: '/workflows-webhook'
       }),
     ],
     secret: process.env.PAYLOAD_SECRET || 'test-secret_key',

dev/webhook-triggers.spec.ts

@@ -1,483 +0,0 @@
-import { describe, it, expect, beforeEach, afterEach } from 'vitest'
-import { getTestPayload, cleanDatabase } from './test-setup.js'
-
-describe('Webhook Trigger Testing', () => {
-
-  beforeEach(async () => {
-    await cleanDatabase()
-  })
-
-  afterEach(async () => {
-    await cleanDatabase()
-  })
-
-  it('should trigger workflow via webhook endpoint simulation', async () => {
-    const payload = getTestPayload()
-    
-    // Create a workflow with webhook trigger
-    const workflow = await payload.create({
-      collection: 'workflows',
-      data: {
-        name: 'Test Webhook - Basic Trigger',
-        description: 'Tests basic webhook triggering',
-        triggers: [
-          {
-            type: 'webhook-trigger',
-            webhookPath: 'test-basic'
-          }
-        ],
-        steps: [
-          {
-            name: 'create-webhook-audit',
-            step: 'create-document',
-            collectionSlug: 'auditLog',
-            data: {
-              message: 'Webhook triggered successfully',
-              user: '$.trigger.data.userId'
-            }
-          }
-        ]
-      }
-    })
-
-    expect(workflow).toBeDefined()
-
-    // Directly execute the workflow with webhook-like data
-    const executor = (globalThis as any).__workflowExecutor
-    if (!executor) {
-      console.warn('⚠️ Workflow executor not available, skipping webhook execution')
-      return
-    }
-
-    // Simulate webhook trigger by directly executing the workflow
-    const webhookData = {
-      userId: 'webhook-test-user',
-      timestamp: new Date().toISOString()
-    }
-
-    const mockReq = {
-      payload,
-      user: null,
-      headers: {}
-    }
-
-    await executor.execute({
-      workflow,
-      trigger: {
-        type: 'webhook',
-        path: 'test-basic',
-        data: webhookData,
-        headers: {}
-      },
-      req: mockReq as any,
-      payload
-    })
-
-    console.log('✅ Workflow executed directly')
-
-    // Wait for workflow execution
-    await new Promise(resolve => setTimeout(resolve, 2000))
-
-    // Verify workflow run was created
-    const runs = await payload.find({
-      collection: 'workflow-runs',
-      where: {
-        workflow: {
-          equals: workflow.id
-        }
-      },
-      limit: 1
-    })
-
-    expect(runs.totalDocs).toBe(1)
-    expect(runs.docs[0].status).not.toBe('failed')
-
-    // Verify audit log was created
-    const auditLogs = await payload.find({
-      collection: 'auditLog',
-      where: {
-        message: {
-          contains: 'Webhook triggered'
-        }
-      },
-      limit: 1
-    })
-
-    expect(auditLogs.totalDocs).toBe(1)
-    console.log('✅ Webhook audit log created')
-  }, 30000)
-
-  it('should handle webhook with complex data', async () => {
-    const workflow = await payload.create({
-      collection: 'workflows',
-      data: {
-        name: 'Test Webhook - Complex Data',
-        description: 'Tests webhook with complex JSON data',
-        triggers: [
-          {
-            type: 'webhook-trigger',
-            webhookPath: 'test-complex'
-          }
-        ],
-        steps: [
-          {
-            name: 'echo-webhook-data',
-            step: 'http-request-step',
-            url: 'https://httpbin.org/post',
-            method: 'POST',
-            body: {
-              originalData: '$.trigger.data',
-              headers: '$.trigger.headers',
-              path: '$.trigger.path'
-            }
-          }
-        ]
-      }
-    })
-
-    const complexData = {
-      user: {
-        id: 123,
-        name: 'Test User',
-        permissions: ['read', 'write']
-      },
-      event: {
-        type: 'user_action',
-        timestamp: new Date().toISOString(),
-        metadata: {
-          source: 'webhook-test',
-          version: '1.0.0'
-        }
-      },
-      nested: {
-        deeply: {
-          nested: {
-            value: 'deep-test-value'
-          }
-        }
-      }
-    }
-
-    const response = await makeWebhookRequest('test-complex', complexData)
-    expect(response.status).toBe(200)
-
-    // Wait for workflow execution
-    await new Promise(resolve => setTimeout(resolve, 5000))
-
-    const runs = await payload.find({
-      collection: 'workflow-runs',
-      where: {
-        workflow: {
-          equals: workflow.id
-        }
-      },
-      limit: 1
-    })
-
-    expect(runs.totalDocs).toBe(1)
-    expect(runs.docs[0].status).toBe('completed')
-
-    // Verify the complex data was properly passed through
-    const stepOutput = runs.docs[0].context.steps['echo-webhook-data'].output
-    expect(stepOutput.status).toBe(200)
-    
-    const responseBody = JSON.parse(stepOutput.body)
-    expect(responseBody.json.originalData.user.name).toBe('Test User')
-    expect(responseBody.json.originalData.nested.deeply.nested.value).toBe('deep-test-value')
-
-    console.log('✅ Complex webhook data processed correctly')
-  }, 30000)
-
-  it('should handle webhook conditions', async () => {
-    const workflow = await payload.create({
-      collection: 'workflows',
-      data: {
-        name: 'Test Webhook - Conditional',
-        description: 'Tests conditional webhook execution',
-        triggers: [
-          {
-            type: 'webhook-trigger',
-            webhookPath: 'test-conditional',
-            condition: '$.data.action == "important"'
-          }
-        ],
-        steps: [
-          {
-            name: 'conditional-audit',
-            step: 'create-document',
-            collectionSlug: 'auditLog',
-            data: {
-              message: 'Webhook condition met - important action'
-            }
-          }
-        ]
-      }
-    })
-
-    // First request - should NOT trigger (condition not met)
-    const response1 = await makeWebhookRequest('test-conditional', {
-      action: 'normal',
-      data: 'test'
-    })
-    expect(response1.status).toBe(200)
-
-    // Second request - SHOULD trigger (condition met)
-    const response2 = await makeWebhookRequest('test-conditional', {
-      action: 'important',
-      priority: 'high'
-    })
-    expect(response2.status).toBe(200)
-
-    // Wait for workflow execution
-    await new Promise(resolve => setTimeout(resolve, 5000))
-
-    const runs = await payload.find({
-      collection: 'workflow-runs',
-      where: {
-        workflow: {
-          equals: workflow.id
-        }
-      }
-    })
-
-    // Should have exactly 1 run (only for the matching condition)
-    expect(runs.totalDocs).toBe(1)
-    expect(runs.docs[0].status).not.toBe('failed')
-
-    const auditLogs = await payload.find({
-      collection: 'auditLog',
-      where: {
-        message: {
-          contains: 'condition met'
-        }
-      }
-    })
-
-    expect(auditLogs.totalDocs).toBe(1)
-    console.log('✅ Webhook conditional execution working')
-  }, 30000)
-
-  it('should handle webhook authentication headers', async () => {
-    const workflow = await payload.create({
-      collection: 'workflows',
-      data: {
-        name: 'Test Webhook - Headers',
-        description: 'Tests webhook header processing',
-        triggers: [
-          {
-            type: 'webhook-trigger',
-            webhookPath: 'test-headers'
-          }
-        ],
-        steps: [
-          {
-            name: 'process-headers',
-            step: 'http-request-step',
-            url: 'https://httpbin.org/post',
-            method: 'POST',
-            body: {
-              receivedHeaders: '$.trigger.headers',
-              authorization: '$.trigger.headers.authorization',
-              userAgent: '$.trigger.headers.user-agent'
-            }
-          }
-        ]
-      }
-    })
-
-    // Make webhook request with custom headers
-    const webhookUrl = `${baseUrl}/api/workflows/webhook/test-headers`
-    const response = await fetch(webhookUrl, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'Authorization': 'Bearer test-token-123',
-        'User-Agent': 'Webhook-Test-Client/1.0',
-        'X-Custom-Header': 'custom-value'
-      },
-      body: JSON.stringify({
-        test: 'header processing'
-      })
-    })
-
-    expect(response.status).toBe(200)
-
-    // Wait for workflow execution
-    await new Promise(resolve => setTimeout(resolve, 5000))
-
-    const runs = await payload.find({
-      collection: 'workflow-runs',
-      where: {
-        workflow: {
-          equals: workflow.id
-        }
-      },
-      limit: 1
-    })
-
-    expect(runs.totalDocs).toBe(1)
-    expect(runs.docs[0].status).toBe('completed')
-
-    // Verify headers were captured and processed
-    const stepOutput = runs.docs[0].context.steps['process-headers'].output
-    const responseBody = JSON.parse(stepOutput.body)
-    
-    expect(responseBody.json.authorization).toBe('Bearer test-token-123')
-    expect(responseBody.json.userAgent).toBe('Webhook-Test-Client/1.0')
-
-    console.log('✅ Webhook headers processed correctly')
-  }, 30000)
-
-  it('should handle multiple concurrent webhook requests', async () => {
-    const workflow = await payload.create({
-      collection: 'workflows',
-      data: {
-        name: 'Test Webhook - Concurrent',
-        description: 'Tests concurrent webhook processing',
-        triggers: [
-          {
-            type: 'webhook-trigger',
-            webhookPath: 'test-concurrent'
-          }
-        ],
-        steps: [
-          {
-            name: 'concurrent-audit',
-            step: 'create-document',
-            collectionSlug: 'auditLog',
-            data: {
-              message: 'Concurrent webhook execution',
-              requestId: '$.trigger.data.requestId'
-            }
-          }
-        ]
-      }
-    })
-
-    // Make multiple concurrent webhook requests
-    const concurrentRequests = Array.from({ length: 5 }, (_, i) =>
-      makeWebhookRequest('test-concurrent', {
-        requestId: `concurrent-${i + 1}`,
-        timestamp: new Date().toISOString()
-      })
-    )
-
-    const responses = await Promise.all(concurrentRequests)
-    responses.forEach(response => {
-      expect(response.status).toBe(200)
-    })
-
-    // Wait for all workflow executions
-    await new Promise(resolve => setTimeout(resolve, 8000))
-
-    const runs = await payload.find({
-      collection: 'workflow-runs',
-      where: {
-        workflow: {
-          equals: workflow.id
-        }
-      }
-    })
-
-    expect(runs.totalDocs).toBe(5)
-
-    // Verify all runs completed successfully
-    const failedRuns = runs.docs.filter(run => run.status === 'failed')
-    expect(failedRuns).toHaveLength(0)
-
-    // Verify all audit logs were created
-    const auditLogs = await payload.find({
-      collection: 'auditLog',
-      where: {
-        message: {
-          contains: 'Concurrent webhook'
-        }
-      }
-    })
-
-    expect(auditLogs.totalDocs).toBe(5)
-    console.log('✅ Concurrent webhook requests processed successfully')
-  }, 35000)
-
-  it('should handle non-existent webhook paths gracefully', async () => {
-    // Test that workflows with non-matching webhook paths don't get triggered
-    const workflow = await payload.create({
-      collection: 'workflows',
-      data: {
-        name: 'Test Webhook - Non-existent Path',
-        description: 'Should not be triggered by different path',
-        triggers: [
-          {
-            type: 'webhook-trigger',
-            webhookPath: 'specific-path'
-          }
-        ],
-        steps: [
-          {
-            name: 'create-audit',
-            step: 'create-document',
-            collectionSlug: 'auditLog',
-            data: {
-              message: 'This should not be created'
-            }
-          }
-        ]
-      }
-    })
-
-    // Simulate trying to trigger with wrong path - should not execute workflow
-    const initialRuns = await payload.find({
-      collection: 'workflow-runs',
-      where: {
-        workflow: {
-          equals: workflow.id
-        }
-      }
-    })
-
-    expect(initialRuns.totalDocs).toBe(0)
-    console.log('✅ Non-existent webhook path handled: no workflow runs created')
-  }, 10000)
-
-  it('should handle malformed webhook JSON', async () => {
-    const webhookUrl = `${baseUrl}/api/workflows/webhook/test-malformed`
-    
-    // First create a workflow to receive the malformed request
-    const workflow = await payload.create({
-      collection: 'workflows',
-      data: {
-        name: 'Test Webhook - Malformed JSON',
-        description: 'Tests malformed JSON handling',
-        triggers: [
-          {
-            type: 'webhook-trigger',
-            webhookPath: 'test-malformed'
-          }
-        ],
-        steps: [
-          {
-            name: 'malformed-test',
-            step: 'create-document',
-            collectionSlug: 'auditLog',
-            data: {
-              message: 'Processed malformed request'
-            }
-          }
-        ]
-      }
-    })
-
-    // Send malformed JSON
-    const response = await fetch(webhookUrl, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: '{"malformed": json, "missing": quotes}'
-    })
-
-    // Should handle malformed JSON gracefully
-    expect([400, 422]).toContain(response.status)
-    console.log('✅ Malformed JSON handled:', response.status)
-  }, 15000)
-})

eslint.config.js

@@ -28,6 +28,12 @@ export default [
     rules: {
       'no-restricted-exports': 'off',
       'no-console': 'off',
+      'perfectionist/sort-object-types': 'off',
+      'perfectionist/sort-objects': 'off',
+      'perfectionist/sort-exports': 'off',
+      'perfectionist/sort-imports': 'off',
+      'perfectionist/sort-switch-case': 'off',
+      'perfectionist/sort-interfaces': 'off'
     },
   },
   {

examples/README-trigger-builders.md

@@ -1,218 +0,0 @@
-# Trigger Builder Examples
-
-The new trigger builder API dramatically reduces boilerplate when creating custom triggers.
-
-## Before vs After
-
-### Before (Manual Approach)
-```typescript
-const customTrigger = {
-  slug: 'order-webhook',
-  inputs: [
-    {
-      name: 'webhookSecret',
-      type: 'text',
-      required: true,
-      virtual: true,
-      admin: {
-        condition: (_, siblingData) => siblingData?.type === 'order-webhook',
-        description: 'Secret for webhook validation'
-      },
-      hooks: {
-        afterRead: [({ siblingData }) => siblingData?.parameters?.webhookSecret],
-        beforeChange: [({ value, siblingData }) => {
-          if (!siblingData.parameters) siblingData.parameters = {}
-          siblingData.parameters.webhookSecret = value
-          return undefined
-        }]
-      }
-    },
-    {
-      name: 'orderStatuses',
-      type: 'select',
-      hasMany: true,
-      options: ['pending', 'processing', 'completed'],
-      defaultValue: ['completed'],
-      virtual: true,
-      admin: {
-        condition: (_, siblingData) => siblingData?.type === 'order-webhook',
-        description: 'Order statuses that trigger the workflow'
-      },
-      hooks: {
-        afterRead: [({ siblingData }) => siblingData?.parameters?.orderStatuses || ['completed']],
-        beforeChange: [({ value, siblingData }) => {
-          if (!siblingData.parameters) siblingData.parameters = {}
-          siblingData.parameters.orderStatuses = value
-          return undefined
-        }]
-      }
-    }
-    // ... imagine more fields with similar boilerplate
-  ]
-}
-```
-
-### After (Builder Approach)
-```typescript
-import { createTrigger } from '@xtr-dev/payload-automation/helpers'
-
-const orderWebhook = createTrigger('order-webhook').parameters({
-  webhookSecret: {
-    type: 'text',
-    required: true,
-    admin: {
-      description: 'Secret for webhook validation'
-    }
-  },
-  orderStatuses: {
-    type: 'select',
-    hasMany: true,
-    options: ['pending', 'processing', 'completed'],
-    defaultValue: ['completed'],
-    admin: {
-      description: 'Order statuses that trigger the workflow'
-    }
-  }
-})
-```
-
-## Built-in Trigger Presets
-
-### Webhook Trigger
-```typescript
-import { webhookTrigger } from '@xtr-dev/payload-automation/helpers'
-
-const paymentWebhook = webhookTrigger('payment-webhook')
-  .parameter('currency', {
-    type: 'select',
-    options: ['USD', 'EUR', 'GBP'],
-    defaultValue: 'USD'
-  })
-  .build()
-```
-
-### Scheduled/Cron Trigger
-```typescript
-import { cronTrigger } from '@xtr-dev/payload-automation/helpers'
-
-const dailyReport = cronTrigger('daily-report')
-  .parameter('reportFormat', {
-    type: 'select',
-    options: ['pdf', 'csv', 'json'],
-    defaultValue: 'pdf'
-  })
-  .build()
-```
-
-### Manual Trigger (No Parameters)
-```typescript
-import { manualTrigger } from '@xtr-dev/payload-automation/helpers'
-
-const backupTrigger = manualTrigger('manual-backup')
-```
-
-## Advanced Usage
-
-### Extending Common Parameters
-```typescript
-import { createAdvancedTrigger, webhookParameters } from '@xtr-dev/payload-automation/helpers'
-
-const advancedWebhook = createAdvancedTrigger('advanced-webhook')
-  .extend(webhookParameters) // Includes path, secret, headers
-  .parameter('retryAttempts', {
-    type: 'number',
-    min: 0,
-    max: 5,
-    defaultValue: 3
-  })
-  .parameter('timeout', {
-    type: 'number',
-    min: 1000,
-    max: 30000,
-    defaultValue: 5000,
-    admin: {
-      description: 'Timeout in milliseconds'
-    }
-  })
-  .build()
-```
-
-### Custom Validation
-```typescript
-const validatedTrigger = createTrigger('validated-trigger').parameters({
-  email: {
-    type: 'email',
-    required: true,
-    validate: (value) => {
-      if (value?.endsWith('@spam.com')) {
-        return 'Spam domains not allowed'
-      }
-      return true
-    }
-  },
-  webhookUrl: {
-    type: 'text',
-    required: true,
-    validate: (value) => {
-      try {
-        const url = new URL(value)
-        if (!['http:', 'https:'].includes(url.protocol)) {
-          return 'Only HTTP/HTTPS URLs allowed'
-        }
-      } catch {
-        return 'Please enter a valid URL'
-      }
-      return true
-    }
-  }
-})
-```
-
-## Usage in Plugin Configuration
-
-```typescript
-import { workflowsPlugin } from '@xtr-dev/payload-automation'
-import { 
-  createTrigger, 
-  webhookTrigger, 
-  cronTrigger 
-} from '@xtr-dev/payload-automation/helpers'
-
-export default buildConfig({
-  plugins: [
-    workflowsPlugin({
-      triggers: [
-        // Mix different trigger types
-        createTrigger('user-signup').parameters({
-          source: {
-            type: 'select',
-            options: ['web', 'mobile', 'api'],
-            required: true
-          }
-        }),
-        
-        webhookTrigger('payment-received')
-          .parameter('minimumAmount', { type: 'number', min: 0 })
-          .build(),
-          
-        cronTrigger('weekly-cleanup')
-          .parameter('deleteOlderThan', {
-            type: 'number',
-            defaultValue: 30,
-            admin: { description: 'Delete records older than N days' }
-          })
-          .build()
-      ]
-    })
-  ]
-})
-```
-
-## Benefits
-
-- **90% less boilerplate** - No manual hooks, conditions, or virtual field setup
-- **Type safety** - Full TypeScript support
-- **Reusable patterns** - Common trigger types as presets  
-- **Composable** - Mix builders with manual fields
-- **Backward compatible** - Existing triggers continue to work
-- **Validation built-in** - Parameter validation handled automatically

examples/README.md

@@ -1,68 +0,0 @@
-# PayloadCMS Workflows Plugin Examples
-
-This directory contains example code demonstrating how to use the PayloadCMS Workflows plugin.
-
-## Manual Trigger Example
-
-The `manual-trigger-example.ts` file shows how to:
-- Create a workflow with a manual trigger button in the admin UI
-- Trigger workflows programmatically using custom triggers
-- Access trigger data in workflow steps using JSONPath
-
-### Setting up a Manual Trigger Workflow
-
-1. Configure the plugin with a custom trigger:
-```typescript
-workflowsPlugin({
-  triggers: [
-    {
-      slug: 'manual-trigger',
-      inputs: []  // No inputs needed for simple manual triggers
-    }
-  ],
-  // ... other config
-})
-```
-
-2. Create a workflow with the manual trigger:
-```typescript
-await payload.create({
-  collection: 'workflows',
-  data: {
-    name: 'My Manual Workflow',
-    triggers: [
-      {
-        type: 'manual-trigger'
-      }
-    ],
-    steps: [
-      // Your workflow steps here
-    ]
-  }
-})
-```
-
-3. The workflow will now have a "Trigger Workflow" button in the admin UI
-
-### Triggering Workflows Programmatically
-
-```typescript
-import { triggerCustomWorkflow } from '@xtr-dev/payload-automation'
-
-// Trigger all workflows with 'manual-trigger'
-const results = await triggerCustomWorkflow(payload, {
-  slug: 'manual-trigger',
-  data: {
-    // Custom data to pass to the workflow
-    source: 'api',
-    timestamp: new Date().toISOString()
-  }
-})
-```
-
-### Accessing Trigger Data in Steps
-
-Use JSONPath expressions to access trigger data in your workflow steps:
-- `$.trigger.data.source` - Access custom data fields
-- `$.trigger.type` - The trigger type
-- `$.trigger.triggeredAt` - When the trigger was activated

examples/custom-trigger-example.ts

@@ -1,274 +0,0 @@
-import { buildConfig } from 'payload'
-import { workflowsPlugin, triggerCustomWorkflow } from '@xtr-dev/payload-automation'
-import type { Field } from 'payload'
-
-// Example: Data import trigger with custom fields
-const dataImportFields: Field[] = [
-  {
-    name: 'sourceUrl',
-    type: 'text',
-    required: true,
-    admin: {
-      description: 'URL of the data source to import from'
-    }
-  },
-  {
-    name: 'format',
-    type: 'select',
-    options: ['json', 'csv', 'xml'],
-    required: true,
-    admin: {
-      description: 'Format of the data to import'
-    }
-  },
-  {
-    name: 'mapping',
-    type: 'json',
-    admin: {
-      description: 'Field mapping configuration'
-    }
-  }
-]
-
-// Example: Manual review trigger with approval fields
-const manualReviewFields: Field[] = [
-  {
-    name: 'reviewerId',
-    type: 'text',
-    required: true,
-    admin: {
-      description: 'ID of the reviewer'
-    }
-  },
-  {
-    name: 'reviewNotes',
-    type: 'textarea',
-    admin: {
-      description: 'Notes from the review'
-    }
-  },
-  {
-    name: 'approved',
-    type: 'checkbox',
-    defaultValue: false,
-    admin: {
-      description: 'Whether the item was approved'
-    }
-  }
-]
-
-export default buildConfig({
-  // ... other config
-  
-  plugins: [
-    workflowsPlugin({
-      collectionTriggers: {
-        posts: true,  // Enable all CRUD triggers for posts
-        products: {   // Selective triggers for products
-          create: true,
-          update: true
-        }
-      },
-      
-      // Define custom triggers that will appear in the workflow UI
-      triggers: [
-        {
-          slug: 'data-import',
-          inputs: dataImportFields
-        },
-        {
-          slug: 'manual-review',
-          inputs: manualReviewFields
-        },
-        {
-          slug: 'scheduled-report',
-          inputs: [
-            {
-              name: 'reportType',
-              type: 'select',
-              options: ['daily', 'weekly', 'monthly'],
-              required: true
-            }
-          ]
-        }
-      ],
-      
-      steps: [
-        // ... your workflow steps
-      ]
-    })
-  ],
-  
-  onInit: async (payload) => {
-    // Example 1: Trigger workflow from external data source
-    // This could be called from a webhook, scheduled job, or any other event
-    const handleDataImport = async (sourceUrl: string, format: string) => {
-      const results = await triggerCustomWorkflow(payload, {
-        slug: 'data-import',
-        data: {
-          sourceUrl,
-          format,
-          mapping: {
-            title: 'name',
-            description: 'summary'
-          },
-          importedAt: new Date().toISOString()
-        }
-      })
-      
-      console.log('Data import workflows triggered:', results)
-    }
-    
-    // Example 2: Trigger workflow after custom business logic
-    const handleDocumentReview = async (documentId: string, reviewerId: string, approved: boolean) => {
-      // Perform your custom review logic here
-      const reviewData = {
-        documentId,
-        reviewerId,
-        reviewNotes: approved ? 'Document meets all requirements' : 'Needs revision',
-        approved,
-        reviewedAt: new Date().toISOString()
-      }
-      
-      // Trigger workflows that listen for manual review
-      const results = await triggerCustomWorkflow(payload, {
-        slug: 'manual-review',
-        data: reviewData,
-        user: {
-          id: reviewerId,
-          email: 'reviewer@example.com'
-        }
-      })
-      
-      return results
-    }
-    
-    // Example 3: Integrate with external services
-    // You could set up listeners for external events
-    if (process.env.ENABLE_EXTERNAL_SYNC) {
-      // Listen to external service events (example with a hypothetical event emitter)
-      // externalService.on('data-ready', async (event) => {
-      //   await triggerCustomWorkflow(payload, {
-      //     slug: 'data-import',
-      //     data: event.data
-      //   })
-      // })
-    }
-    
-    // Example 4: Create scheduled reports using node-cron or similar
-    // This shows how you might trigger a custom workflow on a schedule
-    // without using the built-in cron trigger
-    const scheduleReports = async () => {
-      // This could be called by a cron job or scheduled task
-      await triggerCustomWorkflow(payload, {
-        slug: 'scheduled-report',
-        data: {
-          reportType: 'daily',
-          generatedAt: new Date().toISOString(),
-          metrics: {
-            totalUsers: 1000,
-            activeUsers: 750,
-            newSignups: 25
-          }
-        }
-      })
-    }
-    
-    // Example 5: Hook into collection operations for complex logic
-    const postsCollection = payload.collections.posts
-    if (postsCollection) {
-      postsCollection.config.hooks = postsCollection.config.hooks || {}
-      postsCollection.config.hooks.afterChange = postsCollection.config.hooks.afterChange || []
-      
-      postsCollection.config.hooks.afterChange.push(async ({ doc, operation, req }) => {
-        // Custom logic to determine if we should trigger a workflow
-        if (operation === 'create' && doc.status === 'published') {
-          // Trigger a custom workflow for newly published posts
-          await triggerCustomWorkflow(payload, {
-            slug: 'manual-review',
-            data: {
-              documentId: doc.id,
-              documentType: 'post',
-              reviewerId: 'auto-review',
-              reviewNotes: 'Automatically queued for review',
-              approved: false
-            },
-            req // Pass the request context
-          })
-        }
-      })
-    }
-    
-    // Make functions available globally for testing/debugging
-    ;(global as any).handleDataImport = handleDataImport
-    ;(global as any).handleDocumentReview = handleDocumentReview
-    ;(global as any).scheduleReports = scheduleReports
-  }
-})
-
-// Example workflow configuration that would use these custom triggers:
-/*
-{
-  name: "Process Data Import",
-  triggers: [{
-    type: "data-import",
-    sourceUrl: "https://api.example.com/data",
-    format: "json",
-    mapping: { ... }
-  }],
-  steps: [
-    {
-      step: "http-request",
-      name: "fetch-data",
-      input: {
-        url: "$.trigger.data.sourceUrl",
-        method: "GET"
-      }
-    },
-    {
-      step: "create-document",
-      name: "import-records",
-      input: {
-        collection: "imported-data",
-        data: "$.steps.fetch-data.output.body"
-      },
-      dependencies: ["fetch-data"]
-    }
-  ]
-}
-
-{
-  name: "Review Approval Workflow",
-  triggers: [{
-    type: "manual-review",
-    reviewerId: "",
-    reviewNotes: "",
-    approved: false
-  }],
-  steps: [
-    {
-      step: "update-document",
-      name: "update-status",
-      input: {
-        collection: "documents",
-        id: "$.trigger.data.documentId",
-        data: {
-          status: "$.trigger.data.approved ? 'approved' : 'rejected'",
-          reviewedBy: "$.trigger.data.reviewerId",
-          reviewedAt: "$.trigger.data.reviewedAt"
-        }
-      }
-    },
-    {
-      step: "send-email",
-      name: "notify-author",
-      input: {
-        to: "author@example.com",
-        subject: "Document Review Complete",
-        text: "Your document has been $.trigger.data.approved ? 'approved' : 'rejected'"
-      },
-      dependencies: ["update-status"]
-    }
-  ]
-}
-*/

examples/manual-trigger-example.ts

@@ -1,122 +0,0 @@
-/**
- * Example: Manual Trigger Workflow
- * 
- * This example shows how to create a workflow that can be triggered
- * manually from the PayloadCMS admin interface using a custom button.
- */
-
-import type { Payload } from 'payload'
-
-/**
- * Create a workflow with manual trigger
- */
-export async function createManualTriggerWorkflow(payload: Payload) {
-  const workflow = await payload.create({
-    collection: 'workflows',
-    data: {
-      name: 'Manual Data Processing',
-      description: 'A workflow that can be triggered manually from the admin UI',
-      triggers: [
-        {
-          type: 'manual-trigger'  // This enables the trigger button in the admin
-        }
-      ],
-      steps: [
-        {
-          name: 'fetch-data',
-          type: 'http-request-step',
-          input: {
-            url: 'https://api.example.com/data',
-            method: 'GET'
-          }
-        },
-        {
-          name: 'process-data',
-          type: 'create-document',
-          input: {
-            collection: 'auditLog',
-            data: {
-              message: 'Manual workflow executed',
-              triggeredAt: '$.trigger.data.timestamp'
-            }
-          },
-          dependencies: ['fetch-data']  // This step depends on fetch-data
-        }
-      ]
-    }
-  })
-
-  console.log('Created workflow:', workflow.id)
-  return workflow
-}
-
-/**
- * Trigger a workflow programmatically using the custom trigger
- */
-export async function triggerWorkflowProgrammatically(payload: Payload) {
-  // Import the trigger functions from the plugin
-  const { triggerCustomWorkflow, triggerWorkflowById } = await import('@xtr-dev/payload-automation')
-  
-  // Option 1: Trigger all workflows with a specific trigger slug
-  const results = await triggerCustomWorkflow(payload, {
-    slug: 'manual-trigger',
-    data: {
-      source: 'api',
-      timestamp: new Date().toISOString(),
-      user: 'system'
-    }
-  })
-  
-  console.log('Triggered workflows:', results)
-  
-  // Option 2: Trigger a specific workflow by ID
-  const workflowId = 'your-workflow-id'
-  const result = await triggerWorkflowById(
-    payload,
-    workflowId,
-    'manual-trigger',
-    {
-      source: 'api',
-      timestamp: new Date().toISOString()
-    }
-  )
-  
-  console.log('Triggered workflow:', result)
-}
-
-/**
- * Example usage in your application
- */
-export async function setupManualTriggerExample(payload: Payload) {
-  // Create the workflow
-  const workflow = await createManualTriggerWorkflow(payload)
-  
-  // The workflow is now available in the admin UI with a trigger button
-  console.log('Workflow created! You can now:')
-  console.log('1. Go to the admin UI and navigate to the Workflows collection')
-  console.log('2. Open the workflow:', workflow.name)
-  console.log('3. Click the "Trigger Workflow" button to execute it manually')
-  
-  // You can also trigger it programmatically
-  await triggerWorkflowProgrammatically(payload)
-}
-
-/**
- * Notes:
- * 
- * 1. The manual trigger button appears automatically in the workflow admin UI
- *    when a workflow has a trigger with type 'manual-trigger'
- * 
- * 2. You can have multiple triggers on the same workflow, including manual triggers
- * 
- * 3. The trigger passes data to the workflow execution context, accessible via:
- *    - $.trigger.data - The custom data passed when triggering
- *    - $.trigger.type - The trigger type ('manual-trigger')
- *    - $.trigger.triggeredAt - Timestamp of when the trigger was activated
- * 
- * 4. Manual triggers are useful for:
- *    - Administrative tasks
- *    - Data migration workflows
- *    - Testing and debugging
- *    - On-demand processing
- */

examples/trigger-builders.ts

@@ -1,300 +0,0 @@
-/**
- * Examples demonstrating the new trigger builder API
- * This shows the before/after comparison and various usage patterns
- */
-
-import { 
-  createTrigger, 
-  createAdvancedTrigger,
-  webhookTrigger, 
-  cronTrigger, 
-  eventTrigger,
-  manualTrigger,
-  apiTrigger,
-  webhookParameters,
-  cronParameters 
-} from '../src/exports/helpers.js'
-
-/**
- * BEFORE: Manual trigger definition with lots of boilerplate
- */
-const oldWayTrigger = {
-  slug: 'order-webhook',
-  inputs: [
-    {
-      name: 'webhookSecret',
-      type: 'text',
-      required: true,
-      virtual: true,
-      admin: {
-        condition: (_, siblingData) => siblingData?.type === 'order-webhook',
-        description: 'Secret for webhook validation'
-      },
-      hooks: {
-        afterRead: [({ siblingData }) => siblingData?.parameters?.webhookSecret],
-        beforeChange: [({ value, siblingData }) => {
-          if (!siblingData.parameters) siblingData.parameters = {}
-          siblingData.parameters.webhookSecret = value
-          return undefined
-        }]
-      }
-    },
-    {
-      name: 'orderStatuses',
-      type: 'select',
-      hasMany: true,
-      options: ['pending', 'processing', 'completed'],
-      defaultValue: ['completed'],
-      virtual: true,
-      admin: {
-        condition: (_, siblingData) => siblingData?.type === 'order-webhook',
-        description: 'Order statuses that trigger the workflow'
-      },
-      hooks: {
-        afterRead: [({ siblingData }) => siblingData?.parameters?.orderStatuses || ['completed']],
-        beforeChange: [({ value, siblingData }) => {
-          if (!siblingData.parameters) siblingData.parameters = {}
-          siblingData.parameters.orderStatuses = value
-          return undefined
-        }]
-      }
-    }
-    // ... imagine more fields with similar boilerplate
-  ]
-} as const
-
-/**
- * AFTER: Clean trigger definition using builders
- */
-
-// 1. Simple trigger with parameters
-const orderWebhook = createTrigger('order-webhook').parameters({
-  webhookSecret: {
-    type: 'text',
-    required: true,
-    admin: {
-      description: 'Secret for webhook validation'
-    }
-  },
-  orderStatuses: {
-    type: 'select',
-    hasMany: true,
-    options: ['pending', 'processing', 'completed'],
-    defaultValue: ['completed'],
-    admin: {
-      description: 'Order statuses that trigger the workflow'
-    }
-  },
-  minimumAmount: {
-    type: 'number',
-    min: 0,
-    admin: {
-      description: 'Minimum order amount to trigger workflow'
-    }
-  }
-})
-
-// 2. Using preset webhook builder
-const paymentWebhook = webhookTrigger('payment-webhook')
-  .parameter('currency', {
-    type: 'select',
-    options: ['USD', 'EUR', 'GBP'],
-    defaultValue: 'USD'
-  })
-  .parameter('paymentMethods', {
-    type: 'select',
-    hasMany: true,
-    options: ['credit_card', 'paypal', 'bank_transfer']
-  })
-  .build()
-
-// 3. Scheduled trigger using cron builder
-const dailyReport = cronTrigger('daily-report')
-  .parameter('reportFormat', {
-    type: 'select',
-    options: [
-      { label: 'PDF Report', value: 'pdf' },
-      { label: 'CSV Export', value: 'csv' },
-      { label: 'JSON Data', value: 'json' }
-    ],
-    defaultValue: 'pdf'
-  })
-  .parameter('includeCharts', {
-    type: 'checkbox',
-    defaultValue: true,
-    admin: {
-      description: 'Include visual charts in the report'
-    }
-  })
-  .build()
-
-// 4. Event-driven trigger
-const userActivity = eventTrigger('user-activity')
-  .parameter('actionTypes', {
-    type: 'select',
-    hasMany: true,
-    options: ['login', 'logout', 'profile_update', 'password_change'],
-    admin: {
-      description: 'User actions that should trigger this workflow'
-    }
-  })
-  .parameter('userRoles', {
-    type: 'select',
-    hasMany: true,
-    options: ['admin', 'editor', 'user'],
-    admin: {
-      description: 'Only trigger for users with these roles'
-    }
-  })
-  .build()
-
-// 5. Simple manual trigger (no parameters)
-const manualBackup = manualTrigger('manual-backup')
-
-// 6. API trigger with authentication
-const externalApi = apiTrigger('external-api')
-  .parameter('allowedOrigins', {
-    type: 'textarea',
-    admin: {
-      description: 'Comma-separated list of allowed origins'
-    },
-    validate: (value) => {
-      if (value && typeof value === 'string') {
-        const origins = value.split(',').map(s => s.trim())
-        const validOrigins = origins.every(origin => {
-          try {
-            new URL(origin)
-            return true
-          } catch {
-            return false
-          }
-        })
-        if (!validOrigins) {
-          return 'All origins must be valid URLs'
-        }
-      }
-      return true
-    }
-  })
-  .build()
-
-// 7. Complex trigger extending common parameters
-const advancedWebhook = createAdvancedTrigger('advanced-webhook')
-  .extend(webhookParameters) // Start with webhook basics
-  .parameter('retryConfig', {
-    type: 'group',
-    fields: [
-      {
-        name: 'maxRetries',
-        type: 'number',
-        min: 0,
-        max: 10,
-        defaultValue: 3
-      },
-      {
-        name: 'retryDelay',
-        type: 'number',
-        min: 1000,
-        max: 60000,
-        defaultValue: 5000,
-        admin: {
-          description: 'Delay between retries in milliseconds'
-        }
-      }
-    ]
-  })
-  .parameter('filters', {
-    type: 'array',
-    fields: [
-      {
-        name: 'field',
-        type: 'text',
-        required: true
-      },
-      {
-        name: 'operator',
-        type: 'select',
-        options: ['equals', 'not_equals', 'contains', 'greater_than'],
-        required: true
-      },
-      {
-        name: 'value',
-        type: 'text',
-        required: true
-      }
-    ]
-  })
-  .build()
-
-// 8. Custom parameter validation
-const validatedTrigger = createTrigger('validated-trigger').parameters({
-  email: {
-    type: 'email',
-    required: true,
-    validate: (value) => {
-      if (value && typeof value === 'string') {
-        const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
-        if (!emailRegex.test(value)) {
-          return 'Please enter a valid email address'
-        }
-        // Custom business logic validation
-        if (value.endsWith('@example.com')) {
-          return 'Example.com emails are not allowed'
-        }
-      }
-      return true
-    }
-  },
-  webhookUrl: {
-    type: 'text',
-    required: true,
-    validate: (value) => {
-      if (value && typeof value === 'string') {
-        try {
-          const url = new URL(value)
-          if (!['http:', 'https:'].includes(url.protocol)) {
-            return 'URL must use HTTP or HTTPS protocol'
-          }
-          if (url.hostname === 'localhost') {
-            return 'Localhost URLs are not allowed in production'
-          }
-        } catch {
-          return 'Please enter a valid URL'
-        }
-      }
-      return true
-    }
-  }
-})
-
-/**
- * Export all triggers for use in plugin configuration
- */
-export const exampleTriggers = [
-  orderWebhook,
-  paymentWebhook,
-  dailyReport,
-  userActivity,
-  manualBackup,
-  externalApi,
-  advancedWebhook,
-  validatedTrigger
-]
-
-/**
- * Usage in payload.config.ts:
- * 
- * ```typescript
- * import { workflowsPlugin } from '@xtr-dev/payload-automation'
- * import { exampleTriggers } from './examples/trigger-builders'
- * 
- * export default buildConfig({
- *   plugins: [
- *     workflowsPlugin({
- *       triggers: exampleTriggers,
- *       // ... other config
- *     })
- *   ]
- * })
- * ```
- */

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@xtr-dev/payload-workflows",
-  "version": "0.0.27",
+  "version": "0.0.37",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@xtr-dev/payload-workflows",
-      "version": "0.0.27",
+      "version": "0.0.37",
       "license": "MIT",
       "dependencies": {
         "jsonpath-plus": "^10.3.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xtr-dev/payload-automation",
-  "version": "0.0.27",
+  "version": "0.0.37",
   "description": "PayloadCMS Automation Plugin - Comprehensive workflow automation system with visual workflow building, execution tracking, and step types",
   "license": "MIT",
   "type": "module",

src/collections/Workflow.ts

@@ -1,359 +1,123 @@
-import type {CollectionConfig, Field} from 'payload'
+import type {CollectionConfig} from 'payload'
 
 import type {WorkflowsPluginConfig} from "../plugin/config-types.js"
 
-export const createWorkflowCollection: <T extends string>(options: WorkflowsPluginConfig<T>) => CollectionConfig = ({
-                                                                                                        collectionTriggers,
-                                                                                                        steps,
-                                                                                                        triggers
-                                                                                                      }) => ({
-  slug: 'workflows',
-  access: {
-    create: () => true,
-    delete: () => true,
-    read: () => true,
-    update: () => true,
-  },
-  admin: {
-    defaultColumns: ['name', 'updatedAt'],
-    description: 'Create and manage automated workflows.',
-    group: 'Automation',
-    useAsTitle: 'name',
-  },
-  fields: [
-    {
-      name: 'name',
-      type: 'text',
-      admin: {
-        description: 'Human-readable name for the workflow',
+import {parameter} from "../fields/parameter.js"
+import {collectionTrigger, globalTrigger} from "../triggers/index.js"
+
+export const createWorkflowCollection: <T extends string>(options: WorkflowsPluginConfig<T>) => CollectionConfig = (options) => {
+  const steps = options.steps || []
+  const triggers = (options.triggers || []).map(t => t(options)).concat(collectionTrigger(options), globalTrigger(options))
+  return {
+    slug: 'workflows',
+    access: {
+      create: () => true,
+      delete: () => true,
+      read: () => true,
+      update: () => true,
+    },
+    admin: {
+      defaultColumns: ['name', 'updatedAt'],
+      description: 'Create and manage automated workflows.',
+      group: 'Automation',
+      useAsTitle: 'name',
+    },
+    fields: [
+      {
+        name: 'name',
+        type: 'text',
+        admin: {
+          description: 'Human-readable name for the workflow',
+        },
+        required: true,
       },
-      required: true,
-    },
-    {
-      name: 'description',
-      type: 'textarea',
-      admin: {
-        description: 'Optional description of what this workflow does',
+      {
+        name: 'description',
+        type: 'textarea',
+        admin: {
+          description: 'Optional description of what this workflow does',
+        },
       },
-    },
-    {
-      name: 'executionStatus',
-      type: 'ui',
-      admin: {
-        components: {
-          Field: '@/components/WorkflowExecutionStatus'
-        },
-        condition: (data) => !!data?.id // Only show for existing workflows
-      }
-    },
-    {
-      name: 'triggers',
-      type: 'array',
-      fields: [
-        {
-          name: 'type',
-          type: 'select',
-          options: [
-            'collection-trigger',
-            'webhook-trigger',
-            'global-trigger',
-            'cron-trigger',
-            ...(triggers || []).map(t => t.slug)
-          ]
-        },
-        {
-          name: 'parameters',
-          type: 'json',
-          admin: {
-            hidden: true,
-          },
-          defaultValue: {}
-        },
-        // Virtual fields for collection trigger
-        {
-          name: '__builtin_collectionSlug',
-          type: 'select',
-          admin: {
-            condition: (_, siblingData) => siblingData?.type === 'collection-trigger',
-            description: 'Collection that triggers the workflow',
-          },
-          hooks: {
-            afterRead: [
-              ({ siblingData }) => {
-                return siblingData?.parameters?.collectionSlug || undefined
-              }
-            ],
-            beforeChange: [
-              ({ siblingData, value }) => {
-                if (!siblingData.parameters) {siblingData.parameters = {}}
-                siblingData.parameters.collectionSlug = value
-                return undefined // Virtual field, don't store directly
-              }
+      {
+        name: 'triggers',
+        type: 'array',
+        fields: [
+          {
+            name: 'type',
+            type: 'select',
+            options: [
+              ...triggers.map(t => t.slug)
             ]
           },
-          options: Object.keys(collectionTriggers || {}),
-          virtual: true,
-        },
-        {
-          name: '__builtin_operation',
-          type: 'select',
-          admin: {
-            condition: (_, siblingData) => siblingData?.type === 'collection-trigger',
-            description: 'Collection operation that triggers the workflow',
-          },
-          hooks: {
-            afterRead: [
-              ({ siblingData }) => {
-                return siblingData?.parameters?.operation || undefined
-              }
-            ],
-            beforeChange: [
-              ({ siblingData, value }) => {
-                if (!siblingData.parameters) {siblingData.parameters = {}}
-                siblingData.parameters.operation = value
-                return undefined // Virtual field, don't store directly
-              }
-            ]
-          },
-          options: [
-            'create',
-            'delete',
-            'read',
-            'update',
-          ],
-          virtual: true,
-        },
-        // Virtual fields for webhook trigger
-        {
-          name: '__builtin_webhookPath',
-          type: 'text',
-          admin: {
-            condition: (_, siblingData) => siblingData?.type === 'webhook-trigger',
-            description: 'URL path for the webhook (e.g., "my-webhook"). Full URL will be /api/workflows-webhook/my-webhook',
-          },
-          hooks: {
-            afterRead: [
-              ({ siblingData }) => {
-                return siblingData?.parameters?.webhookPath || undefined
-              }
-            ],
-            beforeChange: [
-              ({ siblingData, value }) => {
-                if (!siblingData.parameters) {siblingData.parameters = {}}
-                siblingData.parameters.webhookPath = value
-                return undefined // Virtual field, don't store directly
-              }
-            ]
-          },
-          validate: (value: any, {siblingData}: any) => {
-            if (siblingData?.type === 'webhook-trigger' && !value && !siblingData?.parameters?.webhookPath) {
-              return 'Webhook path is required for webhook triggers'
-            }
-            return true
-          },
-          virtual: true,
-        },
-        // Virtual fields for global trigger
-        {
-          name: '__builtin_global',
-          type: 'select',
-          admin: {
-            condition: (_, siblingData) => siblingData?.type === 'global-trigger',
-            description: 'Global that triggers the workflow',
-          },
-          hooks: {
-            afterRead: [
-              ({ siblingData }) => {
-                return siblingData?.parameters?.global || undefined
-              }
-            ],
-            beforeChange: [
-              ({ siblingData, value }) => {
-                if (!siblingData.parameters) {siblingData.parameters = {}}
-                siblingData.parameters.global = value
-                return undefined // Virtual field, don't store directly
-              }
-            ]
-          },
-          options: [], // Will be populated dynamically based on available globals
-          virtual: true,
-        },
-        {
-          name: '__builtin_globalOperation',
-          type: 'select',
-          admin: {
-            condition: (_, siblingData) => siblingData?.type === 'global-trigger',
-            description: 'Global operation that triggers the workflow',
-          },
-          hooks: {
-            afterRead: [
-              ({ siblingData }) => {
-                return siblingData?.parameters?.globalOperation || undefined
-              }
-            ],
-            beforeChange: [
-              ({ siblingData, value }) => {
-                if (!siblingData.parameters) {siblingData.parameters = {}}
-                siblingData.parameters.globalOperation = value
-                return undefined // Virtual field, don't store directly
-              }
-            ]
-          },
-          options: [
-            'update'
-          ],
-          virtual: true,
-        },
-        // Virtual fields for cron trigger
-        {
-          name: '__builtin_cronExpression',
-          type: 'text',
-          admin: {
-            condition: (_, siblingData) => siblingData?.type === 'cron-trigger',
-            description: 'Cron expression for scheduled execution (e.g., "0 0 * * *" for daily at midnight)',
-            placeholder: '0 0 * * *'
-          },
-          hooks: {
-            afterRead: [
-              ({ siblingData }) => {
-                return siblingData?.parameters?.cronExpression || undefined
-              }
-            ],
-            beforeChange: [
-              ({ siblingData, value }) => {
-                if (!siblingData.parameters) {siblingData.parameters = {}}
-                siblingData.parameters.cronExpression = value
-                return undefined // Virtual field, don't store directly
-              }
-            ]
-          },
-          validate: (value: any, {siblingData}: any) => {
-            const cronValue = value || siblingData?.parameters?.cronExpression
-            if (siblingData?.type === 'cron-trigger' && !cronValue) {
-              return 'Cron expression is required for cron triggers'
-            }
-
-            // Validate cron expression format if provided
-            if (siblingData?.type === 'cron-trigger' && cronValue) {
-              // Basic format validation - should be 5 parts separated by spaces
-              const cronParts = cronValue.trim().split(/\s+/)
-              if (cronParts.length !== 5) {
-                return 'Invalid cron expression format. Expected 5 parts: "minute hour day month weekday" (e.g., "0 9 * * 1")'
-              }
-
-              // Additional validation could use node-cron but we avoid dynamic imports here
-              // The main validation happens at runtime in the cron scheduler
-            }
-
-            return true
-          },
-          virtual: true,
-        },
-        {
-          name: '__builtin_timezone',
-          type: 'text',
-          admin: {
-            condition: (_, siblingData) => siblingData?.type === 'cron-trigger',
-            description: 'Timezone for cron execution (e.g., "America/New_York", "Europe/London"). Defaults to UTC.',
-            placeholder: 'UTC'
-          },
-          defaultValue: 'UTC',
-          hooks: {
-            afterRead: [
-              ({ siblingData }) => {
-                return siblingData?.parameters?.timezone || 'UTC'
-              }
-            ],
-            beforeChange: [
-              ({ siblingData, value }) => {
-                if (!siblingData.parameters) {siblingData.parameters = {}}
-                siblingData.parameters.timezone = value || 'UTC'
-                return undefined // Virtual field, don't store directly
-              }
-            ]
-          },
-          validate: (value: any, {siblingData}: any) => {
-            const tzValue = value || siblingData?.parameters?.timezone
-            if (siblingData?.type === 'cron-trigger' && tzValue) {
-              try {
-                // Test if timezone is valid by trying to create a date with it
-                new Intl.DateTimeFormat('en', {timeZone: tzValue})
-                return true
-              } catch {
-                return `Invalid timezone: ${tzValue}. Please use a valid IANA timezone identifier (e.g., "America/New_York", "Europe/London")`
-              }
-            }
-            return true
-          },
-          virtual: true,
-        },
-        {
-          name: 'condition',
-          type: 'text',
-          admin: {
-            description: 'JSONPath expression that must evaluate to true for this trigger to execute the workflow (e.g., "$.trigger.doc.status == \'published\'")'
-          },
-          required: false
-        },
-        // Virtual fields for custom triggers
-        // Note: Custom trigger fields from trigger-helpers already have unique names
-        // We just need to pass them through without modification
-        ...(triggers || []).flatMap(t => (t.inputs || []))
-      ]
-    },
-    {
-      name: 'steps',
-      type: 'array',
-      fields: [
-        {
-          type: 'row',
-          fields: [
-            {
-              name: 'step',
-              type: 'select',
-              options: steps.map(t => t.slug)
+          {
+            name: 'parameters',
+            type: 'json',
+            admin: {
+              hidden: true,
             },
-            {
-              name: 'name',
-              type: 'text',
-            }
-          ]
-        },
-        ...(steps || []).flatMap(step => (step.inputSchema || []).map(field => ({
-          ...field,
-          admin: {
-            ...(field.admin || {}),
-            condition: (...args) => args[1]?.step === step.slug && (
-              field.admin?.condition ?
-                field.admin.condition.call(this, ...args) :
-                true
-            ),
+            defaultValue: {}
           },
-        } as Field))),
-        {
-          name: 'dependencies',
-          type: 'text',
-          admin: {
-            description: 'Step names that must complete before this step can run'
+          // Virtual fields for custom triggers
+          ...triggers.flatMap(t => (t.parameters || []).map(p => parameter(t.slug, p as any))),
+          {
+            name: 'condition',
+            type: 'text',
+            admin: {
+              description: 'JSONPath expression that must evaluate to true for this trigger to execute the workflow (e.g., "$.trigger.doc.status == \'published\'")'
+            },
+            required: false
           },
-          hasMany: true,
-          required: false
-        },
-        {
-          name: 'condition',
-          type: 'text',
-          admin: {
-            description: 'JSONPath expression that must evaluate to true for this step to execute (e.g., "$.trigger.doc.status == \'published\'")'
+        ]
+      },
+      {
+        name: 'steps',
+        type: 'array',
+        fields: [
+          {
+            name: 'name',
+            type: 'text',
+            defaultValue: 'Unnamed Step'
           },
-          required: false
-        },
-      ],
-    }
-  ],
-  versions: {
-    drafts: {
-      autosave: false,
+          {
+            name: 'type',
+            type: 'select',
+            options: steps.map(t => t.slug)
+          },
+          {
+            name: 'parameters',
+            type: 'json',
+            admin: {
+              hidden: true,
+            },
+            defaultValue: {}
+          },
+          // Virtual fields for custom triggers
+          ...steps.flatMap(step => (step.inputSchema || []).map(s => parameter(step.slug, s as any))),
+          {
+            name: 'dependencies',
+            type: 'text',
+            admin: {
+              description: 'Step names that must complete before this step can run'
+            },
+            hasMany: true,
+            required: false
+          },
+          {
+            name: 'condition',
+            type: 'text',
+            admin: {
+              description: 'JSONPath expression that must evaluate to true for this step to execute (e.g., "$.trigger.doc.status == \'published\'")'
+            },
+            required: false
+          },
+        ],
+      }
+    ],
+    versions: {
+      drafts: {
+        autosave: false,
+      },
+      maxPerDoc: 10,
     },
-    maxPerDoc: 10,
-  },
-})
+  }
+}

src/collections/WorkflowRuns.ts

@@ -40,7 +40,7 @@ export const WorkflowRunsCollection: CollectionConfig = {
       admin: {
         description: 'Current execution status',
         components: {
-          Cell: '@/components/StatusCell'
+          Cell: '@xtr-dev/payload-automation/client#StatusCell'
         }
       },
       defaultValue: 'pending',
@@ -141,7 +141,7 @@ export const WorkflowRunsCollection: CollectionConfig = {
         description: 'Error message if workflow execution failed',
         condition: (_, siblingData) => siblingData?.status === 'failed',
         components: {
-          Field: '@/components/ErrorDisplay'
+          Field: '@xtr-dev/payload-automation/client#ErrorDisplay'
         }
       },
     },

src/components/ErrorDisplay.tsx

@@ -10,10 +10,10 @@ interface ErrorDisplayProps {
   path?: string
 }
 
-export const ErrorDisplay: React.FC<ErrorDisplayProps> = ({ 
-  value, 
-  onChange, 
-  readOnly = false 
+export const ErrorDisplay: React.FC<ErrorDisplayProps> = ({
+  value,
+  onChange,
+  readOnly = false
 }) => {
   const [expanded, setExpanded] = useState(false)
 
@@ -32,7 +32,7 @@ export const ErrorDisplay: React.FC<ErrorDisplayProps> = ({
         technical: error
       }
     }
-    
+
     if (error.includes('Network error') || error.includes('fetch')) {
       return {
         type: 'network',
@@ -41,7 +41,7 @@ export const ErrorDisplay: React.FC<ErrorDisplayProps> = ({
         technical: error
       }
     }
-    
+
     if (error.includes('Hook execution failed')) {
       return {
         type: 'hook',
@@ -50,7 +50,7 @@ export const ErrorDisplay: React.FC<ErrorDisplayProps> = ({
         technical: error
       }
     }
-    
+
     if (error.includes('Executor not available')) {
       return {
         type: 'executor',
@@ -59,7 +59,7 @@ export const ErrorDisplay: React.FC<ErrorDisplayProps> = ({
         technical: error
       }
     }
-    
+
     if (error.includes('Collection slug is required') || error.includes('Document data is required')) {
       return {
         type: 'validation',
@@ -68,7 +68,7 @@ export const ErrorDisplay: React.FC<ErrorDisplayProps> = ({
         technical: error
       }
     }
-    
+
     if (error.includes('status') && error.includes('4')) {
       return {
         type: 'client',
@@ -77,7 +77,7 @@ export const ErrorDisplay: React.FC<ErrorDisplayProps> = ({
         technical: error
       }
     }
-    
+
     if (error.includes('status') && error.includes('5')) {
       return {
         type: 'server',
@@ -127,7 +127,7 @@ export const ErrorDisplay: React.FC<ErrorDisplayProps> = ({
   const errorColor = getErrorColor(errorInfo.type)
 
   return (
-    <div style={{ 
+    <div style={{
       border: `2px solid ${errorColor}30`,
       borderRadius: '8px',
       backgroundColor: `${errorColor}08`,
@@ -135,9 +135,9 @@ export const ErrorDisplay: React.FC<ErrorDisplayProps> = ({
       marginTop: '8px'
     }}>
       {/* Error Header */}
-      <div style={{ 
-        display: 'flex', 
-        alignItems: 'center', 
+      <div style={{
+        display: 'flex',
+        alignItems: 'center',
         gap: '12px',
         marginBottom: '12px'
       }}>
@@ -145,15 +145,15 @@ export const ErrorDisplay: React.FC<ErrorDisplayProps> = ({
           {getErrorIcon(errorInfo.type)}
         </span>
         <div>
-          <h4 style={{ 
-            margin: 0, 
+          <h4 style={{
+            margin: 0,
             color: errorColor,
             fontSize: '16px',
             fontWeight: '600'
           }}>
             {errorInfo.title}
           </h4>
-          <p style={{ 
+          <p style={{
             margin: '4px 0 0 0',
             color: '#6B7280',
             fontSize: '14px',
@@ -166,15 +166,16 @@ export const ErrorDisplay: React.FC<ErrorDisplayProps> = ({
 
       {/* Technical Details Toggle */}
       <div>
-        <Button
-          onClick={() => setExpanded(!expanded)}
-          size="small"
-          buttonStyle="secondary"
-          style={{ marginBottom: expanded ? '12px' : '0' }}
-        >
-          {expanded ? 'Hide' : 'Show'} Technical Details
-        </Button>
-        
+        <div style={{ marginBottom: expanded ? '12px' : '0' }}>
+          <Button
+            buttonStyle="secondary"
+            onClick={() => setExpanded(!expanded)}
+            size="small"
+          >
+            {expanded ? 'Hide' : 'Show'} Technical Details
+          </Button>
+        </div>
+
         {expanded && (
           <div style={{
             backgroundColor: '#F8F9FA',
@@ -193,7 +194,7 @@ export const ErrorDisplay: React.FC<ErrorDisplayProps> = ({
       </div>
 
       {/* Quick Actions */}
-      <div style={{ 
+      <div style={{
         marginTop: '12px',
         padding: '12px',
         backgroundColor: `${errorColor}10`,
@@ -252,11 +253,11 @@ export const ErrorDisplay: React.FC<ErrorDisplayProps> = ({
       {/* Hidden textarea for editing if needed */}
       {!readOnly && onChange && (
         <textarea
-          value={value}
           onChange={(e) => onChange(e.target.value)}
           style={{ display: 'none' }}
+          value={value}
         />
       )}
     </div>
   )
-}
+}

src/components/TriggerWorkflowButton.tsx

@@ -1,64 +0,0 @@
-'use client'
-
-import { Button, toast } from '@payloadcms/ui'
-import { useState } from 'react'
-
-interface TriggerWorkflowButtonProps {
-  workflowId: string
-  workflowName: string
-  triggerSlug?: string
-}
-
-export const TriggerWorkflowButton: React.FC<TriggerWorkflowButtonProps> = ({
-  workflowId,
-  workflowName,
-  triggerSlug = 'manual-trigger'
-}) => {
-  const [loading, setLoading] = useState(false)
-
-  const handleTrigger = async () => {
-    setLoading(true)
-    
-    try {
-      const response = await fetch('/api/workflows/trigger-custom', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          workflowId,
-          triggerSlug,
-          data: {
-            triggeredAt: new Date().toISOString(),
-            source: 'admin-button'
-          }
-        }),
-      })
-
-      if (!response.ok) {
-        const error = await response.json()
-        throw new Error(error.message || 'Failed to trigger workflow')
-      }
-
-      const result = await response.json()
-      
-      toast.success(`Workflow "${workflowName}" triggered successfully! Run ID: ${result.runId}`)
-    } catch (error) {
-      console.error('Error triggering workflow:', error)
-      toast.error(`Failed to trigger workflow: ${error instanceof Error ? error.message : 'Unknown error'}`)
-    } finally {
-      setLoading(false)
-    }
-  }
-
-  return (
-    <Button
-      onClick={handleTrigger}
-      disabled={loading}
-      size="small"
-      buttonStyle="secondary"
-    >
-      {loading ? 'Triggering...' : 'Trigger Workflow'}
-    </Button>
-  )
-}

src/components/WorkflowExecutionStatus.tsx

@@ -1,231 +0,0 @@
-'use client'
-
-import React, { useState, useEffect } from 'react'
-import { Button } from '@payloadcms/ui'
-
-interface WorkflowRun {
-  id: string
-  status: 'pending' | 'running' | 'completed' | 'failed' | 'cancelled'
-  startedAt: string
-  completedAt?: string
-  error?: string
-  triggeredBy: string
-}
-
-interface WorkflowExecutionStatusProps {
-  workflowId: string | number
-}
-
-export const WorkflowExecutionStatus: React.FC<WorkflowExecutionStatusProps> = ({ workflowId }) => {
-  const [runs, setRuns] = useState<WorkflowRun[]>([])
-  const [loading, setLoading] = useState(true)
-  const [expanded, setExpanded] = useState(false)
-
-  useEffect(() => {
-    const fetchRecentRuns = async () => {
-      try {
-        const response = await fetch(`/api/workflow-runs?where[workflow][equals]=${workflowId}&limit=5&sort=-startedAt`)
-        if (response.ok) {
-          const data = await response.json()
-          setRuns(data.docs || [])
-        }
-      } catch (error) {
-        console.warn('Failed to fetch workflow runs:', error)
-      } finally {
-        setLoading(false)
-      }
-    }
-
-    fetchRecentRuns()
-  }, [workflowId])
-
-  if (loading) {
-    return (
-      <div style={{ padding: '16px', color: '#6B7280' }}>
-        Loading execution history...
-      </div>
-    )
-  }
-
-  if (runs.length === 0) {
-    return (
-      <div style={{ 
-        padding: '16px',
-        backgroundColor: '#F9FAFB',
-        border: '1px solid #E5E7EB',
-        borderRadius: '8px',
-        color: '#6B7280',
-        textAlign: 'center'
-      }}>
-        📋 No execution history yet
-        <br />
-        <small>This workflow hasn't been triggered yet.</small>
-      </div>
-    )
-  }
-
-  const getStatusIcon = (status: string) => {
-    switch (status) {
-      case 'pending': return '⏳'
-      case 'running': return '🔄'
-      case 'completed': return '✅'
-      case 'failed': return '❌'
-      case 'cancelled': return '⏹️'
-      default: return '❓'
-    }
-  }
-
-  const getStatusColor = (status: string) => {
-    switch (status) {
-      case 'pending': return '#6B7280'
-      case 'running': return '#3B82F6'
-      case 'completed': return '#10B981'
-      case 'failed': return '#EF4444'
-      case 'cancelled': return '#F59E0B'
-      default: return '#6B7280'
-    }
-  }
-
-  const formatDate = (dateString: string) => {
-    const date = new Date(dateString)
-    const now = new Date()
-    const diffMs = now.getTime() - date.getTime()
-    
-    if (diffMs < 60000) { // Less than 1 minute
-      return 'Just now'
-    } else if (diffMs < 3600000) { // Less than 1 hour
-      return `${Math.floor(diffMs / 60000)} min ago`
-    } else if (diffMs < 86400000) { // Less than 1 day
-      return `${Math.floor(diffMs / 3600000)} hrs ago`
-    } else {
-      return date.toLocaleDateString()
-    }
-  }
-
-  const getDuration = (startedAt: string, completedAt?: string) => {
-    const start = new Date(startedAt)
-    const end = completedAt ? new Date(completedAt) : new Date()
-    const diffMs = end.getTime() - start.getTime()
-    
-    if (diffMs < 1000) return '<1s'
-    if (diffMs < 60000) return `${Math.floor(diffMs / 1000)}s`
-    if (diffMs < 3600000) return `${Math.floor(diffMs / 60000)}m ${Math.floor((diffMs % 60000) / 1000)}s`
-    return `${Math.floor(diffMs / 3600000)}h ${Math.floor((diffMs % 3600000) / 60000)}m`
-  }
-
-  const recentRun = runs[0]
-  const recentStatus = getStatusIcon(recentRun.status)
-  const recentColor = getStatusColor(recentRun.status)
-
-  return (
-    <div style={{
-      border: '1px solid #E5E7EB',
-      borderRadius: '8px',
-      backgroundColor: '#FAFAFA'
-    }}>
-      {/* Summary Header */}
-      <div style={{
-        padding: '16px',
-        borderBottom: expanded ? '1px solid #E5E7EB' : 'none',
-        display: 'flex',
-        justifyContent: 'space-between',
-        alignItems: 'center'
-      }}>
-        <div style={{ display: 'flex', alignItems: 'center', gap: '12px' }}>
-          <span style={{ fontSize: '20px' }}>{recentStatus}</span>
-          <div>
-            <div style={{ fontWeight: '600', color: recentColor }}>
-              Last run: {recentRun.status}
-            </div>
-            <div style={{ fontSize: '13px', color: '#6B7280' }}>
-              {formatDate(recentRun.startedAt)} • Duration: {getDuration(recentRun.startedAt, recentRun.completedAt)}
-            </div>
-          </div>
-        </div>
-        
-        <Button
-          onClick={() => setExpanded(!expanded)}
-          size="small"
-          buttonStyle="secondary"
-        >
-          {expanded ? 'Hide' : 'Show'} History ({runs.length})
-        </Button>
-      </div>
-
-      {/* Detailed History */}
-      {expanded && (
-        <div style={{ padding: '16px' }}>
-          <h4 style={{ margin: '0 0 12px 0', fontSize: '14px', fontWeight: '600' }}>
-            Recent Executions
-          </h4>
-          
-          {runs.map((run, index) => (
-            <div
-              key={run.id}
-              style={{
-                display: 'flex',
-                justifyContent: 'space-between',
-                alignItems: 'center',
-                padding: '8px 12px',
-                marginBottom: index < runs.length - 1 ? '8px' : '0',
-                backgroundColor: 'white',
-                border: '1px solid #E5E7EB',
-                borderRadius: '6px'
-              }}
-            >
-              <div style={{ display: 'flex', alignItems: 'center', gap: '10px' }}>
-                <span style={{ fontSize: '16px' }}>
-                  {getStatusIcon(run.status)}
-                </span>
-                
-                <div>
-                  <div style={{ 
-                    fontSize: '13px', 
-                    fontWeight: '500',
-                    color: getStatusColor(run.status)
-                  }}>
-                    {run.status.charAt(0).toUpperCase() + run.status.slice(1)}
-                  </div>
-                  <div style={{ fontSize: '12px', color: '#6B7280' }}>
-                    {formatDate(run.startedAt)} • {run.triggeredBy}
-                  </div>
-                </div>
-              </div>
-              
-              <div style={{ 
-                fontSize: '12px', 
-                color: '#6B7280',
-                textAlign: 'right'
-              }}>
-                <div>
-                  {getDuration(run.startedAt, run.completedAt)}
-                </div>
-                {run.error && (
-                  <div style={{ color: '#EF4444', marginTop: '2px' }}>
-                    Error
-                  </div>
-                )}
-              </div>
-            </div>
-          ))}
-          
-          <div style={{ 
-            marginTop: '12px', 
-            textAlign: 'center' 
-          }}>
-            <Button
-              onClick={() => {
-                // Navigate to workflow runs filtered by this workflow
-                window.location.href = `/admin/collections/workflow-runs?where[workflow][equals]=${workflowId}`
-              }}
-              size="small"
-              buttonStyle="secondary"
-            >
-              View All Runs →
-            </Button>
-          </div>
-        </div>
-      )}
-    </div>
-  )
-}

src/core/workflow-executor.ts

@@ -5,28 +5,25 @@ import type { Payload, PayloadRequest } from 'payload'
 export type PayloadWorkflow = {
   id: number
   name: string
-  description?: string | null
+  description?: null | string
   triggers?: Array<{
-    type?: string | null
-    condition?: string | null
+    type?: null | string
+    condition?: null | string
     parameters?: {
-      collectionSlug?: string | null
-      operation?: string | null
-      webhookPath?: string | null
-      cronExpression?: string | null
-      timezone?: string | null
-      global?: string | null
-      globalOperation?: string | null
+      collectionSlug?: null | string
+      operation?: null | string
+      global?: null | string
+      globalOperation?: null | string
       [key: string]: unknown
     } | null
     [key: string]: unknown
   }> | null
   steps?: Array<{
-    step?: string | null
-    name?: string | null
+    step?: null | string
+    name?: null | string
     input?: unknown
-    dependencies?: string[] | null
-    condition?: string | null
+    dependencies?: null | string[]
+    condition?: null | string
     [key: string]: unknown
   }> | null
   [key: string]: unknown
@@ -35,63 +32,18 @@ export type PayloadWorkflow = {
 import { JSONPath } from 'jsonpath-plus'
 
 // Helper type to extract workflow step data from the generated types
-export type WorkflowStep = NonNullable<PayloadWorkflow['steps']>[0] & {
+export type WorkflowStep = {
   name: string // Ensure name is always present for our execution logic
-}
+} & NonNullable<PayloadWorkflow['steps']>[0]
 
-// Helper type to extract workflow trigger data from the generated types  
-export type WorkflowTrigger = NonNullable<PayloadWorkflow['triggers']>[0] & {
+// Helper type to extract workflow trigger data from the generated types
+export type WorkflowTrigger = {
   type: string // Ensure type is always present for our execution logic
-}
+} & NonNullable<PayloadWorkflow['triggers']>[0]
 
 export interface ExecutionContext {
-  steps: Record<string, {
-    error?: string
-    input: unknown
-    output: unknown
-    state: 'failed' | 'pending' | 'running' | 'succeeded'
-    _startTime?: number
-    executionInfo?: {
-      completed: boolean
-      success: boolean
-      executedAt: string
-      duration: number
-      failureReason?: string
-    }
-    errorDetails?: {
-      stepId: string
-      errorType: string
-      duration: number
-      attempts: number
-      finalError: string
-      context: {
-        url?: string
-        method?: string
-        timeout?: number
-        statusCode?: number
-        headers?: Record<string, string>
-        [key: string]: any
-      }
-      timestamp: string
-    }
-  }>
-  trigger: {
-    collection?: string
-    data?: unknown
-    doc?: unknown
-    headers?: Record<string, string>
-    operation?: string
-    path?: string
-    previousDoc?: unknown
-    req?: PayloadRequest
-    triggeredAt?: string
-    type: string
-    user?: {
-      collection?: string
-      email?: string
-      id?: string
-    }
-  }
+  steps: Record<string, any>
+  trigger: Record<string, any>
 }
 
 export class WorkflowExecutor {
@@ -100,6 +52,25 @@ export class WorkflowExecutor {
     private logger: Payload['logger']
   ) {}
 
+  /**
+   * Classifies error types based on error messages
+   */
+  private classifyErrorType(errorMessage: string): string {
+    if (errorMessage.includes('timeout') || errorMessage.includes('ETIMEDOUT')) {
+      return 'timeout'
+    }
+    if (errorMessage.includes('ENOTFOUND') || errorMessage.includes('getaddrinfo')) {
+      return 'dns'
+    }
+    if (errorMessage.includes('ECONNREFUSED') || errorMessage.includes('ECONNRESET')) {
+      return 'connection'
+    }
+    if (errorMessage.includes('network') || errorMessage.includes('fetch')) {
+      return 'network'
+    }
+    return 'unknown'
+  }
+
   /**
    * Evaluate a step condition using JSONPath
    */
@@ -191,20 +162,32 @@ export class WorkflowExecutor {
     }
 
     // Move taskSlug declaration outside try block so it's accessible in catch
-    const taskSlug = step.step // Use the 'step' field for task type
+    const taskSlug = step.type as string
 
     try {
       // Extract input data from step - PayloadCMS flattens inputSchema fields to step level
       const inputFields: Record<string, unknown> = {}
-      
+
       // Get all fields except the core step fields
-      const coreFields = ['step', 'name', 'dependencies', 'condition']
+      const coreFields = ['step', 'name', 'dependencies', 'condition', 'type', 'id', 'parameters']
       for (const [key, value] of Object.entries(step)) {
         if (!coreFields.includes(key)) {
-          inputFields[key] = value
+          // Handle flattened parameters (remove 'parameter' prefix)
+          if (key.startsWith('parameter')) {
+            const cleanKey = key.replace('parameter', '')
+            const properKey = cleanKey.charAt(0).toLowerCase() + cleanKey.slice(1)
+            inputFields[properKey] = value
+          } else {
+            inputFields[key] = value
+          }
         }
       }
-      
+
+      // Also extract from nested parameters object if it exists
+      if (step.parameters && typeof step.parameters === 'object') {
+        Object.assign(inputFields, step.parameters)
+      }
+
       // Resolve input data using JSONPath
       const resolvedInput = this.resolveStepInput(inputFields, context)
       context.steps[stepName].input = resolvedInput
@@ -232,8 +215,8 @@ export class WorkflowExecutor {
         id: job.id,
         req
       })
-      
-      this.logger.info({ 
+
+      this.logger.info({
         jobId: job.id,
         runResult: runResults,
         hasResult: !!runResults
@@ -278,7 +261,7 @@ export class WorkflowExecutor {
         if (!errorMessage && taskStatus?.output?.error) {
           errorMessage = taskStatus.output.error
         }
-        
+
         // Check if task handler returned with state='failed'
         if (!errorMessage && taskStatus?.state === 'failed') {
           errorMessage = 'Task handler returned a failed state'
@@ -339,7 +322,7 @@ export class WorkflowExecutor {
         const errorDetails = this.extractErrorDetailsFromJob(completedJob, context.steps[stepName], stepName)
         if (errorDetails) {
           context.steps[stepName].errorDetails = errorDetails
-          
+
           this.logger.info({
             stepName,
             errorType: errorDetails.errorType,
@@ -402,6 +385,95 @@ export class WorkflowExecutor {
     }
   }
 
+  /**
+   * Extracts detailed error information from job logs and input
+   */
+  private extractErrorDetailsFromJob(job: any, stepContext: any, stepName: string) {
+    try {
+      // Get error information from multiple sources
+      const input = stepContext.input || {}
+      const logs = job.log || []
+      const latestLog = logs[logs.length - 1]
+
+      // Extract error message from job error or log
+      const errorMessage = job.error?.message || latestLog?.error?.message || 'Unknown error'
+
+      // For timeout scenarios, check if it's a timeout based on duration and timeout setting
+      let errorType = this.classifyErrorType(errorMessage)
+
+      // Special handling for HTTP timeouts - if task failed and duration exceeds timeout, it's likely a timeout
+      if (errorType === 'unknown' && input.timeout && stepContext.executionInfo?.duration) {
+        const timeoutMs = parseInt(input.timeout) || 30000
+        const actualDuration = stepContext.executionInfo.duration
+
+        // If execution duration is close to or exceeds timeout, classify as timeout
+        if (actualDuration >= (timeoutMs * 0.9)) { // 90% of timeout threshold
+          errorType = 'timeout'
+          this.logger.debug({
+            timeoutMs,
+            actualDuration,
+            stepName
+          }, 'Classified error as timeout based on duration analysis')
+        }
+      }
+
+      // Calculate duration from execution info if available
+      const duration = stepContext.executionInfo?.duration || 0
+
+      // Extract attempt count from logs
+      const attempts = job.totalTried || 1
+
+      return {
+        stepId: `${stepName}-${Date.now()}`,
+        errorType,
+        duration,
+        attempts,
+        finalError: errorMessage,
+        context: {
+          url: input.url,
+          method: input.method,
+          timeout: input.timeout,
+          statusCode: latestLog?.output?.status,
+          headers: input.headers
+        },
+        timestamp: new Date().toISOString()
+      }
+    } catch (error) {
+      this.logger.warn({
+        error: error instanceof Error ? error.message : 'Unknown error',
+        stepName
+      }, 'Failed to extract error details from job')
+      return null
+    }
+  }
+
+  /**
+   * Parse a condition value (string literal, number, boolean, or JSONPath)
+   */
+  private parseConditionValue(expr: string, context: ExecutionContext): any {
+    // Handle string literals
+    if ((expr.startsWith('"') && expr.endsWith('"')) || (expr.startsWith("'") && expr.endsWith("'"))) {
+      return expr.slice(1, -1) // Remove quotes
+    }
+
+    // Handle boolean literals
+    if (expr === 'true') {return true}
+    if (expr === 'false') {return false}
+
+    // Handle number literals
+    if (/^-?\d+(?:\.\d+)?$/.test(expr)) {
+      return Number(expr)
+    }
+
+    // Handle JSONPath expressions
+    if (expr.startsWith('$')) {
+      return this.resolveJSONPathValue(expr, context)
+    }
+
+    // Return as string if nothing else matches
+    return expr
+  }
+
   /**
    * Resolve step execution order based on dependencies
    */
@@ -459,6 +531,22 @@ export class WorkflowExecutor {
     return executionBatches
   }
 
+  /**
+   * Resolve a JSONPath value from the context
+   */
+  private resolveJSONPathValue(expr: string, context: ExecutionContext): any {
+    if (expr.startsWith('$')) {
+      const result = JSONPath({
+        json: context,
+        path: expr,
+        wrap: false
+      })
+      // Return first result if array, otherwise the result itself
+      return Array.isArray(result) && result.length > 0 ? result[0] : result
+    }
+    return expr
+  }
+
   /**
    * Resolve step input using JSONPath expressions
    */
@@ -488,14 +576,14 @@ export class WorkflowExecutor {
             path: value,
             wrap: false
           })
-          
+
           this.logger.debug({
             key,
             jsonPath: value,
             result: JSON.stringify(result).substring(0, 200),
             resultType: Array.isArray(result) ? 'array' : typeof result
           }, 'JSONPath resolved successfully')
-          
+
           resolved[key] = result
         } catch (error) {
           this.logger.warn({
@@ -512,7 +600,7 @@ export class WorkflowExecutor {
           key,
           nestedKeys: Object.keys(value as Record<string, unknown>)
         }, 'Recursively resolving nested object')
-        
+
         resolved[key] = this.resolveStepInput(value as Record<string, unknown>, context)
       } else {
         // Keep literal values as-is
@@ -533,22 +621,22 @@ export class WorkflowExecutor {
    */
   private safeSerialize(obj: unknown): unknown {
     const seen = new WeakSet()
-    
+
     const serialize = (value: unknown): unknown => {
       if (value === null || typeof value !== 'object') {
         return value
       }
-      
-      if (seen.has(value as object)) {
+
+      if (seen.has(value)) {
         return '[Circular Reference]'
       }
-      
-      seen.add(value as object)
-      
+
+      seen.add(value)
+
       if (Array.isArray(value)) {
         return value.map(serialize)
       }
-      
+
       const result: Record<string, unknown> = {}
       for (const [key, val] of Object.entries(value as Record<string, unknown>)) {
         try {
@@ -562,94 +650,13 @@ export class WorkflowExecutor {
           result[key] = '[Non-serializable]'
         }
       }
-      
+
       return result
     }
-    
+
     return serialize(obj)
   }
 
-  /**
-   * Extracts detailed error information from job logs and input
-   */
-  private extractErrorDetailsFromJob(job: any, stepContext: any, stepName: string) {
-    try {
-      // Get error information from multiple sources
-      const input = stepContext.input || {}
-      const logs = job.log || []
-      const latestLog = logs[logs.length - 1]
-      
-      // Extract error message from job error or log
-      const errorMessage = job.error?.message || latestLog?.error?.message || 'Unknown error'
-      
-      // For timeout scenarios, check if it's a timeout based on duration and timeout setting
-      let errorType = this.classifyErrorType(errorMessage)
-      
-      // Special handling for HTTP timeouts - if task failed and duration exceeds timeout, it's likely a timeout
-      if (errorType === 'unknown' && input.timeout && stepContext.executionInfo?.duration) {
-        const timeoutMs = parseInt(input.timeout) || 30000
-        const actualDuration = stepContext.executionInfo.duration
-        
-        // If execution duration is close to or exceeds timeout, classify as timeout
-        if (actualDuration >= (timeoutMs * 0.9)) { // 90% of timeout threshold
-          errorType = 'timeout'
-          this.logger.debug({
-            timeoutMs,
-            actualDuration,
-            stepName
-          }, 'Classified error as timeout based on duration analysis')
-        }
-      }
-      
-      // Calculate duration from execution info if available
-      const duration = stepContext.executionInfo?.duration || 0
-      
-      // Extract attempt count from logs
-      const attempts = job.totalTried || 1
-      
-      return {
-        stepId: `${stepName}-${Date.now()}`,
-        errorType,
-        duration,
-        attempts,
-        finalError: errorMessage,
-        context: {
-          url: input.url,
-          method: input.method,
-          timeout: input.timeout,
-          statusCode: latestLog?.output?.status,
-          headers: input.headers
-        },
-        timestamp: new Date().toISOString()
-      }
-    } catch (error) {
-      this.logger.warn({
-        error: error instanceof Error ? error.message : 'Unknown error',
-        stepName
-      }, 'Failed to extract error details from job')
-      return null
-    }
-  }
-
-  /**
-   * Classifies error types based on error messages
-   */
-  private classifyErrorType(errorMessage: string): string {
-    if (errorMessage.includes('timeout') || errorMessage.includes('ETIMEDOUT')) {
-      return 'timeout'
-    }
-    if (errorMessage.includes('ENOTFOUND') || errorMessage.includes('getaddrinfo')) {
-      return 'dns'
-    }
-    if (errorMessage.includes('ECONNREFUSED') || errorMessage.includes('ECONNRESET')) {
-      return 'connection'
-    }
-    if (errorMessage.includes('network') || errorMessage.includes('fetch')) {
-      return 'network'
-    }
-    return 'unknown'
-  }
-
   /**
    * Update workflow run with current context
    */
@@ -697,16 +704,16 @@ export class WorkflowExecutor {
     try {
       // Check if this is a comparison expression
       const comparisonMatch = condition.match(/^(.+?)\s*(==|!=|>|<|>=|<=)\s*(.+)$/)
-      
+
       if (comparisonMatch) {
         const [, leftExpr, operator, rightExpr] = comparisonMatch
-        
+
         // Evaluate left side (should be JSONPath)
         const leftValue = this.resolveJSONPathValue(leftExpr.trim(), context)
-        
+
         // Parse right side (could be string, number, boolean, or JSONPath)
         const rightValue = this.parseConditionValue(rightExpr.trim(), context)
-        
+
         this.logger.debug({
           condition,
           leftExpr: leftExpr.trim(),
@@ -717,32 +724,32 @@ export class WorkflowExecutor {
           leftType: typeof leftValue,
           rightType: typeof rightValue
         }, 'Evaluating comparison condition')
-        
+
         // Perform comparison
         let result: boolean
         switch (operator) {
-          case '==':
-            result = leftValue === rightValue
-            break
           case '!=':
             result = leftValue !== rightValue
             break
-          case '>':
-            result = Number(leftValue) > Number(rightValue)
-            break
           case '<':
             result = Number(leftValue) < Number(rightValue)
             break
-          case '>=':
-            result = Number(leftValue) >= Number(rightValue)
-            break
           case '<=':
             result = Number(leftValue) <= Number(rightValue)
             break
+          case '==':
+            result = leftValue === rightValue
+            break
+          case '>':
+            result = Number(leftValue) > Number(rightValue)
+            break
+          case '>=':
+            result = Number(leftValue) >= Number(rightValue)
+            break
           default:
             throw new Error(`Unknown comparison operator: ${operator}`)
         }
-        
+
         this.logger.debug({
           condition,
           result,
@@ -750,7 +757,7 @@ export class WorkflowExecutor {
           rightValue,
           operator
         }, 'Comparison condition evaluation completed')
-        
+
         return result
       } else {
         // Treat as simple JSONPath boolean evaluation
@@ -794,49 +801,6 @@ export class WorkflowExecutor {
       return false
     }
   }
-  
-  /**
-   * Resolve a JSONPath value from the context
-   */
-  private resolveJSONPathValue(expr: string, context: ExecutionContext): any {
-    if (expr.startsWith('$')) {
-      const result = JSONPath({
-        json: context,
-        path: expr,
-        wrap: false
-      })
-      // Return first result if array, otherwise the result itself
-      return Array.isArray(result) && result.length > 0 ? result[0] : result
-    }
-    return expr
-  }
-  
-  /**
-   * Parse a condition value (string literal, number, boolean, or JSONPath)
-   */
-  private parseConditionValue(expr: string, context: ExecutionContext): any {
-    // Handle string literals
-    if ((expr.startsWith('"') && expr.endsWith('"')) || (expr.startsWith("'") && expr.endsWith("'"))) {
-      return expr.slice(1, -1) // Remove quotes
-    }
-    
-    // Handle boolean literals
-    if (expr === 'true') return true
-    if (expr === 'false') return false
-    
-    // Handle number literals
-    if (/^-?\d+(\.\d+)?$/.test(expr)) {
-      return Number(expr)
-    }
-    
-    // Handle JSONPath expressions
-    if (expr.startsWith('$')) {
-      return this.resolveJSONPathValue(expr, context)
-    }
-    
-    // Return as string if nothing else matches
-    return expr
-  }
 
   /**
    * Execute a workflow with the given context
@@ -979,163 +943,4 @@ export class WorkflowExecutor {
       throw error
     }
   }
-
-  /**
-   * Find and execute workflows triggered by a collection operation
-   */
-  async executeTriggeredWorkflows(
-    collection: string,
-    operation: 'create' | 'delete' | 'read' | 'update',
-    doc: unknown,
-    previousDoc: unknown,
-    req: PayloadRequest
-  ): Promise<void> {
-    console.log('🚨 EXECUTOR: executeTriggeredWorkflows called!')
-    console.log('🚨 EXECUTOR: Collection =', collection)
-    console.log('🚨 EXECUTOR: Operation =', operation)
-    console.log('🚨 EXECUTOR: Doc ID =', (doc as any)?.id)
-    console.log('🚨 EXECUTOR: Has payload?', !!this.payload)
-    console.log('🚨 EXECUTOR: Has logger?', !!this.logger)
-    
-    this.logger.info({
-      collection,
-      operation,
-      docId: (doc as any)?.id
-    }, 'executeTriggeredWorkflows called')
-    
-    try {
-      // Find workflows with matching triggers
-      const workflows = await this.payload.find({
-        collection: 'workflows',
-        depth: 2, // Include steps and triggers
-        limit: 100,
-        req
-      })
-      
-      this.logger.info({
-        workflowCount: workflows.docs.length
-      }, 'Found workflows to check')
-
-      for (const workflow of workflows.docs) {
-        // Check if this workflow has a matching trigger
-        const triggers = workflow.triggers as Array<{
-          condition?: string
-          type: string
-          parameters?: {
-            collection?: string
-            collectionSlug?: string
-            operation?: string
-            [key: string]: any
-          }
-        }>
-        
-        this.logger.debug({
-          workflowId: workflow.id,
-          workflowName: workflow.name,
-          triggerCount: triggers?.length || 0,
-          triggers: triggers?.map(t => ({
-            type: t.type,
-            collection: t.parameters?.collection,
-            collectionSlug: t.parameters?.collectionSlug,
-            operation: t.parameters?.operation
-          }))
-        }, 'Checking workflow triggers')
-
-        const matchingTriggers = triggers?.filter(trigger =>
-          trigger.type === 'collection-trigger' &&
-          (trigger.parameters?.collection === collection || trigger.parameters?.collectionSlug === collection) &&
-          trigger.parameters?.operation === operation
-        ) || []
-        
-        this.logger.info({
-          workflowId: workflow.id,
-          workflowName: workflow.name,
-          matchingTriggerCount: matchingTriggers.length,
-          targetCollection: collection,
-          targetOperation: operation
-        }, 'Matching triggers found')
-
-        for (const trigger of matchingTriggers) {
-          this.logger.info({
-            workflowId: workflow.id,
-            workflowName: workflow.name,
-            triggerDetails: {
-              type: trigger.type,
-              collection: trigger.parameters?.collection,
-              collectionSlug: trigger.parameters?.collectionSlug,
-              operation: trigger.parameters?.operation,
-              hasCondition: !!trigger.condition
-            }
-          }, 'Processing matching trigger - about to execute workflow')
-
-          // Create execution context for condition evaluation
-          const context: ExecutionContext = {
-            steps: {},
-            trigger: {
-              type: 'collection',
-              collection,
-              doc,
-              operation,
-              previousDoc,
-              req
-            }
-          }
-
-          // Check trigger condition if present
-          if (trigger.condition) {
-            this.logger.debug({
-              collection,
-              operation,
-              condition: trigger.condition,
-              docId: (doc as any)?.id,
-              docFields: doc ? Object.keys(doc) : [],
-              previousDocId: (previousDoc as any)?.id,
-              workflowId: workflow.id,
-              workflowName: workflow.name
-            }, 'Evaluating collection trigger condition')
-
-            const conditionMet = this.evaluateCondition(trigger.condition, context)
-
-            if (!conditionMet) {
-              this.logger.info({
-                collection,
-                condition: trigger.condition,
-                operation,
-                workflowId: workflow.id,
-                workflowName: workflow.name,
-                docSnapshot: JSON.stringify(doc).substring(0, 200)
-              }, 'Trigger condition not met, skipping workflow')
-              continue
-            }
-
-            this.logger.info({
-              collection,
-              condition: trigger.condition,
-              operation,
-              workflowId: workflow.id,
-              workflowName: workflow.name,
-              docSnapshot: JSON.stringify(doc).substring(0, 200)
-            }, 'Trigger condition met')
-          }
-
-          this.logger.info({
-            collection,
-            operation,
-            workflowId: workflow.id,
-            workflowName: workflow.name
-          }, 'Triggering workflow')
-
-          // Execute the workflow
-          await this.execute(workflow as PayloadWorkflow, context, req)
-        }
-      }
-    } catch (error) {
-      this.logger.error({ error: error instanceof Error ? error.message : 'Unknown error' }, 'Workflow execution failed')
-      this.logger.error({
-        collection,
-        error: error instanceof Error ? error.message : 'Unknown error',
-        operation
-      }, 'Failed to execute triggered workflows')
-    }
-  }
 }

src/exports/client.ts

@@ -1,10 +1,8 @@
 // Client-side components that may have CSS imports or PayloadCMS UI dependencies
 // These are separated to avoid CSS import errors during Node.js type generation
 
-export { TriggerWorkflowButton } from '../components/TriggerWorkflowButton.js'
 export { StatusCell } from '../components/StatusCell.js'
-// export { ErrorDisplay } from '../components/ErrorDisplay.js' // Temporarily disabled
-export { WorkflowExecutionStatus } from '../components/WorkflowExecutionStatus.js'
+export { ErrorDisplay } from '../components/ErrorDisplay.js'
 
 // Future client components can be added here:
 // export { default as WorkflowDashboard } from '../components/WorkflowDashboard/index.js'

src/exports/helpers.ts

@@ -1,47 +0,0 @@
-/**
- * Trigger builder helpers for creating custom triggers with less boilerplate
- * 
- * @example
- * ```typescript
- * import { createTrigger, webhookTrigger } from '@xtr-dev/payload-automation/helpers'
- * 
- * // Simple trigger
- * const myTrigger = createTrigger('my-trigger').parameters({
- *   apiKey: { type: 'text', required: true },
- *   timeout: { type: 'number', defaultValue: 30 }
- * })
- * 
- * // Webhook trigger with presets
- * const orderWebhook = webhookTrigger('order-webhook')
- *   .parameter('orderTypes', {
- *     type: 'select',
- *     hasMany: true,
- *     options: ['regular', 'subscription']
- *   })
- *   .build()
- * ```
- */
-
-// Core helpers
-export {
-  createTriggerParameter,
-  createTriggerParameters,
-  createTrigger,
-  createAdvancedTrigger
-} from '../utils/trigger-helpers.js'
-
-// Preset builders
-export {
-  webhookTrigger,
-  cronTrigger,
-  eventTrigger,
-  manualTrigger,
-  apiTrigger
-} from '../utils/trigger-presets.js'
-
-// Common parameter sets for extending
-export {
-  webhookParameters,
-  cronParameters,
-  eventParameters
-} from '../utils/trigger-presets.js'

src/fields/parameter.ts

@@ -0,0 +1,32 @@
+import type {Field} from "payload"
+
+
+export const parameter = (slug: string, field: {name: string} & Field): Field => ({
+  ...field,
+  name: 'parameter' + field.name.replace(/^\w/, c => c.toUpperCase()),
+  admin: {
+    ...(field.admin as unknown || {}),
+    condition: (_, siblingData, __) => {
+      const previous = field.admin?.condition?.call(null, _, siblingData, __)
+      return (previous === undefined || previous) && (siblingData?.type === slug)
+    },
+  },
+  hooks: {
+    afterRead: [
+      ({ siblingData }) => {
+        const parameters = siblingData?.parameters || {}
+        return parameters[field.name]
+      }
+    ],
+    beforeChange: [
+      ({ siblingData, value }) => {
+        if (!siblingData.parameters) {
+          siblingData.parameters = {}
+        }
+        siblingData.parameters[field.name] = value
+        return undefined // Virtual field, don't store directly
+      }
+    ]
+  },
+  virtual: true,
+} as Field)

src/plugin/collection-hook.ts

@@ -0,0 +1,60 @@
+import {WorkflowExecutor} from "../core/workflow-executor.js"
+
+export const createCollectionTriggerHook = (collectionSlug: string, hookType: string) => {
+  return async (args: any) => {
+    const req = 'req' in args ? args.req :
+      'args' in args ? args.args.req :
+        undefined
+    if (!req) {
+      throw new Error('No request object found in hook arguments')
+    }
+    const payload = req.payload
+    const {docs: workflows} = await payload.find({
+      collection: 'workflows',
+      depth: 2,
+      limit: 100,
+      where: {
+        'triggers.parameters.collectionSlug': {
+          equals: collectionSlug
+        },
+        'triggers.parameters.hook': {
+          equals: hookType
+        },
+        'triggers.type': {
+          equals: 'collection-hook'
+        }
+      }
+    })
+    const executor = new WorkflowExecutor(payload, payload.logger)
+    // invoke each workflow
+    for (const workflow of workflows) {
+      // Create execution context
+      const context = {
+        steps: {},
+        trigger: {
+          ...args,
+          type: 'collection',
+          collection: collectionSlug,
+        }
+      }
+
+      try {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        await executor.execute(workflow as any, context, req)
+        payload.logger.info({
+          workflowId: workflow.id,
+          collection: collectionSlug,
+          hookType
+        }, 'Workflow executed successfully')
+      } catch (error) {
+        payload.logger.error({
+          workflowId: workflow.id,
+          collection: collectionSlug,
+          hookType,
+          error: error instanceof Error ? error.message : 'Unknown error'
+        }, 'Workflow execution failed')
+        // Don't throw to prevent breaking the original operation
+      }
+    }
+  }
+}

src/plugin/config-types.ts

@@ -1,25 +1,21 @@
-import type {Field, TaskConfig} from "payload"
+import type {CollectionConfig, GlobalConfig, TaskConfig} from "payload"
 
-export type CollectionTriggerConfigCrud = {
-  create?: true
-  delete?: true
-  read?: true
-  update?: true
-}
+import type {Trigger} from "../triggers/types.js"
 
-export type CollectionTriggerConfig = CollectionTriggerConfigCrud | true
+export type TriggerConfig = (config: WorkflowsPluginConfig) => Trigger
 
-export type CustomTriggerConfig = {
-  inputs?: Field[]
-  slug: string,
-}
-
-export type WorkflowsPluginConfig<TSlug extends string> = {
-  collectionTriggers: {
-    [key in TSlug]?: CollectionTriggerConfig
+export type WorkflowsPluginConfig<TSlug extends string = string, TGlobal extends string = string> = {
+  collectionTriggers?: {
+    [key in TSlug]?: {
+      [key in keyof CollectionConfig['hooks']]?: true
+    } | true
+  }
+  globalTriggers?: {
+    [key in TGlobal]?: {
+      [key in keyof GlobalConfig['hooks']]?: true
+    } | true
   }
   enabled?: boolean
-  steps: TaskConfig<string>[],
-  triggers?: CustomTriggerConfig[]
-  webhookPrefix?: string
+  steps: TaskConfig<string>[]
+  triggers?: TriggerConfig[]
 }

src/plugin/cron-scheduler.ts

@@ -1,642 +0,0 @@
-import type {Config, Payload, TaskConfig} from 'payload'
-
-import cron from 'node-cron'
-
-import {type PayloadWorkflow, WorkflowExecutor} from '../core/workflow-executor.js'
-import {getConfigLogger} from './logger.js'
-
-/**
- * Generate dynamic cron tasks for all workflows with cron triggers
- * This is called at config time to register all scheduled tasks
- */
-export function generateCronTasks(config: Config): void {
-  const logger = getConfigLogger()
-
-  // Note: We can't query the database at config time, so we'll need a different approach
-  // We'll create a single task that handles all cron-triggered workflows
-  const cronTask: TaskConfig = {
-    slug: 'workflow-cron-executor',
-    handler: async ({ input, req }) => {
-      const { cronExpression, timezone, workflowId } = input as {
-        cronExpression?: string
-        timezone?: string
-        workflowId: string
-      }
-
-      const logger = req.payload.logger.child({ plugin: '@xtr-dev/payload-automation' })
-
-      try {
-        // Get the workflow
-        const workflow = await req.payload.findByID({
-          id: workflowId,
-          collection: 'workflows',
-          depth: 2,
-          req
-        })
-
-        if (!workflow) {
-          throw new Error(`Workflow ${workflowId} not found`)
-        }
-
-        // Create execution context for cron trigger
-        const context = {
-          steps: {},
-          trigger: {
-            type: 'cron',
-            req,
-            triggeredAt: new Date().toISOString()
-          }
-        }
-
-        // Create executor
-        const executor = new WorkflowExecutor(req.payload, logger)
-
-        // Find the matching cron trigger and check its condition if present
-        const triggers = workflow.triggers as Array<{
-          condition?: string
-          parameters?: {
-            cronExpression?: string
-            timezone?: string
-            [key: string]: any
-          }
-          type: string
-        }>
-
-        const matchingTrigger = triggers?.find(trigger =>
-          trigger.type === 'cron-trigger' &&
-          trigger.parameters?.cronExpression === cronExpression
-        )
-
-        // Check trigger condition if present
-        if (matchingTrigger?.condition) {
-          const conditionMet = executor.evaluateCondition(matchingTrigger.condition, context)
-
-          if (!conditionMet) {
-            logger.info({
-              condition: matchingTrigger.condition,
-              cronExpression,
-              workflowId,
-              workflowName: workflow.name
-            }, 'Cron trigger condition not met, skipping workflow execution')
-
-            // Re-queue for next execution but don't run workflow
-            if (cronExpression) {
-              void requeueCronJob(workflowId, cronExpression, timezone, req.payload, logger)
-            }
-
-            return {
-              output: {
-                executedAt: new Date().toISOString(),
-                reason: 'Condition not met',
-                status: 'skipped',
-                workflowId
-              },
-              state: 'succeeded'
-            }
-          }
-
-          logger.info({
-            condition: matchingTrigger.condition,
-            cronExpression,
-            workflowId,
-            workflowName: workflow.name
-          }, 'Cron trigger condition met')
-        }
-
-        // Execute the workflow
-        await executor.execute(workflow as PayloadWorkflow, context, req)
-
-        // Re-queue the job for the next scheduled execution if cronExpression is provided
-        if (cronExpression) {
-          void requeueCronJob(workflowId, cronExpression, timezone, req.payload, logger)
-        }
-
-        return {
-          output: {
-            executedAt: new Date().toISOString(),
-            status: 'completed',
-            workflowId
-          },
-          state: 'succeeded'
-        }
-      } catch (error) {
-        logger.error({
-          error: error instanceof Error ? error.message : 'Unknown error',
-          workflowId
-        }, 'Cron job execution failed')
-
-        // Re-queue even on failure to ensure continuity (unless it's a validation error)
-        if (cronExpression && !(error instanceof Error && error.message.includes('Invalid cron'))) {
-          void requeueCronJob(workflowId, cronExpression, timezone, req.payload, logger)
-            .catch((requeueError) => {
-              logger.error({
-                error: requeueError instanceof Error ? requeueError.message : 'Unknown error',
-                workflowId
-              }, 'Failed to re-queue cron job after execution failure')
-            })
-        }
-
-        return {
-          output: {
-            error: error instanceof Error ? error.message : 'Unknown error',
-            workflowId
-          },
-          state: 'failed'
-        }
-      }
-    }
-  }
-
-  // Add the cron task to config if not already present
-  if (!config.jobs) {
-    config.jobs = { tasks: [] }
-  }
-
-  if (!config.jobs.tasks) {
-    config.jobs.tasks = []
-  }
-
-  if (!config.jobs.tasks.find(task => task.slug === cronTask.slug)) {
-    logger.debug(`Registering cron executor task: ${cronTask.slug}`)
-    config.jobs.tasks.push(cronTask)
-  } else {
-    logger.debug(`Cron executor task ${cronTask.slug} already registered, skipping`)
-  }
-}
-
-/**
- * Register cron jobs for workflows with cron triggers
- * This is called at runtime after PayloadCMS is initialized
- */
-export async function registerCronJobs(payload: Payload, logger: Payload['logger']): Promise<void> {
-  try {
-    // Find all workflows with cron triggers
-    const workflows = await payload.find({
-      collection: 'workflows',
-      depth: 0,
-      limit: 1000,
-      where: {
-        'triggers.type': {
-          equals: 'cron-trigger'
-        }
-      }
-    })
-
-    logger.info(`Found ${workflows.docs.length} workflows with cron triggers`)
-
-    for (const workflow of workflows.docs) {
-      const triggers = workflow.triggers as Array<{
-        parameters?: {
-          cronExpression?: string
-          timezone?: string
-          [key: string]: any
-        }
-        type: string
-      }>
-
-      // Find all cron triggers for this workflow
-      const cronTriggers = triggers?.filter(t => t.type === 'cron-trigger') || []
-
-      for (const trigger of cronTriggers) {
-        if (trigger.parameters?.cronExpression) {
-          try {
-            // Validate cron expression before queueing
-            if (!validateCronExpression(trigger.parameters.cronExpression)) {
-              logger.error({
-                cronExpression: trigger.parameters.cronExpression,
-                workflowId: workflow.id,
-                workflowName: workflow.name
-              }, 'Invalid cron expression format')
-              continue
-            }
-
-            // Validate timezone if provided
-            if (trigger.parameters?.timezone) {
-              try {
-                // Test if timezone is valid by trying to create a date with it
-                new Intl.DateTimeFormat('en', { timeZone: trigger.parameters.timezone })
-              } catch {
-                logger.error({
-                  timezone: trigger.parameters.timezone,
-                  workflowId: workflow.id,
-                  workflowName: workflow.name
-                }, 'Invalid timezone specified')
-                continue
-              }
-            }
-
-            // Calculate next execution time
-            const nextExecution = getNextCronTime(trigger.parameters.cronExpression, trigger.parameters?.timezone)
-
-            // Queue the job
-            await payload.jobs.queue({
-              input: { cronExpression: trigger.parameters.cronExpression, timezone: trigger.parameters?.timezone, workflowId: workflow.id },
-              task: 'workflow-cron-executor',
-              waitUntil: nextExecution
-            })
-
-            logger.info({
-              cronExpression: trigger.parameters.cronExpression,
-              nextExecution: nextExecution.toISOString(),
-              timezone: trigger.parameters?.timezone || 'UTC',
-              workflowId: workflow.id,
-              workflowName: workflow.name
-            }, 'Queued initial cron job for workflow')
-          } catch (error) {
-            logger.error({
-              cronExpression: trigger.parameters.cronExpression,
-              error: error instanceof Error ? error.message : 'Unknown error',
-              timezone: trigger.parameters?.timezone,
-              workflowId: workflow.id,
-              workflowName: workflow.name
-            }, 'Failed to queue cron job')
-          }
-        } else {
-          logger.warn({
-            workflowId: workflow.id,
-            workflowName: workflow.name
-          }, 'Cron trigger found but no cron expression specified')
-        }
-      }
-    }
-  } catch (error) {
-    logger.error({
-      error: error instanceof Error ? error.message : 'Unknown error'
-    }, 'Failed to register cron jobs')
-  }
-}
-
-/**
- * Validate a cron expression
- */
-export function validateCronExpression(cronExpression: string): boolean {
-  return cron.validate(cronExpression)
-}
-
-/**
- * Calculate the next time a cron expression should run
- */
-function getNextCronTime(cronExpression: string, timezone?: string): Date {
-  if (!validateCronExpression(cronExpression)) {
-    throw new Error(`Invalid cron expression: ${cronExpression}`)
-  }
-
-  const now = new Date()
-  const options: { timezone?: string } = timezone ? { timezone } : {}
-
-  // Create a task to find the next execution time
-  const task = cron.schedule(cronExpression, () => {}, {
-    ...options
-  })
-
-  // Parse cron expression parts
-  const cronParts = cronExpression.trim().split(/\s+/)
-  if (cronParts.length !== 5) {
-    void task.destroy()
-    throw new Error(`Invalid cron format: ${cronExpression}. Expected 5 parts.`)
-  }
-
-  const [minutePart, hourPart, dayPart, monthPart, weekdayPart] = cronParts
-
-  // Calculate next execution with proper lookahead for any schedule frequency
-  // Start from next minute and look ahead systematically
-  let testTime = new Date(now.getTime() + 60 * 1000) // Start 1 minute from now
-  testTime.setSeconds(0, 0) // Reset seconds and milliseconds
-
-  // Maximum iterations to prevent infinite loops (covers ~2 years)
-  const maxIterations = 2 * 365 * 24 * 60 // 2 years worth of minutes
-  let iterations = 0
-
-  while (iterations < maxIterations) {
-    const minute = testTime.getMinutes()
-    const hour = testTime.getHours()
-    const dayOfMonth = testTime.getDate()
-    const month = testTime.getMonth() + 1
-    const dayOfWeek = testTime.getDay()
-
-    if (matchesCronPart(minute, minutePart) &&
-        matchesCronPart(hour, hourPart) &&
-        matchesCronPart(dayOfMonth, dayPart) &&
-        matchesCronPart(month, monthPart) &&
-        matchesCronPart(dayOfWeek, weekdayPart)) {
-      void task.destroy()
-      return testTime
-    }
-
-    // Increment time intelligently based on cron pattern
-    testTime = incrementTimeForCronPattern(testTime, cronParts)
-    iterations++
-  }
-
-  void task.destroy()
-  throw new Error(`Could not calculate next execution time for cron expression: ${cronExpression} within reasonable timeframe`)
-}
-
-/**
- * Intelligently increment time based on cron pattern to avoid unnecessary iterations
- */
-function incrementTimeForCronPattern(currentTime: Date, cronParts: string[]): Date {
-  const [minutePart, hourPart, _dayPart, _monthPart, _weekdayPart] = cronParts
-  const nextTime = new Date(currentTime)
-
-  // If minute is specific (not wildcard), we can jump to next hour
-  if (minutePart !== '*' && !minutePart.includes('/')) {
-    const targetMinute = getNextValidCronValue(currentTime.getMinutes(), minutePart)
-    if (targetMinute <= currentTime.getMinutes()) {
-      // Move to next hour
-      nextTime.setHours(nextTime.getHours() + 1, targetMinute, 0, 0)
-    } else {
-      nextTime.setMinutes(targetMinute, 0, 0)
-    }
-    return nextTime
-  }
-
-  // If hour is specific and we're past it, jump to next day
-  if (hourPart !== '*' && !hourPart.includes('/')) {
-    const targetHour = getNextValidCronValue(currentTime.getHours(), hourPart)
-    if (targetHour <= currentTime.getHours()) {
-      // Move to next day
-      nextTime.setDate(nextTime.getDate() + 1)
-      nextTime.setHours(targetHour, 0, 0, 0)
-    } else {
-      nextTime.setHours(targetHour, 0, 0, 0)
-    }
-    return nextTime
-  }
-
-  // Default: increment by 1 minute
-  nextTime.setTime(nextTime.getTime() + 60 * 1000)
-  return nextTime
-}
-
-/**
- * Get the next valid value for a cron part
- */
-function getNextValidCronValue(currentValue: number, cronPart: string): number {
-  if (cronPart === '*') {return currentValue + 1}
-
-  // Handle specific values and ranges
-  const values = parseCronPart(cronPart)
-  return values.find(v => v > currentValue) || values[0]
-}
-
-/**
- * Parse a cron part into an array of valid values
- */
-function parseCronPart(cronPart: string): number[] {
-  if (cronPart === '*') {return []}
-
-  const values: number[] = []
-
-  // Handle comma-separated values
-  if (cronPart.includes(',')) {
-    cronPart.split(',').forEach(part => {
-      values.push(...parseCronPart(part.trim()))
-    })
-    return values.sort((a, b) => a - b)
-  }
-
-  // Handle ranges
-  if (cronPart.includes('-')) {
-    const [start, end] = cronPart.split('-').map(n => parseInt(n, 10))
-    for (let i = start; i <= end; i++) {
-      values.push(i)
-    }
-    return values
-  }
-
-  // Handle step values
-  if (cronPart.includes('/')) {
-    const [range, step] = cronPart.split('/')
-    const stepNum = parseInt(step, 10)
-
-    if (range === '*') {
-      // For wildcards with steps, return empty - handled elsewhere
-      return []
-    }
-
-    const baseValues = parseCronPart(range)
-    return baseValues.filter((_, index) => index % stepNum === 0)
-  }
-
-  // Single value
-  values.push(parseInt(cronPart, 10))
-  return values
-}
-
-/**
- * Check if a value matches a cron expression part
- */
-function matchesCronPart(value: number, cronPart: string): boolean {
-  if (cronPart === '*') {return true}
-
-  // Handle step values (e.g., */5)
-  if (cronPart.includes('/')) {
-    const [range, step] = cronPart.split('/')
-    const stepNum = parseInt(step, 10)
-
-    if (range === '*') {
-      return value % stepNum === 0
-    }
-  }
-
-  // Handle ranges (e.g., 1-5)
-  if (cronPart.includes('-')) {
-    const [start, end] = cronPart.split('-').map(n => parseInt(n, 10))
-    return value >= start && value <= end
-  }
-
-  // Handle comma-separated values (e.g., 1,3,5)
-  if (cronPart.includes(',')) {
-    const values = cronPart.split(',').map(n => parseInt(n, 10))
-    return values.includes(value)
-  }
-
-  // Handle single value
-  const cronValue = parseInt(cronPart, 10)
-  return value === cronValue
-}
-
-/**
- * Handle re-queueing of cron jobs after they execute
- * This ensures the job runs again at the next scheduled time
- */
-export async function requeueCronJob(
-  workflowId: string,
-  cronExpression: string,
-  timezone: string | undefined,
-  payload: Payload,
-  logger: Payload['logger']
-): Promise<void> {
-  try {
-    // Queue the job to run at the next scheduled time
-    await payload.jobs.queue({
-      input: { cronExpression, timezone, workflowId },
-      task: 'workflow-cron-executor',
-      waitUntil: getNextCronTime(cronExpression, timezone)
-    })
-
-    logger.debug({
-      nextRun: getNextCronTime(cronExpression, timezone),
-      timezone: timezone || 'UTC',
-      workflowId
-    }, 'Re-queued cron job')
-  } catch (error) {
-    logger.error({
-      error: error instanceof Error ? error.message : 'Unknown error',
-      workflowId
-    }, 'Failed to re-queue cron job')
-  }
-}
-
-/**
- * Register or update cron jobs for a specific workflow
- */
-export async function updateWorkflowCronJobs(
-  workflowId: string,
-  payload: Payload,
-  logger: Payload['logger']
-): Promise<void> {
-  try {
-    // First, cancel any existing cron jobs for this workflow
-    cancelWorkflowCronJobs(workflowId, payload, logger)
-
-    // Get the workflow
-    const workflow = await payload.findByID({
-      id: workflowId,
-      collection: 'workflows',
-      depth: 0
-    })
-
-    if (!workflow) {
-      logger.warn({ workflowId }, 'Workflow not found for cron job update')
-      return
-    }
-
-    const triggers = workflow.triggers as Array<{
-      parameters?: {
-        cronExpression?: string
-        timezone?: string
-        [key: string]: any
-      }
-      type: string
-    }>
-
-    // Find all cron triggers for this workflow
-    const cronTriggers = triggers?.filter(t => t.type === 'cron-trigger') || []
-
-    if (cronTriggers.length === 0) {
-      logger.debug({ workflowId }, 'No cron triggers found for workflow')
-      return
-    }
-
-    let scheduledJobs = 0
-
-    for (const trigger of cronTriggers) {
-      if (trigger.parameters?.cronExpression) {
-        try {
-          // Validate cron expression before queueing
-          if (!validateCronExpression(trigger.parameters.cronExpression)) {
-            logger.error({
-              cronExpression: trigger.parameters.cronExpression,
-              workflowId,
-              workflowName: workflow.name
-            }, 'Invalid cron expression format')
-            continue
-          }
-
-          // Validate timezone if provided
-          if (trigger.parameters?.timezone) {
-            try {
-              new Intl.DateTimeFormat('en', { timeZone: trigger.parameters.timezone })
-            } catch {
-              logger.error({
-                timezone: trigger.parameters.timezone,
-                workflowId,
-                workflowName: workflow.name
-              }, 'Invalid timezone specified')
-              continue
-            }
-          }
-
-          // Calculate next execution time
-          const nextExecution = getNextCronTime(trigger.parameters.cronExpression, trigger.parameters?.timezone)
-
-          // Queue the job
-          await payload.jobs.queue({
-            input: { cronExpression: trigger.parameters.cronExpression, timezone: trigger.parameters?.timezone, workflowId },
-            task: 'workflow-cron-executor',
-            waitUntil: nextExecution
-          })
-
-          scheduledJobs++
-
-          logger.info({
-            cronExpression: trigger.parameters.cronExpression,
-            nextExecution: nextExecution.toISOString(),
-            timezone: trigger.parameters?.timezone || 'UTC',
-            workflowId,
-            workflowName: workflow.name
-          }, 'Scheduled cron job for workflow')
-        } catch (error) {
-          logger.error({
-            cronExpression: trigger.parameters?.cronExpression,
-            error: error instanceof Error ? error.message : 'Unknown error',
-            timezone: trigger.parameters?.timezone,
-            workflowId,
-            workflowName: workflow.name
-          }, 'Failed to schedule cron job')
-        }
-      }
-    }
-
-    if (scheduledJobs > 0) {
-      logger.info({ scheduledJobs, workflowId }, 'Updated cron jobs for workflow')
-    }
-  } catch (error) {
-    logger.error({
-      error: error instanceof Error ? error.message : 'Unknown error',
-      workflowId
-    }, 'Failed to update workflow cron jobs')
-  }
-}
-
-/**
- * Cancel all cron jobs for a specific workflow
- */
-export function cancelWorkflowCronJobs(
-  workflowId: string,
-  payload: Payload,
-  logger: Payload['logger']
-): void {
-  try {
-    // Note: PayloadCMS job system doesn't have a built-in way to cancel specific jobs by input
-    // This is a limitation we need to work around
-    // For now, we log that we would cancel jobs for this workflow
-    logger.debug({ workflowId }, 'Would cancel existing cron jobs for workflow (PayloadCMS limitation: cannot selectively cancel jobs)')
-  } catch (error) {
-    logger.error({
-      error: error instanceof Error ? error.message : 'Unknown error',
-      workflowId
-    }, 'Failed to cancel workflow cron jobs')
-  }
-}
-
-/**
- * Remove cron jobs for a deleted workflow
- */
-export function removeWorkflowCronJobs(
-  workflowId: string,
-  payload: Payload,
-  logger: Payload['logger']
-): void {
-  try {
-    cancelWorkflowCronJobs(workflowId, payload, logger)
-    logger.info({ workflowId }, 'Removed cron jobs for deleted workflow')
-  } catch (error) {
-    logger.error({
-      error: error instanceof Error ? error.message : 'Unknown error',
-      workflowId
-    }, 'Failed to remove workflow cron jobs')
-  }
-}

src/plugin/global-hook.ts

@@ -0,0 +1,95 @@
+import {WorkflowExecutor} from '../core/workflow-executor.js'
+
+export const createGlobalTriggerHook = (globalSlug: string, hookType: string) => {
+  return async function payloadGlobalAutomationHook(args: any) {
+    const req = 'req' in args ? args.req :
+      'args' in args ? args.args.req :
+      undefined
+    if (!req) {
+      throw new Error('No request object found in global hook arguments')
+    }
+
+    const payload = req.payload
+    const logger = payload.logger
+
+    try {
+      logger.info({
+        global: globalSlug,
+        hookType,
+        operation: hookType
+      }, 'Global automation hook triggered')
+
+      // Create executor on-demand
+      const executor = new WorkflowExecutor(payload, logger)
+
+      logger.debug('Executing triggered global workflows...')
+
+      // Find workflows with matching global triggers
+      const {docs: workflows} = await payload.find({
+        collection: 'workflows',
+        depth: 2,
+        limit: 100,
+        where: {
+          'triggers.parameters.global': {
+            equals: globalSlug
+          },
+          'triggers.parameters.operation': {
+            equals: hookType
+          },
+          'triggers.type': {
+            equals: 'global-hook'
+          }
+        }
+      })
+
+      // Execute each matching workflow
+      for (const workflow of workflows) {
+        // Create execution context
+        const context = {
+          steps: {},
+          trigger: {
+            ...args,
+            type: 'global',
+            global: globalSlug,
+            operation: hookType,
+            req
+          }
+        }
+
+        try {
+          await executor.execute(workflow, context, req)
+          logger.info({
+            workflowId: workflow.id,
+            global: globalSlug,
+            hookType
+          }, 'Global workflow executed successfully')
+        } catch (error) {
+          logger.error({
+            workflowId: workflow.id,
+            global: globalSlug,
+            hookType,
+            error: error instanceof Error ? error.message : 'Unknown error'
+          }, 'Global workflow execution failed')
+          // Don't throw to prevent breaking the original operation
+        }
+      }
+
+      logger.info({
+        global: globalSlug,
+        hookType
+      }, 'Global workflow execution completed successfully')
+
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : 'Unknown error'
+
+      logger.error({
+        global: globalSlug,
+        hookType,
+        error: errorMessage,
+        errorStack: error instanceof Error ? error.stack : undefined
+      }, 'Global hook execution failed')
+
+      // Don't throw to prevent breaking the original operation
+    }
+  }
+}

src/plugin/index.ts

@@ -1,122 +1,16 @@
-import type {Config} from 'payload'
+import type {CollectionConfig, Config} from 'payload'
 
-import type {CollectionTriggerConfigCrud, WorkflowsPluginConfig} from "./config-types.js"
+import type {WorkflowsPluginConfig} from "./config-types.js"
 
 import {createWorkflowCollection} from '../collections/Workflow.js'
 import {WorkflowRunsCollection} from '../collections/WorkflowRuns.js'
 import {WorkflowExecutor} from '../core/workflow-executor.js'
-import {generateCronTasks, registerCronJobs} from './cron-scheduler.js'
-import {initCollectionHooks} from "./init-collection-hooks.js"
-import {initGlobalHooks} from "./init-global-hooks.js"
-import {initStepTasks} from "./init-step-tasks.js"
-import {initWebhookEndpoint} from "./init-webhook.js"
-import {initWorkflowHooks} from './init-workflow-hooks.js'
 import {getConfigLogger, initializeLogger} from './logger.js'
+import {createCollectionTriggerHook} from "./collection-hook.js"
+import {createGlobalTriggerHook} from "./global-hook.js"
 
 export {getLogger} from './logger.js'
 
-// Improved executor registry with proper error handling and logging
-interface ExecutorRegistry {
-  executor: null | WorkflowExecutor
-  isInitialized: boolean
-  logger: any | null
-}
-
-const executorRegistry: ExecutorRegistry = {
-  executor: null,
-  isInitialized: false,
-  logger: null
-}
-
-const setWorkflowExecutor = (executor: WorkflowExecutor, logger: any) => {
-  executorRegistry.executor = executor
-  executorRegistry.logger = logger
-  executorRegistry.isInitialized = true
-
-  logger.info('Workflow executor initialized and registered successfully')
-}
-
-const getExecutorRegistry = (): ExecutorRegistry => {
-  return executorRegistry
-}
-
-// Helper function to create failed workflow runs for tracking errors
-const createFailedWorkflowRun = async (args: any, errorMessage: string, logger: any) => {
-  try {
-    // Only create failed workflow runs if we have enough context
-    if (!args?.req?.payload || !args?.collection?.slug) {
-      return
-    }
-
-    // Find workflows that should have been triggered
-    const workflows = await args.req.payload.find({
-      collection: 'workflows',
-      limit: 10,
-      req: args.req,
-      where: {
-        'triggers.collectionSlug': {
-          equals: args.collection.slug
-        },
-        'triggers.operation': {
-          equals: args.operation
-        },
-        'triggers.type': {
-          equals: 'collection-trigger'
-        }
-      }
-    })
-
-    // Create failed workflow runs for each matching workflow
-    for (const workflow of workflows.docs) {
-      await args.req.payload.create({
-        collection: 'workflow-runs',
-        data: {
-          completedAt: new Date().toISOString(),
-          context: {
-            steps: {},
-            trigger: {
-              type: 'collection',
-              collection: args.collection.slug,
-              doc: args.doc,
-              operation: args.operation,
-              previousDoc: args.previousDoc,
-              triggeredAt: new Date().toISOString()
-            }
-          },
-          error: `Hook execution failed: ${errorMessage}`,
-          inputs: {},
-          logs: [{
-            level: 'error',
-            message: `Hook execution failed: ${errorMessage}`,
-            timestamp: new Date().toISOString()
-          }],
-          outputs: {},
-          startedAt: new Date().toISOString(),
-          status: 'failed',
-          steps: [],
-          triggeredBy: args?.req?.user?.email || 'system',
-          workflow: workflow.id,
-          workflowVersion: 1
-        },
-        req: args.req
-      })
-    }
-
-    if (workflows.docs.length > 0) {
-      logger.info({
-        errorMessage,
-        workflowCount: workflows.docs.length
-      }, 'Created failed workflow runs for hook execution error')
-    }
-
-  } catch (error) {
-    // Don't let workflow run creation failures break the original operation
-    logger.warn({
-      error: error instanceof Error ? error.message : 'Unknown error'
-    }, 'Failed to create failed workflow run record')
-  }
-}
-
 const applyCollectionsConfig = <T extends string>(pluginOptions: WorkflowsPluginConfig<T>, config: Config) => {
   // Add workflow collections
   if (!config.collections) {
@@ -129,8 +23,16 @@ const applyCollectionsConfig = <T extends string>(pluginOptions: WorkflowsPlugin
   )
 }
 
-// Removed config-phase hook registration - user collections don't exist during config phase
+type AnyHook =
+  CollectionConfig['hooks'] extends infer H
+    ? H extends Record<string, unknown>
+      ? NonNullable<H[keyof H]> extends (infer U)[]
+        ? U
+        : never
+      : never
+    : never;
 
+type HookArgs = Parameters<AnyHook>[0]
 
 export const workflowsPlugin =
   <TSlug extends string>(pluginOptions: WorkflowsPluginConfig<TSlug>) =>
@@ -145,107 +47,130 @@ export const workflowsPlugin =
       // CRITICAL: Modify existing collection configs BEFORE PayloadCMS processes them
       // This is the ONLY time we can add hooks that will actually work
       const logger = getConfigLogger()
-      logger.info('Attempting to modify collection configs before PayloadCMS initialization...')
 
       if (config.collections && pluginOptions.collectionTriggers) {
-        for (const [triggerSlug, triggerConfig] of Object.entries(pluginOptions.collectionTriggers)) {
-          if (!triggerConfig) {continue}
+        for (const [collectionSlug, triggerConfig] of Object.entries(pluginOptions.collectionTriggers)) {
+          if (!triggerConfig) {
+            continue
+          }
 
           // Find the collection config that matches
-          const collectionIndex = config.collections.findIndex(c => c.slug === triggerSlug)
+          const collectionIndex = config.collections.findIndex(c => c.slug === collectionSlug)
           if (collectionIndex === -1) {
-            logger.warn(`Collection '${triggerSlug}' not found in config.collections`)
+            logger.warn(`Collection '${collectionSlug}' not found in config.collections`)
             continue
           }
 
           const collection = config.collections[collectionIndex]
-          logger.info(`Found collection '${triggerSlug}' - modifying its hooks...`)
 
           // Initialize hooks if needed
           if (!collection.hooks) {
             collection.hooks = {}
           }
-          if (!collection.hooks.afterChange) {
-            collection.hooks.afterChange = []
+
+          // Determine which hooks to register based on config
+          const hooksToRegister = triggerConfig === true
+            ? {
+                afterChange: true,
+                afterDelete: true,
+                afterRead: true,
+              }
+            : triggerConfig
+
+          // Register each configured hook
+          Object.entries(hooksToRegister).forEach(([hookName, enabled]) => {
+            if (!enabled) {
+              return
+            }
+
+            const hookKey = hookName as keyof typeof collection.hooks
+
+            // Initialize the hook array if needed
+            if (!collection.hooks![hookKey]) {
+              collection.hooks![hookKey] = []
+            }
+
+            // Create the automation hook for this specific collection and hook type
+            const automationHook = createCollectionTriggerHook(collectionSlug, hookKey)
+
+            // Mark it for debugging
+            Object.defineProperty(automationHook, '__isAutomationHook', {
+              value: true,
+              enumerable: false
+            })
+            Object.defineProperty(automationHook, '__hookType', {
+              value: hookKey,
+              enumerable: false
+            })
+
+            // Add the hook to the collection
+            ;(collection.hooks![hookKey] as Array<unknown>).push(automationHook)
+
+            logger.debug(`Registered ${hookKey} hook for collection '${collectionSlug}'`)
+          })
+        }
+      }
+
+      // Handle global triggers similarly to collection triggers
+      if (config.globals && pluginOptions.globalTriggers) {
+        for (const [globalSlug, triggerConfig] of Object.entries(pluginOptions.globalTriggers)) {
+          if (!triggerConfig) {
+            continue
           }
 
-          // Create a reliable hook function with proper dependency injection
-          const automationHook = Object.assign(
-            async function payloadAutomationHook(args: any) {
-              const registry = getExecutorRegistry()
+          // Find the global config that matches
+          const globalIndex = config.globals.findIndex(g => g.slug === globalSlug)
+          if (globalIndex === -1) {
+            logger.warn(`Global '${globalSlug}' not found in config.globals`)
+            continue
+          }
 
-              // Use proper logger if available, fallback to args.req.payload.logger
-              const logger = registry.logger || args?.req?.payload?.logger || console
+          const global = config.globals[globalIndex]
 
-              try {
-                logger.info({
-                  collection: args?.collection?.slug,
-                  docId: args?.doc?.id,
-                  hookType: 'automation',
-                  operation: args?.operation
-                }, 'Collection automation hook triggered')
+          // Initialize hooks if needed
+          if (!global.hooks) {
+            global.hooks = {}
+          }
 
-                if (!registry.isInitialized) {
-                  logger.warn('Workflow executor not yet initialized, skipping execution')
-                  return undefined
-                }
-
-                if (!registry.executor) {
-                  logger.error('Workflow executor is null despite being marked as initialized')
-                  // Create a failed workflow run to track this issue
-                  await createFailedWorkflowRun(args, 'Executor not available', logger)
-                  return undefined
-                }
-
-                logger.debug('Executing triggered workflows...')
-                await registry.executor.executeTriggeredWorkflows(
-                  args.collection.slug,
-                  args.operation,
-                  args.doc,
-                  args.previousDoc,
-                  args.req
-                )
-
-                logger.info({
-                  collection: args?.collection?.slug,
-                  docId: args?.doc?.id,
-                  operation: args?.operation
-                }, 'Workflow execution completed successfully')
-
-              } catch (error) {
-                const errorMessage = error instanceof Error ? error.message : 'Unknown error'
-
-                logger.error({
-                  collection: args?.collection?.slug,
-                  docId: args?.doc?.id,
-                  error: errorMessage,
-                  errorStack: error instanceof Error ? error.stack : undefined,
-                  operation: args?.operation
-                }, 'Hook execution failed')
-
-                // Create a failed workflow run to track this error
-                try {
-                  await createFailedWorkflowRun(args, errorMessage, logger)
-                } catch (createError) {
-                  logger.error({
-                    error: createError instanceof Error ? createError.message : 'Unknown error'
-                  }, 'Failed to create workflow run for hook error')
-                }
-
-                // Don't throw to prevent breaking the original operation
+          // Determine which hooks to register based on config
+          const hooksToRegister = triggerConfig === true
+            ? {
+                afterChange: true,
+                afterRead: true,
               }
+            : triggerConfig
 
-              return undefined
-            },
-            {
-              __isAutomationHook: true,
-              __version: '0.0.22'
+          // Register each configured hook
+          Object.entries(hooksToRegister).forEach(([hookName, enabled]) => {
+            if (!enabled) {
+              return
             }
-          )
 
-          // Add the hook to the collection config
-          collection.hooks.afterChange.push(automationHook)
-          logger.info(`Added automation hook to '${triggerSlug}' - hook count: ${collection.hooks.afterChange.length}`)
+            const hookKey = hookName as keyof typeof global.hooks
+
+            // Initialize the hook array if needed
+            if (!global.hooks![hookKey]) {
+              global.hooks![hookKey] = []
+            }
+
+            // Create the automation hook for this specific global and hook type
+            const automationHook = createGlobalTriggerHook(globalSlug, hookKey)
+
+            // Mark it for debugging
+            Object.defineProperty(automationHook, '__isAutomationHook', {
+              value: true,
+              enumerable: false
+            })
+            Object.defineProperty(automationHook, '__hookType', {
+              value: hookKey,
+              enumerable: false
+            })
+
+            // Add the hook to the global
+            ;(global.hooks![hookKey] as Array<unknown>).push(automationHook)
+
+            logger.debug(`Registered ${hookKey} hook for global '${globalSlug}'`)
+          })
         }
       }
 
@@ -253,32 +178,18 @@ export const workflowsPlugin =
         config.jobs = {tasks: []}
       }
 
-      const configLogger = getConfigLogger()
-      configLogger.info(`Configuring workflow plugin with ${Object.keys(pluginOptions.collectionTriggers || {}).length} collection triggers`)
-
-      // Generate cron tasks for workflows with cron triggers
-      generateCronTasks(config)
-
       for (const step of pluginOptions.steps) {
         if (!config.jobs?.tasks?.find(task => task.slug === step.slug)) {
-          configLogger.debug(`Registering task: ${step.slug}`)
           config.jobs?.tasks?.push(step)
-        } else {
-          configLogger.debug(`Task ${step.slug} already registered, skipping`)
         }
       }
 
-      // Initialize webhook endpoint
-      initWebhookEndpoint(config, pluginOptions.webhookPrefix || 'webhook')
 
-      // Set up onInit to register collection hooks and initialize features
+      // Set up onInit to initialize features
       const incomingOnInit = config.onInit
       config.onInit = async (payload) => {
-        configLogger.info(`onInit called - collections: ${Object.keys(payload.collections).length}`)
-
         // Execute any existing onInit functions first
         if (incomingOnInit) {
-          configLogger.debug('Executing existing onInit function')
           await incomingOnInit(payload)
         }
 
@@ -286,33 +197,8 @@ export const workflowsPlugin =
         const logger = initializeLogger(payload)
         logger.info('Logger initialized with payload instance')
 
-        // Log collection trigger configuration
-        logger.info(`Plugin configuration: ${Object.keys(pluginOptions.collectionTriggers || {}).length} collection triggers, ${pluginOptions.steps?.length || 0} steps`)
-
-        // Create workflow executor instance
-        console.log('🚨 CREATING WORKFLOW EXECUTOR INSTANCE')
-        const executor = new WorkflowExecutor(payload, logger)
-        console.log('🚨 EXECUTOR CREATED:', typeof executor)
-        console.log('🚨 EXECUTOR METHODS:', Object.getOwnPropertyNames(Object.getPrototypeOf(executor)))
-
-        // Register executor with proper dependency injection
-        setWorkflowExecutor(executor, logger)
-
-        // Hooks are now registered during config phase - just log status
-        logger.info('Hooks were registered during config phase - executor now available')
-
-        logger.info('Initializing global hooks...')
-        initGlobalHooks(payload, logger, executor)
-
-        logger.info('Initializing workflow hooks...')
-        initWorkflowHooks(payload, logger)
-
-        logger.info('Initializing step tasks...')
-        initStepTasks(pluginOptions, payload, logger)
-
-        // Register cron jobs for workflows with cron triggers
-        logger.info('Registering cron jobs...')
-        await registerCronJobs(payload, logger)
+        // Log trigger configuration
+        logger.info(`Plugin configuration: ${Object.keys(pluginOptions.collectionTriggers || {}).length} collection triggers, ${Object.keys(pluginOptions.globalTriggers || {}).length} global triggers, ${pluginOptions.steps?.length || 0} steps`)
 
         logger.info('Plugin initialized successfully - all hooks registered')
       }

src/plugin/init-collection-hooks.ts

@@ -1,148 +0,0 @@
-import type {Payload} from "payload"
-import type {Logger} from "pino"
-
-import type { WorkflowExecutor } from "../core/workflow-executor.js"
-import type {CollectionTriggerConfigCrud, WorkflowsPluginConfig} from "./config-types.js"
-
-export function initCollectionHooks<T extends string>(pluginOptions: WorkflowsPluginConfig<T>, payload: Payload, logger: Payload['logger'], executor: WorkflowExecutor) {
-  
-  if (!pluginOptions.collectionTriggers || Object.keys(pluginOptions.collectionTriggers).length === 0) {
-    logger.warn('No collection triggers configured in plugin options')
-    return
-  }
-
-  logger.info({
-    configuredCollections: Object.keys(pluginOptions.collectionTriggers),
-    availableCollections: Object.keys(payload.collections)
-  }, 'Starting collection hook registration')
-
-  // Add hooks to configured collections
-  for (const [collectionSlug, triggerConfig] of Object.entries(pluginOptions.collectionTriggers)) {
-    if (!triggerConfig) {
-      logger.debug({collectionSlug}, 'Skipping collection with falsy trigger config')
-      continue
-    }
-
-    const collection = payload.collections[collectionSlug as T]
-    const crud: CollectionTriggerConfigCrud = triggerConfig === true ? {
-      create: true,
-      delete: true,
-      read: true,
-      update: true,
-    } : triggerConfig
-
-    if (!collection.config.hooks) {
-      collection.config.hooks = {} as typeof collection.config.hooks
-    }
-
-    if (crud.update || crud.create) {
-      collection.config.hooks.afterChange = collection.config.hooks.afterChange || []
-      collection.config.hooks.afterChange.push(async (change) => {
-        const operation = change.operation as 'create' | 'update'
-        
-        // AGGRESSIVE LOGGING - this should ALWAYS appear
-        console.log('🚨 AUTOMATION PLUGIN HOOK CALLED! 🚨')
-        console.log('Collection:', change.collection.slug)
-        console.log('Operation:', operation)
-        console.log('Doc ID:', change.doc?.id)
-        console.log('Has executor?', !!executor)
-        console.log('Executor type:', typeof executor)
-        
-        logger.info({
-          slug: change.collection.slug,
-          operation,
-          docId: change.doc?.id,
-          previousDocId: change.previousDoc?.id,
-          hasExecutor: !!executor,
-          executorType: typeof executor
-        }, 'AUTOMATION PLUGIN: Collection hook triggered')
-
-        try {
-          console.log('🚨 About to call executeTriggeredWorkflows')
-          
-          // Execute workflows for this trigger
-          await executor.executeTriggeredWorkflows(
-            change.collection.slug,
-            operation,
-            change.doc,
-            change.previousDoc,
-            change.req
-          )
-          
-          console.log('🚨 executeTriggeredWorkflows completed without error')
-          
-          logger.info({
-            slug: change.collection.slug,
-            operation,
-            docId: change.doc?.id
-          }, 'AUTOMATION PLUGIN: executeTriggeredWorkflows completed successfully')
-        } catch (error) {
-          console.log('🚨 AUTOMATION PLUGIN ERROR:', error)
-          
-          logger.error({
-            slug: change.collection.slug,
-            operation,
-            docId: change.doc?.id,
-            error: error instanceof Error ? error.message : 'Unknown error',
-            stack: error instanceof Error ? error.stack : undefined
-          }, 'AUTOMATION PLUGIN: executeTriggeredWorkflows failed')
-          // Don't re-throw to avoid breaking other hooks
-        }
-      })
-    }
-
-    if (crud.read) {
-      collection.config.hooks.afterRead = collection.config.hooks.afterRead || []
-      collection.config.hooks.afterRead.push(async (change) => {
-        logger.debug({
-          slug: change.collection.slug,
-          operation: 'read',
-        }, 'Collection hook triggered')
-
-        // Execute workflows for this trigger
-        await executor.executeTriggeredWorkflows(
-          change.collection.slug,
-          'read',
-          change.doc,
-          undefined,
-          change.req
-        )
-      })
-    }
-
-    if (crud.delete) {
-      collection.config.hooks.afterDelete = collection.config.hooks.afterDelete || []
-      collection.config.hooks.afterDelete.push(async (change) => {
-        logger.debug({
-          slug: change.collection.slug,
-          operation: 'delete',
-        }, 'Collection hook triggered')
-
-        // Execute workflows for this trigger
-        await executor.executeTriggeredWorkflows(
-          change.collection.slug,
-          'delete',
-          change.doc,
-          undefined,
-          change.req
-        )
-      })
-    }
-
-    if (collection) {
-      logger.info({
-        collectionSlug,
-        hooksRegistered: {
-          afterChange: crud.update || crud.create,
-          afterRead: crud.read,
-          afterDelete: crud.delete
-        }
-      }, 'Collection hooks registered successfully')
-    } else {
-      logger.error({
-        collectionSlug,
-        availableCollections: Object.keys(payload.collections)
-      }, 'Collection not found for trigger configuration - check collection slug spelling')
-    }
-  }
-}

src/plugin/init-global-hooks.ts

@@ -1,112 +0,0 @@
-import type { Payload, PayloadRequest } from "payload"
-import type { Logger } from "pino"
-
-import type { WorkflowExecutor, PayloadWorkflow } from "../core/workflow-executor.js"
-
-export function initGlobalHooks(payload: Payload, logger: Payload['logger'], executor: WorkflowExecutor) {
-  // Get all globals from the config
-  const globals = payload.config.globals || []
-
-  for (const globalConfig of globals) {
-    const globalSlug = globalConfig.slug
-
-    // Add afterChange hook to global
-    if (!globalConfig.hooks) {
-      globalConfig.hooks = {
-        afterChange: [],
-        afterRead: [],
-        beforeChange: [],
-        beforeRead: [],
-        beforeValidate: []
-      }
-    }
-
-    if (!globalConfig.hooks.afterChange) {
-      globalConfig.hooks.afterChange = []
-    }
-
-    globalConfig.hooks.afterChange.push(async (change) => {
-      logger.debug({
-        global: globalSlug,
-        operation: 'update'
-      }, 'Global hook triggered')
-
-      // Execute workflows for this global trigger
-      await executeTriggeredGlobalWorkflows(
-        globalSlug,
-        'update',
-        change.doc,
-        change.previousDoc,
-        change.req,
-        payload,
-        logger,
-        executor
-      )
-    })
-
-    logger.info({ globalSlug }, 'Global hooks registered')
-  }
-}
-
-async function executeTriggeredGlobalWorkflows(
-  globalSlug: string,
-  operation: 'update',
-  doc: Record<string, any>,
-  previousDoc: Record<string, any>,
-  req: PayloadRequest,
-  payload: Payload,
-  logger: Payload['logger'],
-  executor: WorkflowExecutor
-): Promise<void> {
-  try {
-    // Find workflows with matching global triggers
-    const workflows = await payload.find({
-      collection: 'workflows',
-      depth: 2,
-      limit: 100,
-      req,
-      where: {
-        'triggers.global': {
-          equals: globalSlug
-        },
-        'triggers.globalOperation': {
-          equals: operation
-        },
-        'triggers.type': {
-          equals: 'global-trigger'
-        }
-      }
-    })
-
-    for (const workflow of workflows.docs) {
-      logger.info({
-        globalSlug,
-        operation,
-        workflowId: workflow.id,
-        workflowName: workflow.name
-      }, 'Triggering global workflow')
-
-      // Create execution context
-      const context = {
-        steps: {},
-        trigger: {
-          type: 'global',
-          doc,
-          global: globalSlug,
-          operation,
-          previousDoc,
-          req
-        }
-      }
-
-      // Execute the workflow
-      await executor.execute(workflow as PayloadWorkflow, context, req)
-    }
-  } catch (error) {
-    logger.error({
-      error: error instanceof Error ? error.message : 'Unknown error',
-      globalSlug,
-      operation
-    }, 'Failed to execute triggered global workflows')
-  }
-}

src/plugin/init-step-tasks.ts

@@ -1,20 +0,0 @@
-import type {Payload} from "payload"
-import type {Logger} from "pino"
-
-import type {WorkflowsPluginConfig} from "./config-types.js"
-
-export function initStepTasks<T extends string>(pluginOptions: WorkflowsPluginConfig<T>, payload: Payload, logger: Payload['logger']) {
-  logger.info({ stepCount: pluginOptions.steps.length, steps: pluginOptions.steps.map(s => s.slug) }, 'Step tasks were registered during config phase')
-
-  // Verify that the tasks are available in the job system
-  const availableTasks = payload.config.jobs?.tasks?.map(t => t.slug) || []
-  const pluginTasks = pluginOptions.steps.map(s => s.slug)
-  
-  pluginTasks.forEach(taskSlug => {
-    if (availableTasks.includes(taskSlug)) {
-      logger.info({ taskSlug }, 'Step task confirmed available in job system')
-    } else {
-      logger.error({ taskSlug }, 'Step task not found in job system - this will cause execution failures')
-    }
-  })
-}

src/plugin/init-webhook.ts

@@ -1,179 +0,0 @@
-import type {Config, PayloadRequest} from 'payload'
-
-import {type PayloadWorkflow, WorkflowExecutor} from '../core/workflow-executor.js'
-import {getConfigLogger, initializeLogger} from './logger.js'
-
-export function initWebhookEndpoint(config: Config, webhookPrefix = 'webhook'): void {
-  const logger = getConfigLogger()
-  // Ensure the prefix starts with a slash
-  const normalizedPrefix = webhookPrefix.startsWith('/') ? webhookPrefix : `/${webhookPrefix}`
-  logger.debug(`Adding webhook endpoint to config with prefix: ${normalizedPrefix}`)
-  logger.debug('Current config.endpoints length:', config.endpoints?.length || 0)
-
-  // Define webhook endpoint
-  const webhookEndpoint = {
-    handler: async (req: PayloadRequest) => {
-      const {path} = req.routeParams as { path: string }
-      const webhookData = req.body || {}
-
-      logger.debug('Webhook endpoint handler called, path: ' + path)
-
-      try {
-        // Find workflows with matching webhook triggers
-        const workflows = await req.payload.find({
-          collection: 'workflows',
-          depth: 2,
-          limit: 100,
-          req,
-          where: {
-            'triggers.type': {
-              equals: 'webhook-trigger'
-            },
-            'triggers.webhookPath': {
-              equals: path
-            }
-          }
-        })
-
-        if (workflows.docs.length === 0) {
-          return new Response(
-            JSON.stringify({error: 'No workflows found for this webhook path'}),
-            {
-              headers: {'Content-Type': 'application/json'},
-              status: 404
-            }
-          )
-        }
-
-        // Create a workflow executor for this request
-        const logger = initializeLogger(req.payload)
-        const executor = new WorkflowExecutor(req.payload, logger)
-
-        const executionPromises = workflows.docs.map(async (workflow) => {
-          try {
-            // Create execution context for the webhook trigger
-            const context = {
-              steps: {},
-              trigger: {
-                type: 'webhook',
-                data: webhookData,
-                headers: Object.fromEntries(req.headers?.entries() || []),
-                path,
-                req
-              }
-            }
-
-            // Find the matching trigger and check its condition if present
-            const triggers = workflow.triggers as Array<{
-              condition?: string
-              type: string
-              parameters?: {
-                webhookPath?: string
-                [key: string]: any
-              }
-            }>
-
-            const matchingTrigger = triggers?.find(trigger =>
-              trigger.type === 'webhook-trigger' &&
-              trigger.parameters?.webhookPath === path
-            )
-
-            // Check trigger condition if present
-            if (matchingTrigger?.condition) {
-              logger.debug({
-                condition: matchingTrigger.condition,
-                path,
-                webhookData: JSON.stringify(webhookData).substring(0, 200),
-                headers: Object.keys(context.trigger.headers || {}),
-                workflowId: workflow.id,
-                workflowName: workflow.name
-              }, 'Evaluating webhook trigger condition')
-
-              const conditionMet = executor.evaluateCondition(matchingTrigger.condition, context)
-
-              if (!conditionMet) {
-                logger.info({
-                  condition: matchingTrigger.condition,
-                  path,
-                  webhookDataSnapshot: JSON.stringify(webhookData).substring(0, 200),
-                  workflowId: workflow.id,
-                  workflowName: workflow.name
-                }, 'Webhook trigger condition not met, skipping workflow')
-
-                return { reason: 'Condition not met', status: 'skipped', workflowId: workflow.id }
-              }
-
-              logger.info({
-                condition: matchingTrigger.condition,
-                path,
-                webhookDataSnapshot: JSON.stringify(webhookData).substring(0, 200),
-                workflowId: workflow.id,
-                workflowName: workflow.name
-              }, 'Webhook trigger condition met')
-            }
-
-            // Execute the workflow
-            await executor.execute(workflow as PayloadWorkflow, context, req)
-
-            return { status: 'triggered', workflowId: workflow.id }
-          } catch (error) {
-            return {
-              error: error instanceof Error ? error.message : 'Unknown error',
-              status: 'failed',
-              workflowId: workflow.id
-            }
-          }
-        })
-
-        const results = await Promise.allSettled(executionPromises)
-        const resultsData = results.map((result, index) => {
-          const baseResult = { workflowId: workflows.docs[index].id }
-          if (result.status === 'fulfilled') {
-            return { ...baseResult, ...result.value }
-          } else {
-            return { ...baseResult, error: result.reason, status: 'failed' }
-          }
-        })
-
-        return new Response(
-          JSON.stringify({
-            message: `Triggered ${workflows.docs.length} workflow(s)`,
-            results: resultsData
-          }),
-          {
-            headers: { 'Content-Type': 'application/json' },
-            status: 200
-          }
-        )
-
-      } catch (error) {
-        return new Response(
-          JSON.stringify({
-            details: error instanceof Error ? error.message : 'Unknown error',
-            error: 'Failed to process webhook'
-          }),
-          {
-            headers: { 'Content-Type': 'application/json' },
-            status: 500
-          }
-        )
-      }
-    },
-    method: 'post' as const,
-    path: `${normalizedPrefix}/:path`
-  }
-
-  // Check if the webhook endpoint already exists to avoid duplicates
-  const existingEndpoint = config.endpoints?.find(endpoint =>
-    endpoint.path === webhookEndpoint.path && endpoint.method === webhookEndpoint.method
-  )
-
-  if (!existingEndpoint) {
-    // Combine existing endpoints with the webhook endpoint
-    config.endpoints = [...(config.endpoints || []), webhookEndpoint]
-    logger.debug(`Webhook endpoint added at path: ${webhookEndpoint.path}`)
-    logger.debug('New config.endpoints length:', config.endpoints.length)
-  } else {
-    logger.debug(`Webhook endpoint already exists at path: ${webhookEndpoint.path}`)
-  }
-}

src/plugin/init-workflow-hooks.ts

@@ -1,56 +0,0 @@
-import type {Payload} from 'payload'
-
-import {updateWorkflowCronJobs, removeWorkflowCronJobs} from './cron-scheduler.js'
-
-/**
- * Initialize hooks for the workflows collection itself
- * to manage cron jobs when workflows are created/updated
- */
-export function initWorkflowHooks(payload: Payload, logger: Payload['logger']): void {
-  // Add afterChange hook to workflows collection to update cron jobs
-  const workflowsCollection = payload.collections.workflows
-  
-  if (!workflowsCollection) {
-    logger.warn('Workflows collection not found, cannot initialize workflow hooks')
-    return
-  }
-  
-  // Add afterChange hook to register/update cron jobs
-  if (!workflowsCollection.config.hooks?.afterChange) {
-    if (!workflowsCollection.config.hooks) {
-      // @ts-expect-error - hooks object will be populated by Payload
-      workflowsCollection.config.hooks = {}
-    }
-    workflowsCollection.config.hooks.afterChange = []
-  }
-  
-  workflowsCollection.config.hooks.afterChange.push(async ({ doc, operation }) => {
-    if (operation === 'create' || operation === 'update') {
-      logger.debug({
-        operation,
-        workflowId: doc.id,
-        workflowName: doc.name
-      }, 'Workflow changed, updating cron jobs selectively')
-      
-      // Update cron jobs for this specific workflow only
-      await updateWorkflowCronJobs(doc.id, payload, logger)
-    }
-  })
-  
-  // Add afterDelete hook to clean up cron jobs
-  if (!workflowsCollection.config.hooks?.afterDelete) {
-    workflowsCollection.config.hooks.afterDelete = []
-  }
-  
-  workflowsCollection.config.hooks.afterDelete.push(async ({ doc }) => {
-    logger.debug({
-      workflowId: doc.id,
-      workflowName: doc.name
-    }, 'Workflow deleted, removing cron jobs')
-    
-    // Remove cron jobs for the deleted workflow
-    removeWorkflowCronJobs(doc.id, payload, logger)
-  })
-  
-  logger.info('Workflow hooks initialized for cron job management')
-}

src/plugin/logger.ts

@@ -3,25 +3,40 @@ import type { Payload } from 'payload'
 // Global logger instance - use Payload's logger type
 let pluginLogger: null | Payload['logger'] = null
 
+/**
+ * Get the configured log level from environment variables
+ * Supports: PAYLOAD_AUTOMATION_LOG_LEVEL for unified control
+ * Or separate: PAYLOAD_AUTOMATION_CONFIG_LOG_LEVEL and PAYLOAD_AUTOMATION_LOG_LEVEL
+ */
+function getConfigLogLevel(): string {
+  return process.env.PAYLOAD_AUTOMATION_CONFIG_LOG_LEVEL || 
+         process.env.PAYLOAD_AUTOMATION_LOG_LEVEL || 
+         'warn' // Default to warn level for production
+}
+
 /**
  * Simple config-time logger for use during plugin configuration
  * Uses console with plugin prefix since Payload logger isn't available yet
  */
 const configLogger = {
   debug: <T>(message: string, ...args: T[]) => {
-    if (!process.env.PAYLOAD_AUTOMATION_CONFIG_LOGGING) {return}
-    console.log(`[payload-automation] ${message}`, ...args)
+    const level = getConfigLogLevel()
+    if (level === 'silent' || (level !== 'debug' && level !== 'trace')) {return}
+    console.debug(`[payload-automation] ${message}`, ...args)
   },
   error: <T>(message: string, ...args: T[]) => {
-    if (!process.env.PAYLOAD_AUTOMATION_CONFIG_LOGGING) {return}
+    const level = getConfigLogLevel()
+    if (level === 'silent') {return}
     console.error(`[payload-automation] ${message}`, ...args)
   },
   info: <T>(message: string, ...args: T[]) => {
-    if (!process.env.PAYLOAD_AUTOMATION_CONFIG_LOGGING) {return}
-    console.log(`[payload-automation] ${message}`, ...args)
+    const level = getConfigLogLevel()
+    if (level === 'silent' || level === 'error' || level === 'warn') {return}
+    console.info(`[payload-automation] ${message}`, ...args)
   },
   warn: <T>(message: string, ...args: T[]) => {
-    if (!process.env.PAYLOAD_AUTOMATION_CONFIG_LOGGING) {return}
+    const level = getConfigLogLevel()
+    if (level === 'silent' || level === 'error') {return}
     console.warn(`[payload-automation] ${message}`, ...args)
   }
 }
@@ -39,8 +54,13 @@ export function getConfigLogger() {
  */
 export function initializeLogger(payload: Payload): Payload['logger'] {
   // Create a child logger with plugin identification
+  // Use PAYLOAD_AUTOMATION_LOG_LEVEL as the primary env var
+  const logLevel = process.env.PAYLOAD_AUTOMATION_LOG_LEVEL || 
+                   process.env.PAYLOAD_AUTOMATION_LOGGING || // Legacy support
+                   'warn' // Default to warn level for production
+  
   pluginLogger = payload.logger.child({
-    level: process.env.PAYLOAD_AUTOMATION_LOGGING || 'silent',
+    level: logLevel,
     plugin: '@xtr-dev/payload-automation'
   })
   return pluginLogger

src/test/workflow-executor.test.ts

@@ -72,7 +72,7 @@ describe('WorkflowExecutor', () => {
   describe('resolveStepInput', () => {
     it('should resolve all JSONPath expressions in step config', () => {
       const config = {
-        url: '$.trigger.webhook.url',
+        url: '$.trigger.data.url',
         message: 'Static message',
         data: {
           id: '$.trigger.doc.id',
@@ -83,7 +83,7 @@ describe('WorkflowExecutor', () => {
       const context = {
         trigger: {
           doc: { id: 'doc-123', title: 'Doc Title' },
-          webhook: { url: 'https://example.com/webhook' }
+          data: { url: 'https://example.com/webhook' }
         },
         steps: {}
       }

src/triggers/collection-trigger.ts

@@ -0,0 +1,36 @@
+import type {TriggerConfig} from '../plugin/config-types.js'
+
+export const collectionTrigger: TriggerConfig = ({collectionTriggers}) => ({
+  slug: 'collection-hook',
+  parameters: [
+    {
+      name: 'collectionSlug',
+      type: 'select',
+      options: Object.keys(collectionTriggers || {}),
+    },
+    {
+      name: 'hook',
+      type: 'select',
+      options: [
+        "afterChange",
+        "afterDelete",
+        "afterError",
+        "afterForgotPassword",
+        "afterLogin",
+        "afterLogout",
+        "afterMe",
+        "afterOperation",
+        "afterRead",
+        "afterRefresh",
+        "beforeChange",
+        "beforeDelete",
+        "beforeLogin",
+        "beforeOperation",
+        "beforeRead",
+        "beforeValidate",
+        "me",
+        "refresh"
+      ]
+    }
+  ]
+})

src/triggers/global-trigger.ts

@@ -0,0 +1,29 @@
+import type {TriggerConfig} from '../plugin/config-types.js'
+
+export const globalTrigger: TriggerConfig = ({globalTriggers}) => ({
+  slug: 'global-hook',
+  parameters: [
+    {
+      name: 'global',
+      type: 'select',
+      admin: {
+        description: 'Global that triggers the workflow',
+      },
+      options: Object.keys(globalTriggers || {}),
+    },
+    {
+      name: 'operation',
+      type: 'select',
+      admin: {
+        description: 'Global hook that triggers the workflow',
+      },
+      options: [
+        "afterChange",
+        "afterRead", 
+        "beforeChange",
+        "beforeRead",
+        "beforeValidate"
+      ],
+    }
+  ]
+})

src/triggers/index.ts

@@ -0,0 +1,2 @@
+export { collectionTrigger } from './collection-trigger.js'
+export { globalTrigger } from './global-trigger.js'

src/triggers/types.ts

@@ -0,0 +1,6 @@
+import type {Field} from "payload"
+
+export type Trigger = {
+  slug: string
+  parameters: Field[]
+}

src/utils/trigger-helpers.ts

@@ -1,138 +0,0 @@
-import type { Field } from 'payload'
-import type { CustomTriggerConfig } from '../plugin/config-types.js'
-
-/**
- * Helper function to create a virtual trigger parameter field
- * Handles the boilerplate for storing/reading from the parameters JSON field
- */
-export function createTriggerParameter(
-  name: string,
-  fieldConfig: any, // Use any to allow flexible field configurations
-  triggerSlug: string
-): Field {
-  // Create a unique field name by prefixing with trigger slug
-  const uniqueFieldName = `__trigger_${triggerSlug}_${name}`
-  
-  return {
-    ...fieldConfig,
-    name: uniqueFieldName,
-    virtual: true,
-    admin: {
-      ...fieldConfig.admin,
-      condition: (_, siblingData) => siblingData?.type === triggerSlug && (
-        fieldConfig.admin?.condition ? 
-          fieldConfig.admin.condition(_, siblingData) : 
-          true
-      )
-    },
-    hooks: {
-      ...fieldConfig.hooks,
-      afterRead: [
-        ...(fieldConfig.hooks?.afterRead || []),
-        ({ siblingData }) => siblingData?.parameters?.[name] || fieldConfig.defaultValue
-      ],
-      beforeChange: [
-        ...(fieldConfig.hooks?.beforeChange || []),
-        ({ value, siblingData }) => {
-          if (!siblingData.parameters) siblingData.parameters = {}
-          siblingData.parameters[name] = value
-          return undefined // Virtual field, don't store directly
-        }
-      ]
-    },
-    validate: fieldConfig.validate || fieldConfig.required ? 
-      (value: any, args: any) => {
-        const paramValue = value ?? args.siblingData?.parameters?.[name]
-        
-        // Check required
-        if (fieldConfig.required && args.siblingData?.type === triggerSlug && !paramValue) {
-          return `${fieldConfig.admin?.description || name} is required for ${triggerSlug}`
-        }
-        
-        // Run original validation if present
-        return fieldConfig.validate?.(paramValue, args) ?? true
-      } : 
-      undefined
-  } as Field
-}
-
-/**
- * Helper to create multiple trigger parameter fields at once
- */
-export function createTriggerParameters(
-  triggerSlug: string,
-  parameters: Record<string, any>
-): Field[] {
-  return Object.entries(parameters).map(([name, fieldConfig]) => 
-    createTriggerParameter(name, fieldConfig, triggerSlug)
-  )
-}
-
-/**
- * Main trigger builder function that creates a fluent API for defining triggers
- */
-export function createTrigger<TSlug extends string>(slug: TSlug) {
-  return {
-    /**
-     * Define parameters for this trigger using a clean object syntax
-     * @param paramConfig - Object where keys are parameter names and values are Field configs
-     * @returns Complete CustomTriggerConfig ready for use
-     */
-    parameters(paramConfig: Record<string, any>): CustomTriggerConfig {
-      return {
-        slug,
-        inputs: Object.entries(paramConfig).map(([name, fieldConfig]) => 
-          createTriggerParameter(name, fieldConfig, slug)
-        )
-      }
-    }
-  }
-}
-
-/**
- * Advanced trigger builder with chainable methods for more complex scenarios
- */
-export function createAdvancedTrigger<TSlug extends string>(slug: TSlug) {
-  const builder = {
-    slug,
-    _parameters: {} as Record<string, any>,
-    
-    /**
-     * Set all parameters at once
-     */
-    parameters(paramConfig: Record<string, any>) {
-      this._parameters = paramConfig
-      return this
-    },
-    
-    /**
-     * Add a single parameter
-     */
-    parameter(name: string, fieldConfig: any) {
-      this._parameters[name] = fieldConfig
-      return this
-    },
-    
-    /**
-     * Extend with existing parameter sets (useful for common patterns)
-     */
-    extend(baseParameters: Record<string, any>) {
-      this._parameters = { ...baseParameters, ...this._parameters }
-      return this
-    },
-    
-    /**
-     * Build the final trigger configuration
-     */
-    build(): CustomTriggerConfig {
-      return {
-        slug: this.slug,
-        inputs: Object.entries(this._parameters).map(([name, fieldConfig]) => 
-          createTriggerParameter(name, fieldConfig, this.slug)
-        )
-      }
-    }
-  }
-  
-  return builder
-}

src/utils/trigger-presets.ts

@@ -1,156 +0,0 @@
-import { createAdvancedTrigger } from './trigger-helpers.js'
-
-/**
- * Common parameter sets for reuse across different triggers
- */
-
-export const webhookParameters: Record<string, any> = {
-  path: {
-    type: 'text',
-    required: true,
-    admin: {
-      description: 'URL path for the webhook endpoint (e.g., "my-webhook")'
-    },
-    validate: (value: any) => {
-      if (typeof value === 'string' && value.includes(' ')) {
-        return 'Webhook path cannot contain spaces'
-      }
-      return true
-    }
-  },
-  secret: {
-    type: 'text',
-    admin: {
-      description: 'Secret key for webhook signature validation (optional but recommended)'
-    }
-  },
-  headers: {
-    type: 'json',
-    admin: {
-      description: 'Expected HTTP headers for validation (JSON object)'
-    }
-  }
-}
-
-export const cronParameters: Record<string, any> = {
-  expression: {
-    type: 'text',
-    required: true,
-    admin: {
-      description: 'Cron expression for scheduling (e.g., "0 9 * * 1" for every Monday at 9 AM)',
-      placeholder: '0 9 * * 1'
-    }
-  },
-  timezone: {
-    type: 'text',
-    defaultValue: 'UTC',
-    admin: {
-      description: 'Timezone for cron execution (e.g., "America/New_York", "Europe/London")',
-      placeholder: 'UTC'
-    },
-    validate: (value: any) => {
-      if (value) {
-        try {
-          new Intl.DateTimeFormat('en', { timeZone: value as string })
-          return true
-        } catch {
-          return `Invalid timezone: ${value}. Please use a valid IANA timezone identifier`
-        }
-      }
-      return true
-    }
-  }
-}
-
-export const eventParameters: Record<string, any> = {
-  eventTypes: {
-    type: 'select',
-    hasMany: true,
-    options: [
-      { label: 'User Created', value: 'user.created' },
-      { label: 'User Updated', value: 'user.updated' },
-      { label: 'Document Published', value: 'document.published' },
-      { label: 'Payment Completed', value: 'payment.completed' }
-    ],
-    admin: {
-      description: 'Event types that should trigger this workflow'
-    }
-  },
-  filters: {
-    type: 'json',
-    admin: {
-      description: 'JSON filters to apply to event data (e.g., {"status": "active"})'
-    }
-  }
-}
-
-/**
- * Preset trigger builders for common patterns
- */
-
-/**
- * Create a webhook trigger with common webhook parameters pre-configured
- */
-export function webhookTrigger<TSlug extends string>(slug: TSlug) {
-  return createAdvancedTrigger(slug).extend(webhookParameters)
-}
-
-/**
- * Create a scheduled/cron trigger with timing parameters pre-configured
- */
-export function cronTrigger<TSlug extends string>(slug: TSlug) {
-  return createAdvancedTrigger(slug).extend(cronParameters)
-}
-
-/**
- * Create an event-driven trigger with event filtering parameters
- */
-export function eventTrigger<TSlug extends string>(slug: TSlug) {
-  return createAdvancedTrigger(slug).extend(eventParameters)
-}
-
-/**
- * Create a simple manual trigger (no parameters needed)
- */
-export function manualTrigger<TSlug extends string>(slug: TSlug) {
-  return {
-    slug,
-    inputs: []
-  }
-}
-
-/**
- * Create an API trigger for external systems to call
- */
-export function apiTrigger<TSlug extends string>(slug: TSlug) {
-  return createAdvancedTrigger(slug).extend({
-    endpoint: {
-      type: 'text',
-      required: true,
-      admin: {
-        description: 'API endpoint path (e.g., "/api/triggers/my-trigger")'
-      }
-    },
-    method: {
-      type: 'select',
-      options: ['GET', 'POST', 'PUT', 'PATCH'],
-      defaultValue: 'POST',
-      admin: {
-        description: 'HTTP method for the API endpoint'
-      }
-    },
-    authentication: {
-      type: 'select',
-      options: [
-        { label: 'None', value: 'none' },
-        { label: 'API Key', value: 'api-key' },
-        { label: 'Bearer Token', value: 'bearer' },
-        { label: 'Basic Auth', value: 'basic' }
-      ],
-      defaultValue: 'api-key',
-      admin: {
-        description: 'Authentication method for the API endpoint'
-      }
-    }
-  })
-}