@friggframework/admin-scripts 2.0.0--canary.517.44c158e.0 → 2.0.0--canary.517.b384239.0

package/README.md

@@ -8,7 +8,7 @@ Typical use cases:
 -   **Recurring maintenance** — refresh webhooks/subscriptions before they expire.
 -   **Built-in utilities** — OAuth token refresh, integration health checks.
 
-> Admin scripts are a **high-privilege** surface. Every endpoint is protected by an admin API key (`x-frigg-admin-api-key`), scripts run in your private VPC subnets, and every execution is tracked in the `AdminProcess` table. Never expose the admin API key to browsers or end users.
+> Admin scripts are a **high-privilege** surface. Every endpoint is protected by an admin API key (`x-frigg-admin-api-key`), scripts run in your private VPC subnets, and every execution is tracked in the `AdminScriptExecution` table. Never expose the admin API key to browsers or end users.
 
 ---
 
@@ -129,7 +129,7 @@ module.exports = { AttioHealingScript };
 | `instantiate(integrationId)` | Returns a hydrated integration instance for calling external APIs. Requires `config.requireIntegrationInstance: true`.         |
 | `queueScript(name, params?)` | Enqueue another script as a follow-up (tracked as a child of the current execution).                                           |
 | `queueScriptBatch(entries)`  | Enqueue many follow-up scripts at once.                                                                                        |
-| `getExecutionId()`           | The current `AdminProcess` record id.                                                                                          |
+| `getExecutionId()`           | The current `AdminScriptExecution` record id.                                                                                  |
 
 Commands return **plain, decrypted data** on success (field-level encryption is handled transparently) or an `{ error, reason, code }` object on failure — scripts check `.error` themselves. Scripts have no direct repository access; all database interaction goes through the command layer.
 
@@ -247,7 +247,7 @@ async execute(params) {
 -   **Sync** (`mode: 'sync'`) — runs in the API Lambda, result returned in the response. Capped by the API timeout.
 -   **Async** (`mode: 'async'`, default) — queued to SQS and run by the worker Lambda (15-min budget). The SQS queue has a redrive policy (up to 3 receives) to a dead-letter queue, so a crashed invocation is retried at the infrastructure level. There is no application-level per-script retry — model idempotency accordingly.
 
-Every execution is persisted as an `AdminProcess` record with its `state` (`PENDING` → `RUNNING` → `COMPLETED`/`FAILED`), input, output, metrics, and logs.
+Every execution is persisted as an `AdminScriptExecution` record with its `state` (`PENDING` → `RUNNING` → `COMPLETED`/`FAILED`), input, output, metrics, and logs.
 
 ---
 

package/package.json

@@ -1,19 +1,19 @@
 {
     "name": "@friggframework/admin-scripts",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.517.44c158e.0",
+    "version": "2.0.0--canary.517.b384239.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.44c158e.0",
+        "@friggframework/core": "2.0.0--canary.517.b384239.0",
         "@hapi/boom": "^10.0.1",
         "express": "^4.18.2",
         "serverless-http": "^3.2.0"
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.517.44c158e.0",
-        "@friggframework/prettier-config": "2.0.0--canary.517.44c158e.0",
-        "@friggframework/test": "2.0.0--canary.517.44c158e.0",
+        "@friggframework/eslint-config": "2.0.0--canary.517.b384239.0",
+        "@friggframework/prettier-config": "2.0.0--canary.517.b384239.0",
+        "@friggframework/test": "2.0.0--canary.517.b384239.0",
         "eslint": "^8.22.0",
         "jest": "^29.7.0",
         "prettier": "^2.7.1",
@@ -44,5 +44,5 @@
         "maintenance",
         "operations"
     ],
-    "gitHead": "44c158e7a3bbeaac4b410c1062b0ce209bffd7f0"
+    "gitHead": "b384239f327baa975cb82c0f63888e67f40160c3"
 }

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

@@ -1,4 +1,7 @@
-const { createSchedulerAdapter } = require('../scheduler-adapter-factory');
+const {
+    createSchedulerAdapter,
+    createSchedulerAdapterFromEnv,
+} = require('../scheduler-adapter-factory');
 const { AWSSchedulerAdapter } = require('../aws-scheduler-adapter');
 const { LocalSchedulerAdapter } = require('../local-scheduler-adapter');
 
@@ -135,4 +138,51 @@ describe('Scheduler Adapter Factory', () => {
             ).toThrow();
         });
     });
+
+    describe('createSchedulerAdapterFromEnv()', () => {
+        it('falls back to the local adapter off-AWS when SCHEDULER_PROVIDER is unset', () => {
+            delete process.env.SCHEDULER_PROVIDER;
+            delete process.env.AWS_LAMBDA_FUNCTION_NAME;
+
+            const adapter = createSchedulerAdapterFromEnv();
+
+            expect(adapter).toBeInstanceOf(LocalSchedulerAdapter);
+        });
+
+        it('throws 503 when SCHEDULER_PROVIDER is unset in a deployed Lambda', () => {
+            delete process.env.SCHEDULER_PROVIDER;
+            process.env.AWS_LAMBDA_FUNCTION_NAME = 'admin-script-router';
+
+            let error;
+            try {
+                createSchedulerAdapterFromEnv();
+            } catch (e) {
+                error = e;
+            }
+
+            expect(error).toBeDefined();
+            expect(error.isBoom).toBe(true);
+            expect(error.output.statusCode).toBe(503);
+        });
+
+        it('builds the AWS adapter from SCHEDULER_PROVIDER + ADMIN_SCRIPT_* env', () => {
+            process.env.SCHEDULER_PROVIDER = 'aws';
+            process.env.ADMIN_SCRIPT_EXECUTOR_LAMBDA_ARN =
+                awsAdapterParams.targetLambdaArn;
+            process.env.ADMIN_SCRIPT_SCHEDULE_GROUP =
+                awsAdapterParams.scheduleGroupName;
+            process.env.SCHEDULER_ROLE_ARN = awsAdapterParams.roleArn;
+
+            const adapter = createSchedulerAdapterFromEnv();
+
+            expect(adapter).toBeInstanceOf(AWSSchedulerAdapter);
+            expect(adapter.targetLambdaArn).toBe(
+                awsAdapterParams.targetLambdaArn
+            );
+            expect(adapter.scheduleGroupName).toBe(
+                awsAdapterParams.scheduleGroupName
+            );
+            expect(adapter.roleArn).toBe(awsAdapterParams.roleArn);
+        });
+    });
 });

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

@@ -1,13 +1,16 @@
+const Boom = require('@hapi/boom');
 const { AWSSchedulerAdapter } = require('./aws-scheduler-adapter');
 const { LocalSchedulerAdapter } = require('./local-scheduler-adapter');
 
 /**
  * Scheduler Adapter Factory
  *
- * Application Layer - Hexagonal Architecture
+ * Infrastructure Layer - Hexagonal Architecture
  *
- * Creates the appropriate scheduler adapter based on explicit configuration
- * from appDefinition. Does not auto-detect or read environment variables.
+ * `createSchedulerAdapter` builds an adapter from an explicit `type` (no env
+ * reads). `createSchedulerAdapterFromEnv` resolves the type from the runtime
+ * environment and enforces that a deployed Lambda never silently falls back to
+ * the in-memory local adapter.
  */
 
 /**
@@ -46,6 +49,37 @@ function createSchedulerAdapter(options = {}) {
     }
 }
 
+/**
+ * Resolve and build the scheduler adapter from the runtime environment.
+ *
+ * The local adapter is in-memory only (schedules vanish on cold start), so it
+ * must never be the silent default in a deployed Lambda: require an explicit
+ * SCHEDULER_PROVIDER when running on AWS, and fall back to 'local' only for
+ * local dev/tests.
+ *
+ * @returns {SchedulerAdapter}
+ * @throws {Boom.Boom} 503 (serverUnavailable) when SCHEDULER_PROVIDER is unset
+ *   in a deployed Lambda.
+ */
+function createSchedulerAdapterFromEnv() {
+    const type =
+        process.env.SCHEDULER_PROVIDER ||
+        (process.env.AWS_LAMBDA_FUNCTION_NAME ? null : 'local');
+    if (!type) {
+        throw Boom.serverUnavailable(
+            'SCHEDULER_PROVIDER is not configured. Set it (e.g. "aws") via appDefinition.admin.enableScheduling.'
+        );
+    }
+
+    return createSchedulerAdapter({
+        type,
+        targetLambdaArn: process.env.ADMIN_SCRIPT_EXECUTOR_LAMBDA_ARN,
+        scheduleGroupName: process.env.ADMIN_SCRIPT_SCHEDULE_GROUP,
+        roleArn: process.env.SCHEDULER_ROLE_ARN,
+    });
+}
+
 module.exports = {
     createSchedulerAdapter,
+    createSchedulerAdapterFromEnv,
 };

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

@@ -38,9 +38,9 @@ describe('ScriptRunner', () => {
         scriptFactory = new ScriptFactory([TestScript]);
 
         mockCommands = {
-            createAdminProcess: jest.fn(),
-            updateAdminProcessState: jest.fn(),
-            completeAdminProcess: jest.fn(),
+            createExecution: jest.fn(),
+            updateExecutionState: jest.fn(),
+            completeExecution: jest.fn(),
         };
 
         mockContext = {
@@ -52,11 +52,11 @@ describe('ScriptRunner', () => {
         createAdminScriptCommands.mockReturnValue(mockCommands);
         createAdminScriptContext.mockReturnValue(mockContext);
 
-        mockCommands.createAdminProcess.mockResolvedValue({
+        mockCommands.createExecution.mockResolvedValue({
             id: 'exec-123',
         });
-        mockCommands.updateAdminProcessState.mockResolvedValue({});
-        mockCommands.completeAdminProcess.mockResolvedValue({ success: true });
+        mockCommands.updateExecutionState.mockResolvedValue({});
+        mockCommands.completeExecution.mockResolvedValue({ success: true });
     });
 
     afterEach(() => {
@@ -89,7 +89,7 @@ describe('ScriptRunner', () => {
             expect(result.executionId).toBe('exec-123');
             expect(result.metrics.durationMs).toBeGreaterThanOrEqual(0);
 
-            expect(mockCommands.createAdminProcess).toHaveBeenCalledWith({
+            expect(mockCommands.createExecution).toHaveBeenCalledWith({
                 scriptName: 'test-script',
                 scriptVersion: '1.0.0',
                 trigger: 'MANUAL',
@@ -98,12 +98,12 @@ describe('ScriptRunner', () => {
                 audit: { apiKeyName: 'test-key' },
             });
 
-            expect(mockCommands.updateAdminProcessState).toHaveBeenCalledWith(
+            expect(mockCommands.updateExecutionState).toHaveBeenCalledWith(
                 'exec-123',
                 'RUNNING'
             );
 
-            expect(mockCommands.completeAdminProcess).toHaveBeenCalledWith(
+            expect(mockCommands.completeExecution).toHaveBeenCalledWith(
                 'exec-123',
                 expect.objectContaining({
                     state: 'COMPLETED',
@@ -170,7 +170,7 @@ describe('ScriptRunner', () => {
             expect(result.scriptName).toBe('failing-script');
             expect(result.error.message).toBe('Script failed');
 
-            expect(mockCommands.completeAdminProcess).toHaveBeenCalledWith(
+            expect(mockCommands.completeExecution).toHaveBeenCalledWith(
                 'exec-123',
                 expect.objectContaining({
                     state: 'FAILED',
@@ -227,8 +227,8 @@ describe('ScriptRunner', () => {
             );
 
             expect(result.executionId).toBe('existing-exec-456');
-            expect(mockCommands.createAdminProcess).not.toHaveBeenCalled();
-            expect(mockCommands.updateAdminProcessState).toHaveBeenCalledWith(
+            expect(mockCommands.createExecution).not.toHaveBeenCalled();
+            expect(mockCommands.updateExecutionState).toHaveBeenCalledWith(
                 'existing-exec-456',
                 'RUNNING'
             );
@@ -237,7 +237,7 @@ describe('ScriptRunner', () => {
         it('reports COMPLETED even when persisting completion fails', async () => {
             // Commands return an error object (never throw). A successful script
             // must not be misreported as FAILED if the completion write fails.
-            mockCommands.completeAdminProcess.mockResolvedValue({
+            mockCommands.completeExecution.mockResolvedValue({
                 error: 500,
                 reason: 'DB write failed',
             });
@@ -257,7 +257,7 @@ describe('ScriptRunner', () => {
         });
 
         it('throws when the execution record cannot be created', async () => {
-            mockCommands.createAdminProcess.mockResolvedValue({
+            mockCommands.createExecution.mockResolvedValue({
                 error: 500,
                 reason: 'DB down',
             });
@@ -282,7 +282,7 @@ describe('ScriptRunner', () => {
 
             await runner.execute('test-script', {}, { trigger: 'MANUAL' });
 
-            expect(mockCommands.completeAdminProcess).toHaveBeenCalledWith(
+            expect(mockCommands.completeExecution).toHaveBeenCalledWith(
                 'exec-123',
                 expect.objectContaining({
                     logs: [{ level: 'info', message: 'hi' }],

package/src/application/admin-script-context.js

@@ -21,7 +21,7 @@ const { QueuerUtil } = require('@friggframework/core/queues');
 class AdminScriptContext {
     /**
      * @param {Object} [params={}] - Context configuration
-     * @param {string|number|null} [params.executionId] - ID of the AdminProcess record this context is scoped to (used for log persistence and script chaining)
+     * @param {string|number|null} [params.executionId] - ID of the AdminScriptExecution record this context is scoped to (used for log persistence and script chaining)
      * @param {Object|null} [params.integrationFactory] - Factory used to hydrate integration instances; required for scripts that call instantiate()
      * @param {Object|null} [params.commands] - Frigg command bundle ({ users, credentials, entities, integrations }) injected by the composition root and exposed to scripts as context.commands
      */

package/src/application/script-runner.js

@@ -17,7 +17,7 @@ class ScriptRunner {
      * @param {Object} params
      * @param {ScriptFactory} params.scriptFactory - Required. The registry used
      *   to resolve and instantiate scripts by name (built by bootstrap.js).
-     * @param {Object} [params.commands] - Admin process command layer; defaults
+     * @param {Object} [params.commands] - Admin script execution command layer; defaults
      *   to a fresh createAdminScriptCommands().
      * @param {Object} [params.integrationFactory] - Hydrates integration
      *   instances for scripts that need them.
@@ -42,8 +42,8 @@ class ScriptRunner {
      * @param {string} options.trigger - 'MANUAL' | 'SCHEDULED' | 'QUEUE'
      * @param {string} options.mode - 'sync' | 'async'
      * @param {Object} options.audit - Audit info { apiKeyName, apiKeyLast4, ipAddress }
-     * @param {string} options.executionId - Reuse existing AdminProcess record ID (NOT the Lambda execution ID).
-     *   This is the database ID from the AdminProcess collection/table that tracks script executions.
+     * @param {string} options.executionId - Reuse existing AdminScriptExecution record ID (NOT the Lambda execution ID).
+     *   This is the database ID from the AdminScriptExecution collection/table that tracks script executions.
      *   Pass this when resuming a queued execution to continue using the same execution record.
      */
     async execute(scriptName, params = {}, options = {}) {
@@ -78,7 +78,7 @@ class ScriptRunner {
 
         // Create execution record if not provided
         if (!executionId) {
-            const execution = await this.commands.createAdminProcess({
+            const execution = await this.commands.createExecution({
                 scriptName,
                 scriptVersion: definition.version,
                 trigger,
@@ -91,7 +91,8 @@ class ScriptRunner {
             // than tracking an `undefined` execution id.
             if (execution.error) {
                 throw new Error(
-                    execution.reason || 'Failed to create admin process record'
+                    execution.reason ||
+                        'Failed to create admin script execution record'
                 );
             }
             executionId = execution.id;
@@ -108,7 +109,7 @@ class ScriptRunner {
 
         let output;
         try {
-            await this.commands.updateAdminProcessState(executionId, 'RUNNING');
+            await this.commands.updateExecutionState(executionId, 'RUNNING');
 
             // Create script instance with context injected via constructor
             const script = this.scriptFactory.createInstance(scriptName, {
@@ -122,7 +123,7 @@ class ScriptRunner {
         } catch (error) {
             const durationMs = new Date() - startTime;
 
-            const completion = await this.commands.completeAdminProcess(
+            const completion = await this.commands.completeExecution(
                 executionId,
                 {
                     state: 'FAILED',
@@ -169,7 +170,7 @@ class ScriptRunner {
             metrics: { durationMs },
         };
 
-        const completion = await this.commands.completeAdminProcess(
+        const completion = await this.commands.completeExecution(
             executionId,
             {
                 state: 'COMPLETED',

package/src/infrastructure/__tests__/admin-script-router.test.js

@@ -23,7 +23,7 @@ const {
 } = require('@friggframework/core/application/commands/admin-script-commands');
 const { QueuerUtil } = require('@friggframework/core/queues');
 const {
-    createSchedulerAdapter,
+    createSchedulerAdapterFromEnv,
 } = require('../../adapters/scheduler-adapter-factory');
 
 describe('Admin Script Router', () => {
@@ -58,9 +58,9 @@ describe('Admin Script Router', () => {
         };
 
         mockCommands = {
-            createAdminProcess: jest.fn(),
-            findAdminProcessById: jest.fn(),
-            findAdminProcessesByName: jest.fn(),
+            createExecution: jest.fn(),
+            findExecutionById: jest.fn(),
+            findExecutionsByName: jest.fn(),
         };
 
         mockSchedulerAdapter = {
@@ -76,7 +76,7 @@ describe('Admin Script Router', () => {
         });
         createScriptRunner.mockReturnValue(mockRunner);
         createAdminScriptCommands.mockReturnValue(mockCommands);
-        createSchedulerAdapter.mockReturnValue(mockSchedulerAdapter);
+        createSchedulerAdapterFromEnv.mockReturnValue(mockSchedulerAdapter);
         QueuerUtil.send = jest.fn().mockResolvedValue({});
 
         // Default mock implementations
@@ -185,7 +185,7 @@ describe('Admin Script Router', () => {
         it('should queue script for async execution', async () => {
             process.env.ADMIN_SCRIPT_QUEUE_URL =
                 'https://sqs.us-east-1.amazonaws.com/123/test-queue';
-            mockCommands.createAdminProcess.mockResolvedValue({
+            mockCommands.createExecution.mockResolvedValue({
                 id: 'exec-456',
             });
 
@@ -212,7 +212,7 @@ describe('Admin Script Router', () => {
         it('should default to async mode', async () => {
             process.env.ADMIN_SCRIPT_QUEUE_URL =
                 'https://sqs.us-east-1.amazonaws.com/123/test-queue';
-            mockCommands.createAdminProcess.mockResolvedValue({
+            mockCommands.createExecution.mockResolvedValue({
                 id: 'exec-789',
             });
 
@@ -257,7 +257,7 @@ describe('Admin Script Router', () => {
 
     describe('GET /admin/scripts/:scriptName/executions/:executionId', () => {
         it('should return execution details', async () => {
-            mockCommands.findAdminProcessById.mockResolvedValue({
+            mockCommands.findExecutionById.mockResolvedValue({
                 id: 'exec-123',
                 scriptName: 'test-script',
                 status: 'COMPLETED',
@@ -273,7 +273,7 @@ describe('Admin Script Router', () => {
         });
 
         it('should return 404 for non-existent execution', async () => {
-            mockCommands.findAdminProcessById.mockResolvedValue({
+            mockCommands.findExecutionById.mockResolvedValue({
                 error: 404,
                 reason: 'Execution not found',
                 code: 'EXECUTION_NOT_FOUND',
@@ -290,7 +290,7 @@ describe('Admin Script Router', () => {
 
     describe('GET /admin/scripts/:scriptName/executions', () => {
         it('should list executions for specific script', async () => {
-            mockCommands.findAdminProcessesByName.mockResolvedValue([
+            mockCommands.findExecutionsByName.mockResolvedValue([
                 { id: 'exec-1', name: 'test-script', state: 'COMPLETED' },
                 { id: 'exec-2', name: 'test-script', state: 'RUNNING' },
             ]);
@@ -301,7 +301,7 @@ describe('Admin Script Router', () => {
 
             expect(response.status).toBe(200);
             expect(response.body.executions).toHaveLength(2);
-            expect(mockCommands.findAdminProcessesByName).toHaveBeenCalledWith(
+            expect(mockCommands.findExecutionsByName).toHaveBeenCalledWith(
                 'test-script',
                 {
                     limit: 50,
@@ -310,13 +310,13 @@ describe('Admin Script Router', () => {
         });
 
         it('should accept query parameters (status maps to state, limit is bounded)', async () => {
-            mockCommands.findAdminProcessesByName.mockResolvedValue([]);
+            mockCommands.findExecutionsByName.mockResolvedValue([]);
 
             await request(app).get(
                 '/admin/scripts/test-script/executions?status=COMPLETED&limit=10'
             );
 
-            expect(mockCommands.findAdminProcessesByName).toHaveBeenCalledWith(
+            expect(mockCommands.findExecutionsByName).toHaveBeenCalledWith(
                 'test-script',
                 {
                     limit: 10,

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

@@ -22,7 +22,7 @@ describe('Admin Script Executor Handler', () => {
         mockScriptCommands = { id: 'script-commands' };
         mockRunner = { execute: jest.fn() };
         mockCommands = {
-            completeAdminProcess: jest.fn().mockResolvedValue({}),
+            completeExecution: jest.fn().mockResolvedValue({}),
         };
 
         bootstrapAdminScripts.mockReturnValue({
@@ -89,7 +89,7 @@ describe('Admin Script Executor Handler', () => {
             expect(response.statusCode).toBe(200);
             const body = JSON.parse(response.body);
             expect(body.results[0].status).toBe('FAILED');
-            expect(mockCommands.completeAdminProcess).toHaveBeenCalledWith(
+            expect(mockCommands.completeExecution).toHaveBeenCalledWith(
                 'exec-2',
                 expect.objectContaining({ state: 'FAILED' })
             );
@@ -159,7 +159,7 @@ describe('Admin Script Executor Handler', () => {
             expect(body.processed).toBe(2);
             expect(body.results[0].status).toBe('FAILED');
             expect(body.results[1].status).toBe('COMPLETED');
-            expect(mockCommands.completeAdminProcess).toHaveBeenCalledWith(
+            expect(mockCommands.completeExecution).toHaveBeenCalledWith(
                 'exec-bad',
                 expect.objectContaining({ state: 'FAILED' })
             );

package/src/infrastructure/admin-script-router.js

@@ -1,6 +1,5 @@
 const express = require('express');
 const serverless = require('serverless-http');
-const Boom = require('@hapi/boom');
 const { validateAdminApiKey } = require('./admin-auth-middleware');
 const { createScriptRunner } = require('../application/script-runner');
 const {
@@ -12,7 +11,7 @@ const {
 } = require('@friggframework/core/application/commands/admin-script-commands');
 const { QueuerUtil } = require('@friggframework/core/queues');
 const {
-    createSchedulerAdapter,
+    createSchedulerAdapterFromEnv,
 } = require('../adapters/scheduler-adapter-factory');
 const { bootstrapAdminScripts } = require('./bootstrap');
 const {
@@ -60,51 +59,6 @@ function buildAudit(req) {
     };
 }
 
-/**
- * Create schedule use case instances
- * @param {ScriptFactory} scriptFactory - Registry injected from the request.
- * @private
- */
-function createScheduleUseCases(scriptFactory) {
-    const commands = createAdminScriptCommands();
-
-    // The local adapter is in-memory only (schedules vanish on cold start), so it
-    // must never be the silent default in a deployed Lambda. Require an explicit
-    // provider when running on AWS; fall back to 'local' only for local dev/tests.
-    const schedulerType =
-        process.env.SCHEDULER_PROVIDER ||
-        (process.env.AWS_LAMBDA_FUNCTION_NAME ? null : 'local');
-    if (!schedulerType) {
-        throw Boom.serverUnavailable(
-            'SCHEDULER_PROVIDER is not configured. Set it (e.g. "aws") via appDefinition.admin.enableScheduling.'
-        );
-    }
-
-    const schedulerAdapter = createSchedulerAdapter({
-        type: schedulerType,
-        targetLambdaArn: process.env.ADMIN_SCRIPT_EXECUTOR_LAMBDA_ARN,
-        scheduleGroupName: process.env.ADMIN_SCRIPT_SCHEDULE_GROUP,
-        roleArn: process.env.SCHEDULER_ROLE_ARN,
-    });
-
-    return {
-        getEffectiveSchedule: new GetEffectiveScheduleUseCase({
-            commands,
-            scriptFactory,
-        }),
-        upsertSchedule: new UpsertScheduleUseCase({
-            commands,
-            schedulerAdapter,
-            scriptFactory,
-        }),
-        deleteSchedule: new DeleteScheduleUseCase({
-            commands,
-            schedulerAdapter,
-            scriptFactory,
-        }),
-    };
-}
-
 /**
  * GET /admin/scripts
  * List all registered scripts
@@ -261,7 +215,7 @@ router.post('/scripts/:scriptName', async (req, res) => {
         }
 
         const commands = createAdminScriptCommands();
-        const execution = await commands.createAdminProcess({
+        const execution = await commands.createExecution({
             scriptName,
             scriptVersion: definition.version,
             trigger: 'MANUAL',
@@ -309,7 +263,7 @@ router.get('/scripts/:scriptName/executions/:executionId', async (req, res) => {
     try {
         const { executionId } = req.params;
         const commands = createAdminScriptCommands();
-        const execution = await commands.findAdminProcessById(executionId);
+        const execution = await commands.findExecutionById(executionId);
 
         if (execution.error) {
             return res.status(execution.error).json({
@@ -340,7 +294,7 @@ router.get('/scripts/:scriptName/executions', async (req, res) => {
             ? 50
             : Math.min(Math.max(parsedLimit, 1), 200);
 
-        const executions = await commands.findAdminProcessesByName(scriptName, {
+        const executions = await commands.findExecutionsByName(scriptName, {
             limit: safeLimit,
             ...(status && { state: status }),
         });
@@ -360,7 +314,11 @@ router.get('/scripts/:scriptName/schedule', async (req, res) => {
     try {
         const { scriptName } = req.params;
         const { scriptFactory } = bootstrapAdminScripts();
-        const { getEffectiveSchedule } = createScheduleUseCases(scriptFactory);
+        const commands = createAdminScriptCommands();
+        const getEffectiveSchedule = new GetEffectiveScheduleUseCase({
+            commands,
+            scriptFactory,
+        });
 
         const result = await getEffectiveSchedule.execute(scriptName);
 
@@ -383,7 +341,13 @@ router.put('/scripts/:scriptName/schedule', async (req, res) => {
         const { scriptName } = req.params;
         const { enabled, cronExpression, timezone } = req.body;
         const { scriptFactory } = bootstrapAdminScripts();
-        const { upsertSchedule } = createScheduleUseCases(scriptFactory);
+        const commands = createAdminScriptCommands();
+        const schedulerAdapter = createSchedulerAdapterFromEnv();
+        const upsertSchedule = new UpsertScheduleUseCase({
+            commands,
+            schedulerAdapter,
+            scriptFactory,
+        });
 
         const result = await upsertSchedule.execute(scriptName, {
             enabled,
@@ -414,7 +378,13 @@ router.delete('/scripts/:scriptName/schedule', async (req, res) => {
     try {
         const { scriptName } = req.params;
         const { scriptFactory } = bootstrapAdminScripts();
-        const { deleteSchedule } = createScheduleUseCases(scriptFactory);
+        const commands = createAdminScriptCommands();
+        const schedulerAdapter = createSchedulerAdapterFromEnv();
+        const deleteSchedule = new DeleteScheduleUseCase({
+            commands,
+            schedulerAdapter,
+            scriptFactory,
+        });
 
         const result = await deleteSchedule.execute(scriptName);
 

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

@@ -8,7 +8,7 @@ const { bootstrapAdminScripts } = require('./bootstrap');
  * Run a single execution message through the ScriptRunner.
  * @param {Object} message - Parsed execution message.
  * @param {string} message.scriptName - Name of the registered script to run (required).
- * @param {string} [message.executionId] - Existing AdminProcess id to resume; when
+ * @param {string} [message.executionId] - Existing AdminScriptExecution id to resume; when
  *   absent, ScriptRunner creates a new record.
  * @param {string} [message.trigger] - Execution trigger; defaults to 'QUEUE'.
  * @param {Object} [message.params] - Parameters passed to the script.
@@ -59,7 +59,7 @@ async function runMessage(
 }
 
 /**
- * Mark an admin process FAILED when the worker itself blows up (parse error,
+ * Mark an admin script execution FAILED when the worker itself blows up (parse error,
  * runner construction), so the record doesn't stay stuck in a non-terminal
  * state. No-op when there is no execution id.
  * @private
@@ -68,7 +68,7 @@ async function markFailed(executionId, error) {
     if (!executionId) return;
     try {
         const commands = createAdminScriptCommands();
-        await commands.completeAdminProcess(executionId, {
+        await commands.completeExecution(executionId, {
             state: 'FAILED',
             error: {
                 name: error.name,