@shipfox/api-workflows 7.1.0 → 9.0.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shipfox/api-workflows",
   "license": "MIT",
-  "version": "7.1.0",
+  "version": "9.0.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ShipfoxHQ/shipfox.git",
@@ -11,10 +11,6 @@
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "imports": {
-    "#test/*": "./test/*",
-    "#*": "./dist/*"
-  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -26,29 +22,31 @@
     "@temporalio/workflow": "1.18.1",
     "drizzle-orm": "^0.45.2",
     "zod": "^4.4.3",
-    "@shipfox/api-auth-context": "7.1.0",
-    "@shipfox/api-auth-dto": "7.1.0",
-    "@shipfox/api-agent-dto": "6.0.0",
-    "@shipfox/annotations-dto": "6.0.0",
-    "@shipfox/api-definitions-dto": "6.0.0",
-    "@shipfox/api-projects-dto": "6.0.0",
-    "@shipfox/api-integration-core-dto": "6.0.0",
-    "@shipfox/api-runners": "7.1.0",
-    "@shipfox/api-projects": "7.1.0",
-    "@shipfox/api-secrets-dto": "6.0.0",
-    "@shipfox/api-workflows-dto": "6.0.0",
-    "@shipfox/api-runners-dto": "7.0.1",
-    "@shipfox/inter-module": "0.2.0",
-    "@shipfox/expression": "1.1.3",
-    "@shipfox/node-drizzle": "0.3.2",
-    "@shipfox/node-error-monitoring": "0.2.0",
-    "@shipfox/node-fastify": "0.3.0",
-    "@shipfox/node-module": "0.5.0",
-    "@shipfox/node-opentelemetry": "0.6.0",
-    "@shipfox/node-outbox": "0.2.4",
-    "@shipfox/node-postgres": "0.4.2",
-    "@shipfox/node-temporal": "0.4.0",
-    "@shipfox/runner-labels": "0.1.1"
+    "@shipfox/api-auth-dto": "9.0.1",
+    "@shipfox/api-agent-dto": "9.0.1",
+    "@shipfox/annotations-dto": "9.0.1",
+    "@shipfox/api-auth-context": "9.0.1",
+    "@shipfox/api-definitions-dto": "9.0.1",
+    "@shipfox/api-projects-dto": "9.0.1",
+    "@shipfox/api-secrets-dto": "9.0.1",
+    "@shipfox/api-workflows-dto": "9.0.1",
+    "@shipfox/api-integration-core-dto": "9.0.1",
+    "@shipfox/inter-module": "0.2.1",
+    "@shipfox/api-runners-dto": "9.0.1",
+    "@shipfox/expression": "1.1.4",
+    "@shipfox/node-error-monitoring": "0.2.1",
+    "@shipfox/node-fastify": "0.3.1",
+    "@shipfox/node-opentelemetry": "0.6.1",
+    "@shipfox/node-outbox": "0.2.5",
+    "@shipfox/node-postgres": "0.4.3",
+    "@shipfox/node-module": "1.0.0",
+    "@shipfox/node-temporal": "0.4.1",
+    "@shipfox/runner-labels": "0.1.2",
+    "@shipfox/node-drizzle": "0.3.3",
+    "@shipfox/workflow-document": "2.1.2"
+  },
+  "imports": {
+    "#*": "./dist/*"
   },
   "scripts": {
     "build": "shipfox-swc && shipfox-temporal-bundle dist/temporal/workflows/index.js",

package/src/core/agent-defaults.ts

@@ -1,5 +1,6 @@
-import type {AgentThinking, Harness, ModelProviderRef} from '@shipfox/api-agent-dto';
+import type {ModelProviderRef} from '@shipfox/api-agent-dto';
 import type {AgentInterModuleClient} from '@shipfox/api-agent-dto/inter-module';
+import type {AgentThinking, Harness} from '@shipfox/workflow-document';
 
 export interface AgentDefaultsInput {
   readonly harness?: Harness | undefined;

package/src/core/agent-tool-capability-warning.test.ts

@@ -1,8 +1,7 @@
 import type {AnnotationsInterModuleClient} from '@shipfox/annotations-dto/inter-module';
-import type {JobLeaseTokenClaims} from '@shipfox/api-auth';
-import {sql} from 'drizzle-orm';
-import {db} from '#db/db.js';
-import {runnersTestClient} from '#test/fixtures/runners-inter-module.js';
+import type {JobLeaseTokenClaims} from '@shipfox/api-auth-dto';
+import type {RunnersInterModuleClient} from '@shipfox/api-runners-dto/inter-module';
+import {runnersTestClient, setRunnerToolCapabilities} from '#test/fixtures/runners-inter-module.js';
 import {warnAgentToolCapabilityMismatchOnDispatch as warnAgentToolCapabilityMismatchOnDispatchImpl} from './agent-tool-capability-warning.js';
 import type {Step} from './entities/step.js';
 
@@ -86,45 +85,20 @@ function agentStep(params: Partial<Step> = {}): Step {
   };
 }
 
-async function insertRunnerSession(params: {
+function setRunnerSessionCapabilities(params: {
   runnerSessionId: string;
   workspaceId: string;
-  toolCapabilities: Record<string, unknown> | null;
+  toolCapabilities:
+    | Awaited<
+        ReturnType<RunnersInterModuleClient['getEffectiveRunnerToolCapabilities']>
+      >['capabilities']
+    | null;
   reportedAt?: 'fresh' | 'stale' | 'missing';
-}): Promise<void> {
-  const reportedAt =
-    params.reportedAt === 'missing'
-      ? sql`NULL`
-      : params.reportedAt === 'stale'
-        ? sql`now() - interval '1 hour'`
-        : sql`now()`;
-  const toolCapabilities =
-    params.toolCapabilities === null
-      ? sql`NULL`
-      : sql`${JSON.stringify(params.toolCapabilities)}::jsonb`;
-
-  await db().execute(sql`
-    INSERT INTO runners_runner_sessions (
-      id,
-      workspace_id,
-      scope,
-      registration_token_id,
-      registration_token_kind,
-      labels,
-      tool_capabilities,
-      tool_capabilities_reported_at
-    )
-    VALUES (
-      ${params.runnerSessionId},
-      ${params.workspaceId},
-      'workspace',
-      ${crypto.randomUUID()},
-      'manual',
-      ARRAY['linux'],
-      ${toolCapabilities},
-      ${reportedAt}
-    )
-  `);
+}): void {
+  setRunnerToolCapabilities(params.runnerSessionId, {
+    capabilities: params.toolCapabilities === null ? {harnesses: {}} : params.toolCapabilities,
+    reportFresh: params.reportedAt !== 'missing' && params.reportedAt !== 'stale',
+  });
 }
 
 function annotationsFor(jobExecutionId: string): Array<{context: string; body: string}> {
@@ -138,7 +112,7 @@ describe('warnAgentToolCapabilityMismatchOnDispatch', () => {
   it('writes a warning when the matched runner advertised a set without requested tools', async () => {
     const identity = lease();
     const step = agentStep({jobExecutionId: identity.jobExecutionId});
-    await insertRunnerSession({
+    setRunnerSessionCapabilities({
       runnerSessionId: identity.runnerSessionId,
       workspaceId: identity.workspaceId,
       toolCapabilities: {harnesses: {pi: {tools: ['read']}}},
@@ -156,7 +130,7 @@ describe('warnAgentToolCapabilityMismatchOnDispatch', () => {
   it('writes unknown wording when capabilities are missing', async () => {
     const identity = lease();
     const step = agentStep({jobExecutionId: identity.jobExecutionId});
-    await insertRunnerSession({
+    setRunnerSessionCapabilities({
       runnerSessionId: identity.runnerSessionId,
       workspaceId: identity.workspaceId,
       toolCapabilities: null,
@@ -173,7 +147,7 @@ describe('warnAgentToolCapabilityMismatchOnDispatch', () => {
   it('writes missing-harness wording when fresh capabilities omit the harness', async () => {
     const identity = lease();
     const step = agentStep({jobExecutionId: identity.jobExecutionId});
-    await insertRunnerSession({
+    setRunnerSessionCapabilities({
       runnerSessionId: identity.runnerSessionId,
       workspaceId: identity.workspaceId,
       toolCapabilities: {harnesses: {claude: {tools: ['read', 'web_search']}}},
@@ -199,7 +173,7 @@ describe('warnAgentToolCapabilityMismatchOnDispatch', () => {
         prompt: 'Fix it.',
       },
     });
-    await insertRunnerSession({
+    setRunnerSessionCapabilities({
       runnerSessionId: identity.runnerSessionId,
       workspaceId: identity.workspaceId,
       toolCapabilities: {harnesses: {pi: {tools: ['read']}}},
@@ -214,20 +188,16 @@ describe('warnAgentToolCapabilityMismatchOnDispatch', () => {
   it('removes an existing warning when a later dispatch has all requested tools', async () => {
     const identity = lease();
     const step = agentStep({jobExecutionId: identity.jobExecutionId});
-    await insertRunnerSession({
+    setRunnerSessionCapabilities({
       runnerSessionId: identity.runnerSessionId,
       workspaceId: identity.workspaceId,
       toolCapabilities: {harnesses: {pi: {tools: ['read']}}},
     });
     await warnAgentToolCapabilityMismatchOnDispatch({leaseIdentity: identity, step});
-    await db().execute(sql`
-      UPDATE runners_runner_sessions
-      SET tool_capabilities = ${JSON.stringify({
-        harnesses: {pi: {tools: ['read', 'web_search']}},
-      })}::jsonb,
-      tool_capabilities_reported_at = now()
-      WHERE id = ${identity.runnerSessionId}
-    `);
+    setRunnerToolCapabilities(identity.runnerSessionId, {
+      capabilities: {harnesses: {pi: {tools: ['read', 'web_search']}}},
+      reportFresh: true,
+    });
 
     await warnAgentToolCapabilityMismatchOnDispatch({leaseIdentity: identity, step});
 
@@ -247,7 +217,7 @@ describe('warnAgentToolCapabilityMismatchOnDispatch', () => {
         prompt: 'Fix it.',
       },
     });
-    await insertRunnerSession({
+    setRunnerSessionCapabilities({
       runnerSessionId: identity.runnerSessionId,
       workspaceId: identity.workspaceId,
       toolCapabilities: null,
@@ -265,7 +235,7 @@ describe('warnAgentToolCapabilityMismatchOnDispatch', () => {
       type: 'run',
       config: {run: 'echo ok'},
     });
-    await insertRunnerSession({
+    setRunnerSessionCapabilities({
       runnerSessionId: identity.runnerSessionId,
       workspaceId: identity.workspaceId,
       toolCapabilities: null,
@@ -290,7 +260,7 @@ describe('warnAgentToolCapabilityMismatchOnDispatch', () => {
         prompt: 'Fix it.',
       },
     });
-    await insertRunnerSession({
+    setRunnerSessionCapabilities({
       runnerSessionId: identity.runnerSessionId,
       workspaceId: identity.workspaceId,
       toolCapabilities: {harnesses: {pi: {tools: []}}},

package/src/core/agent-tools.ts

@@ -3,18 +3,20 @@ import type {
   MaterializedAgentIntegrationToolConfigDto,
 } from '@shipfox/api-agent-dto';
 import type {WorkflowModel} from '@shipfox/api-definitions-dto';
-import type {
-  AgentToolCatalogEntry,
-  AgentToolCatalogMethod,
-  IntegrationProviderKind,
-  IntegrationsModuleClient,
-} from '@shipfox/api-integration-core-dto';
-import type {ProjectsModuleClient} from '@shipfox/api-projects-dto';
+import type {IntegrationsModuleClient} from '@shipfox/api-integration-core-dto/inter-module';
+import type {ProjectsModuleClient} from '@shipfox/api-projects-dto/inter-module';
 import {AgentIntegrationMaterializationError} from './errors.js';
 
 type WorkflowModelJob = WorkflowModel['jobs'][number];
 type WorkflowModelAgentStep = Extract<WorkflowModelJob['steps'][number], {kind: 'agent'}>;
 type WorkflowModelStepIntegration = NonNullable<WorkflowModelAgentStep['integrations']>[number];
+type IntegrationsAgentToolsContext = Awaited<
+  ReturnType<IntegrationsModuleClient['getAgentToolsContext']>
+>;
+export type AgentToolCatalogEntry =
+  IntegrationsAgentToolsContext['catalogs'][number]['tools'][number];
+type AgentToolCatalogMethod = NonNullable<AgentToolCatalogEntry['methods']>[number];
+type IntegrationProviderKind = IntegrationsAgentToolsContext['catalogs'][number]['provider'];
 type AgentToolCatalogs = ReadonlyMap<IntegrationProviderKind, readonly AgentToolCatalogEntry[]>;
 type WorkspaceConnectionSnapshot = ReadonlyMap<
   string,

package/src/core/checkout.test.ts

@@ -1,5 +1,5 @@
-import type {IntegrationsModuleClient} from '@shipfox/api-integration-core-dto';
-import type {ProjectsModuleClient} from '@shipfox/api-projects-dto';
+import type {IntegrationsModuleClient} from '@shipfox/api-integration-core-dto/inter-module';
+import type {ProjectsModuleClient} from '@shipfox/api-projects-dto/inter-module';
 import * as workflowRuns from '#db/workflow-runs.js';
 import {jobFactory} from '#test/factories/job.js';
 import {projectFactory} from '#test/factories/project.js';

package/src/core/checkout.ts

@@ -1,5 +1,5 @@
-import type {IntegrationsModuleClient} from '@shipfox/api-integration-core-dto';
-import type {ProjectsModuleClient} from '@shipfox/api-projects-dto';
+import type {IntegrationsModuleClient} from '@shipfox/api-integration-core-dto/inter-module';
+import type {ProjectsModuleClient} from '@shipfox/api-projects-dto/inter-module';
 import {getJobById, getWorkflowRunByAttemptId} from '#db/workflow-runs.js';
 import {
   CheckoutIntentUnresolvedError,

package/src/core/entities/step.ts

@@ -1,7 +1,5 @@
 import type {
   AgentIntegrationMcpServerConfigDto,
-  AgentThinking,
-  Harness,
   MaterializedAgentIntegrationConfigDto,
 } from '@shipfox/api-agent-dto';
 import type {
@@ -10,6 +8,7 @@ import type {
   ResolvedField,
   WorkflowExpression,
 } from '@shipfox/expression';
+import type {AgentThinking, Harness} from '@shipfox/workflow-document';
 import type {InterpolationUnresolvableField} from '../errors.js';
 
 export type StepStatus = 'pending' | 'running' | 'succeeded' | 'failed' | 'cancelled' | 'skipped';

package/src/core/errors.ts

@@ -104,13 +104,6 @@ export class JobNotFoundError extends Error {
   }
 }
 
-export class JobLeaseNotActiveError extends Error {
-  constructor(readonly jobExecutionId: string) {
-    super(`Job lease is no longer active: ${jobExecutionId}`);
-    this.name = 'JobLeaseNotActiveError';
-  }
-}
-
 export class InvalidJobRunnerLabelsError extends Error {
   constructor(readonly labels: readonly string[]) {
     super(`Job runner labels are invalid: ${labels.join(', ')}`);

package/src/core/job-execution.ts

@@ -16,7 +16,6 @@ import {
   getStepAttemptsByJobExecutionId,
   getStepsByJobExecutionIdForUpdate,
   insertRunningStepAttempt,
-  lockActiveJobExecutionLeaseForUpdate,
   markStepRunning,
   markStepSkipped,
   settleJobFailed,
@@ -33,7 +32,6 @@ import type {PersistedEvaluationTraceEntry, Step, StepStatusReason} from './enti
 import {
   AgentConfigUnresolvableError,
   InterpolationUnresolvableError,
-  JobLeaseNotActiveError,
   JobNotFoundError,
   StepAttemptAheadError,
   StepNotFoundError,
@@ -336,21 +334,16 @@ function dispatchConfigError(error: DispatchConfigError): Record<string, unknown
 }
 
 export interface NextStepForLeasedJobExecutionParams {
-  jobId: string;
   jobExecutionId: string;
-  runnerSessionId: string;
   agent?: AgentInterModuleClient | undefined;
 }
 
 export function nextStepForLeasedJobExecution(
   params: NextStepForLeasedJobExecutionParams,
 ): Promise<NextStep> {
-  return withTransaction(async (tx) => {
-    const leaseIsActive = await lockActiveJobExecutionLeaseForUpdate(params, tx);
-    if (!leaseIsActive) throw new JobLeaseNotActiveError(params.jobExecutionId);
-
-    return nextStepForJobExecutionInTransaction(params.jobExecutionId, tx, params.agent);
-  });
+  return withTransaction((tx) =>
+    nextStepForJobExecutionInTransaction(params.jobExecutionId, tx, params.agent),
+  );
 }
 
 export function nextStepForJob(

package/src/core/run-workflow.test.ts

@@ -1,7 +1,7 @@
 import type {AgentInterModuleClient} from '@shipfox/api-agent-dto/inter-module';
-import type {WorkflowDefinition} from '@shipfox/api-definitions';
-import {createWorkflowModelSnapshot} from '@shipfox/api-definitions-dto';
+import {createWorkflowModelSnapshot, type WorkflowModel} from '@shipfox/api-definitions-dto';
 import type {DefinitionsInterModuleClient} from '@shipfox/api-definitions-dto/inter-module';
+import {agentValidationCatalog} from '#test/fixtures/agent-inter-module.js';
 import {workflowModel} from '#test/index.js';
 import type {TriggerPayload} from './entities/workflow-run.js';
 import {DefinitionNotFoundError, ProjectMismatchError} from './errors.js';
@@ -16,61 +16,26 @@ const mockResolveAgentConfig = vi.hoisted(() =>
   }),
 );
 
-vi.mock('@shipfox/api-definitions', () => ({
-  DEFAULT_JOB_CHECKOUT: {
-    permissions: {contents: 'read'},
-    persistCredentials: true,
-  },
-  getDefinitionById: vi.fn(),
-}));
+type DefinitionForWorkflowRun = NonNullable<
+  Awaited<ReturnType<DefinitionsInterModuleClient['getDefinitionForWorkflowRun']>>['definition']
+>;
 
-import {getDefinitionById} from '@shipfox/api-definitions';
-
-const mockGetDefinitionById = vi.mocked(getDefinitionById);
+let definitionResponse: DefinitionForWorkflowRun | null = null;
 const definitions: DefinitionsInterModuleClient = {
-  getDefinitionForWorkflowRun: async ({definitionId}) => {
-    const definition = await mockGetDefinitionById(definitionId);
-    return {
-      definition:
-        definition === undefined
-          ? null
-          : {
-              id: definition.id,
-              projectId: definition.projectId,
-              name: definition.name,
-              model: createWorkflowModelSnapshot(definition.model),
-              sourceSnapshot: definition.sourceSnapshot,
-            },
-    };
-  },
+  getDefinitionForWorkflowRun: async () => ({definition: definitionResponse}),
 };
 
-function buildDefinition(overrides?: Partial<WorkflowDefinition>): WorkflowDefinition {
-  const model = workflowModel();
-  const document = {
-    name: model.name,
-    jobs: {
-      build: {steps: [{run: 'echo hello'}]},
-    },
-  };
+function buildDefinition(
+  overrides: Partial<Omit<DefinitionForWorkflowRun, 'model'>> & {model?: WorkflowModel} = {},
+): DefinitionForWorkflowRun {
+  const {model = workflowModel(), ...definitionOverrides} = overrides;
   return {
     id: crypto.randomUUID(),
     projectId: crypto.randomUUID(),
-    configPath: '.shipfox/workflows/test.yml',
-    source: 'manual',
-    sha: null,
-    ref: null,
     name: 'Test Workflow',
-    definition: document,
-    document,
-    model,
+    model: createWorkflowModelSnapshot(model),
     sourceSnapshot: null,
-    contentHash: null,
-    fetchedAt: new Date(),
-    createdAt: new Date(),
-    updatedAt: new Date(),
-    deletedAt: null,
-    ...overrides,
+    ...definitionOverrides,
   };
 }
 
@@ -87,6 +52,7 @@ describe('runWorkflow', () => {
   let workspaceId: string;
   let projectId: string;
   const agent: AgentInterModuleClient = {
+    getValidationCatalog: vi.fn().mockResolvedValue(agentValidationCatalog),
     resolveAgentConfig: mockResolveAgentConfig,
     resolveRuntimeCredentials: vi.fn(),
   };
@@ -95,11 +61,12 @@ describe('runWorkflow', () => {
     workspaceId = crypto.randomUUID();
     projectId = crypto.randomUUID();
     mockResolveAgentConfig.mockClear();
+    definitionResponse = null;
   });
 
   test('creates a run from a valid definition with the provided manual trigger payload', async () => {
     const definition = buildDefinition({projectId});
-    mockGetDefinitionById.mockResolvedValue(definition);
+    definitionResponse = definition;
     const triggerPayload = manualPayload();
 
     const run = await runWorkflow(definitions, {
@@ -129,7 +96,7 @@ describe('runWorkflow', () => {
       },
     });
     const definition = buildDefinition({projectId, model});
-    mockGetDefinitionById.mockResolvedValue(definition);
+    definitionResponse = definition;
 
     const run = await runWorkflow(definitions, {
       workspaceId,
@@ -145,7 +112,7 @@ describe('runWorkflow', () => {
 
   test('persists an integration trigger payload intact', async () => {
     const definition = buildDefinition({projectId});
-    mockGetDefinitionById.mockResolvedValue(definition);
+    definitionResponse = definition;
     const triggerPayload: TriggerPayload = {
       provider: 'github',
       source: 'github_acme',
@@ -171,7 +138,7 @@ describe('runWorkflow', () => {
   test('creates the run with the definition source snapshot', async () => {
     const sourceSnapshot = {content: 'name: Test Workflow\njobs: {}\n', format: 'yaml'} as const;
     const definition = buildDefinition({projectId, sourceSnapshot});
-    mockGetDefinitionById.mockResolvedValue(definition);
+    definitionResponse = definition;
 
     const run = await runWorkflow(definitions, {
       workspaceId,
@@ -185,7 +152,7 @@ describe('runWorkflow', () => {
   });
 
   test('throws DefinitionNotFoundError for unknown definition', async () => {
-    mockGetDefinitionById.mockResolvedValue(undefined);
+    definitionResponse = null;
 
     const unknownId = crypto.randomUUID();
 
@@ -203,7 +170,7 @@ describe('runWorkflow', () => {
   test('throws ProjectMismatchError when definition.projectId does not match', async () => {
     const otherProjectId = crypto.randomUUID();
     const definition = buildDefinition({projectId: otherProjectId});
-    mockGetDefinitionById.mockResolvedValue(definition);
+    definitionResponse = definition;
 
     await expect(
       runWorkflow(definitions, {
@@ -218,7 +185,7 @@ describe('runWorkflow', () => {
 
   test('passes inputs through to the run', async () => {
     const definition = buildDefinition({projectId});
-    mockGetDefinitionById.mockResolvedValue(definition);
+    definitionResponse = definition;
 
     const run = await runWorkflow(definitions, {
       workspaceId,

package/src/core/run-workflow.ts

@@ -1,8 +1,8 @@
 import type {AgentInterModuleClient} from '@shipfox/api-agent-dto/inter-module';
 import {workflowModelFromSnapshot} from '@shipfox/api-definitions-dto';
 import type {DefinitionsInterModuleClient} from '@shipfox/api-definitions-dto/inter-module';
-import type {IntegrationsModuleClient} from '@shipfox/api-integration-core-dto';
-import type {ProjectsModuleClient} from '@shipfox/api-projects-dto';
+import type {IntegrationsModuleClient} from '@shipfox/api-integration-core-dto/inter-module';
+import type {ProjectsModuleClient} from '@shipfox/api-projects-dto/inter-module';
 import type {SecretsInterModuleClient} from '@shipfox/api-secrets-dto/inter-module';
 import {createWorkflowRun} from '#db/workflow-runs.js';
 import {createAgentDefaultsResolver} from './agent-defaults.js';

package/src/core/step-config/agent.ts

@@ -4,13 +4,13 @@ import {
   AGENT_INTEGRATION_MCP_SERVER_NAME,
   AGENT_INTEGRATION_MCP_TRANSPORT,
   type AgentIntegrationMcpServerConfigDto,
-  type AgentThinking,
   type MaterializedAgentIntegrationConfigDto,
 } from '@shipfox/api-agent-dto';
 import {agentInterModuleContract} from '@shipfox/api-agent-dto/inter-module';
 import type {WorkflowModel} from '@shipfox/api-definitions-dto';
 import type {ResolvedField, SiteResolvedField} from '@shipfox/expression';
 import {isInterModuleKnownError} from '@shipfox/inter-module';
+import type {AgentThinking} from '@shipfox/workflow-document';
 import type {AgentDefaultsResolver, ResolvedAgentDefaults} from '#core/agent-defaults.js';
 import {
   type AgentToolMaterializationContext,

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

@@ -5,10 +5,9 @@ import {
   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 type {AgentToolCatalogEntry, 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';

package/src/core/step-config/materialize-workflow-model.test.ts

@@ -1,9 +1,5 @@
 import {agentInterModuleContract} from '@shipfox/api-agent-dto/inter-module';
-import {
-  DEFAULT_JOB_CHECKOUT,
-  normalizeWorkflowDocument,
-  type WorkflowModel,
-} from '@shipfox/api-definitions';
+import {DEFAULT_JOB_CHECKOUT, type WorkflowModel} from '@shipfox/api-definitions-dto';
 import {createInterModuleKnownError} from '@shipfox/inter-module';
 import type {AgentDefaultsResolver} from '#core/agent-defaults.js';
 import {AgentConfigUnresolvableError, InterpolationUnresolvableError} from '#core/errors.js';
@@ -539,7 +535,7 @@ describe('materializeWorkflowModel', () => {
   });
 
   it('freezes vars from the run-creation context into step config', async () => {
-    const model = normalizeWorkflowDocument({
+    const model = workflowModel({
       name: 'vars workflow',
       runner: 'ubuntu-latest',
       jobs: {
@@ -999,14 +995,15 @@ describe('materializeWorkflowModel', () => {
 
   it('skips listening job steps at workflow-run creation', async () => {
     const stepNameSource = `Review ${template('execution.index')}`;
-    const model = normalizeWorkflowDocument({
+    const model = workflowModel({
       name: 'Listening workflow',
       runner: 'ubuntu-latest',
       jobs: {
         review: {
           listening: {
             on: [{source: 'github', event: 'pull_request_review'}],
-            max_executions: 3,
+            maxExecutions: 3,
+            onResolve: 'finish',
           },
           steps: [{name: stepNameSource, prompt: 'Summarize the review.'}],
         },
@@ -1027,14 +1024,15 @@ describe('materializeWorkflowModel', () => {
   });
 
   it('materializes one-shot siblings while skipping listening steps', async () => {
-    const model = normalizeWorkflowDocument({
+    const model = workflowModel({
       name: 'Mixed workflow',
       runner: 'ubuntu-latest',
       jobs: {
         review: {
           listening: {
             on: [{source: 'github', event: 'pull_request_review'}],
-            max_executions: 3,
+            maxExecutions: 3,
+            onResolve: 'finish',
           },
           steps: [{name: `Review ${template('execution.index')}`, prompt: 'Summarize it.'}],
         },
@@ -1095,12 +1093,12 @@ describe('materializeWorkflowModel', () => {
   });
 
   it('materializes step if as server-owned condition outside runner config', async () => {
-    const model = normalizeWorkflowDocument({
+    const model = workflowModel({
       name: 'Conditional workflow',
       runner: 'ubuntu-latest',
       jobs: {
         build: {
-          steps: [{if: template('false'), run: 'npm test'}],
+          steps: [{if: expression('false'), run: 'npm test'}],
         },
       },
     });
@@ -1112,7 +1110,6 @@ describe('materializeWorkflowModel', () => {
       language: 'cel',
       source: 'false',
       check: 'typed',
-      resultType: 'bool',
     });
     expect(step?.config).toEqual({run: 'npm test'});
   });

package/src/db/job-listeners.ts

@@ -1,7 +1,7 @@
 import type {AgentInterModuleClient} from '@shipfox/api-agent-dto/inter-module';
 import {readPersistedWorkflowModel} from '@shipfox/api-definitions-dto';
-import type {IntegrationsModuleClient} from '@shipfox/api-integration-core-dto';
-import type {ProjectsModuleClient} from '@shipfox/api-projects-dto';
+import type {IntegrationsModuleClient} from '@shipfox/api-integration-core-dto/inter-module';
+import type {ProjectsModuleClient} from '@shipfox/api-projects-dto/inter-module';
 import {
   WORKFLOWS_JOB_ACTIVATED,
   type WorkflowsJobActivatedEventDto,