@sdods/cli 0.21.0 → 0.22.0

package/dist/commands/report.js

@@ -3,7 +3,7 @@ import { tmpdir } from 'node:os';
 import { basename, dirname, extname, join, resolve } from 'node:path';
 import { execa } from 'execa';
 import pc from 'picocolors';
-import { legacyRunFiles, runFiles, } from '@sdods/contracts';
+import { legacyRunFiles, parseVersioned, runFiles, } from '@sdods/contracts';
 import { SdodsError, collectGateEvidence, evaluateGates, gateReportsFromRunnerJson, gateTotalsFromRunnerStats, hasGates, ingestGateJudge, } from '@sdods/core';
 import { createContext } from '../context.js';
 import { gateFailedError, printGates } from '../gates.js';
@@ -168,11 +168,12 @@ export function register(program) {
     });
     report
         .command('ingest [files...]')
-        .description('Ingest cucumber messages NDJSON and runner JSON results into the database')
+        .description('Ingest cucumber messages NDJSON, runner JSON and JUnit XML results into the database')
         .requiredOption('--run-id <id>', 'run id (directory name under the artifacts root)')
         .option('-p, --project <slug>', 'project slug when run.json is missing')
         .option('--manifest <file>', 'explicit run.json path')
-        .option('--format <fmt>', 'auto|cucumber|runner-json (alias: pw-json)', 'auto')
+        .option('--format <fmt>', 'auto|cucumber|runner-json (alias: pw-json)|junit', 'auto')
+        .option('--approved-skips <file>', 'approved-skip registry (approved-skips/v1); a skip it does not approve makes the run INFRASTRUCTURE_ERROR')
         .option('--artifacts-dir <dir>', 'artifacts root (default .sdods/runs)')
         .option('--replace', 'delete previously ingested rows of this run first')
         .option('-e, --env <name>', 'environment name when run.json is missing')
@@ -192,13 +193,18 @@ export function register(program) {
             const { basename } = await import('node:path');
             const form = new FormData();
             let count = 0;
-            for (const f of files) {
+            for (const [i, f] of files.entries()) {
                 const abs = resolve(ctx.rootDir, f);
                 if (!existsSync(abs))
                     continue;
-                form.append('files', new Blob([readFileSync(abs)]), basename(abs));
+                // The server accepts result files by name; a JUnit file goes up under the name it reads.
+                const junit = ingestFormat(opts.format, abs) === 'junit' &&
+                    !/^junit(\.shard-\d+)?\.xml$/.test(basename(abs));
+                form.append('files', new Blob([readFileSync(abs)]), junit ? `junit.shard-${i}.xml` : basename(abs));
                 count++;
             }
+            if (opts.approvedSkips)
+                form.append('files', new Blob([readFileSync(resolve(ctx.rootDir, opts.approvedSkips))]), 'approved-skips.json');
             if (!count)
                 throw new SdodsError('CONFIG_INVALID', 'No existing files to upload.', { exitCode: 2 });
             const url = `${serverUrl.replace(/\/$/, '')}/api/runs/${encodeURIComponent(opts.runId)}/ingest`;
@@ -223,19 +229,15 @@ export function register(program) {
             const root = opts.artifactsDir
                 ? resolve(ctx.rootDir, opts.artifactsDir)
                 : artifactsRoot(ctx.rootDir);
-            const ndjson = [];
-            const runnerJson = [];
+            const paths = { cucumber: [], 'runner-json': [], junit: [] };
             for (const f of files) {
                 const abs = resolve(ctx.rootDir, f);
-                const fmt = opts.format === 'auto'
-                    ? abs.endsWith('.ndjson')
-                        ? 'cucumber'
-                        : 'runner-json'
-                    : // `pw-json` is the pre-1.0 name, still accepted
-                        opts.format === 'pw-json'
-                            ? 'runner-json'
-                            : opts.format;
-                (fmt === 'cucumber' ? ndjson : runnerJson).push(abs);
+                const fmt = ingestFormat(opts.format, abs);
+                if (!paths[fmt])
+                    throw new SdodsError('CONFIG_INVALID', `Unknown --format "${opts.format}".`, {
+                        exitCode: 2,
+                    });
+                paths[fmt].push(abs);
             }
             const manifest = opts.manifest
                 ? readJsonFile(resolve(ctx.rootDir, opts.manifest))
@@ -244,8 +246,12 @@ export function register(program) {
                 runId: opts.runId,
                 projectSlug: opts.project,
                 manifest,
-                ndjsonPaths: ndjson,
-                runnerJsonPaths: runnerJson,
+                ndjsonPaths: paths.cucumber,
+                runnerJsonPaths: paths['runner-json'],
+                junitPaths: paths.junit,
+                approvedSkips: opts.approvedSkips
+                    ? parseVersioned('approved-skips', readJsonFile(resolve(ctx.rootDir, opts.approvedSkips))).skips
+                    : undefined,
                 artifactsRoot: root,
                 replace: Boolean(opts.replace),
                 env: opts.env,
@@ -260,7 +266,9 @@ export function register(program) {
                 return json(res);
             ok(`Ingested run ${res.runId} (${res.projectSlug}): ${res.scenarios} scenario(s), ${res.attempts} attempt(s), ${res.steps} step(s), ${res.artifacts} artifact(s), ${res.healEvents} heal event(s)`);
             const t = res.totals;
-            out(`${pc.green(`${t.passed} passed`)}  ${pc.red(`${t.failed} failed`)}  ${pc.yellow(`${t.flaky} flaky`)}  ${pc.dim(`${t.skipped} skipped`)}  → ${res.status}`);
+            out(`${pc.green(`${t.passed} passed`)}  ${pc.red(`${t.failed} failed`)}  ${pc.yellow(`${t.flaky} flaky`)}  ${pc.dim(`${t.skipped} skipped`)}  → ${res.status} (${res.outcome})`);
+            for (const r of res.outcomeReasons)
+                out(pc.yellow(`  ${r.code}${r.test ? ` · ${r.test}` : ''}${r.detail ? `: ${r.detail}` : ''}`));
             if (res.gates)
                 out(`gates · process ${res.gates.process}: ${res.gates.passed
                     ? pc.green('passed')
@@ -478,4 +486,11 @@ export function register(program) {
         await execa(file, argv, { stdio: 'inherit', cwd: ctx.rootDir });
     });
 }
+/** The format of one `report ingest` file: `--format`, or its extension under `auto`. */
+function ingestFormat(format, file) {
+    if (format === 'auto')
+        return file.endsWith('.ndjson') ? 'cucumber' : file.endsWith('.xml') ? 'junit' : 'runner-json';
+    // `pw-json` is the pre-1.0 name, still accepted
+    return format === 'pw-json' ? 'runner-json' : format;
+}
 //# sourceMappingURL=report.js.map

package/dist/commands/steps.d.ts

@@ -1,5 +1,10 @@
 import type { Command } from 'commander';
 import type { StepDef } from '@sdods/contracts';
+/**
+ * The line of a failed `bddgen export` that says why, so the error names the cause rather than
+ * only "could not list" (SDO-71): the first `Error:` line of a stack, else the last line printed.
+ */
+export declare function failureReason(output: string): string | undefined;
 /** Parse `bddgen export` output (`* Given ...` lines) into StepDef[]. */
 export declare function listSteps(rootDir: string, slug: string, opts?: {
     unused?: boolean;

package/dist/commands/steps.js

@@ -4,6 +4,17 @@ import { SdodsError, coreStepsDir } from '@sdods/core';
 import { createContext } from '../context.js';
 import { json, table } from '../ui.js';
 import { toolCommand } from '../workspace-bin.js';
+/**
+ * The line of a failed `bddgen export` that says why, so the error names the cause rather than
+ * only "could not list" (SDO-71): the first `Error:` line of a stack, else the last line printed.
+ */
+export function failureReason(output) {
+    const lines = output
+        .split('\n')
+        .map((l) => l.trim())
+        .filter(Boolean);
+    return lines.find((l) => /^\w*Error\b/.test(l)) ?? lines.at(-1);
+}
 /** Parse `bddgen export` output (`* Given ...` lines) into StepDef[]. */
 export async function listSteps(rootDir, slug, opts = {}) {
     const env = {
@@ -19,6 +30,7 @@ export async function listSteps(rootDir, slug, opts = {}) {
     const result = await execa(file, argv, { cwd: rootDir, env, reject: false, all: true });
     if (result.exitCode !== 0) {
         throw new SdodsError('RUN_FAILED', `Could not list the step definitions of ${slug}.`, {
+            hint: failureReason(result.all ?? ''),
             details: { output: result.all?.slice(-2000) },
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sdods/cli",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "SDODS command line: run, record, analyze, agents, MCP server, scheduler and the web server.",
   "license": "Apache-2.0",
   "funding": "https://sdods.com/sponsor/",
@@ -26,22 +26,22 @@
     "node": ">=22"
   },
   "dependencies": {
-    "@sdods/contracts": "0.21.0",
-    "@sdods/core": "0.21.0",
+    "@sdods/contracts": "0.22.0",
+    "@sdods/core": "0.22.0",
     "commander": "^15.0.0",
     "execa": "^10.2.1",
     "picocolors": "^1.1.1",
     "semver": "^7.8.5",
     "yaml": "^2.9.1",
     "zod": "^4.6.7",
-    "@playwright/test": "^1.64.0",
-    "playwright-core": "^1.64.0",
-    "@sdods/integrations": "0.21.0",
-    "@sdods/mcp": "0.21.0",
-    "@sdods/agents": "0.21.0",
-    "@sdods/db": "0.21.0",
+    "@playwright/test": "^1.64.1",
+    "playwright-core": "^1.64.1",
+    "@sdods/integrations": "0.22.0",
+    "@sdods/mcp": "0.22.0",
+    "@sdods/agents": "0.22.0",
+    "@sdods/db": "0.22.0",
     "csv-parse": "^7.0.3",
-    "@sdods/server": "0.21.0"
+    "@sdods/server": "0.22.0"
   },
   "homepage": "https://sdods.com",
   "bugs": {