@flakiness/sdk 0.129.4 → 0.131.0

package/lib/cli/cli.js

@@ -737,8 +737,50 @@ var Ranges;
 import { TypedHTTP as TypedHTTP4 } from "@flakiness/shared/common/typedHttp.js";
 import assert4 from "assert";
 import { Command, Option } from "commander";
-import fs12 from "fs";
-import path10 from "path";
+import path11 from "path";
+
+// ../package.json
+var package_default = {
+  name: "flakiness",
+  version: "0.131.0",
+  private: true,
+  scripts: {
+    minor: "./version.mjs minor",
+    patch: "./version.mjs patch",
+    dev: "npx kubik --env-file=.env.dev -w $(find . -name build.mts) ./app.mts ./stripe.mts",
+    "dev+billing": "npx kubik --env-file=.env.dev+billing -w $(find . -name build.mts) ./app.mts ./stripe.mts",
+    prod: "npx kubik --env-file=.env.prodlocal -w ./server.mts ./web/build.mts ./experimental/build.mts ./landing/build.mts",
+    build: "npx kubik $(find . -name build.mts)",
+    perf: "node --max-old-space-size=10240 --enable-source-maps --env-file=.env.prodlocal experimental/lib/perf_filter.js"
+  },
+  engines: {
+    node: ">=24"
+  },
+  author: "Degu Labs, Inc",
+  license: "Fair Source 100",
+  workspaces: [
+    "./report",
+    "./sdk",
+    "./docs",
+    "./landing",
+    "./devenv",
+    "./database",
+    "./server",
+    "./shared",
+    "./experimental",
+    "./e2e",
+    "./web"
+  ],
+  devDependencies: {
+    "@playwright/test": "^1.54.0",
+    "@types/node": "^22.10.2",
+    esbuild: "^0.27.0",
+    glob: "^10.3.10",
+    kubik: "^0.24.0",
+    tsx: "^4.19.2",
+    typescript: "^5.6.2"
+  }
+};
 
 // src/flakinessConfig.ts
 import fs2 from "fs";
@@ -869,6 +911,29 @@ var ansiRegex = new RegExp("[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:
 function stripAnsi(str) {
   return str.replace(ansiRegex, "");
 }
+async function saveReportAndAttachments(report, attachments, outputFolder) {
+  const reportPath = path.join(outputFolder, "report.json");
+  const attachmentsFolder = path.join(outputFolder, "attachments");
+  await fs.promises.rm(outputFolder, { recursive: true, force: true });
+  await fs.promises.mkdir(outputFolder, { recursive: true });
+  await fs.promises.writeFile(reportPath, JSON.stringify(report), "utf-8");
+  if (attachments.length)
+    await fs.promises.mkdir(attachmentsFolder);
+  const movedAttachments = [];
+  for (const attachment of attachments) {
+    const attachmentPath = path.join(attachmentsFolder, attachment.id);
+    if (attachment.path)
+      await fs.promises.cp(attachment.path, attachmentPath);
+    else if (attachment.body)
+      await fs.promises.writeFile(attachmentPath, attachment.body);
+    movedAttachments.push({
+      contentType: attachment.contentType,
+      id: attachment.id,
+      path: attachmentPath
+    });
+  }
+  return movedAttachments;
+}
 function shell(command, args, options) {
   try {
     const result = spawnSync(command, args, { encoding: "utf-8", ...options });
@@ -1158,7 +1223,7 @@ import fs5 from "fs/promises";
 import path5 from "path";
 
 // src/junit.ts
-import { ReportUtils as ReportUtils2, FlakinessReport as FK } from "@flakiness/report";
+import { ReportUtils as ReportUtils2 } from "@flakiness/report";
 import { parseXml, XmlElement, XmlText } from "@rgrove/parse-xml";
 import assert2 from "assert";
 import fs4 from "fs";
@@ -1236,7 +1301,7 @@ async function traverseJUnitReport(context, node) {
         file,
         line,
         column: 1
-      } : FK.NO_LOCATION,
+      } : void 0,
       type: name ? "suite" : file ? "file" : "anonymous suite",
       suites: [],
       tests: []
@@ -1298,7 +1363,7 @@ async function traverseJUnitReport(context, node) {
         file,
         line,
         column: 1
-      } : FK.NO_LOCATION,
+      } : void 0,
       attempts: [{
         environmentIdx: currentEnvIndex,
         expectedStatus,
@@ -1394,21 +1459,8 @@ async function cmdConvert(junitPath, options) {
     runStartTimestamp: Date.now(),
     runDuration: 0
   });
-  await fs5.writeFile("fkreport.json", JSON.stringify(report, null, 2));
-  console.log("\u2713 Saved report to fkreport.json");
-  if (attachments.length > 0) {
-    await fs5.mkdir("fkattachments", { recursive: true });
-    for (const attachment of attachments) {
-      if (attachment.path) {
-        const destPath = path5.join("fkattachments", attachment.id);
-        await fs5.copyFile(attachment.path, destPath);
-      } else if (attachment.body) {
-        const destPath = path5.join("fkattachments", attachment.id);
-        await fs5.writeFile(destPath, attachment.body);
-      }
-    }
-    console.log(`\u2713 Saved ${attachments.length} attachments to fkattachments/`);
-  }
+  await saveReportAndAttachments(report, attachments, options.outputDir);
+  console.log(`\u2713 Saved to ${options.outputDir}`);
 }
 async function findXmlFiles(dir, result = []) {
   const entries = await fs5.readdir(dir, { withFileTypes: true });
@@ -1463,28 +1515,6 @@ async function cmdDownload(session2, project, runId) {
   console.log(`\u2714\uFE0F Saved as ${rootDir}`);
 }
 
-// src/cli/cmd-link.ts
-async function cmdLink(slug) {
-  const session2 = await FlakinessSession.load();
-  if (!session2) {
-    console.log(`Please login first`);
-    process.exit(1);
-  }
-  const [orgSlug, projectSlug] = slug.split("/");
-  const project = await session2.api.project.findProject.GET({
-    orgSlug,
-    projectSlug
-  });
-  if (!project) {
-    console.log(`Failed to find project ${slug}`);
-    process.exit(1);
-  }
-  const config = FlakinessConfig.createEmpty();
-  config.setProjectPublicId(project.projectPublicId);
-  await config.save();
-  console.log(`\u2713 Linked to ${session2.endpoint()}/${project.org.orgSlug}/${project.projectSlug}`);
-}
-
 // ../server/lib/common/knownClientIds.js
 var KNOWN_CLIENT_IDS = {
   OFFICIAL_WEB: "flakiness-io-official-cli",
@@ -1507,7 +1537,8 @@ async function cmdLogout() {
 }
 
 // src/cli/cmd-login.ts
-async function cmdLogin(endpoint) {
+var DEFAULT_FLAKINESS_ENDPOINT = "https://flakiness.io";
+async function cmdLogin(endpoint = DEFAULT_FLAKINESS_ENDPOINT) {
   await cmdLogout();
   const api = createServerAPI(endpoint);
   const data = await api.deviceauth.createRequest.POST({
@@ -1521,8 +1552,8 @@ async function cmdLogin(endpoint) {
     await new Promise((x) => setTimeout(x, 2e3));
     const result = await api.deviceauth.getToken.GET({ deviceCode: data.deviceCode }).catch((e) => void 0);
     if (!result) {
-      console.log(`Authorization request was rejected.`);
-      return;
+      console.error(`Authorization request was rejected.`);
+      process.exit(1);
     }
     token = result.token;
     if (token)
@@ -1544,12 +1575,47 @@ async function cmdLogin(endpoint) {
     const message = e instanceof Error ? e.message : String(e);
     console.error(`x Failed to login:`, message);
   }
+  return session2;
+}
+
+// src/cli/cmd-link.ts
+async function cmdLink(slugOrUrl) {
+  let slug = slugOrUrl;
+  let endpoint = DEFAULT_FLAKINESS_ENDPOINT;
+  if (slugOrUrl.startsWith("http://") || slugOrUrl.startsWith("https://")) {
+    const url = URL.parse(slugOrUrl);
+    if (!url) {
+      console.error(`Invalid URL: ${slugOrUrl}`);
+      process.exit(1);
+    }
+    slug = url.pathname.substring(1);
+    endpoint = url.origin;
+  } else if (slugOrUrl.startsWith("flakiness.io/")) {
+    endpoint = "https://flakiness.io";
+    slug = slugOrUrl.substring("flakiness.io/".length);
+  }
+  let session2 = await FlakinessSession.load();
+  if (!session2 || session2.endpoint() !== endpoint)
+    session2 = await cmdLogin(endpoint);
+  const [orgSlug, projectSlug] = slug.split("/");
+  const project = await session2.api.project.findProject.GET({
+    orgSlug,
+    projectSlug
+  });
+  if (!project) {
+    console.log(`Failed to find project ${slug}`);
+    process.exit(1);
+  }
+  const config = FlakinessConfig.createEmpty();
+  config.setProjectPublicId(project.projectPublicId);
+  await config.save();
+  console.log(`\u2713 Linked to ${session2.endpoint()}/${project.org.orgSlug}/${project.projectSlug}`);
 }
 
 // src/cli/cmd-show-report.ts
 import chalk from "chalk";
 import open2 from "open";
-import path7 from "path";
+import path8 from "path";
 
 // src/localReportServer.ts
 import { TypedHTTP as TypedHTTP3 } from "@flakiness/shared/common/typedHttp.js";
@@ -1560,9 +1626,14 @@ import compression from "compression";
 import debug from "debug";
 import express from "express";
 import "express-async-errors";
-import fs8 from "fs";
 import http2 from "http";
 
+// src/localReportApi.ts
+import { TypedHTTP as TypedHTTP2 } from "@flakiness/shared/common/typedHttp.js";
+import fs7 from "fs";
+import path7 from "path";
+import { z } from "zod/v4";
+
 // src/localGit.ts
 import { exec } from "child_process";
 import { promisify } from "util";
@@ -1604,9 +1675,37 @@ async function listLocalCommits(gitRoot, head, count) {
 }
 
 // src/localReportApi.ts
-import { TypedHTTP as TypedHTTP2 } from "@flakiness/shared/common/typedHttp.js";
-import fs7 from "fs";
-import { z } from "zod/v4";
+var ReportInfo = class {
+  constructor(_options) {
+    this._options = _options;
+  }
+  report;
+  attachmentIdToPath = /* @__PURE__ */ new Map();
+  commits = [];
+  async refresh() {
+    const report = await fs7.promises.readFile(this._options.reportPath, "utf-8").then((x) => JSON.parse(x)).catch((e) => void 0);
+    if (!report) {
+      this.report = void 0;
+      this.commits = [];
+      this.attachmentIdToPath = /* @__PURE__ */ new Map();
+      return;
+    }
+    if (JSON.stringify(report) === JSON.stringify(this.report))
+      return;
+    this.report = report;
+    this.commits = await listLocalCommits(path7.dirname(this._options.reportPath), report.commitId, 100);
+    const attachmentsDir = this._options.attachmentsFolder;
+    const { attachmentIdToPath, missingAttachments } = await resolveAttachmentPaths(report, attachmentsDir);
+    if (missingAttachments.length) {
+      const first = missingAttachments.slice(0, 3);
+      for (let i = 0; i < 3 && i < missingAttachments.length; ++i)
+        console.warn(`Missing attachment with id ${missingAttachments[i]}`);
+      if (missingAttachments.length > 3)
+        console.warn(`...and ${missingAttachments.length - 3} more missing attachments.`);
+    }
+    this.attachmentIdToPath = attachmentIdToPath;
+  }
+};
 var t = TypedHTTP2.Router.create();
 var localReportRouter = {
   ping: t.get({
@@ -1616,7 +1715,7 @@ var localReportRouter = {
   }),
   lastCommits: t.get({
     handler: async ({ ctx }) => {
-      return ctx.commits;
+      return ctx.reportInfo.commits;
     }
   }),
   report: {
@@ -1625,7 +1724,7 @@ var localReportRouter = {
         attachmentId: z.string().min(1).max(100).transform((id) => id)
       }),
       handler: async ({ ctx, input }) => {
-        const idx = ctx.attachmentIdToPath.get(input.attachmentId);
+        const idx = ctx.reportInfo.attachmentIdToPath.get(input.attachmentId);
         if (!idx)
           throw TypedHTTP2.HttpError.withCode("NOT_FOUND");
         const buffer = await fs7.promises.readFile(idx.path);
@@ -1634,7 +1733,8 @@ var localReportRouter = {
     }),
     json: t.get({
       handler: async ({ ctx }) => {
-        return ctx.report;
+        await ctx.reportInfo.refresh();
+        return ctx.reportInfo.report;
       }
     })
   }
@@ -1649,17 +1749,6 @@ var LocalReportServer = class _LocalReportServer {
     this._authToken = _authToken;
   }
   static async create(options) {
-    const report = JSON.parse(await fs8.promises.readFile(options.reportPath, "utf-8"));
-    const attachmentsDir = options.attachmentsFolder;
-    const { attachmentIdToPath, missingAttachments } = await resolveAttachmentPaths(report, attachmentsDir);
-    if (missingAttachments.length) {
-      const first = missingAttachments.slice(0, 3);
-      for (let i = 0; i < 3 && i < missingAttachments.length; ++i)
-        console.warn(`Missing attachment with id ${missingAttachments[i]}`);
-      if (missingAttachments.length > 3)
-        console.warn(`...and ${missingAttachments.length - 3} more missing attachments.`);
-    }
-    const commits = await listLocalCommits(process.cwd(), report.commitId, 100);
     const app = express();
     app.set("etag", false);
     const authToken = randomUUIDBase62();
@@ -1682,9 +1771,10 @@ var LocalReportServer = class _LocalReportServer {
       });
       next();
     });
+    const reportInfo = new ReportInfo(options);
     app.use("/" + authToken, createTypedHttpExpressMiddleware({
       router: localReportRouter,
-      createRootContext: async ({ req, res, input }) => ({ report, commits, attachmentIdToPath })
+      createRootContext: async ({ req, res, input }) => ({ reportInfo })
     }));
     app.use((err2, req, res, next) => {
       if (err2 instanceof TypedHTTP3.HttpError)
@@ -1718,7 +1808,7 @@ var LocalReportServer = class _LocalReportServer {
 
 // src/cli/cmd-show-report.ts
 async function cmdShowReport(reportFolder) {
-  const reportPath = path7.join(reportFolder, "report.json");
+  const reportPath = path8.join(reportFolder, "report.json");
   const session2 = await FlakinessSession.load();
   const config = await FlakinessConfig.load();
   const projectPublicId = config.projectPublicId();
@@ -1768,8 +1858,8 @@ async function cmdUnlink() {
 }
 
 // src/cli/cmd-upload-playwright-json.ts
-import fs10 from "fs/promises";
-import path8 from "path";
+import fs9 from "fs/promises";
+import path9 from "path";
 
 // src/playwrightJSONReport.ts
 import { FlakinessReport as FK2 } from "@flakiness/report";
@@ -1950,7 +2040,7 @@ function parseJSONError(context, error) {
 // src/reportUploader.ts
 import { compressTextAsync, compressTextSync } from "@flakiness/shared/node/compression.js";
 import assert3 from "assert";
-import fs9 from "fs";
+import fs8 from "fs";
 import { URL as URL2 } from "url";
 var ReportUploader = class _ReportUploader {
   static optionsFromEnv(overrides) {
@@ -2048,16 +2138,16 @@ var ReportUpload = class {
           url: uploadUrl,
           headers: {
             "Content-Type": attachment.contentType,
-            "Content-Length": (await fs9.promises.stat(attachmentPath)).size + ""
+            "Content-Length": (await fs8.promises.stat(attachmentPath)).size + ""
           },
           method: "put"
         });
-        fs9.createReadStream(attachmentPath).pipe(request);
+        fs8.createReadStream(attachmentPath).pipe(request);
         await responseDataPromise;
       }, HTTP_BACKOFF);
       return;
     }
-    let buffer = attachment.body ? attachment.body : attachment.path ? await fs9.promises.readFile(attachment.path) : void 0;
+    let buffer = attachment.body ? attachment.body : attachment.path ? await fs8.promises.readFile(attachment.path) : void 0;
     assert3(buffer);
     const encoding = compressable ? "br" : void 0;
     if (compressable)
@@ -2082,12 +2172,12 @@ var ReportUpload = class {
 
 // src/cli/cmd-upload-playwright-json.ts
 async function cmdUploadPlaywrightJson(relativePath, options) {
-  const fullPath = path8.resolve(relativePath);
-  if (!await fs10.access(fullPath, fs10.constants.F_OK).then(() => true).catch(() => false)) {
+  const fullPath = path9.resolve(relativePath);
+  if (!await fs9.access(fullPath, fs9.constants.F_OK).then(() => true).catch(() => false)) {
     console.error(`Error: path ${fullPath} is not accessible`);
     process.exit(1);
   }
-  const text = await fs10.readFile(fullPath, "utf-8");
+  const text = await fs9.readFile(fullPath, "utf-8");
   const playwrightJson = JSON.parse(text);
   const { attachments, report, unaccessibleAttachmentPaths } = await PlaywrightJSONReport.parse(PlaywrightJSONReport.collectMetadata(), playwrightJson, {
     extractAttachments: true
@@ -2109,20 +2199,20 @@ async function cmdUploadPlaywrightJson(relativePath, options) {
 
 // src/cli/cmd-upload.ts
 import chalk2 from "chalk";
-import fs11 from "fs/promises";
-import path9 from "path";
+import fs10 from "fs/promises";
+import path10 from "path";
 var warn = (txt) => console.warn(chalk2.yellow(`[flakiness.io] WARN: ${txt}`));
 var err = (txt) => console.error(chalk2.red(`[flakiness.io] Error: ${txt}`));
 var log = (txt) => console.log(`[flakiness.io] ${txt}`);
 async function cmdUpload(relativePath, options) {
-  const fullPath = path9.resolve(relativePath);
-  if (!await fs11.access(fullPath, fs11.constants.F_OK).then(() => true).catch(() => false)) {
+  const fullPath = path10.resolve(relativePath);
+  if (!await fs10.access(fullPath, fs10.constants.F_OK).then(() => true).catch(() => false)) {
     err(`Path ${fullPath} is not accessible!`);
     process.exit(1);
   }
-  const text = await fs11.readFile(fullPath, "utf-8");
+  const text = await fs10.readFile(fullPath, "utf-8");
   const report = JSON.parse(text);
-  const attachmentsDir = options.attachmentsDir ?? path9.dirname(fullPath);
+  const attachmentsDir = options.attachmentsDir ?? path10.dirname(fullPath);
   const { attachmentIdToPath, missingAttachments } = await resolveAttachmentPaths(report, attachmentsDir);
   if (missingAttachments.length) {
     warn(`Missing ${missingAttachments.length} attachments`);
@@ -2155,7 +2245,7 @@ async function cmdWhoami() {
 // src/cli/cli.ts
 var session = await FlakinessSession.load();
 var optAccessToken = new Option("-t, --access-token <token>", "A read-write flakiness.io access token").env("FLAKINESS_ACCESS_TOKEN");
-var optEndpoint = new Option("-e, --endpoint <url>", "An endpoint where the service is deployed").default(session?.endpoint() ?? "https://flakiness.io").env("FLAKINESS_ENDPOINT");
+var optEndpoint = new Option("-e, --endpoint <url>", "An endpoint where the service is deployed").default(session?.endpoint() ?? DEFAULT_FLAKINESS_ENDPOINT).env("FLAKINESS_ENDPOINT");
 var optAttachmentsDir = new Option("--attachments-dir <dir>", "Directory containing attachments to upload. Defaults to the report directory");
 async function runCommand(callback) {
   try {
@@ -2167,8 +2257,7 @@ async function runCommand(callback) {
     process.exit(1);
   }
 }
-var PACKAGE_JSON = JSON.parse(fs12.readFileSync(path10.resolve(import.meta.dirname, "..", "..", "package.json"), "utf-8"));
-var program = new Command().name("flakiness").description("Flakiness CLI tool").version(PACKAGE_JSON.version);
+var program = new Command().name("flakiness").description("Flakiness CLI tool").version(package_default.version);
 async function ensureAccessToken(options) {
   let accessToken = options.accessToken;
   if (!accessToken) {
@@ -2195,7 +2284,7 @@ program.command("upload-playwright-json", { hidden: true }).description("Upload
   await cmdUploadPlaywrightJson(relativePath, await ensureAccessToken(options));
 }));
 var optLink = new Option("--link <org/proj>", "A project to link to");
-program.command("login").description("Login to the flakiness.io service").addOption(optEndpoint).addOption(optLink).action(async (options) => runCommand(async () => {
+program.command("login").description("Login to the Flakiness.io service").addOption(optEndpoint).addOption(optLink).action(async (options) => runCommand(async () => {
   await cmdLogin(options.endpoint);
   if (options.link)
     await cmdLink(options.link);
@@ -2206,11 +2295,11 @@ program.command("logout").description("Logout from current session").action(asyn
 program.command("whoami").description("Show current logged in user information").action(async () => runCommand(async () => {
   await cmdWhoami();
 }));
-program.command("link").description("Link repository to the flakiness project").addOption(optEndpoint).argument("org/project", 'An org and project slugs, e.g. "facebook/react"').action(async (slug, options) => runCommand(async () => {
+program.command("link").description("Link repository to the flakiness project").addOption(optEndpoint).argument("flakiness.io/org/project", "A URL of the Flakiness.io project").action(async (slugOrUrl, options) => runCommand(async () => {
   const session2 = await FlakinessSession.load();
   if (!session2)
     await cmdLogin(options.endpoint);
-  await cmdLink(slug);
+  await cmdLink(slugOrUrl);
 }));
 program.command("unlink").description("Unlink repository from the flakiness project").action(async () => runCommand(async () => {
   await cmdUnlink();
@@ -2268,11 +2357,11 @@ program.command("upload").description("Upload Flakiness report to the flakiness.
     await cmdUpload(relativePath, await ensureAccessToken(options));
   });
 });
-program.command("show-report [report]").description("Show flakiness report").argument("[relative-path]", "Path to the Flakiness report file or folder that contains `report.json`.").action(async (arg) => runCommand(async () => {
-  const dir = path10.join(process.cwd(), arg ?? "flakiness-report");
+program.command("show").description("Show flakiness report").argument("[relative-path]", "Path to the Flakiness report file or folder that contains `report.json`. (default: flakiness-report)").action(async (arg) => runCommand(async () => {
+  const dir = path11.resolve(arg ?? "flakiness-report");
   await cmdShowReport(dir);
 }));
-program.command("convert-junit").description("Convert JUnit XML report(s) to Flakiness report format").argument("<junit-root-dir-path>", "Path to JUnit XML file or directory containing XML files").option("--env-name <name>", "Environment name for the report", "default").option("--commit-id <id>", "Git commit ID (auto-detected if not provided)").action(async (junitPath, options) => {
+program.command("convert-junit").description("Convert JUnit XML report(s) to Flakiness report format").argument("<junit-root-dir-path>", "Path to JUnit XML file or directory containing XML files").option("--env-name <name>", "Environment name for the report", "junit").option("--commit-id <id>", "Git commit ID (auto-detected if not provided)").option("--output-dir <dir>", "Output directory for the report", "flakiness-report").action(async (junitPath, options) => {
   await runCommand(async () => {
     await cmdConvert(junitPath, options);
   });

package/lib/cli/cmd-convert.js

@@ -2,14 +2,14 @@
 
 // src/cli/cmd-convert.ts
 import fs3 from "fs/promises";
-import path2 from "path";
+import path3 from "path";
 
 // src/junit.ts
-import { ReportUtils as ReportUtils2, FlakinessReport as FK } from "@flakiness/report";
+import { ReportUtils as ReportUtils2 } from "@flakiness/report";
 import { parseXml, XmlElement, XmlText } from "@rgrove/parse-xml";
 import assert2 from "assert";
 import fs2 from "fs";
-import path from "path";
+import path2 from "path";
 
 // src/utils.ts
 import { ReportUtils } from "@flakiness/report";
@@ -19,6 +19,7 @@ import crypto from "crypto";
 import fs from "fs";
 import http from "http";
 import https from "https";
+import path, { posix as posixPath, win32 as win32Path } from "path";
 function sha1File(filePath) {
   return new Promise((resolve, reject) => {
     const hash = crypto.createHash("sha1");
@@ -122,6 +123,29 @@ var httpUtils;
   httpUtils2.postJSON = postJSON;
 })(httpUtils || (httpUtils = {}));
 var ansiRegex = new RegExp("[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))", "g");
+async function saveReportAndAttachments(report, attachments, outputFolder) {
+  const reportPath = path.join(outputFolder, "report.json");
+  const attachmentsFolder = path.join(outputFolder, "attachments");
+  await fs.promises.rm(outputFolder, { recursive: true, force: true });
+  await fs.promises.mkdir(outputFolder, { recursive: true });
+  await fs.promises.writeFile(reportPath, JSON.stringify(report), "utf-8");
+  if (attachments.length)
+    await fs.promises.mkdir(attachmentsFolder);
+  const movedAttachments = [];
+  for (const attachment of attachments) {
+    const attachmentPath = path.join(attachmentsFolder, attachment.id);
+    if (attachment.path)
+      await fs.promises.cp(attachment.path, attachmentPath);
+    else if (attachment.body)
+      await fs.promises.writeFile(attachmentPath, attachment.body);
+    movedAttachments.push({
+      contentType: attachment.contentType,
+      id: attachment.id,
+      path: attachmentPath
+    });
+  }
+  return movedAttachments;
+}
 function shell(command, args, options) {
   try {
     const result = spawnSync(command, args, { encoding: "utf-8", ...options });
@@ -187,7 +211,7 @@ function extractStdout(testcase, stdio) {
   }));
 }
 async function parseAttachment(value) {
-  let absolutePath = path.resolve(process.cwd(), value);
+  let absolutePath = path2.resolve(process.cwd(), value);
   if (fs2.existsSync(absolutePath)) {
     const id = await sha1File(absolutePath);
     return {
@@ -219,7 +243,7 @@ async function traverseJUnitReport(context, node) {
         file,
         line,
         column: 1
-      } : FK.NO_LOCATION,
+      } : void 0,
       type: name ? "suite" : file ? "file" : "anonymous suite",
       suites: [],
       tests: []
@@ -260,7 +284,7 @@ async function traverseJUnitReport(context, node) {
           id: attachment.id,
           contentType: attachment.contentType,
           //TODO: better default names for attachments?
-          name: attachment.path ? path.basename(attachment.path) : `attachment`
+          name: attachment.path ? path2.basename(attachment.path) : `attachment`
         });
       } else {
         annotations.push({
@@ -281,7 +305,7 @@ async function traverseJUnitReport(context, node) {
         file,
         line,
         column: 1
-      } : FK.NO_LOCATION,
+      } : void 0,
       attempts: [{
         environmentIdx: currentEnvIndex,
         expectedStatus,
@@ -335,7 +359,7 @@ async function parseJUnit(xmls, options) {
 
 // src/cli/cmd-convert.ts
 async function cmdConvert(junitPath, options) {
-  const fullPath = path2.resolve(junitPath);
+  const fullPath = path3.resolve(junitPath);
   if (!await fs3.access(fullPath, fs3.constants.F_OK).then(() => true).catch(() => false)) {
     console.error(`Error: path ${fullPath} is not accessible`);
     process.exit(1);
@@ -377,26 +401,13 @@ async function cmdConvert(junitPath, options) {
     runStartTimestamp: Date.now(),
     runDuration: 0
   });
-  await fs3.writeFile("fkreport.json", JSON.stringify(report, null, 2));
-  console.log("\u2713 Saved report to fkreport.json");
-  if (attachments.length > 0) {
-    await fs3.mkdir("fkattachments", { recursive: true });
-    for (const attachment of attachments) {
-      if (attachment.path) {
-        const destPath = path2.join("fkattachments", attachment.id);
-        await fs3.copyFile(attachment.path, destPath);
-      } else if (attachment.body) {
-        const destPath = path2.join("fkattachments", attachment.id);
-        await fs3.writeFile(destPath, attachment.body);
-      }
-    }
-    console.log(`\u2713 Saved ${attachments.length} attachments to fkattachments/`);
-  }
+  await saveReportAndAttachments(report, attachments, options.outputDir);
+  console.log(`\u2713 Saved to ${options.outputDir}`);
 }
 async function findXmlFiles(dir, result = []) {
   const entries = await fs3.readdir(dir, { withFileTypes: true });
   for (const entry of entries) {
-    const fullPath = path2.join(dir, entry.name);
+    const fullPath = path3.join(dir, entry.name);
     if (entry.isFile() && entry.name.toLowerCase().endsWith(".xml"))
       result.push(fullPath);
     else if (entry.isDirectory())