@shipfox/client-workflows 22.0.3 → 23.0.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shipfox/client-workflows",
   "license": "MIT",
-  "version": "22.0.3",
+  "version": "23.0.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ShipfoxHQ/shipfox.git",
@@ -28,13 +28,13 @@
     "@swc/helpers": "^0.5.17",
     "date-fns": "^4.1.0",
     "@shipfox/annotations-dto": "12.3.0",
-    "@shipfox/api-definitions-dto": "12.3.0",
-    "@shipfox/api-workflows-dto": "13.1.0",
+    "@shipfox/api-definitions-dto": "14.0.0",
+    "@shipfox/api-workflows-dto": "14.0.0",
     "@shipfox/client-api": "6.0.1",
     "@shipfox/client-logs": "22.0.3",
-    "@shipfox/client-projects": "22.0.3",
-    "@shipfox/client-shell": "22.0.3",
-    "@shipfox/client-triggers": "22.0.3",
+    "@shipfox/client-projects": "23.0.0",
+    "@shipfox/client-shell": "23.0.0",
+    "@shipfox/client-triggers": "23.0.0",
     "@shipfox/client-ui": "22.0.3",
     "@shipfox/react-ui": "2.2.0"
   },

package/src/core/entities/job.ts

@@ -28,13 +28,13 @@ export type JobStatusReason =
 export interface JobListening {
   on: Array<{
     source: string;
-    event: string;
+    event?: string | undefined;
     inputs?: Record<string, unknown> | undefined;
     filter?: string | undefined;
   }>;
   until: Array<{
     source: string;
-    event: string;
+    event?: string | undefined;
     inputs?: Record<string, unknown> | undefined;
     filter?: string | undefined;
   }> | null;

package/src/pages/project-workflows-page.test.tsx

@@ -1,5 +1,5 @@
 import {configureApiClient} from '@shipfox/client-api';
-import {fireEvent, screen, waitFor} from '@testing-library/react';
+import {fireEvent, screen, waitFor, within} from '@testing-library/react';
 import {
   jsonResponse,
   PROJECT_TEST_WID,
@@ -69,11 +69,12 @@ describe('ProjectWorkflowsPage', () => {
               finished_at: null,
               last_error_code: 'no-workflow-files',
               last_error_message: 'No workflow files found',
-              warnings: [
+              diagnostics: [
                 {
                   code: 're-evaluating-command',
                   message: 'Workflow data is re-executed as shell code.',
                   path: 'jobs.build.steps.0.run',
+                  severity: 'warning',
                 },
               ],
             },
@@ -104,16 +105,20 @@ describe('ProjectWorkflowsPage', () => {
               finished_at: '2026-05-07T01:00:00.000Z',
               last_error_code: null,
               last_error_message: null,
-              warnings: [
+              diagnostics: [
                 {
                   code: 're-evaluating-command',
                   message: 'Workflow data is re-executed as shell code.',
                   path: 'jobs.build.steps.0.run',
+                  file_path: '.shipfox/workflows/warning.yml',
+                  severity: 'warning',
                 },
                 {
                   code: 're-evaluating-command',
                   message: 'Workflow data is re-executed as shell code.',
                   path: 'jobs.build.steps.0.run',
+                  file_path: '.shipfox/workflows/warning.yml',
+                  severity: 'warning',
                 },
               ],
             },
@@ -125,12 +130,87 @@ describe('ProjectWorkflowsPage', () => {
     renderWorkflowsPage();
 
     expect(await screen.findByText('Workflow definition warnings')).toBeInTheDocument();
+    // Both warnings group under the shared workflow file; the file label renders once.
     expect(screen.getAllByText('Workflow data is re-executed as shell code.')).toHaveLength(2);
-    expect(screen.getAllByRole('listitem')).toHaveLength(2);
+    expect(screen.getAllByText('.shipfox/workflows/warning.yml')).toHaveLength(1);
     expect(screen.getAllByText('jobs.build.steps.0.run')).toHaveLength(2);
+    expect(screen.getByRole('status')).toBeInTheDocument();
     expect(screen.queryByText('Workflow sync failed')).not.toBeInTheDocument();
   });
 
+  test('shows errors and warnings together with severity labels, grouped by file path', async () => {
+    configureApiClient({
+      fetchImpl: createProjectDetailFetch({
+        definitions: jsonResponse(
+          definitionsDto({
+            sync: {
+              ref: 'main',
+              status: 'succeeded',
+              last_sync_at: '2026-05-07T01:00:00.000Z',
+              started_at: '2026-05-07T00:59:55.000Z',
+              finished_at: '2026-05-07T01:00:00.000Z',
+              last_error_code: null,
+              last_error_message: null,
+              diagnostics: [
+                {
+                  code: 'invalid-trigger-event',
+                  message: 'Trigger event is never delivered by this source.',
+                  path: 'triggers.on_deploy',
+                  file_path: '.shipfox/workflows/deploy.yml',
+                  severity: 'error',
+                },
+                {
+                  code: 'unknown-trigger-source',
+                  message: 'No connection matches this source slug.',
+                  path: 'triggers.on_deploy',
+                  file_path: '.shipfox/workflows/deploy.yml',
+                  severity: 'warning',
+                },
+                {
+                  code: 're-evaluating-command',
+                  message: 'Workflow data is re-executed as shell code.',
+                  path: 'jobs.build.steps.0.run',
+                  file_path: '.shipfox/workflows/build.yml',
+                  severity: 'warning',
+                },
+              ],
+            },
+          }),
+        ),
+      }),
+    });
+
+    renderWorkflowsPage();
+
+    expect(await screen.findByText('Workflow definition diagnostics')).toBeInTheDocument();
+    const diagnosticsCallout = screen.getByRole('status');
+    expect(diagnosticsCallout).toBeInTheDocument();
+    // Two groups: the deploy workflow file and the build workflow file.
+    expect(within(diagnosticsCallout).getAllByText('.shipfox/workflows/deploy.yml')).toHaveLength(
+      1,
+    );
+    expect(within(diagnosticsCallout).getAllByText('.shipfox/workflows/build.yml')).toHaveLength(1);
+    expect(within(diagnosticsCallout).getAllByText('triggers.on_deploy')).toHaveLength(2);
+    expect(within(diagnosticsCallout).getAllByText('jobs.build.steps.0.run')).toHaveLength(1);
+    const errorRow = within(diagnosticsCallout).getByText(
+      'Trigger event is never delivered by this source.',
+    );
+    const warningRow = within(diagnosticsCallout).getByText(
+      'No connection matches this source slug.',
+    );
+    expect(errorRow).toHaveClass('text-tag-error-text');
+    expect(warningRow).not.toHaveClass('text-tag-error-text');
+    expect(
+      within(diagnosticsCallout).getByText('Error:', {selector: 'span.font-medium'}),
+    ).toBeInTheDocument();
+    expect(
+      within(diagnosticsCallout).getAllByText('Warning:', {selector: 'span.font-medium'}),
+    ).toHaveLength(2);
+    expect(
+      within(diagnosticsCallout).getByText('Workflow data is re-executed as shell code.'),
+    ).toBeInTheDocument();
+  });
+
   test('opens and closes the definition drawer by clicking the row', async () => {
     configureApiClient({fetchImpl: createProjectDetailFetch()});
 
@@ -301,7 +381,7 @@ function baseDefinitionsDto() {
       finished_at: '2026-05-07T01:00:00.000Z',
       last_error_code: null,
       last_error_message: null,
-      warnings: [],
+      diagnostics: [],
     },
   };
 }

package/src/pages/project-workflows-page.tsx

@@ -1,6 +1,7 @@
 import {ApiError} from '@shipfox/client-api';
 import {
   type Definition,
+  type DefinitionSyncDiagnostic,
   type DefinitionSyncSummary,
   SourceStrip,
   useDefinitionsInfiniteQuery,
@@ -101,7 +102,7 @@ function ProjectWorkflowsPageInner({projectId}: {projectId: string}) {
           />
 
           <WorkflowSyncAlert sync={sync} />
-          <WorkflowSyncWarnings sync={sync} />
+          <WorkflowSyncDiagnostics sync={sync} />
 
           <WorkflowDefinitionsList
             definitions={definitions}
@@ -382,30 +383,54 @@ function WorkflowSyncAlert({sync}: {sync: DefinitionSyncSummary | null | undefin
   );
 }
 
-function WorkflowSyncWarnings({sync}: {sync: DefinitionSyncSummary | null | undefined}) {
-  if (sync?.status !== 'succeeded' || sync.warnings.length === 0) return null;
+function WorkflowSyncDiagnostics({sync}: {sync: DefinitionSyncSummary | null | undefined}) {
+  if (sync?.status !== 'succeeded' || sync.diagnostics.length === 0) return null;
 
-  const seenKeys = new Map<string, number>();
-  const warningItems = sync.warnings.map((warning) => {
-    const baseKey = `${warning.code}-${warning.path ?? 'workflow'}-${warning.message}`;
-    const occurrence = seenKeys.get(baseKey) ?? 0;
-    seenKeys.set(baseKey, occurrence + 1);
-    return {key: `${baseKey}-${occurrence}`, warning};
-  });
+  const hasErrors = sync.diagnostics.some((diagnostic) => diagnostic.severity === 'error');
+  const hasWarnings = sync.diagnostics.some((diagnostic) => diagnostic.severity === 'warning');
+  const groups = groupDiagnosticsByFilePath(sync.diagnostics);
+  const title =
+    hasErrors && hasWarnings
+      ? 'Workflow definition diagnostics'
+      : hasErrors
+        ? 'Workflow definition errors'
+        : 'Workflow definition warnings';
 
   return (
-    <Callout role="status" type="warning">
+    <Callout role="status" type={hasErrors ? 'error' : 'warning'}>
       <div className="flex flex-col gap-inline">
         <Text size="sm" bold>
-          Workflow definition warnings
+          {title}
         </Text>
         <ul className="flex flex-col gap-tight">
-          {warningItems.map(({key, warning}) => (
-            <li key={key}>
-              <Text size="sm">{warning.message}</Text>
-              {warning.path ? (
-                <Code className="text-foreground-neutral-muted">{warning.path}</Code>
+          {groups.map((group) => (
+            <li key={group.key} className="flex flex-col gap-tight">
+              {group.filePath ? (
+                <Code className="text-foreground-neutral-muted">{group.filePath}</Code>
               ) : null}
+              <ul className="flex flex-col gap-tight">
+                {group.items.map(({key, diagnostic}) => {
+                  const severityLabel = diagnostic.severity === 'error' ? 'Error' : 'Warning';
+
+                  return (
+                    <li key={key}>
+                      {diagnostic.path ? (
+                        <Code className="text-foreground-neutral-muted">{diagnostic.path}</Code>
+                      ) : null}
+                      <Text size="sm">
+                        <span className="font-medium">{severityLabel}:</span>{' '}
+                        <span
+                          className={
+                            diagnostic.severity === 'error' ? 'text-tag-error-text' : undefined
+                          }
+                        >
+                          {diagnostic.message}
+                        </span>
+                      </Text>
+                    </li>
+                  );
+                })}
+              </ul>
             </li>
           ))}
         </ul>
@@ -414,6 +439,35 @@ function WorkflowSyncWarnings({sync}: {sync: DefinitionSyncSummary | null | unde
   );
 }
 
+interface DiagnosticGroup {
+  key: string;
+  filePath: string | undefined;
+  items: {key: string; diagnostic: DefinitionSyncDiagnostic}[];
+}
+
+function groupDiagnosticsByFilePath(
+  diagnostics: readonly DefinitionSyncDiagnostic[],
+): DiagnosticGroup[] {
+  const groups: DiagnosticGroup[] = [];
+  const indexByFilePath = new Map<string, number>();
+  for (const diagnostic of diagnostics) {
+    const filePathKey = diagnostic.filePath ?? '';
+    const groupIndex = indexByFilePath.get(filePathKey);
+    if (groupIndex === undefined) {
+      indexByFilePath.set(filePathKey, groups.length);
+      groups.push({
+        key: `${filePathKey}-${groups.length}`,
+        filePath: diagnostic.filePath,
+        items: [{key: `${filePathKey}-0`, diagnostic}],
+      });
+    } else {
+      const group = groups[groupIndex];
+      if (group) group.items.push({key: `${filePathKey}-${group.items.length}`, diagnostic});
+    }
+  }
+  return groups;
+}
+
 function DefinitionSheet({
   definition,
   onOpenChange,

package/test/fixtures/workflow-run.ts

@@ -66,6 +66,8 @@ export function workflowRunDto(
     name: 'deploy-web',
     workflow_name: 'deploy-web',
     status: 'running',
+    origin: 'synced',
+    dev_source: null,
     current_attempt: 1,
     latest_attempt: 1,
     trigger_provider: null,