ortoni-report 3.0.4 → 4.0.0

package/dist/ortoni-report.mjs

@@ -21,17 +21,17 @@ var FileManager = class {
       }
     }
   }
-  writeReportFile(filename, content) {
+  writeReportFile(filename, data) {
+    const templatePath = path.resolve(__dirname, "index.html");
+    let html = fs.readFileSync(templatePath, "utf-8");
+    const reportJSON = JSON.stringify({
+      data
+    });
+    html = html.replace("__ORTONI_TEST_REPORTDATA__", reportJSON);
     const outputPath = path.join(process.cwd(), this.folderPath, filename);
-    fs.writeFileSync(outputPath, content);
+    fs.writeFileSync(outputPath, html);
     return outputPath;
   }
-  readCssContent() {
-    return fs.readFileSync(
-      path.resolve(__dirname, "style", "main.css"),
-      "utf-8"
-    );
-  }
   copyTraceViewerAssets(skip) {
     if (skip) return;
     const traceViewerFolder = path.join(
@@ -66,157 +66,48 @@ var FileManager = class {
   }
 };
 
-// src/helpers/HTMLGenerator.ts
-import path3 from "path";
-
 // src/utils/groupProjects.ts
 function groupResults(config, results) {
   if (config.showProject) {
     const groupedResults = results.reduce((acc, result, index) => {
       const testId = `${result.filePath}:${result.projectName}:${result.title}`;
+      const key = `${testId}-${result.key}-${result.retryAttemptCount}`;
       const { filePath, suite, projectName } = result;
       acc[filePath] = acc[filePath] || {};
       acc[filePath][suite] = acc[filePath][suite] || {};
       acc[filePath][suite][projectName] = acc[filePath][suite][projectName] || [];
-      acc[filePath][suite][projectName].push({ ...result, index, testId });
+      acc[filePath][suite][projectName].push({ ...result, index, testId, key });
       return acc;
     }, {});
     return groupedResults;
   } else {
     const groupedResults = results.reduce((acc, result, index) => {
       const testId = `${result.filePath}:${result.projectName}:${result.title}`;
+      const key = `${testId}-${result.key}-${result.retryAttemptCount}`;
       const { filePath, suite } = result;
       acc[filePath] = acc[filePath] || {};
       acc[filePath][suite] = acc[filePath][suite] || [];
-      acc[filePath][suite].push({ ...result, index, testId });
+      acc[filePath][suite].push({ ...result, index, testId, key });
       return acc;
     }, {});
     return groupedResults;
   }
 }
 
-// src/utils/utils.ts
-import path2 from "path";
-function msToTime(duration) {
-  const milliseconds = Math.floor(duration % 1e3);
-  const seconds = Math.floor(duration / 1e3 % 60);
-  const minutes = Math.floor(duration / (1e3 * 60) % 60);
-  const hours = Math.floor(duration / (1e3 * 60 * 60) % 24);
-  let result = "";
-  if (hours > 0) {
-    result += `${hours}h:`;
-  }
-  if (minutes > 0 || hours > 0) {
-    result += `${minutes < 10 ? "0" + minutes : minutes}m:`;
-  }
-  if (seconds > 0 || minutes > 0 || hours > 0) {
-    result += `${seconds < 10 ? "0" + seconds : seconds}s`;
-  }
-  if (milliseconds > 0 && !(seconds > 0 || minutes > 0 || hours > 0)) {
-    result += `${milliseconds}ms`;
-  } else if (milliseconds > 0) {
-    result += `:${milliseconds < 100 ? "0" + milliseconds : milliseconds}ms`;
-  }
-  return result;
-}
-function normalizeFilePath(filePath) {
-  const normalizedPath = path2.normalize(filePath);
-  return path2.basename(normalizedPath);
-}
-function formatDate(date) {
-  const day = String(date.getDate()).padStart(2, "0");
-  const month = date.toLocaleString("default", { month: "short" });
-  const year = date.getFullYear();
-  const time = date.toLocaleTimeString();
-  return `${day}-${month}-${year} ${time}`;
-}
-function safeStringify(obj, indent = 2) {
-  const cache = /* @__PURE__ */ new Set();
-  const json = JSON.stringify(
-    obj,
-    (key, value) => {
-      if (typeof value === "object" && value !== null) {
-        if (cache.has(value)) {
-          return;
-        }
-        cache.add(value);
-      }
-      return value;
-    },
-    indent
-  );
-  cache.clear();
-  return json;
-}
-function ensureHtmlExtension(filename) {
-  const ext = path2.extname(filename);
-  if (ext && ext.toLowerCase() === ".html") {
-    return filename;
-  }
-  return `${filename}.html`;
-}
-function escapeHtml(unsafe) {
-  if (typeof unsafe !== "string") {
-    return String(unsafe);
-  }
-  return unsafe.replace(/[&<"']/g, function(match) {
-    const escapeMap = {
-      "&": "&amp;",
-      "<": "&lt;",
-      ">": "&gt;",
-      '"': "&quot;",
-      "'": "&#039;"
-    };
-    return escapeMap[match] || match;
-  });
-}
-function formatDateUTC(date) {
-  return date.toISOString();
-}
-function formatDateLocal(isoString) {
-  const date = new Date(isoString);
-  const options = {
-    year: "numeric",
-    month: "short",
-    day: "2-digit",
-    hour: "2-digit",
-    minute: "2-digit",
-    hour12: true,
-    timeZoneName: "short"
-  };
-  return new Intl.DateTimeFormat(void 0, options).format(date);
-}
-function formatDateNoTimezone(isoString) {
-  const date = new Date(isoString);
-  return date.toLocaleString("en-US", {
-    dateStyle: "medium",
-    timeStyle: "short"
-  });
-}
-
 // src/helpers/HTMLGenerator.ts
-import fs2 from "fs";
-import Handlebars from "handlebars";
 var HTMLGenerator = class {
   constructor(ortoniConfig, dbManager) {
     this.ortoniConfig = ortoniConfig;
-    this.registerHandlebarsHelpers();
-    this.registerPartials();
     this.dbManager = dbManager;
   }
-  async generateHTML(filteredResults, totalDuration, cssContent, results, projectSet) {
+  async generateFinalReport(filteredResults, totalDuration, results, projectSet) {
     const data = await this.prepareReportData(
       filteredResults,
       totalDuration,
       results,
       projectSet
     );
-    const templateSource = fs2.readFileSync(
-      path3.resolve(__dirname, "views", "main.hbs"),
-      "utf-8"
-    );
-    const template = Handlebars.compile(templateSource);
-    return template({ ...data, inlineCss: cssContent });
+    return data;
   }
   async getReportData() {
     return {
@@ -226,18 +117,6 @@ var HTMLGenerator = class {
       slowTests: await this.dbManager.getSlowTests()
     };
   }
-  async chartTrendData() {
-    return {
-      labels: (await this.getReportData()).trends.map(
-        (t) => formatDateNoTimezone(t.run_date)
-      ),
-      passed: (await this.getReportData()).trends.map((t) => t.passed),
-      failed: (await this.getReportData()).trends.map((t) => t.failed),
-      avgDuration: (await this.getReportData()).trends.map(
-        (t) => t.avg_duration
-      )
-    };
-  }
   async prepareReportData(filteredResults, totalDuration, results, projectSet) {
     const totalTests = filteredResults.length;
     const passedTests = results.filter((r) => r.status === "passed").length;
@@ -255,8 +134,7 @@ var HTMLGenerator = class {
       results,
       projectSet
     );
-    const utcRunDate = formatDateUTC(/* @__PURE__ */ new Date());
-    const localRunDate = formatDateLocal(utcRunDate);
+    const lastRunDate = (/* @__PURE__ */ new Date()).toLocaleString();
     const testHistories = await Promise.all(
       results.map(async (result) => {
         const testId = `${result.filePath}:${result.projectName}:${result.title}`;
@@ -268,34 +146,44 @@ var HTMLGenerator = class {
       })
     );
     return {
-      utcRunDate,
-      localRunDate,
-      testHistories,
-      logo: this.ortoniConfig.logo || void 0,
-      totalDuration,
-      results,
-      retryCount: results.filter((r) => r.isRetry).length,
-      passCount: passedTests,
-      failCount: failed,
-      skipCount: results.filter((r) => r.status === "skipped").length,
-      flakyCount: flakyTests,
-      totalCount: filteredResults.length,
-      groupedResults: groupResults(this.ortoniConfig, results),
-      projectName: this.ortoniConfig.projectName,
-      authorName: this.ortoniConfig.authorName,
-      meta: this.ortoniConfig.meta,
-      testType: this.ortoniConfig.testType,
-      preferredTheme: this.ortoniConfig.preferredTheme,
-      successRate,
-      lastRunDate: formatDate(/* @__PURE__ */ new Date()),
-      projects: projectSet,
-      allTags: Array.from(allTags),
-      showProject: this.ortoniConfig.showProject || false,
-      title: this.ortoniConfig.title || "Ortoni Playwright Test Report",
-      chartType: this.ortoniConfig.chartType || "pie",
-      reportAnalyticsData: await this.getReportData(),
-      chartData: await this.chartTrendData(),
-      ...this.extractProjectStats(projectResults)
+      summary: {
+        overAllResult: {
+          pass: passedTests,
+          fail: failed,
+          skip: results.filter((r) => r.status === "skipped").length,
+          retry: results.filter((r) => r.retryAttemptCount).length,
+          flaky: flakyTests,
+          total: filteredResults.length
+        },
+        successRate,
+        lastRunDate,
+        totalDuration,
+        stats: this.extractProjectStats(projectResults)
+      },
+      testResult: {
+        tests: groupResults(this.ortoniConfig, results),
+        testHistories,
+        allTags: Array.from(allTags),
+        set: projectSet
+      },
+      userConfig: {
+        projectName: this.ortoniConfig.projectName,
+        authorName: this.ortoniConfig.authorName,
+        type: this.ortoniConfig.testType,
+        title: this.ortoniConfig.title
+      },
+      userMeta: {
+        meta: this.ortoniConfig.meta
+      },
+      preferences: {
+        theme: this.ortoniConfig.preferredTheme,
+        logo: this.ortoniConfig.logo || void 0,
+        showProject: this.ortoniConfig.showProject || false
+      },
+      analytics: {
+        reportData: await this.getReportData()
+        // chartTrendData: await this.chartTrendData(),
+      }
     };
   }
   calculateProjectResults(filteredResults, results, projectSet) {
@@ -313,7 +201,7 @@ var HTMLGenerator = class {
           (r) => r.status === "failed" || r.status === "timedOut"
         ).length,
         skippedTests: allProjectTests.filter((r) => r.status === "skipped").length,
-        retryTests: allProjectTests.filter((r) => r.isRetry).length,
+        retryTests: allProjectTests.filter((r) => r.retryAttemptCount).length,
         flakyTests: allProjectTests.filter((r) => r.status === "flaky").length,
         totalTests: projectTests.length
       };
@@ -330,59 +218,18 @@ var HTMLGenerator = class {
       flakyTests: projectResults.map((result) => result.flakyTests)
     };
   }
-  registerHandlebarsHelpers() {
-    Handlebars.registerHelper("joinWithSpace", (array) => array.join(" "));
-    Handlebars.registerHelper("json", (context) => safeStringify(context));
-    Handlebars.registerHelper(
-      "eq",
-      (actualStatus, expectedStatus) => actualStatus === expectedStatus
-    );
-    Handlebars.registerHelper(
-      "includes",
-      (actualStatus, expectedStatus) => actualStatus.includes(expectedStatus)
-    );
-    Handlebars.registerHelper("gr", (count) => count > 0);
-    Handlebars.registerHelper("or", function(a3, b2) {
-      return a3 || b2;
-    });
-    Handlebars.registerHelper("concat", function(...args) {
-      args.pop();
-      return args.join("");
-    });
-  }
-  registerPartials() {
-    [
-      "head",
-      "sidebar",
-      "testPanel",
-      "summaryCard",
-      "userInfo",
-      "project",
-      "testStatus",
-      "testIcons",
-      "analytics"
-    ].forEach((partialName) => {
-      Handlebars.registerPartial(
-        partialName,
-        fs2.readFileSync(
-          path3.resolve(__dirname, "views", `${partialName}.hbs`),
-          "utf-8"
-        )
-      );
-    });
-  }
 };
 
 // src/helpers/resultProcessor .ts
 import AnsiToHtml from "ansi-to-html";
-import path5 from "path";
+import path4 from "path";
 
 // src/utils/attachFiles.ts
-import path4 from "path";
-import fs4 from "fs";
+import path2 from "path";
+import fs3 from "fs";
 
 // src/helpers/markdownConverter.ts
-import fs3 from "fs";
+import fs2 from "fs";
 
 // node_modules/marked/lib/marked.esm.js
 function M() {
@@ -1507,77 +1354,44 @@ var Ft = T.parse;
 var Qt = b.lex;
 
 // src/helpers/markdownConverter.ts
-function convertMarkdownToHtml(markdownPath, htmlOutputPath, stepsError, resultError) {
-  const hasMarkdown = fs3.existsSync(markdownPath);
-  const markdownContent = hasMarkdown ? fs3.readFileSync(markdownPath, "utf-8") : "";
+function convertMarkdownToHtml(markdownPath, htmlOutputPath) {
+  const hasMarkdown = fs2.existsSync(markdownPath);
+  const markdownContent = hasMarkdown ? fs2.readFileSync(markdownPath, "utf-8") : "";
   const markdownHtml = hasMarkdown ? k(markdownContent) : "";
-  const stepsHtml = stepsError.filter((step) => step.snippet?.trim()).map(
-    (step) => `
-      <div>
-        <pre><code>${step.snippet}</code></pre>
-        ${step.location ? `<p><em>Location: ${escapeHtml(step.location)}</em></p>` : ""}
-      </div>`
-  ).join("\n");
-  const errorHtml = resultError.map((error) => `<pre><code>${error}</code></pre>`).join("\n");
-  const fullHtml = `
-    <!DOCTYPE html>
-    <html lang="en">
-    <head>
-      <meta charset="UTF-8" />
-      <title>Ortoni Error Report</title>
-      <style>
-        body { font-family: sans-serif; padding: 2rem; line-height: 1.6; max-width: 900px; margin: auto; }
-        code, pre { background: #f4f4f4; padding: 0.5rem; border-radius: 5px; display: block; overflow-x: auto; }
-        h1, h2, h3 { color: #444; }
-        hr { margin: 2em 0; }
-      </style>
-    </head>
-    <body>
-      <h1>Instructions</h1>
-      <ul>
-        <li>Following Playwright test failed.</li>
-        <li>Explain why, be concise, respect Playwright best practices.</li>
-        <li>Provide a snippet of code with the fix, if possible.</li>
-      </ul>
-      <h1>Error Details</h1>
-      ${errorHtml || "<p>No errors found.</p>"}
-      ${stepsHtml || "<p>No step data available.</p>"}
-      ${markdownHtml ? `${markdownHtml}` : ""}
-    </body>
-    </html>
-  `;
-  fs3.writeFileSync(htmlOutputPath, fullHtml, "utf-8");
+  const drawerHtml = `${markdownHtml || ""}`;
+  fs2.writeFileSync(htmlOutputPath, drawerHtml.trim(), "utf-8");
   if (hasMarkdown) {
-    fs3.unlinkSync(markdownPath);
+    fs2.unlinkSync(markdownPath);
   }
 }
 
 // src/utils/attachFiles.ts
 function attachFiles(subFolder, result, testResult, config, steps, errors) {
   const folderPath = config.folderPath || "ortoni-report";
-  const attachmentsFolder = path4.join(
+  const attachmentsFolder = path2.join(
     folderPath,
     "ortoni-data",
     "attachments",
     subFolder
   );
-  if (!fs4.existsSync(attachmentsFolder)) {
-    fs4.mkdirSync(attachmentsFolder, { recursive: true });
+  if (!fs3.existsSync(attachmentsFolder)) {
+    fs3.mkdirSync(attachmentsFolder, { recursive: true });
   }
   if (!result.attachments) return;
   const { base64Image } = config;
   testResult.screenshots = [];
+  testResult.videoPath = [];
   result.attachments.forEach((attachment) => {
     const { contentType, name, path: attachmentPath, body } = attachment;
     if (!attachmentPath && !body) return;
-    const fileName = attachmentPath ? path4.basename(attachmentPath) : `${name}.${getFileExtension(contentType)}`;
-    const relativePath = path4.join(
+    const fileName = attachmentPath ? path2.basename(attachmentPath) : `${name}.${getFileExtension(contentType)}`;
+    const relativePath = path2.join(
       "ortoni-data",
       "attachments",
       subFolder,
       fileName
     );
-    const fullPath = path4.join(attachmentsFolder, fileName);
+    const fullPath = path2.join(attachmentsFolder, fileName);
     if (contentType === "image/png") {
       handleImage(
         attachmentPath,
@@ -1620,13 +1434,13 @@ function handleImage(attachmentPath, body, base64Image, fullPath, relativePath,
   let screenshotPath = "";
   if (attachmentPath) {
     try {
-      const screenshotContent = fs4.readFileSync(
+      const screenshotContent = fs3.readFileSync(
         attachmentPath,
         base64Image ? "base64" : void 0
       );
       screenshotPath = base64Image ? `data:image/png;base64,${screenshotContent}` : relativePath;
       if (!base64Image) {
-        fs4.copyFileSync(attachmentPath, fullPath);
+        fs3.copyFileSync(attachmentPath, fullPath);
       }
     } catch (error) {
       console.error(
@@ -1643,13 +1457,17 @@ function handleImage(attachmentPath, body, base64Image, fullPath, relativePath,
 }
 function handleAttachment(attachmentPath, fullPath, relativePath, resultKey, testResult, steps, errors) {
   if (attachmentPath) {
-    fs4.copyFileSync(attachmentPath, fullPath);
-    testResult[resultKey] = relativePath;
+    fs3.copyFileSync(attachmentPath, fullPath);
+    if (resultKey === "videoPath") {
+      testResult[resultKey]?.push(relativePath);
+    } else if (resultKey === "tracePath") {
+      testResult[resultKey] = relativePath;
+    }
   }
   if (resultKey === "markdownPath" && errors) {
     const htmlPath = fullPath.replace(/\.md$/, ".html");
     const htmlRelativePath = relativePath.replace(/\.md$/, ".html");
-    convertMarkdownToHtml(fullPath, htmlPath, steps || [], errors || []);
+    convertMarkdownToHtml(fullPath, htmlPath);
     testResult[resultKey] = htmlRelativePath;
     return;
   }
@@ -1664,6 +1482,61 @@ function getFileExtension(contentType) {
   return extensions[contentType] || "unknown";
 }
 
+// src/utils/utils.ts
+import path3 from "path";
+function normalizeFilePath(filePath) {
+  const normalizedPath = path3.normalize(filePath);
+  return path3.basename(normalizedPath);
+}
+function ensureHtmlExtension(filename) {
+  const ext = path3.extname(filename);
+  if (ext && ext.toLowerCase() === ".html") {
+    return filename;
+  }
+  return `${filename}.html`;
+}
+function escapeHtml(unsafe) {
+  if (typeof unsafe !== "string") {
+    return String(unsafe);
+  }
+  return unsafe.replace(/[&<"']/g, function(match) {
+    const escapeMap = {
+      "&": "&amp;",
+      "<": "&lt;",
+      ">": "&gt;",
+      '"': "&quot;",
+      "'": "&#039;"
+    };
+    return escapeMap[match] || match;
+  });
+}
+function formatDateLocal(dateInput) {
+  const date = typeof dateInput === "string" ? new Date(dateInput) : dateInput;
+  const options = {
+    year: "numeric",
+    month: "short",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    hour12: true,
+    timeZoneName: "short"
+    // or "Asia/Kolkata"
+  };
+  return new Intl.DateTimeFormat(void 0, options).format(date);
+}
+function extractSuites(titlePath) {
+  const tagPattern = /@[\w]+/g;
+  const suiteParts = titlePath.slice(3, titlePath.length - 1).map((p) => p.replace(tagPattern, "").trim());
+  return {
+    hierarchy: suiteParts.join(" > "),
+    // full hierarchy
+    topLevelSuite: suiteParts[0] ?? "",
+    // first suite
+    parentSuite: suiteParts[suiteParts.length - 1] ?? ""
+    // last suite
+  };
+}
+
 // src/helpers/resultProcessor .ts
 var TestResultProcessor = class {
   constructor(projectRoot) {
@@ -1679,19 +1552,21 @@ var TestResultProcessor = class {
     const tagPattern = /@[\w]+/g;
     const title = test.title.replace(tagPattern, "").trim();
     const suite = test.titlePath()[3].replace(tagPattern, "").trim();
+    const suiteAndTitle = extractSuites(test.titlePath());
+    const suiteHierarchy = suiteAndTitle.hierarchy;
     const testResult = {
-      port: ortoniConfig.port || 2004,
+      suiteHierarchy,
+      key: test.id,
       annotations: test.annotations,
       testTags: test.tags,
       location: `${filePath}:${location.line}:${location.column}`,
-      retry: result.retry > 0 ? "retry" : "",
-      isRetry: result.retry,
+      retryAttemptCount: result.retry,
       projectName,
       suite,
       title,
       status,
       flaky: test.outcome(),
-      duration: msToTime(result.duration),
+      duration: result.duration,
       errors: result.errors.map(
         (e) => this.ansiToHtml.toHtml(escapeHtml(e.stack || e.toString()))
       ),
@@ -1703,7 +1578,8 @@ var TestResultProcessor = class {
       ),
       filePath,
       filters: projectSet,
-      base64Image: ortoniConfig.base64Image
+      base64Image: ortoniConfig.base64Image,
+      testId: `${filePath}:${projectName}:${title}`
     };
     attachFiles(
       test.id,
@@ -1717,7 +1593,7 @@ var TestResultProcessor = class {
   }
   processSteps(steps) {
     return steps.map((step) => {
-      const stepLocation = step.location ? `${path5.relative(this.projectRoot, step.location.file)}:${step.location.line}:${step.location.column}` : "";
+      const stepLocation = step.location ? `${path4.relative(this.projectRoot, step.location.file)}:${step.location.line}:${step.location.column}` : "";
       return {
         snippet: this.ansiToHtml.toHtml(escapeHtml(step.error?.snippet || "")),
         title: step.title,
@@ -1782,7 +1658,7 @@ var DatabaseManager = class {
           run_id INTEGER,
           test_id TEXT,
           status TEXT,
-          duration TEXT,
+          duration INTEGER, -- store duration as raw ms
           error_message TEXT,
           FOREIGN KEY (run_id) REFERENCES test_runs (id)
         );
@@ -1842,6 +1718,7 @@ var DatabaseManager = class {
           `${result.filePath}:${result.projectName}:${result.title}`,
           result.status,
           result.duration,
+          // store raw ms
           result.errors.join("\n")
         ]);
       }
@@ -1908,7 +1785,7 @@ var DatabaseManager = class {
         (SELECT COUNT(*) FROM test_results) as totalTests,
         (SELECT COUNT(*) FROM test_results WHERE status = 'passed') as passed,
         (SELECT COUNT(*) FROM test_results WHERE status = 'failed') as failed,
-        (SELECT AVG(CAST(duration AS FLOAT)) FROM test_results) as avgDuration
+        (SELECT AVG(duration) FROM test_results) as avgDuration
     `);
       const passRate = summary.totalTests ? (summary.passed / summary.totalTests * 100).toFixed(2) : 0;
       return {
@@ -1918,6 +1795,7 @@ var DatabaseManager = class {
         failed: summary.failed,
         passRate: parseFloat(passRate.toString()),
         avgDuration: Math.round(summary.avgDuration || 0)
+        // raw ms avg
       };
     } catch (error) {
       console.error("OrtoniReport: Error getting summary data:", error);
@@ -1942,7 +1820,7 @@ var DatabaseManager = class {
       SELECT trun.run_date,
         SUM(CASE WHEN tr.status = 'passed' THEN 1 ELSE 0 END) AS passed,
         SUM(CASE WHEN tr.status = 'failed' THEN 1 ELSE 0 END) AS failed,
-        AVG(CAST(tr.duration AS FLOAT)) AS avg_duration
+        AVG(tr.duration) AS avg_duration
       FROM test_results tr
       JOIN test_runs trun ON tr.run_id = trun.id
       GROUP BY trun.run_date
@@ -1955,6 +1833,7 @@ var DatabaseManager = class {
         ...row,
         run_date: formatDateLocal(row.run_date),
         avg_duration: Math.round(row.avg_duration || 0)
+        // raw ms avg
       }));
     } catch (error) {
       console.error("OrtoniReport: Error getting trends data:", error);
@@ -1972,7 +1851,8 @@ var DatabaseManager = class {
       SELECT
         test_id,
         COUNT(*) AS total,
-        SUM(CASE WHEN status = 'flaky' THEN 1 ELSE 0 END) AS flaky
+        SUM(CASE WHEN status = 'flaky' THEN 1 ELSE 0 END) AS flaky,
+        AVG(duration) AS avg_duration
       FROM test_results
       GROUP BY test_id
       HAVING flaky > 0
@@ -1996,7 +1876,7 @@ var DatabaseManager = class {
         `
       SELECT
         test_id,
-        AVG(CAST(duration AS FLOAT)) AS avg_duration
+        AVG(duration) AS avg_duration
       FROM test_results
       GROUP BY test_id
       ORDER BY avg_duration DESC
@@ -2007,6 +1887,7 @@ var DatabaseManager = class {
       return rows.map((row) => ({
         test_id: row.test_id,
         avg_duration: Math.round(row.avg_duration || 0)
+        // raw ms avg
       }));
     } catch (error) {
       console.error("OrtoniReport: Error getting slow tests:", error);
@@ -2016,7 +1897,7 @@ var DatabaseManager = class {
 };
 
 // src/ortoni-report.ts
-import path6 from "path";
+import path5 from "path";
 var OrtoniReport = class {
   constructor(ortoniConfig = {}) {
     this.ortoniConfig = ortoniConfig;
@@ -2047,7 +1928,7 @@ var OrtoniReport = class {
     this.testResultProcessor = new TestResultProcessor(config.rootDir);
     this.fileManager.ensureReportDirectory();
     await this.dbManager.initialize(
-      path6.join(this.folderPath, "ortoni-data-history.sqlite")
+      path5.join(this.folderPath, "ortoni-data-history.sqlite")
     );
   }
   onStdOut(chunk, _test, _result) {
@@ -2081,23 +1962,21 @@ var OrtoniReport = class {
       this.overAllStatus = result.status;
       if (this.shouldGenerateReport) {
         const filteredResults = this.results.filter(
-          (r) => r.status !== "skipped" && !r.isRetry
+          (r) => r.status !== "skipped"
         );
-        const totalDuration = msToTime(result.duration);
-        const cssContent = this.fileManager.readCssContent();
+        const totalDuration = result.duration;
         const runId = await this.dbManager.saveTestRun();
         if (runId !== null) {
           await this.dbManager.saveTestResults(runId, this.results);
-          const html = await this.htmlGenerator.generateHTML(
+          const finalReportData = await this.htmlGenerator.generateFinalReport(
             filteredResults,
             totalDuration,
-            cssContent,
             this.results,
             this.projectSet
           );
           this.outputPath = this.fileManager.writeReportFile(
             this.outputFilename,
-            html
+            finalReportData
           );
         } else {
           console.error("OrtoniReport: Error saving test run to database");