@shipfox/api-workflows 5.0.0 → 7.0.1

package/src/core/step-config/complete-step-dispatch-config.test.ts

@@ -1,5 +1,3 @@
-import {UnsupportedHarnessThinkingError} from '@shipfox/api-agent/core/errors';
-import type {AgentDefaultsResolver} from '@shipfox/api-agent/core/resolve-agent-config';
 import {
   AGENT_INTEGRATION_MCP_AUTH,
   AGENT_INTEGRATION_MCP_ENDPOINT,
@@ -8,7 +6,10 @@ import {
   type AgentIntegrationMcpServerConfigDto,
   type MaterializedAgentIntegrationConfigDto,
 } from '@shipfox/api-agent-dto';
+import {agentInterModuleContract} from '@shipfox/api-agent-dto/inter-module';
 import {parseWorkflowTemplate, planInterpolationField} from '@shipfox/expression';
+import {createInterModuleKnownError} from '@shipfox/inter-module';
+import type {AgentDefaultsResolver} from '#core/agent-defaults.js';
 import type {Step} from '#core/entities/step.js';
 import {AgentConfigUnresolvableError, InterpolationUnresolvableError} from '#core/errors.js';
 import {completeStepDispatchConfig} from './complete-step-dispatch-config.js';
@@ -112,7 +113,7 @@ function integrationMcpServers(
 }
 
 describe('completeStepDispatchConfig', () => {
-  it('copies frozen agent integrations from the dispatch plan', () => {
+  it('copies frozen agent integrations from the dispatch plan', async () => {
     const integrations = [materializedIntegration()];
     const pending = step({
       type: 'agent',
@@ -130,7 +131,7 @@ describe('completeStepDispatchConfig', () => {
       },
     });
 
-    const result = completeStepDispatchConfig({
+    const result = await completeStepDispatchConfig({
       step: pending,
       context,
       resolveAgentDefaults,
@@ -141,7 +142,7 @@ describe('completeStepDispatchConfig', () => {
     expect(result.config.mcpServers).toEqual(integrationMcpServers(integrations));
   });
 
-  it('serializes residual secret env values as secret bindings without writing env values', () => {
+  it('serializes residual secret env values as secret bindings without writing env values', async () => {
     const pending = step({
       config: {},
       configPlan: {
@@ -152,7 +153,7 @@ describe('completeStepDispatchConfig', () => {
       },
     });
 
-    const result = completeStepDispatchConfig({
+    const result = await completeStepDispatchConfig({
       step: pending,
       context,
       resolveAgentDefaults,
@@ -196,7 +197,7 @@ describe('completeStepDispatchConfig', () => {
     ]);
   });
 
-  it('rejects secret env bindings with malformed target names', () => {
+  it('rejects secret env bindings with malformed target names', async () => {
     const pending = step({
       config: {},
       configPlan: {
@@ -214,10 +215,10 @@ describe('completeStepDispatchConfig', () => {
         definitionId: 'def-1',
       });
 
-    expect(act).toThrow();
+    await expect(act()).rejects.toThrow();
   });
 
-  it('keeps fully resolved step config byte-identical apart from resolved env additions', () => {
+  it('keeps fully resolved step config byte-identical apart from resolved env additions', async () => {
     const pending = step({
       config: {run: 'echo "$SHA"'},
       configPlan: {
@@ -227,7 +228,7 @@ describe('completeStepDispatchConfig', () => {
       },
     });
 
-    const result = completeStepDispatchConfig({
+    const result = await completeStepDispatchConfig({
       step: pending,
       context,
       resolveAgentDefaults,
@@ -250,7 +251,7 @@ describe('completeStepDispatchConfig', () => {
     });
   });
 
-  it('completes deferred agent config with the resolved harness', () => {
+  it('completes deferred agent config with the resolved harness', async () => {
     const integration = materializedIntegration();
     const mcpServers = integrationMcpServers([integration]);
     const pending = step({
@@ -267,7 +268,7 @@ describe('completeStepDispatchConfig', () => {
       },
     });
 
-    const result = completeStepDispatchConfig({
+    const result = await completeStepDispatchConfig({
       step: pending,
       context,
       resolveAgentDefaults,
@@ -298,7 +299,7 @@ describe('completeStepDispatchConfig', () => {
     });
   });
 
-  it('wraps harness resolver errors as unresolvable agent config', () => {
+  it('wraps harness resolver errors as unresolvable agent config', async () => {
     const pending = step({
       type: 'agent',
       config: {},
@@ -311,13 +312,11 @@ describe('completeStepDispatchConfig', () => {
       },
     });
     const failingResolver: AgentDefaultsResolver = () => {
-      throw new UnsupportedHarnessThinkingError('claude', 'off', [
-        'low',
-        'medium',
-        'high',
-        'xhigh',
-        'max',
-      ]);
+      throw createInterModuleKnownError(
+        agentInterModuleContract.methods.resolveAgentConfig,
+        'agent-config-invalid',
+        {},
+      );
     };
 
     const act = () =>
@@ -328,10 +327,10 @@ describe('completeStepDispatchConfig', () => {
         definitionId: 'def-1',
       });
 
-    expect(act).toThrow(AgentConfigUnresolvableError);
+    await expect(act()).rejects.toThrow(AgentConfigUnresolvableError);
   });
 
-  it('throws when a server-side segment still survives dispatch', () => {
+  it('throws when a server-side segment still survives dispatch', async () => {
     const pending = step({
       config: {},
       configPlan: {
@@ -349,6 +348,6 @@ describe('completeStepDispatchConfig', () => {
         definitionId: 'def-1',
       });
 
-    expect(act).toThrow(InterpolationUnresolvableError);
+    await expect(act()).rejects.toThrow(InterpolationUnresolvableError);
   });
 });

package/src/core/step-config/complete-step-dispatch-config.ts

@@ -1,19 +1,19 @@
-import type {AgentDefaultsResolver} from '@shipfox/api-agent/core/resolve-agent-config';
 import {capTraceEntries} from '@shipfox/expression';
+import type {AgentDefaultsResolver} from '#core/agent-defaults.js';
 import type {PersistedEvaluationTraceEntry, Step} from '#core/entities/step.js';
 import {completeAgentConfig} from './agent.js';
 import {completeRunDispatchConfig} from './run.js';
 import type {WorkflowEvaluationContext} from './workflow-evaluation-context.js';
 
-export function completeStepDispatchConfig(params: {
+export async function completeStepDispatchConfig(params: {
   readonly step: Step;
   readonly context: WorkflowEvaluationContext;
-  readonly resolveAgentDefaults: AgentDefaultsResolver;
+  readonly resolveAgentDefaults?: AgentDefaultsResolver | undefined;
   readonly definitionId: string;
-}): {
+}): Promise<{
   readonly config: Record<string, unknown>;
   readonly trace: readonly PersistedEvaluationTraceEntry[];
-} {
+}> {
   const plan = params.step.configPlan;
   if (plan === null) return {config: params.step.config, trace: []};
 
@@ -27,7 +27,7 @@ export function completeStepDispatchConfig(params: {
     definitionId: params.definitionId,
     trace,
   });
-  completeAgentConfig({
+  await completeAgentConfig({
     config,
     plan,
     context: params.context,

package/src/core/step-config/materialize-job-execution-steps.test.ts

@@ -1,21 +1,29 @@
-import {
-  InvalidAgentModelError,
-  UnsupportedModelProviderError,
-} from '@shipfox/api-agent/core/errors';
-import type {AgentDefaultsResolver} from '@shipfox/api-agent/core/resolve-agent-config';
 import {
   AGENT_INTEGRATION_MCP_AUTH,
   AGENT_INTEGRATION_MCP_ENDPOINT,
   AGENT_INTEGRATION_MCP_SERVER_NAME,
   AGENT_INTEGRATION_MCP_TRANSPORT,
 } from '@shipfox/api-agent-dto';
+import {agentInterModuleContract} from '@shipfox/api-agent-dto/inter-module';
 import type {AgentToolCatalogEntry} from '@shipfox/api-integration-core';
+import {createInterModuleKnownError} from '@shipfox/inter-module';
+import type {AgentDefaultsResolver} from '#core/agent-defaults.js';
 import type {AgentToolMaterializationContext} from '#core/agent-tools.js';
 import {AgentConfigUnresolvableError, InterpolationUnresolvableError} from '#core/errors.js';
+import {resolveTestAgentDefaults} from '#test/fixtures/agent-inter-module.js';
 import {workflowModel} from '#test/index.js';
-import {materializeJobExecutionSteps} from './materialize-job-execution-steps.js';
+import {materializeJobExecutionSteps as materializeJobExecutionStepsImpl} from './materialize-job-execution-steps.js';
 import type {WorkflowEvaluationContext} from './workflow-evaluation-context.js';
 
+function materializeJobExecutionSteps(
+  params: Parameters<typeof materializeJobExecutionStepsImpl>[0],
+): ReturnType<typeof materializeJobExecutionStepsImpl> {
+  return materializeJobExecutionStepsImpl({
+    resolveAgentDefaults: resolveTestAgentDefaults,
+    ...params,
+  });
+}
+
 function template(source: string): string {
   return `\${{ ${source} }}`;
 }
@@ -150,7 +158,7 @@ function githubAgentToolCatalog(): readonly AgentToolCatalogEntry[] {
 }
 
 describe('materializeJobExecutionSteps', () => {
-  it('prepends setup and resolves job-execution context fields', () => {
+  it('prepends setup and resolves job-execution context fields', async () => {
     const model = workflowModel({
       jobs: {
         review: {
@@ -167,7 +175,7 @@ describe('materializeJobExecutionSteps', () => {
     const job = model.jobs[0];
     if (!job) throw new Error('Expected workflow job');
 
-    const steps = materializeJobExecutionSteps({model, job, context: jobExecutionContext()});
+    const steps = await materializeJobExecutionSteps({model, job, context: jobExecutionContext()});
 
     expect(steps).toEqual([
       {
@@ -231,7 +239,7 @@ describe('materializeJobExecutionSteps', () => {
     ]);
   });
 
-  it('freezes resolved agent integration tools with default connection, repo, and token scope', () => {
+  it('freezes resolved agent integration tools with default connection, repo, and token scope', async () => {
     const model = workflowModel({
       jobs: {
         fix: {
@@ -256,7 +264,7 @@ describe('materializeJobExecutionSteps', () => {
     const job = model.jobs[0];
     if (!job) throw new Error('Expected workflow job');
 
-    const steps = materializeJobExecutionSteps({
+    const steps = await materializeJobExecutionSteps({
       model,
       job,
       context: jobExecutionContext(),
@@ -333,7 +341,7 @@ describe('materializeJobExecutionSteps', () => {
     ]);
   });
 
-  it('carries frozen integrations through the agent dispatch plan when prompt is deferred', () => {
+  it('carries frozen integrations through the agent dispatch plan when prompt is deferred', async () => {
     const model = workflowModel({
       jobs: {
         fix: {
@@ -360,7 +368,7 @@ describe('materializeJobExecutionSteps', () => {
     const job = model.jobs[0];
     if (!job) throw new Error('Expected workflow job');
 
-    const steps = materializeJobExecutionSteps({
+    const steps = await materializeJobExecutionSteps({
       model,
       job,
       context: jobExecutionContext(),
@@ -412,7 +420,7 @@ describe('materializeJobExecutionSteps', () => {
     ]);
   });
 
-  it('throws a permanent interpolation error for available missing value paths', () => {
+  it('throws a permanent interpolation error for available missing value paths', async () => {
     const model = workflowModel({
       jobs: {
         review: {
@@ -426,7 +434,7 @@ describe('materializeJobExecutionSteps', () => {
 
     let error: unknown;
     try {
-      materializeJobExecutionSteps({
+      await materializeJobExecutionSteps({
         model,
         job,
         context: {...baseContext, values: {...baseContext.values, inputs: {}}},
@@ -444,10 +452,7 @@ describe('materializeJobExecutionSteps', () => {
     });
   });
 
-  it.each([
-    new UnsupportedModelProviderError('unknown-provider'),
-    new InvalidAgentModelError('pi', 'anthropic', 'missing-model'),
-  ])('wraps known resolver errors as permanent agent config errors', (cause) => {
+  it('wraps known resolver errors as permanent agent config errors', async () => {
     const model = workflowModel({
       jobs: {
         review: {steps: [{prompt: 'Summarize the review.'}]},
@@ -456,7 +461,11 @@ describe('materializeJobExecutionSteps', () => {
     const job = model.jobs[0];
     if (!job) throw new Error('Expected workflow job');
     const resolveAgentDefaults = vi.fn<AgentDefaultsResolver>().mockImplementation(() => {
-      throw cause;
+      throw createInterModuleKnownError(
+        agentInterModuleContract.methods.resolveAgentConfig,
+        'agent-config-invalid',
+        {},
+      );
     });
 
     const materialize = () =>
@@ -468,11 +477,13 @@ describe('materializeJobExecutionSteps', () => {
         definitionId: 'def-1',
       });
 
-    expect(materialize).toThrow(AgentConfigUnresolvableError);
-    expect(materialize).toThrow('Agent configuration cannot be resolved for definition def-1');
+    await expect(materialize()).rejects.toThrow(AgentConfigUnresolvableError);
+    await expect(materialize()).rejects.toThrow(
+      'Agent configuration cannot be resolved for definition def-1',
+    );
   });
 
-  it('throws a permanent interpolation error for unsafe run interpolation', () => {
+  it('throws a permanent interpolation error for unsafe run interpolation', async () => {
     const model = workflowModel({
       jobs: {
         review: {steps: [{run: `echo \`${template('execution.index')}\``}]},
@@ -489,6 +500,6 @@ describe('materializeJobExecutionSteps', () => {
         definitionId: 'def-1',
       });
 
-    expect(materialize).toThrow(InterpolationUnresolvableError);
+    await expect(materialize()).rejects.toThrow(InterpolationUnresolvableError);
   });
 });

package/src/core/step-config/materialize-job-execution-steps.ts

@@ -1,9 +1,6 @@
-import {
-  type AgentDefaultsResolver,
-  catalogDefaultAgentResolver,
-} from '@shipfox/api-agent/core/resolve-agent-config';
-import type {WorkflowModel} from '@shipfox/api-definitions';
+import type {WorkflowModel} from '@shipfox/api-definitions-dto';
 import type {WorkflowExpression} from '@shipfox/expression';
+import type {AgentDefaultsResolver} from '#core/agent-defaults.js';
 import type {
   AgentToolMaterializationContext,
   AgentToolMaterializationSnapshot,
@@ -57,14 +54,14 @@ const SETUP_STEP: MaterializedWorkflowStep = {
   position: 0,
 };
 
-export function materializeJobExecutionSteps(
+export async function materializeJobExecutionSteps(
   params: MaterializeJobExecutionStepsParams,
-): readonly MaterializedWorkflowStep[] {
+): Promise<readonly MaterializedWorkflowStep[]> {
   const {
     model,
     job,
     context,
-    resolveAgentDefaults = catalogDefaultAgentResolver,
+    resolveAgentDefaults,
     definitionId = model.name,
     agentToolContext,
     agentToolSnapshot,
@@ -72,37 +69,39 @@ export function materializeJobExecutionSteps(
 
   return [
     SETUP_STEP,
-    ...job.steps.map((step, stepPosition) => {
-      // The trusted context exposes the stable job key; the authored display field remains `job.name`.
-      const stepContext = {...context.values, job: {key: job.key}};
-      const resolved = resolveStepConfig({
-        jobKey: job.key,
-        step,
-        workflowEnv: model.env,
-        workflowEnvTemplates: model.templates?.env,
-        jobEnv: job.env,
-        jobEnvTemplates: job.templates?.env,
-        context: stepContext,
-        site: context.site,
-        resolveAgentDefaults,
-        definitionId,
-        agentToolContext,
-        agentToolSnapshot,
-      });
-      return {
-        key: step.key ?? null,
-        name: resolved.name ?? stepDisplayName(step),
-        sourceLocation: step.sourceLocation ?? null,
-        status: 'pending' as const,
-        type: step.kind,
-        config: resolved.config,
-        ...(step.if === undefined ? {} : {condition: step.if}),
-        authoredConfig: resolved.authoredConfig,
-        ...materializedConfigPlan(resolved.configPlan, resolved.trace),
-        ...(resolved.diagnostics.length === 0 ? {} : {diagnostics: resolved.diagnostics}),
-        position: stepPosition + 1,
-      };
-    }),
+    ...(await Promise.all(
+      job.steps.map(async (step, stepPosition) => {
+        // The trusted context exposes the stable job key; the authored display field remains `job.name`.
+        const stepContext = {...context.values, job: {key: job.key}};
+        const resolved = await resolveStepConfig({
+          jobKey: job.key,
+          step,
+          workflowEnv: model.env,
+          workflowEnvTemplates: model.templates?.env,
+          jobEnv: job.env,
+          jobEnvTemplates: job.templates?.env,
+          context: stepContext,
+          site: context.site,
+          resolveAgentDefaults,
+          definitionId,
+          agentToolContext,
+          agentToolSnapshot,
+        });
+        return {
+          key: step.key ?? null,
+          name: resolved.name ?? stepDisplayName(step),
+          sourceLocation: step.sourceLocation ?? null,
+          status: 'pending' as const,
+          type: step.kind,
+          config: resolved.config,
+          ...(step.if === undefined ? {} : {condition: step.if}),
+          authoredConfig: resolved.authoredConfig,
+          ...materializedConfigPlan(resolved.configPlan, resolved.trace),
+          ...(resolved.diagnostics.length === 0 ? {} : {diagnostics: resolved.diagnostics}),
+          position: stepPosition + 1,
+        };
+      }),
+    )),
   ];
 }