@flakiness/sdk 0.130.0 → 0.132.0

package/lib/cli/cli.js

@@ -742,7 +742,7 @@ import path11 from "path";
 // ../package.json
 var package_default = {
   name: "flakiness",
-  version: "0.130.0",
+  version: "0.132.0",
   private: true,
   scripts: {
     minor: "./version.mjs minor",
@@ -911,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 });
@@ -1436,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 });
@@ -1506,12 +1516,7 @@ async function cmdDownload(session2, project, runId) {
 }
 
 // src/cli/cmd-link.ts
-async function cmdLink(slug) {
-  const session2 = await FlakinessSession.load();
-  if (!session2) {
-    console.log(`Please login first`);
-    process.exit(1);
-  }
+async function cmdLink(session2, slug) {
   const [orgSlug, projectSlug] = slug.split("/");
   const project = await session2.api.project.findProject.GET({
     orgSlug,
@@ -1544,12 +1549,13 @@ async function cmdLogout() {
     return;
   const currentSession = await session2.api.user.currentSession.GET().catch((e) => void 0);
   if (currentSession)
-    await session2.api.user.logoutSession.POST({ sessionId: currentSession.sessionPublicId });
+    await session2.api.user.logoutSession.POST({ sessionId: currentSession.sessionPublicId }).catch((e) => void 0);
   await FlakinessSession.remove();
 }
 
 // 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({
@@ -1563,8 +1569,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)
@@ -1586,6 +1592,7 @@ 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-show-report.ts
@@ -1624,8 +1631,10 @@ async function listLocalCommits(gitRoot, head, count) {
     // %at: Author date as a Unix timestamp (seconds since epoch)
     "%an",
     // %an: Author name
-    "%s"
+    "%s",
     // %s:  Subject (the first line of the commit message)
+    "%P"
+    // %P:  Parent hashes (space-separated)
   ].join(FIELD_SEPARATOR);
   const command = `git log ${head} -n ${count} --pretty=format:"${prettyFormat}" -z`;
   try {
@@ -1634,13 +1643,14 @@ async function listLocalCommits(gitRoot, head, count) {
       return [];
     }
     return stdout.trim().split(RECORD_SEPARATOR).filter((record) => record).map((record) => {
-      const [commitId, timestampStr, author, message] = record.split(FIELD_SEPARATOR);
+      const [commitId, timestampStr, author, message, parentsStr] = record.split(FIELD_SEPARATOR);
+      const parents = parentsStr ? parentsStr.split(" ").filter((p) => p) : [];
       return {
         commitId,
         timestamp: parseInt(timestampStr, 10) * 1e3,
-        // Convert timestamp from seconds to milliseconds
         author,
         message,
+        parents,
         walkIndex: 0
       };
     });
@@ -2180,29 +2190,31 @@ 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 = 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 fs10.readFile(fullPath, "utf-8");
-  const report = JSON.parse(text);
-  const attachmentsDir = options.attachmentsDir ?? path10.dirname(fullPath);
-  const { attachmentIdToPath, missingAttachments } = await resolveAttachmentPaths(report, attachmentsDir);
-  if (missingAttachments.length) {
-    warn(`Missing ${missingAttachments.length} attachments`);
-  }
+async function cmdUpload(relativePaths, options) {
   const uploader = new ReportUploader({
     flakinessAccessToken: options.accessToken,
     flakinessEndpoint: options.endpoint
   });
-  const upload = uploader.createUpload(report, Array.from(attachmentIdToPath.values()));
-  const uploadResult = await upload.upload();
-  if (!uploadResult.success) {
-    err(`Failed to upload to ${options.endpoint}: ${uploadResult.message}`);
-  } else {
-    log(`\u2713 Uploaded ${uploadResult.reportUrl ?? uploadResult.message ?? ""}`);
+  for (const relativePath of relativePaths) {
+    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 fs10.readFile(fullPath, "utf-8");
+    const report = JSON.parse(text);
+    const attachmentsDir = options.attachmentsDir ?? path10.dirname(fullPath);
+    const { attachmentIdToPath, missingAttachments } = await resolveAttachmentPaths(report, attachmentsDir);
+    if (missingAttachments.length) {
+      warn(`Missing ${missingAttachments.length} attachments`);
+    }
+    const upload = uploader.createUpload(report, Array.from(attachmentIdToPath.values()));
+    const uploadResult = await upload.upload();
+    if (!uploadResult.success) {
+      err(`Failed to upload to ${options.endpoint}: ${uploadResult.message}`);
+    } else {
+      log(`\u2713 Uploaded ${uploadResult.reportUrl ?? uploadResult.message ?? ""}`);
+    }
   }
 }
 
@@ -2221,7 +2233,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 {
@@ -2259,11 +2271,8 @@ async function ensureAccessToken(options) {
 program.command("upload-playwright-json", { hidden: true }).description("Upload Playwright Test JSON report to the flakiness.io service").argument("<relative-path-to-json>", "Path to the Playwright JSON report file").addOption(optAccessToken).addOption(optEndpoint).action(async (relativePath, options) => runCommand(async () => {
   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).action(async (options) => runCommand(async () => {
   await cmdLogin(options.endpoint);
-  if (options.link)
-    await cmdLink(options.link);
 }));
 program.command("logout").description("Logout from current session").action(async () => runCommand(async () => {
   await cmdLogout();
@@ -2271,11 +2280,25 @@ 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 () => {
-  const session2 = await FlakinessSession.load();
-  if (!session2)
-    await cmdLogin(options.endpoint);
-  await cmdLink(slug);
+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 () => {
+  let slug = slugOrUrl;
+  let endpoint = options.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 || await session2.api.user.whoami.GET().catch((e) => void 0) === void 0)
+    session2 = await cmdLogin(endpoint);
+  await cmdLink(session2, slug);
 }));
 program.command("unlink").description("Unlink repository from the flakiness project").action(async () => runCommand(async () => {
   await cmdUnlink();
@@ -2328,16 +2351,16 @@ program.command("download").description("Download run").addOption(optSince).addO
   }
   await Promise.all(downloaders);
 }));
-program.command("upload").description("Upload Flakiness report to the flakiness.io service").argument("<relative-path>", "Path to the Flakiness report file").addOption(optAccessToken).addOption(optEndpoint).addOption(optAttachmentsDir).action(async (relativePath, options) => {
+program.command("upload").description("Upload Flakiness report to the flakiness.io service").argument("<relative-paths...>", "Paths to the Flakiness report files").addOption(optAccessToken).addOption(optEndpoint).addOption(optAttachmentsDir).action(async (relativePaths, options) => {
   await runCommand(async () => {
-    await cmdUpload(relativePath, await ensureAccessToken(options));
+    await cmdUpload(relativePaths, 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 () => {
+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 } 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 {
@@ -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({
@@ -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())

package/lib/cli/cmd-link.js

@@ -185,77 +185,8 @@ var FlakinessConfig = class _FlakinessConfig {
   }
 };
 
-// src/flakinessSession.ts
-import fs2 from "fs/promises";
-import os from "os";
-import path3 from "path";
-
-// src/serverapi.ts
-import { TypedHTTP } from "@flakiness/shared/common/typedHttp.js";
-function createServerAPI(endpoint, options) {
-  endpoint += "/api/";
-  const fetcher = options?.auth ? (url, init) => fetch(url, {
-    ...init,
-    headers: {
-      ...init.headers,
-      "Authorization": `Bearer ${options.auth}`
-    }
-  }) : fetch;
-  if (options?.retries)
-    return TypedHTTP.createClient(endpoint, (url, init) => retryWithBackoff(() => fetcher(url, init), options.retries));
-  return TypedHTTP.createClient(endpoint, fetcher);
-}
-
-// src/flakinessSession.ts
-var CONFIG_DIR = (() => {
-  const configDir = process.platform === "darwin" ? path3.join(os.homedir(), "Library", "Application Support", "flakiness") : process.platform === "win32" ? path3.join(os.homedir(), "AppData", "Roaming", "flakiness") : path3.join(os.homedir(), ".config", "flakiness");
-  return configDir;
-})();
-var CONFIG_PATH = path3.join(CONFIG_DIR, "config.json");
-var FlakinessSession = class _FlakinessSession {
-  constructor(_config) {
-    this._config = _config;
-    this.api = createServerAPI(this._config.endpoint, { auth: this._config.token });
-  }
-  static async loadOrDie() {
-    const session = await _FlakinessSession.load();
-    if (!session)
-      throw new Error(`Please login first with 'npx flakiness login'`);
-    return session;
-  }
-  static async load() {
-    const data = await fs2.readFile(CONFIG_PATH, "utf-8").catch((e) => void 0);
-    if (!data)
-      return void 0;
-    const json = JSON.parse(data);
-    return new _FlakinessSession(json);
-  }
-  static async remove() {
-    await fs2.unlink(CONFIG_PATH).catch((e) => void 0);
-  }
-  api;
-  endpoint() {
-    return this._config.endpoint;
-  }
-  path() {
-    return CONFIG_PATH;
-  }
-  sessionToken() {
-    return this._config.token;
-  }
-  async save() {
-    await fs2.mkdir(CONFIG_DIR, { recursive: true });
-    await fs2.writeFile(CONFIG_PATH, JSON.stringify(this._config, null, 2));
-  }
-};
-
 // src/cli/cmd-link.ts
-async function cmdLink(slug) {
-  const session = await FlakinessSession.load();
-  if (!session) {
-    console.log(`Please login first`);
-    process.exit(1);
-  }
+async function cmdLink(session, slug) {
   const [orgSlug, projectSlug] = slug.split("/");
   const project = await session.api.project.findProject.GET({
     orgSlug,

package/lib/cli/cmd-login.js

@@ -171,12 +171,13 @@ async function cmdLogout() {
     return;
   const currentSession = await session.api.user.currentSession.GET().catch((e) => void 0);
   if (currentSession)
-    await session.api.user.logoutSession.POST({ sessionId: currentSession.sessionPublicId });
+    await session.api.user.logoutSession.POST({ sessionId: currentSession.sessionPublicId }).catch((e) => void 0);
   await FlakinessSession.remove();
 }
 
 // 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({
@@ -190,8 +191,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)
@@ -213,8 +214,10 @@ async function cmdLogin(endpoint) {
     const message = e instanceof Error ? e.message : String(e);
     console.error(`x Failed to login:`, message);
   }
+  return session;
 }
 export {
+  DEFAULT_FLAKINESS_ENDPOINT,
   cmdLogin
 };
 //# sourceMappingURL=cmd-login.js.map

package/lib/cli/cmd-logout.js

@@ -161,7 +161,7 @@ async function cmdLogout() {
     return;
   const currentSession = await session.api.user.currentSession.GET().catch((e) => void 0);
   if (currentSession)
-    await session.api.user.logoutSession.POST({ sessionId: currentSession.sessionPublicId });
+    await session.api.user.logoutSession.POST({ sessionId: currentSession.sessionPublicId }).catch((e) => void 0);
   await FlakinessSession.remove();
 }
 export {

package/lib/cli/cmd-show-report.js

@@ -320,8 +320,10 @@ async function listLocalCommits(gitRoot, head, count) {
     // %at: Author date as a Unix timestamp (seconds since epoch)
     "%an",
     // %an: Author name
-    "%s"
+    "%s",
     // %s:  Subject (the first line of the commit message)
+    "%P"
+    // %P:  Parent hashes (space-separated)
   ].join(FIELD_SEPARATOR);
   const command = `git log ${head} -n ${count} --pretty=format:"${prettyFormat}" -z`;
   try {
@@ -330,13 +332,14 @@ async function listLocalCommits(gitRoot, head, count) {
       return [];
     }
     return stdout.trim().split(RECORD_SEPARATOR).filter((record) => record).map((record) => {
-      const [commitId, timestampStr, author, message] = record.split(FIELD_SEPARATOR);
+      const [commitId, timestampStr, author, message, parentsStr] = record.split(FIELD_SEPARATOR);
+      const parents = parentsStr ? parentsStr.split(" ").filter((p) => p) : [];
       return {
         commitId,
         timestamp: parseInt(timestampStr, 10) * 1e3,
-        // Convert timestamp from seconds to milliseconds
         author,
         message,
+        parents,
         walkIndex: 0
       };
     });

package/lib/cli/cmd-upload.js

@@ -288,29 +288,31 @@ var ReportUpload = class {
 var warn = (txt) => console.warn(chalk.yellow(`[flakiness.io] WARN: ${txt}`));
 var err = (txt) => console.error(chalk.red(`[flakiness.io] Error: ${txt}`));
 var log = (txt) => console.log(`[flakiness.io] ${txt}`);
-async function cmdUpload(relativePath, options) {
-  const fullPath = path2.resolve(relativePath);
-  if (!await fs3.access(fullPath, fs3.constants.F_OK).then(() => true).catch(() => false)) {
-    err(`Path ${fullPath} is not accessible!`);
-    process.exit(1);
-  }
-  const text = await fs3.readFile(fullPath, "utf-8");
-  const report = JSON.parse(text);
-  const attachmentsDir = options.attachmentsDir ?? path2.dirname(fullPath);
-  const { attachmentIdToPath, missingAttachments } = await resolveAttachmentPaths(report, attachmentsDir);
-  if (missingAttachments.length) {
-    warn(`Missing ${missingAttachments.length} attachments`);
-  }
+async function cmdUpload(relativePaths, options) {
   const uploader = new ReportUploader({
     flakinessAccessToken: options.accessToken,
     flakinessEndpoint: options.endpoint
   });
-  const upload = uploader.createUpload(report, Array.from(attachmentIdToPath.values()));
-  const uploadResult = await upload.upload();
-  if (!uploadResult.success) {
-    err(`Failed to upload to ${options.endpoint}: ${uploadResult.message}`);
-  } else {
-    log(`\u2713 Uploaded ${uploadResult.reportUrl ?? uploadResult.message ?? ""}`);
+  for (const relativePath of relativePaths) {
+    const fullPath = path2.resolve(relativePath);
+    if (!await fs3.access(fullPath, fs3.constants.F_OK).then(() => true).catch(() => false)) {
+      err(`Path ${fullPath} is not accessible!`);
+      process.exit(1);
+    }
+    const text = await fs3.readFile(fullPath, "utf-8");
+    const report = JSON.parse(text);
+    const attachmentsDir = options.attachmentsDir ?? path2.dirname(fullPath);
+    const { attachmentIdToPath, missingAttachments } = await resolveAttachmentPaths(report, attachmentsDir);
+    if (missingAttachments.length) {
+      warn(`Missing ${missingAttachments.length} attachments`);
+    }
+    const upload = uploader.createUpload(report, Array.from(attachmentIdToPath.values()));
+    const uploadResult = await upload.upload();
+    if (!uploadResult.success) {
+      err(`Failed to upload to ${options.endpoint}: ${uploadResult.message}`);
+    } else {
+      log(`\u2713 Uploaded ${uploadResult.reportUrl ?? uploadResult.message ?? ""}`);
+    }
   }
 }
 export {

package/lib/localGit.js

@@ -12,8 +12,10 @@ async function listLocalCommits(gitRoot, head, count) {
     // %at: Author date as a Unix timestamp (seconds since epoch)
     "%an",
     // %an: Author name
-    "%s"
+    "%s",
     // %s:  Subject (the first line of the commit message)
+    "%P"
+    // %P:  Parent hashes (space-separated)
   ].join(FIELD_SEPARATOR);
   const command = `git log ${head} -n ${count} --pretty=format:"${prettyFormat}" -z`;
   try {
@@ -22,13 +24,14 @@ async function listLocalCommits(gitRoot, head, count) {
       return [];
     }
     return stdout.trim().split(RECORD_SEPARATOR).filter((record) => record).map((record) => {
-      const [commitId, timestampStr, author, message] = record.split(FIELD_SEPARATOR);
+      const [commitId, timestampStr, author, message, parentsStr] = record.split(FIELD_SEPARATOR);
+      const parents = parentsStr ? parentsStr.split(" ").filter((p) => p) : [];
       return {
         commitId,
         timestamp: parseInt(timestampStr, 10) * 1e3,
-        // Convert timestamp from seconds to milliseconds
         author,
         message,
+        parents,
         walkIndex: 0
       };
     });

package/lib/localReportApi.js

@@ -18,8 +18,10 @@ async function listLocalCommits(gitRoot, head, count) {
     // %at: Author date as a Unix timestamp (seconds since epoch)
     "%an",
     // %an: Author name
-    "%s"
+    "%s",
     // %s:  Subject (the first line of the commit message)
+    "%P"
+    // %P:  Parent hashes (space-separated)
   ].join(FIELD_SEPARATOR);
   const command = `git log ${head} -n ${count} --pretty=format:"${prettyFormat}" -z`;
   try {
@@ -28,13 +30,14 @@ async function listLocalCommits(gitRoot, head, count) {
       return [];
     }
     return stdout.trim().split(RECORD_SEPARATOR).filter((record) => record).map((record) => {
-      const [commitId, timestampStr, author, message] = record.split(FIELD_SEPARATOR);
+      const [commitId, timestampStr, author, message, parentsStr] = record.split(FIELD_SEPARATOR);
+      const parents = parentsStr ? parentsStr.split(" ").filter((p) => p) : [];
       return {
         commitId,
         timestamp: parseInt(timestampStr, 10) * 1e3,
-        // Convert timestamp from seconds to milliseconds
         author,
         message,
+        parents,
         walkIndex: 0
       };
     });