@shipfox/api-server 16.0.0 → 17.0.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "@shipfox/api-server",
   "license": "MIT",
   "private": false,
-  "version": "16.0.0",
+  "version": "17.0.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ShipfoxHQ/shipfox.git",
@@ -22,37 +22,37 @@
     }
   },
   "dependencies": {
-    "@shipfox/annotations": "15.0.0",
+    "@shipfox/annotations": "17.0.0",
+    "@shipfox/api-agent": "17.0.0",
     "@shipfox/annotations-dto": "12.3.0",
-    "@shipfox/api-agent": "16.0.0",
-    "@shipfox/api-agent-dto": "16.0.0",
-    "@shipfox/api-auth": "15.0.0",
-    "@shipfox/api-auth-dto": "15.0.0",
-    "@shipfox/api-definitions": "16.0.0",
-    "@shipfox/api-definitions-dto": "16.0.0",
-    "@shipfox/api-dispatcher": "15.0.0",
-    "@shipfox/api-email-challenges": "1.1.10",
-    "@shipfox/api-integration-core": "16.0.0",
+    "@shipfox/api-agent-dto": "17.0.0",
+    "@shipfox/api-auth": "17.0.0",
+    "@shipfox/api-auth-dto": "17.0.0",
+    "@shipfox/api-definitions": "17.0.0",
+    "@shipfox/api-dispatcher": "17.0.0",
+    "@shipfox/api-integration-core": "17.0.0",
+    "@shipfox/api-email-challenges": "1.1.11",
     "@shipfox/api-integration-core-dto": "16.0.0",
-    "@shipfox/api-logs": "16.0.0",
-    "@shipfox/api-projects": "16.0.0",
+    "@shipfox/api-logs": "17.0.0",
     "@shipfox/api-projects-dto": "15.0.0",
-    "@shipfox/api-runners": "16.0.0",
+    "@shipfox/api-projects": "17.0.0",
+    "@shipfox/api-definitions-dto": "17.0.0",
+    "@shipfox/api-runners": "17.0.0",
     "@shipfox/api-runners-dto": "16.0.0",
-    "@shipfox/api-secrets": "15.0.0",
+    "@shipfox/api-secrets": "17.0.0",
     "@shipfox/api-secrets-dto": "12.0.0",
-    "@shipfox/api-triggers": "16.0.0",
-    "@shipfox/api-workflows": "16.0.0",
-    "@shipfox/api-workflows-dto": "16.0.0",
+    "@shipfox/api-triggers": "17.0.0",
     "@shipfox/api-workspaces-dto": "15.0.0",
-    "@shipfox/api-workspaces": "16.0.0",
+    "@shipfox/api-workflows": "17.0.0",
+    "@shipfox/api-workspaces": "17.0.0",
     "@shipfox/config": "1.2.4",
     "@shipfox/node-error-monitoring": "0.3.0",
     "@shipfox/node-fastify": "0.4.3",
+    "@shipfox/api-workflows-dto": "17.0.0",
     "@shipfox/node-jwt": "0.4.0",
     "@shipfox/node-module": "1.0.7",
     "@shipfox/node-opentelemetry": "0.6.5",
-    "@shipfox/node-postgres": "0.5.0"
+    "@shipfox/node-postgres": "0.5.1"
   },
   "imports": {
     "#*": "./dist/*"

package/src/modules.test.ts

@@ -207,6 +207,8 @@ describe('defaultModules', () => {
             getValidationCatalog: vi.fn(),
             resolveAgentConfig: vi.fn(),
             resolveRuntimeCredentials: vi.fn(),
+            claimSession: vi.fn(),
+            carryOverSessions: vi.fn(),
           },
         },
       ],
@@ -244,8 +246,10 @@ describe('defaultModules', () => {
           contract: workflowsInterModuleContract,
           handlers: {
             deliverEventToJobListener: vi.fn(),
+            getLeasedAgentSessionContext: vi.fn(),
             getLeasedAgentToolContext: vi.fn(),
             getStepLogContext: vi.fn(),
+            listJobStepAttempts: vi.fn(),
             resolveWorkflowRunTriggerReference: vi.fn(),
             startDevRun: vi.fn(),
             startRunFromTrigger: vi.fn(),
@@ -329,15 +333,18 @@ describe('defaultModules', () => {
   it('uses the default Agent module factory when none is supplied', async () => {
     await defaultModules();
 
-    expect(mocks.createAgentModule).toHaveBeenCalledWith({secrets: expect.any(Object)});
+    expect(mocks.createAgentModule).toHaveBeenCalledWith({
+      secrets: expect.any(Object),
+      workflows: expect.any(Object),
+    });
     expect(mocks.createAgentModule.mock.calls[0]?.[0].secrets).not.toHaveProperty('getSecret');
   });
 
   it('composes Agent with the shared Secrets client and registers the supplied module', async () => {
     const customAgentModule = mocks.createAgentModule();
     mocks.createAgentModule.mockClear();
-    const agentModule = vi.fn<DefaultAgentModuleFactory>(({secrets}) =>
-      mocks.createAgentModule({secrets}),
+    const agentModule = vi.fn<DefaultAgentModuleFactory>((options) =>
+      mocks.createAgentModule(options),
     );
 
     const modules = await defaultModules({agentModule});
@@ -352,7 +359,10 @@ describe('defaultModules', () => {
     };
     const secretValues = await agentSecrets.getSecretsByNamespace(scope);
 
-    expect(agentModule).toHaveBeenCalledWith({secrets: expect.any(Object)});
+    expect(agentModule).toHaveBeenCalledWith({
+      secrets: expect.any(Object),
+      workflows: expect.any(Object),
+    });
     expect(secretValues).toEqual({values: {}});
     expect(mocks.getSecretsByNamespace).toHaveBeenCalledWith(
       scope,
@@ -360,7 +370,10 @@ describe('defaultModules', () => {
     );
     expect(agentSecrets).not.toHaveProperty('getSecret');
     expect(agentSecrets).not.toHaveProperty('getVariablesByNamespace');
-    expect(mocks.createAgentModule).toHaveBeenCalledWith({secrets: agentSecrets});
+    expect(mocks.createAgentModule).toHaveBeenCalledWith({
+      secrets: agentSecrets,
+      workflows: expect.any(Object),
+    });
     expect(mocks.createAgentModule).toHaveBeenCalledTimes(1);
     expect(modules.filter((module) => module.name === 'agent')).toEqual([customAgentModule]);
     expect(

package/src/modules.ts

@@ -26,7 +26,10 @@ import {
 } from '@shipfox/api-secrets-dto/inter-module';
 import {createTriggersModule} from '@shipfox/api-triggers';
 import {createWorkflowsModule} from '@shipfox/api-workflows';
-import {workflowsInterModuleContract} from '@shipfox/api-workflows-dto/inter-module';
+import {
+  type WorkflowsModuleClient,
+  workflowsInterModuleContract,
+} from '@shipfox/api-workflows-dto/inter-module';
 import {createWorkspacesModule} from '@shipfox/api-workspaces';
 import {
   type WorkspacesInterModuleClient,
@@ -62,6 +65,14 @@ export type DefaultAuthModuleFactory = (options: {
  */
 export type DefaultAgentModuleFactory = (options: {
   secrets: Pick<SecretsInterModuleClient, 'deleteSecrets' | 'getSecretsByNamespace' | 'setSecrets'>;
+  /**
+   * Optional: the step-attempt-terminated release and the stale-claim reap cron
+   * are always registered so composed claim creators get a release backstop;
+   * only the job-terminated grace sweep is gated on this client, so a factory
+   * built without it stays claim/release-free (as before the session release
+   * stack landed).
+   */
+  workflows?: WorkflowsModuleClient | undefined;
 }) => ShipfoxModule;
 export type DefaultRunnersModuleFactory = (options: {auth: AuthInterModuleClient}) => ShipfoxModule;
 export type DefaultModulesExtension = (options: {
@@ -183,6 +194,7 @@ export async function defaultModules(
   const extensionModules = options.extension?.({workspaces: workspacesClient}) ?? [];
   const agentModule = (options.agentModule ?? createAgentModule)({
     secrets: createAgentSecretsClient(secretsClient),
+    workflows: workflowsClient,
   });
   if (options.agentModule) validateCustomAgentModule(agentModule);
 

package/test/published/_environment.mjs

@@ -37,12 +37,13 @@ export function publishedTestEnvironment() {
     SLACK_OAUTH_CLIENT_SECRET: 'external-consumer-client-secret',
     SLACK_OAUTH_REDIRECT_URL: 'https://shipfox.example.com/integrations/slack/callback',
     SLACK_SIGNING_SECRET: 'external-consumer-signing-secret',
-    LOG_STORAGE_S3_ACCESS_KEY_ID: 'external-consumer-access-key',
-    LOG_STORAGE_S3_BUCKET: 'shipfox-logs',
-    LOG_STORAGE_S3_ENDPOINT: 'http://127.0.0.1:3900',
-    LOG_STORAGE_S3_FORCE_PATH_STYLE: 'true',
-    LOG_STORAGE_S3_REGION: 'garage',
-    LOG_STORAGE_S3_SECRET_ACCESS_KEY: 'external-consumer-secret-key',
+    OBJECT_STORAGE_S3_ACCESS_KEY_ID: 'external-consumer-access-key',
+    OBJECT_STORAGE_S3_BUCKET: 'shipfox',
+    OBJECT_STORAGE_S3_ENDPOINT: 'http://127.0.0.1:3900',
+    OBJECT_STORAGE_S3_FORCE_PATH_STYLE: 'true',
+    OBJECT_STORAGE_S3_REGION: 'garage',
+    OBJECT_STORAGE_S3_SECRET_ACCESS_KEY: 'external-consumer-secret-key',
+    AGENT_SESSION_ENCRYPTION_KEK: 'MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY=',
     POSTGRES_DATABASE: postgresDatabase,
     POSTGRES_HOST: postgresHost,
     POSTGRES_MAX_CONNECTIONS: '5',