@friggframework/admin-scripts 2.0.0--canary.517.aeeef23.0 → 2.0.0--canary.517.7e78259.0

package/index.js

@@ -36,7 +36,6 @@ const { AWSSchedulerAdapter } = require('./src/adapters/aws-scheduler-adapter');
 const { LocalSchedulerAdapter } = require('./src/adapters/local-scheduler-adapter');
 const {
     createSchedulerAdapter,
-    detectSchedulerAdapterType,
 } = require('./src/adapters/scheduler-adapter-factory');
 
 module.exports = {
@@ -71,5 +70,4 @@ module.exports = {
     AWSSchedulerAdapter,
     LocalSchedulerAdapter,
     createSchedulerAdapter,
-    detectSchedulerAdapterType,
 };

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "@friggframework/admin-scripts",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.517.aeeef23.0",
+    "version": "2.0.0--canary.517.7e78259.0",
     "description": "Admin Script Runner for Frigg - Execute maintenance and operational scripts in hosted environments",
     "dependencies": {
         "@aws-sdk/client-scheduler": "^3.588.0",
-        "@friggframework/core": "2.0.0--canary.517.aeeef23.0",
+        "@friggframework/core": "2.0.0--canary.517.7e78259.0",
         "bcryptjs": "^2.4.3",
         "express": "^4.18.2",
         "lodash": "4.17.21",
@@ -13,9 +13,9 @@
         "uuid": "^9.0.1"
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.517.aeeef23.0",
-        "@friggframework/prettier-config": "2.0.0--canary.517.aeeef23.0",
-        "@friggframework/test": "2.0.0--canary.517.aeeef23.0",
+        "@friggframework/eslint-config": "2.0.0--canary.517.7e78259.0",
+        "@friggframework/prettier-config": "2.0.0--canary.517.7e78259.0",
+        "@friggframework/test": "2.0.0--canary.517.7e78259.0",
         "eslint": "^8.22.0",
         "jest": "^29.7.0",
         "prettier": "^2.7.1",
@@ -46,5 +46,5 @@
         "maintenance",
         "operations"
     ],
-    "gitHead": "aeeef23b75be72e029f84eb3ad392c01a7da0ed9"
+    "gitHead": "7e782599075f468b2defbb00cd243dcce243702f"
 }

package/src/adapters/__tests__/aws-scheduler-adapter.test.js

@@ -18,34 +18,28 @@ jest.mock('@aws-sdk/client-scheduler', () => {
     };
 });
 
+const defaultParams = {
+    targetLambdaArn: 'arn:aws:lambda:us-east-1:123456789012:function:admin-script-executor',
+    scheduleGroupName: 'frigg-admin-scripts',
+    roleArn: 'arn:aws:iam::123456789012:role/test-role',
+};
+
 describe('AWSSchedulerAdapter', () => {
     let adapter;
     let mockSend;
-    let originalEnv;
-
-    beforeAll(() => {
-        originalEnv = { ...process.env };
-    });
+    const originalEnv = process.env;
 
     beforeEach(() => {
         jest.clearAllMocks();
-
-        // Reset environment variables
-        process.env.AWS_REGION = 'us-east-1';
-        process.env.SCHEDULE_GROUP_NAME = 'test-schedule-group';
-        process.env.SCHEDULER_ROLE_ARN = 'arn:aws:iam::123456789012:role/test-role';
-        process.env.ADMIN_SCRIPT_LAMBDA_ARN = 'arn:aws:lambda:us-east-1:123456789012:function:test-executor';
+        process.env = { ...originalEnv, AWS_REGION: 'us-east-1' };
 
         const sdk = require('@aws-sdk/client-scheduler');
         mockSend = sdk._mockSend;
 
-        adapter = new AWSSchedulerAdapter({
-            targetLambdaArn: 'arn:aws:lambda:us-east-1:123456789012:function:admin-script-executor',
-            scheduleGroupName: 'frigg-admin-scripts',
-        });
+        adapter = new AWSSchedulerAdapter({ ...defaultParams });
     });
 
-    afterAll(() => {
+    afterEach(() => {
         process.env = originalEnv;
     });
 
@@ -60,35 +54,46 @@ describe('AWSSchedulerAdapter', () => {
     });
 
     describe('Constructor', () => {
-        it('should use provided configuration', () => {
+        it('should use provided configuration and AWS_REGION from env', () => {
+            process.env.AWS_REGION = 'eu-west-1';
             const customAdapter = new AWSSchedulerAdapter({
-                region: 'eu-west-1',
                 targetLambdaArn: 'arn:aws:lambda:eu-west-1:123456789012:function:custom',
                 scheduleGroupName: 'custom-group',
+                roleArn: 'arn:aws:iam::123456789012:role/custom-role',
             });
 
             expect(customAdapter.region).toBe('eu-west-1');
             expect(customAdapter.targetLambdaArn).toBe('arn:aws:lambda:eu-west-1:123456789012:function:custom');
             expect(customAdapter.scheduleGroupName).toBe('custom-group');
+            expect(customAdapter.roleArn).toBe('arn:aws:iam::123456789012:role/custom-role');
         });
 
-        it('should use environment variables as fallback', () => {
-            const envAdapter = new AWSSchedulerAdapter();
-
-            expect(envAdapter.region).toBe('us-east-1');
-            expect(envAdapter.targetLambdaArn).toBe('arn:aws:lambda:us-east-1:123456789012:function:test-executor');
-            expect(envAdapter.scheduleGroupName).toBe('test-schedule-group');
+        it('should throw if AWS_REGION is not set', () => {
+            delete process.env.AWS_REGION;
+            expect(() => new AWSSchedulerAdapter({
+                ...defaultParams,
+            })).toThrow('AWSSchedulerAdapter requires AWS_REGION environment variable');
         });
 
-        it('should use defaults when no config or env vars', () => {
-            delete process.env.AWS_REGION;
-            delete process.env.SCHEDULE_GROUP_NAME;
-            delete process.env.ADMIN_SCRIPT_LAMBDA_ARN;
+        it('should throw if targetLambdaArn is missing', () => {
+            expect(() => new AWSSchedulerAdapter({
+                scheduleGroupName: defaultParams.scheduleGroupName,
+                roleArn: defaultParams.roleArn,
+            })).toThrow('AWSSchedulerAdapter requires targetLambdaArn');
+        });
 
-            const defaultAdapter = new AWSSchedulerAdapter();
+        it('should throw if scheduleGroupName is missing', () => {
+            expect(() => new AWSSchedulerAdapter({
+                targetLambdaArn: defaultParams.targetLambdaArn,
+                roleArn: defaultParams.roleArn,
+            })).toThrow('AWSSchedulerAdapter requires scheduleGroupName');
+        });
 
-            expect(defaultAdapter.region).toBe('us-east-1');
-            expect(defaultAdapter.scheduleGroupName).toBe('frigg-admin-scripts');
+        it('should throw if roleArn is missing', () => {
+            expect(() => new AWSSchedulerAdapter({
+                targetLambdaArn: defaultParams.targetLambdaArn,
+                scheduleGroupName: defaultParams.scheduleGroupName,
+            })).toThrow('AWSSchedulerAdapter requires roleArn');
         });
     });
 
@@ -139,7 +144,7 @@ describe('AWSSchedulerAdapter', () => {
             });
         });
 
-        it('should configure target with Lambda ARN and role', async () => {
+        it('should configure target with Lambda ARN and constructor roleArn', async () => {
             mockSend.mockResolvedValue({
                 ScheduleArn: 'arn:aws:scheduler:us-east-1:123456789012:schedule/frigg-admin-scripts/frigg-script-test-script',
             });
@@ -154,6 +159,26 @@ describe('AWSSchedulerAdapter', () => {
             expect(command.params.Target.RoleArn).toBe('arn:aws:iam::123456789012:role/test-role');
         });
 
+        it('should use roleArn from constructor, not process.env', async () => {
+            const customRoleArn = 'arn:aws:iam::999999999999:role/custom-scheduler-role';
+            const customAdapter = new AWSSchedulerAdapter({
+                ...defaultParams,
+                roleArn: customRoleArn,
+            });
+
+            mockSend.mockResolvedValue({
+                ScheduleArn: 'arn:aws:scheduler:us-east-1:123456789012:schedule/frigg-admin-scripts/frigg-script-test-script',
+            });
+
+            await customAdapter.createSchedule({
+                scriptName: 'test-script',
+                cronExpression: 'cron(0 0 * * ? *)',
+            });
+
+            const command = mockSend.mock.calls[0][0];
+            expect(command.params.Target.RoleArn).toBe(customRoleArn);
+        });
+
         it('should enable schedule by default', async () => {
             mockSend.mockResolvedValue({
                 ScheduleArn: 'arn:aws:scheduler:us-east-1:123456789012:schedule/frigg-admin-scripts/frigg-script-test-script',
@@ -301,9 +326,7 @@ describe('AWSSchedulerAdapter', () => {
 
     describe('Lazy SDK loading', () => {
         it('should load AWS SDK on first client access', () => {
-            const newAdapter = new AWSSchedulerAdapter({
-                targetLambdaArn: 'arn:aws:lambda:us-east-1:123456789012:function:test',
-            });
+            const newAdapter = new AWSSchedulerAdapter({ ...defaultParams });
 
             expect(newAdapter.scheduler).toBeNull();
 

package/src/adapters/__tests__/scheduler-adapter-factory.test.js

@@ -1,7 +1,4 @@
-const {
-    createSchedulerAdapter,
-    detectSchedulerAdapterType,
-} = require('../scheduler-adapter-factory');
+const { createSchedulerAdapter } = require('../scheduler-adapter-factory');
 const { AWSSchedulerAdapter } = require('../aws-scheduler-adapter');
 const { LocalSchedulerAdapter } = require('../local-scheduler-adapter');
 
@@ -17,71 +14,56 @@ jest.mock('@aws-sdk/client-scheduler', () => ({
     ListSchedulesCommand: jest.fn(),
 }));
 
-describe('Scheduler Adapter Factory', () => {
-    let originalEnv;
+const awsAdapterParams = {
+    targetLambdaArn: 'arn:aws:lambda:us-east-1:123456789012:function:test',
+    scheduleGroupName: 'test-group',
+    roleArn: 'arn:aws:iam::123456789012:role/test-role',
+};
 
-    beforeAll(() => {
-        originalEnv = { ...process.env };
-    });
+describe('Scheduler Adapter Factory', () => {
+    const originalEnv = process.env;
 
     beforeEach(() => {
-        // Reset environment variables
-        delete process.env.SCHEDULER_ADAPTER;
-        delete process.env.STAGE;
-        delete process.env.NODE_ENV;
+        process.env = { ...originalEnv, AWS_REGION: 'us-east-1' };
     });
 
-    afterAll(() => {
+    afterEach(() => {
         process.env = originalEnv;
     });
 
     describe('createSchedulerAdapter()', () => {
-        it('should create local adapter by default', () => {
-            const adapter = createSchedulerAdapter();
+        it('should throw if type is not provided', () => {
+            expect(() => createSchedulerAdapter()).toThrow();
+        });
 
-            expect(adapter).toBeInstanceOf(LocalSchedulerAdapter);
-            expect(adapter.getName()).toBe('local-cron');
+        it('should throw if type is not provided in options object', () => {
+            expect(() => createSchedulerAdapter({})).toThrow();
         });
 
-        it('should create local adapter when explicitly specified', () => {
+        it('should create local adapter when type is "local"', () => {
             const adapter = createSchedulerAdapter({ type: 'local' });
 
             expect(adapter).toBeInstanceOf(LocalSchedulerAdapter);
+            expect(adapter.getName()).toBe('local-cron');
         });
 
         it('should create AWS adapter when type is "aws"', () => {
-            const adapter = createSchedulerAdapter({ type: 'aws' });
+            const adapter = createSchedulerAdapter({ type: 'aws', ...awsAdapterParams });
 
             expect(adapter).toBeInstanceOf(AWSSchedulerAdapter);
             expect(adapter.getName()).toBe('aws-eventbridge-scheduler');
         });
 
         it('should create AWS adapter when type is "eventbridge"', () => {
-            const adapter = createSchedulerAdapter({ type: 'eventbridge' });
-
-            expect(adapter).toBeInstanceOf(AWSSchedulerAdapter);
-        });
-
-        it('should use SCHEDULER_ADAPTER env variable', () => {
-            process.env.SCHEDULER_ADAPTER = 'aws';
-
-            const adapter = createSchedulerAdapter();
+            const adapter = createSchedulerAdapter({ type: 'eventbridge', ...awsAdapterParams });
 
             expect(adapter).toBeInstanceOf(AWSSchedulerAdapter);
         });
 
-        it('should allow explicit type to override env variable', () => {
-            process.env.SCHEDULER_ADAPTER = 'aws';
-
-            const adapter = createSchedulerAdapter({ type: 'local' });
-
-            expect(adapter).toBeInstanceOf(LocalSchedulerAdapter);
-        });
-
         it('should handle case-insensitive type values', () => {
-            const adapter1 = createSchedulerAdapter({ type: 'AWS' });
+            const adapter1 = createSchedulerAdapter({ type: 'AWS', ...awsAdapterParams });
             const adapter2 = createSchedulerAdapter({ type: 'LOCAL' });
-            const adapter3 = createSchedulerAdapter({ type: 'EventBridge' });
+            const adapter3 = createSchedulerAdapter({ type: 'EventBridge', ...awsAdapterParams });
 
             expect(adapter1).toBeInstanceOf(AWSSchedulerAdapter);
             expect(adapter2).toBeInstanceOf(LocalSchedulerAdapter);
@@ -91,17 +73,29 @@ describe('Scheduler Adapter Factory', () => {
         it('should pass AWS configuration to AWS adapter', () => {
             const config = {
                 type: 'aws',
-                region: 'eu-west-1',
                 targetLambdaArn: 'arn:aws:lambda:eu-west-1:123456789012:function:test',
                 scheduleGroupName: 'custom-group',
+                roleArn: 'arn:aws:iam::123456789012:role/custom-role',
             };
 
             const adapter = createSchedulerAdapter(config);
 
             expect(adapter).toBeInstanceOf(AWSSchedulerAdapter);
-            expect(adapter.region).toBe('eu-west-1');
+            expect(adapter.region).toBe('us-east-1'); // From process.env.AWS_REGION
             expect(adapter.targetLambdaArn).toBe('arn:aws:lambda:eu-west-1:123456789012:function:test');
             expect(adapter.scheduleGroupName).toBe('custom-group');
+            expect(adapter.roleArn).toBe('arn:aws:iam::123456789012:role/custom-role');
+        });
+
+        it('should pass roleArn through to AWS adapter', () => {
+            const adapter = createSchedulerAdapter({
+                type: 'aws',
+                ...awsAdapterParams,
+                roleArn: 'arn:aws:iam::999999999999:role/scheduler-role',
+            });
+
+            expect(adapter).toBeInstanceOf(AWSSchedulerAdapter);
+            expect(adapter.roleArn).toBe('arn:aws:iam::999999999999:role/scheduler-role');
         });
 
         it('should ignore AWS config for local adapter', () => {
@@ -116,142 +110,8 @@ describe('Scheduler Adapter Factory', () => {
             expect(adapter.region).toBeUndefined();
         });
 
-        it('should handle unknown adapter type by creating local adapter', () => {
-            const adapter = createSchedulerAdapter({ type: 'unknown-type' });
-
-            expect(adapter).toBeInstanceOf(LocalSchedulerAdapter);
-        });
-    });
-
-    describe('detectSchedulerAdapterType()', () => {
-        it('should return "local" by default', () => {
-            const type = detectSchedulerAdapterType();
-
-            expect(type).toBe('local');
-        });
-
-        it('should return env SCHEDULER_ADAPTER when set', () => {
-            process.env.SCHEDULER_ADAPTER = 'aws';
-
-            const type = detectSchedulerAdapterType();
-
-            expect(type).toBe('aws');
-        });
-
-        it('should return "aws" for production stage', () => {
-            process.env.STAGE = 'production';
-
-            const type = detectSchedulerAdapterType();
-
-            expect(type).toBe('aws');
-        });
-
-        it('should return "aws" for prod stage', () => {
-            process.env.STAGE = 'prod';
-
-            const type = detectSchedulerAdapterType();
-
-            expect(type).toBe('aws');
-        });
-
-        it('should return "aws" for staging stage', () => {
-            process.env.STAGE = 'staging';
-
-            const type = detectSchedulerAdapterType();
-
-            expect(type).toBe('aws');
-        });
-
-        it('should return "aws" for stage stage', () => {
-            process.env.STAGE = 'stage';
-
-            const type = detectSchedulerAdapterType();
-
-            expect(type).toBe('aws');
-        });
-
-        it('should handle case-insensitive stage values', () => {
-            process.env.STAGE = 'PRODUCTION';
-
-            const type = detectSchedulerAdapterType();
-
-            expect(type).toBe('aws');
-        });
-
-        it('should return "local" for dev stage', () => {
-            process.env.STAGE = 'dev';
-
-            const type = detectSchedulerAdapterType();
-
-            expect(type).toBe('local');
-        });
-
-        it('should return "local" for development stage', () => {
-            process.env.STAGE = 'development';
-
-            const type = detectSchedulerAdapterType();
-
-            expect(type).toBe('local');
-        });
-
-        it('should return "local" for test stage', () => {
-            process.env.STAGE = 'test';
-
-            const type = detectSchedulerAdapterType();
-
-            expect(type).toBe('local');
-        });
-
-        it('should return "local" for local stage', () => {
-            process.env.STAGE = 'local';
-
-            const type = detectSchedulerAdapterType();
-
-            expect(type).toBe('local');
-        });
-
-        it('should use NODE_ENV as fallback for STAGE', () => {
-            delete process.env.STAGE;
-            process.env.NODE_ENV = 'production';
-
-            const type = detectSchedulerAdapterType();
-
-            expect(type).toBe('aws');
-        });
-
-        it('should prioritize explicit SCHEDULER_ADAPTER over auto-detection', () => {
-            process.env.SCHEDULER_ADAPTER = 'local';
-            process.env.STAGE = 'production';
-
-            const type = detectSchedulerAdapterType();
-
-            expect(type).toBe('local');
-        });
-    });
-
-    describe('Integration with createSchedulerAdapter', () => {
-        it('should auto-detect and create AWS adapter in production', () => {
-            process.env.STAGE = 'production';
-
-            const adapter = createSchedulerAdapter();
-
-            expect(adapter).toBeInstanceOf(AWSSchedulerAdapter);
-        });
-
-        it('should auto-detect and create local adapter in development', () => {
-            process.env.STAGE = 'development';
-
-            const adapter = createSchedulerAdapter();
-
-            expect(adapter).toBeInstanceOf(LocalSchedulerAdapter);
-        });
-
-        it('should allow explicit override of auto-detection', () => {
-            process.env.STAGE = 'production';
-
-            const adapter = createSchedulerAdapter({ type: 'local' });
-
-            expect(adapter).toBeInstanceOf(LocalSchedulerAdapter);
+        it('should throw for unknown adapter type', () => {
+            expect(() => createSchedulerAdapter({ type: 'unknown-type' })).toThrow();
         });
     });
 });

package/src/adapters/aws-scheduler-adapter.js

@@ -25,12 +25,19 @@ function loadSchedulerSDK() {
  * Supports cron expressions, timezone configuration, and Lambda invocation.
  */
 class AWSSchedulerAdapter extends SchedulerAdapter {
-    constructor({ region, credentials, targetLambdaArn, scheduleGroupName } = {}) {
+    constructor({ credentials, targetLambdaArn, scheduleGroupName, roleArn } = {}) {
         super();
-        this.region = region || process.env.AWS_REGION || 'us-east-1';
+        if (!targetLambdaArn) throw new Error('AWSSchedulerAdapter requires targetLambdaArn');
+        if (!scheduleGroupName) throw new Error('AWSSchedulerAdapter requires scheduleGroupName');
+        if (!roleArn) throw new Error('AWSSchedulerAdapter requires roleArn');
+        // Region inherits from the service (set by Lambda runtime, same for all AWS resources)
+        const region = process.env.AWS_REGION;
+        if (!region) throw new Error('AWSSchedulerAdapter requires AWS_REGION environment variable');
+        this.region = region;
         this.credentials = credentials;
-        this.targetLambdaArn = targetLambdaArn || process.env.ADMIN_SCRIPT_LAMBDA_ARN;
-        this.scheduleGroupName = scheduleGroupName || process.env.SCHEDULE_GROUP_NAME || 'frigg-admin-scripts';
+        this.targetLambdaArn = targetLambdaArn;
+        this.scheduleGroupName = scheduleGroupName;
+        this.roleArn = roleArn;
         this.scheduler = null;
     }
 
@@ -61,7 +68,7 @@ class AWSSchedulerAdapter extends SchedulerAdapter {
             FlexibleTimeWindow: { Mode: 'OFF' },
             Target: {
                 Arn: this.targetLambdaArn,
-                RoleArn: process.env.SCHEDULER_ROLE_ARN,
+                RoleArn: this.roleArn,
                 Input: JSON.stringify({
                     scriptName,
                     trigger: 'SCHEDULED',

package/src/adapters/scheduler-adapter-factory.js

@@ -6,64 +6,44 @@ const { LocalSchedulerAdapter } = require('./local-scheduler-adapter');
  *
  * Application Layer - Hexagonal Architecture
  *
- * Creates the appropriate scheduler adapter based on configuration.
- * Supports environment-based auto-detection and explicit configuration.
+ * Creates the appropriate scheduler adapter based on explicit configuration
+ * from appDefinition. Does not auto-detect or read environment variables.
  */
 
 /**
  * Create a scheduler adapter instance
  *
- * @param {Object} options - Configuration options
- * @param {string} [options.type] - Adapter type ('aws', 'eventbridge', 'local')
- * @param {string} [options.region] - AWS region (for AWS adapter)
+ * @param {Object} options - Configuration options (from appDefinition.adminScripts.scheduler)
+ * @param {string} options.type - Adapter type ('aws', 'eventbridge', 'local') - required
  * @param {Object} [options.credentials] - AWS credentials (for AWS adapter)
- * @param {string} [options.targetLambdaArn] - Lambda ARN to invoke (for AWS adapter)
- * @param {string} [options.scheduleGroupName] - EventBridge schedule group name (for AWS adapter)
+ * @param {string} [options.targetLambdaArn] - Lambda ARN to invoke (required for AWS adapter)
+ * @param {string} [options.scheduleGroupName] - EventBridge schedule group name (required for AWS adapter)
+ * @param {string} [options.roleArn] - IAM role ARN for scheduler (required for AWS adapter)
  * @returns {SchedulerAdapter} Configured scheduler adapter
  */
 function createSchedulerAdapter(options = {}) {
-    const adapterType = options.type || detectSchedulerAdapterType();
+    if (!options.type) {
+        throw new Error('Scheduler adapter type is required. Configure in appDefinition.adminScripts.scheduler.type');
+    }
 
-    switch (adapterType.toLowerCase()) {
+    switch (options.type.toLowerCase()) {
         case 'aws':
         case 'eventbridge':
             return new AWSSchedulerAdapter({
-                region: options.region,
                 credentials: options.credentials,
                 targetLambdaArn: options.targetLambdaArn,
                 scheduleGroupName: options.scheduleGroupName,
+                roleArn: options.roleArn,
             });
 
         case 'local':
-        default:
             return new LocalSchedulerAdapter();
-    }
-}
-
-/**
- * Determine the appropriate scheduler adapter type based on environment
- *
- * @returns {string} Adapter type ('aws' or 'local')
- */
-function detectSchedulerAdapterType() {
-    // If explicitly set, use that
-    if (process.env.SCHEDULER_ADAPTER) {
-        return process.env.SCHEDULER_ADAPTER;
-    }
 
-    // Auto-detect based on environment
-    const stage = process.env.STAGE || process.env.NODE_ENV || 'local';
-
-    // Use AWS adapter in production/staging environments
-    if (['production', 'prod', 'staging', 'stage'].includes(stage.toLowerCase())) {
-        return 'aws';
+        default:
+            throw new Error(`Unknown scheduler adapter type: ${options.type}`);
     }
-
-    // Use local adapter for dev/test/local
-    return 'local';
 }
 
 module.exports = {
     createSchedulerAdapter,
-    detectSchedulerAdapterType,
 };

package/src/application/__tests__/script-runner.test.js

@@ -27,7 +27,7 @@ describe('ScriptRunner', () => {
             },
         };
 
-        async execute(frigg, params) {
+        async execute(params) {
             return { success: true, params };
         }
     }
@@ -102,6 +102,22 @@ describe('ScriptRunner', () => {
             );
         });
 
+        it('should throw error if trigger is not provided', async () => {
+            const runner = new ScriptRunner({ scriptFactory, commands: mockCommands });
+
+            await expect(
+                runner.execute('test-script', { foo: 'bar' }, {})
+            ).rejects.toThrow('options.trigger is required');
+        });
+
+        it('should throw error if options are omitted entirely', async () => {
+            const runner = new ScriptRunner({ scriptFactory, commands: mockCommands });
+
+            await expect(
+                runner.execute('test-script', { foo: 'bar' })
+            ).rejects.toThrow('options.trigger is required');
+        });
+
         it('should handle script execution failure', async () => {
             class FailingScript extends AdminScriptBase {
                 static Definition = {
@@ -235,6 +251,7 @@ describe('ScriptRunner', () => {
 
             // Missing required parameter
             const result = await runner.execute('schema-script', {}, {
+                trigger: 'MANUAL',
                 dryRun: true,
             });
 
@@ -272,6 +289,7 @@ describe('ScriptRunner', () => {
                 name: 123,
                 enabled: 'true',
             }, {
+                trigger: 'MANUAL',
                 dryRun: true,
             });
 
@@ -307,6 +325,7 @@ describe('ScriptRunner', () => {
                 name: 'test',
                 count: 42,
             }, {
+                trigger: 'MANUAL',
                 dryRun: true,
             });
 

package/src/application/script-runner.js

@@ -32,7 +32,11 @@ class ScriptRunner {
      * @param {boolean} options.dryRun - Dry-run mode: validate and preview without executing
      */
     async execute(scriptName, params = {}, options = {}) {
-        const { trigger = 'MANUAL', audit = {}, executionId: existingExecutionId, dryRun = false } = options;
+        const { trigger, audit = {}, executionId: existingExecutionId, dryRun = false } = options;
+
+        if (!trigger) {
+            throw new Error('options.trigger is required (MANUAL | SCHEDULED | QUEUE)');
+        }
 
         // Get script class
         const scriptClass = this.scriptFactory.get(scriptName);

package/src/infrastructure/script-executor-handler.js

@@ -46,7 +46,7 @@ async function handler(event) {
                 const commands = createAdminScriptCommands();
                 await commands
                     .completeAdminProcess(executionId, {
-                        status: 'FAILED',
+                        state: 'FAILED',
                         error: {
                             name: error.name,
                             message: error.message,

package/PR_517_REVIEW_TRACKER.md

@@ -1,56 +0,0 @@
-# PR #517 Comment Tracker
-
-## ✅ ADDRESSED - Ready to Reply
-
-| # | File:Line | Original Comment | What We Did | Reply |
-|---|-----------|------------------|-------------|-------|
-| 1 | `admin-frigg-commands.js:15` | "I don't think this should even exist, we're just duplicating methods" | Renamed to `AdminScriptContext`, clarified as facade pattern | Renamed to `AdminScriptContext`. It's a facade - wraps repositories so scripts have one API instead of multiple imports. Open to discussing alternatives. |
-| 2 | `admin-script-base.js:94` | "Commands should come via constructor" | Changed to constructor injection | Done. Context now passed via constructor, scripts access via `this.context`. |
-| 3 | `admin-script-base.js:109` | "logging does not belong here" | Removed logging from base class | Removed. Scripts use `this.context.log()` which persists to admin process record. |
-| 4 | `admin-script-base.js:54` | "I would rename to requireIntegrationInstance" | Already renamed | Done - already renamed in current code. |
-| 5 | `admin-script-base.js:56` | "This is just a duplication of the static Definition" | Cleaned up display object | Cleaned up. `display` now only holds UI overrides (category, icon). Label/description fall back to top-level via static methods. |
-| 6 | `schedule-management-use-case.js:1` | "A use case should have single entry point" | Already split in previous session | Already split into `UpsertScheduleUseCase`, `DeleteScheduleUseCase`, `GetEffectiveScheduleUseCase`. |
-| 7 | `package.json:20` | "chai and sinon should slowly be pushed away" | Sinon removed in previous session | Sinon already removed. Will remove chai too. |
-
----
-
-## 📝 NEEDS RESPONSE ONLY - No Code Change Required
-
-| # | File:Line | Original Comment | Reply |
-|---|-----------|------------------|-------|
-| 8 | `admin-frigg-commands.js:160` | "this does not belong here" (queueScript) | queueScript enables self-queuing pattern (fan-out, pagination, retries). It's here so scripts don't need queue internals. Could move to separate utility if preferred. |
-| 9 | `admin-script-base.js:39` | "why do we need the source?" | Distinguishes builtin vs user-defined scripts. UI can filter differently, builtins could have special handling. Could remove if not needed. |
-| 10 | `admin-script-base.js:42` | "what's the idea with these schemas?" | Optional JSON Schema for validation/documentation. Could wire to OpenAPI or dynamic UI forms. Not critical for v1 - could remove and add later. |
-| 11 | `admin-script-base.js:46` | "enabled property confusion" | Agreed the matrix is confusing. Intent: `schedule.enabled` controls auto-trigger independent of registration. Could simplify to just use presence in appDefinition. |
-| 12 | `admin-script-base.js:52` | "Do we have retry logic in place already?" | Not yet - placeholder for Phase 2. Could remove until we build it. |
-| 13 | `admin-script-base.js:81` | "What is the executionId?" | ID of AdminProcess record tracking this execution. Used to persist logs and update status. Created before script runs, passed to constructor. |
-| 14 | `schedule-management-use-case.js:89` | "why save to database if EventBridge is source of truth?" | Database stores user's config override. EventBridge is execution engine. On deploy, we sync DB to EventBridge. Tracks user config vs code default. |
-
----
-
-## 🔧 OUTSTANDING - Needs Code Changes
-
-| # | File:Line | Original Comment | Task |
-|---|-----------|------------------|------|
-| 15 | `docs/architecture-decisions/005-admin-script-runner.md:71` | "What is 'frigg' in this parameter?" | Update ADR - rename `frigg` to `context` throughout |
-| 16 | `package.json:22` | "We already use nock for http request mocking" | Remove msw if present, use nock consistently |
-| 17 | `package.json:12` | "why mongoose?" | Check if mongoose needed or can be removed |
-| 18 | `schedule-management-use-case.js:109` | "leaking AWS specifics" | Abstract behind SchedulerAdapter, remove EventBridge references from use case |
-| 19 | `schedule-management-use-case.js:138` | "should not mention EventBridge here" | Same as above |
-| 20 | `adapters/aws-scheduler-adapter.js:30` | "should not infer/guess/default any variable" | Remove defaults, require explicit config |
-| 21 | `adapters/scheduler-adapter-factory.js:48` | "env var confusion, prefer appDefinition" | Move scheduler config to appDefinition |
-| 22 | `script-runner.js:36` | "we should not assume default values" | Remove defaults, require explicit values |
-| 23 | `dry-run-http-interceptor.js:1` | "I don't understand why this is needed" | Explain or remove - was for intercepting HTTP in dry-run mode |
-| 24 | `dry-run-repository-wrapper.js:1` | "This is smelly" | Review/remove - was for wrapping repos in dry-run mode |
-| 25 | `.github/workflows/release.yml:11` | "why do we need those?" | Check release workflow changes |
-
----
-
-## ❓ NEEDS DISCUSSION - Architectural Decisions
-
-| # | File:Line | Original Comment | Decision Needed |
-|---|-----------|------------------|-----------------|
-| 26 | `admin-script-base.js:39` | source field | Keep BUILTIN/USER_DEFINED or remove? |
-| 27 | `admin-script-base.js:42` | inputSchema/outputSchema | Keep for future or remove for now? |
-| 28 | `admin-script-base.js:46` | schedule.enabled | Simplify to just appDefinition presence? |
-| 29 | `admin-script-base.js:52` | maxRetries | Remove placeholder or keep? |