@code-pushup/cli 0.50.0 → 0.52.0

package/index.js

@@ -163,9 +163,27 @@ function hasNonZeroWeightedRef(refs) {
   return refs.reduce((acc, { weight }) => weight + acc, 0) !== 0;
 }
 
-// packages/models/src/lib/audit.ts
+// packages/models/src/lib/source.ts
 import { z as z2 } from "zod";
-var auditSchema = z2.object({
+var sourceFileLocationSchema = z2.object(
+  {
+    file: filePathSchema.describe("Relative path to source file in Git repo"),
+    position: z2.object(
+      {
+        startLine: positiveIntSchema.describe("Start line"),
+        startColumn: positiveIntSchema.describe("Start column").optional(),
+        endLine: positiveIntSchema.describe("End line").optional(),
+        endColumn: positiveIntSchema.describe("End column").optional()
+      },
+      { description: "Location in file" }
+    ).optional()
+  },
+  { description: "Source file location" }
+);
+
+// packages/models/src/lib/audit.ts
+import { z as z3 } from "zod";
+var auditSchema = z3.object({
   slug: slugSchema.describe("ID (unique within plugin)")
 }).merge(
   metaSchema({
@@ -175,7 +193,7 @@ var auditSchema = z2.object({
     description: "List of scorable metrics for the given plugin"
   })
 );
-var pluginAuditsSchema = z2.array(auditSchema, {
+var pluginAuditsSchema = z3.array(auditSchema, {
   description: "List of audits maintained in a plugin"
 }).min(1).refine(
   (auditMetadata) => !getDuplicateSlugsInAudits(auditMetadata),
@@ -194,31 +212,16 @@ function getDuplicateSlugsInAudits(audits) {
 }
 
 // packages/models/src/lib/audit-output.ts
-import { z as z5 } from "zod";
+import { z as z6 } from "zod";
 
 // packages/models/src/lib/issue.ts
-import { z as z3 } from "zod";
-var sourceFileLocationSchema = z3.object(
-  {
-    file: filePathSchema.describe("Relative path to source file in Git repo"),
-    position: z3.object(
-      {
-        startLine: positiveIntSchema.describe("Start line"),
-        startColumn: positiveIntSchema.describe("Start column").optional(),
-        endLine: positiveIntSchema.describe("End line").optional(),
-        endColumn: positiveIntSchema.describe("End column").optional()
-      },
-      { description: "Location in file" }
-    ).optional()
-  },
-  { description: "Source file location" }
-);
-var issueSeveritySchema = z3.enum(["info", "warning", "error"], {
+import { z as z4 } from "zod";
+var issueSeveritySchema = z4.enum(["info", "warning", "error"], {
   description: "Severity level"
 });
-var issueSchema = z3.object(
+var issueSchema = z4.object(
   {
-    message: z3.string({ description: "Descriptive error message" }).max(MAX_ISSUE_MESSAGE_LENGTH),
+    message: z4.string({ description: "Descriptive error message" }).max(MAX_ISSUE_MESSAGE_LENGTH),
     severity: issueSeveritySchema,
     source: sourceFileLocationSchema.optional()
   },
@@ -226,60 +229,60 @@ var issueSchema = z3.object(
 );
 
 // packages/models/src/lib/table.ts
-import { z as z4 } from "zod";
-var tableAlignmentSchema = z4.enum(["left", "center", "right"], {
+import { z as z5 } from "zod";
+var tableAlignmentSchema = z5.enum(["left", "center", "right"], {
   description: "Cell alignment"
 });
-var tableColumnObjectSchema = z4.object({
-  key: z4.string(),
-  label: z4.string().optional(),
+var tableColumnObjectSchema = z5.object({
+  key: z5.string(),
+  label: z5.string().optional(),
   align: tableAlignmentSchema.optional()
 });
-var tableRowObjectSchema = z4.record(tableCellValueSchema, {
+var tableRowObjectSchema = z5.record(tableCellValueSchema, {
   description: "Object row"
 });
-var tableRowPrimitiveSchema = z4.array(tableCellValueSchema, {
+var tableRowPrimitiveSchema = z5.array(tableCellValueSchema, {
   description: "Primitive row"
 });
-var tableSharedSchema = z4.object({
-  title: z4.string().optional().describe("Display title for table")
+var tableSharedSchema = z5.object({
+  title: z5.string().optional().describe("Display title for table")
 });
 var tablePrimitiveSchema = tableSharedSchema.merge(
-  z4.object(
+  z5.object(
     {
-      columns: z4.array(tableAlignmentSchema).optional(),
-      rows: z4.array(tableRowPrimitiveSchema)
+      columns: z5.array(tableAlignmentSchema).optional(),
+      rows: z5.array(tableRowPrimitiveSchema)
     },
     { description: "Table with primitive rows and optional alignment columns" }
   )
 );
 var tableObjectSchema = tableSharedSchema.merge(
-  z4.object(
+  z5.object(
     {
-      columns: z4.union([
-        z4.array(tableAlignmentSchema),
-        z4.array(tableColumnObjectSchema)
+      columns: z5.union([
+        z5.array(tableAlignmentSchema),
+        z5.array(tableColumnObjectSchema)
       ]).optional(),
-      rows: z4.array(tableRowObjectSchema)
+      rows: z5.array(tableRowObjectSchema)
     },
     {
       description: "Table with object rows and optional alignment or object columns"
     }
   )
 );
-var tableSchema = (description = "Table information") => z4.union([tablePrimitiveSchema, tableObjectSchema], { description });
+var tableSchema = (description = "Table information") => z5.union([tablePrimitiveSchema, tableObjectSchema], { description });
 
 // packages/models/src/lib/audit-output.ts
 var auditValueSchema = nonnegativeNumberSchema.describe("Raw numeric value");
-var auditDisplayValueSchema = z5.string({ description: "Formatted value (e.g. '0.9 s', '2.1 MB')" }).optional();
-var auditDetailsSchema = z5.object(
+var auditDisplayValueSchema = z6.string({ description: "Formatted value (e.g. '0.9 s', '2.1 MB')" }).optional();
+var auditDetailsSchema = z6.object(
   {
-    issues: z5.array(issueSchema, { description: "List of findings" }).optional(),
+    issues: z6.array(issueSchema, { description: "List of findings" }).optional(),
     table: tableSchema("Table of related findings").optional()
   },
   { description: "Detailed information" }
 );
-var auditOutputSchema = z5.object(
+var auditOutputSchema = z6.object(
   {
     slug: slugSchema.describe("Reference to audit"),
     displayValue: auditDisplayValueSchema,
@@ -289,7 +292,7 @@ var auditOutputSchema = z5.object(
   },
   { description: "Audit information" }
 );
-var auditOutputsSchema = z5.array(auditOutputSchema, {
+var auditOutputsSchema = z6.array(auditOutputSchema, {
   description: "List of JSON formatted audit output emitted by the runner process of a plugin"
 }).refine(
   (audits) => !getDuplicateSlugsInAudits2(audits),
@@ -306,13 +309,13 @@ function getDuplicateSlugsInAudits2(audits) {
 }
 
 // packages/models/src/lib/category-config.ts
-import { z as z6 } from "zod";
+import { z as z7 } from "zod";
 var categoryRefSchema = weightedRefSchema(
   "Weighted references to audits and/or groups for the category",
   "Slug of an audit or group (depending on `type`)"
 ).merge(
-  z6.object({
-    type: z6.enum(["audit", "group"], {
+  z7.object({
+    type: z7.enum(["audit", "group"], {
       description: "Discriminant for reference kind, affects where `slug` is looked up"
     }),
     plugin: slugSchema.describe(
@@ -333,8 +336,8 @@ var categoryConfigSchema = scorableSchema(
     description: "Meta info for category"
   })
 ).merge(
-  z6.object({
-    isBinary: z6.boolean({
+  z7.object({
+    isBinary: z7.boolean({
       description: 'Is this a binary category (i.e. only a perfect score considered a "pass")?'
     }).optional()
   })
@@ -350,7 +353,7 @@ function getDuplicateRefsInCategoryMetrics(metrics) {
     metrics.map(({ slug, type, plugin }) => `${type} :: ${plugin} / ${slug}`)
   );
 }
-var categoriesSchema = z6.array(categoryConfigSchema, {
+var categoriesSchema = z7.array(categoryConfigSchema, {
   description: "Categorization of individual audits"
 }).refine(
   (categoryCfg) => !getDuplicateSlugCategories(categoryCfg),
@@ -369,18 +372,18 @@ function getDuplicateSlugCategories(categories) {
 }
 
 // packages/models/src/lib/commit.ts
-import { z as z7 } from "zod";
-var commitSchema = z7.object(
+import { z as z8 } from "zod";
+var commitSchema = z8.object(
   {
-    hash: z7.string({ description: "Commit SHA (full)" }).regex(
+    hash: z8.string({ description: "Commit SHA (full)" }).regex(
       /^[\da-f]{40}$/,
       "Commit SHA should be a 40-character hexadecimal string"
     ),
-    message: z7.string({ description: "Commit message" }),
-    date: z7.coerce.date({
+    message: z8.string({ description: "Commit message" }),
+    date: z8.coerce.date({
       description: "Date and time when commit was authored"
     }),
-    author: z7.string({
+    author: z8.string({
       description: "Commit author name"
     }).trim()
   },
@@ -388,22 +391,22 @@ var commitSchema = z7.object(
 );
 
 // packages/models/src/lib/core-config.ts
-import { z as z13 } from "zod";
+import { z as z14 } from "zod";
 
 // packages/models/src/lib/persist-config.ts
-import { z as z8 } from "zod";
-var formatSchema = z8.enum(["json", "md"]);
-var persistConfigSchema = z8.object({
+import { z as z9 } from "zod";
+var formatSchema = z9.enum(["json", "md"]);
+var persistConfigSchema = z9.object({
   outputDir: filePathSchema.describe("Artifacts folder").optional(),
   filename: fileNameSchema.describe("Artifacts file name (without extension)").optional(),
-  format: z8.array(formatSchema).optional()
+  format: z9.array(formatSchema).optional()
 });
 
 // packages/models/src/lib/plugin-config.ts
-import { z as z11 } from "zod";
+import { z as z12 } from "zod";
 
 // packages/models/src/lib/group.ts
-import { z as z9 } from "zod";
+import { z as z10 } from "zod";
 var groupRefSchema = weightedRefSchema(
   "Weighted reference to a group",
   "Reference slug to a group within this plugin (e.g. 'max-lines')"
@@ -420,7 +423,7 @@ var groupSchema = scorableSchema(
   getDuplicateRefsInGroups,
   duplicateRefsInGroupsErrorMsg
 ).merge(groupMetaSchema);
-var groupsSchema = z9.array(groupSchema, {
+var groupsSchema = z10.array(groupSchema, {
   description: "List of groups"
 }).optional().refine(
   (groups2) => !getDuplicateSlugsInGroups(groups2),
@@ -448,14 +451,14 @@ function getDuplicateSlugsInGroups(groups2) {
 }
 
 // packages/models/src/lib/runner-config.ts
-import { z as z10 } from "zod";
-var outputTransformSchema = z10.function().args(z10.unknown()).returns(z10.union([auditOutputsSchema, z10.promise(auditOutputsSchema)]));
-var runnerConfigSchema = z10.object(
+import { z as z11 } from "zod";
+var outputTransformSchema = z11.function().args(z11.unknown()).returns(z11.union([auditOutputsSchema, z11.promise(auditOutputsSchema)]));
+var runnerConfigSchema = z11.object(
   {
-    command: z10.string({
+    command: z11.string({
       description: "Shell command to execute"
     }),
-    args: z10.array(z10.string({ description: "Command arguments" })).optional(),
+    args: z11.array(z11.string({ description: "Command arguments" })).optional(),
     outputFile: filePathSchema.describe("Output path"),
     outputTransform: outputTransformSchema.optional()
   },
@@ -463,8 +466,8 @@ var runnerConfigSchema = z10.object(
     description: "How to execute runner"
   }
 );
-var onProgressSchema = z10.function().args(z10.unknown()).returns(z10.void());
-var runnerFunctionSchema = z10.function().args(onProgressSchema.optional()).returns(z10.union([auditOutputsSchema, z10.promise(auditOutputsSchema)]));
+var onProgressSchema = z11.function().args(z11.unknown()).returns(z11.void());
+var runnerFunctionSchema = z11.function().args(onProgressSchema.optional()).returns(z11.union([auditOutputsSchema, z11.promise(auditOutputsSchema)]));
 
 // packages/models/src/lib/plugin-config.ts
 var pluginMetaSchema = packageVersionSchema().merge(
@@ -475,13 +478,13 @@ var pluginMetaSchema = packageVersionSchema().merge(
     description: "Plugin metadata"
   })
 ).merge(
-  z11.object({
+  z12.object({
     slug: slugSchema.describe("Unique plugin slug within core config"),
     icon: materialIconSchema
   })
 );
-var pluginDataSchema = z11.object({
-  runner: z11.union([runnerConfigSchema, runnerFunctionSchema]),
+var pluginDataSchema = z12.object({
+  runner: z12.union([runnerConfigSchema, runnerFunctionSchema]),
   audits: pluginAuditsSchema,
   groups: groupsSchema
 });
@@ -507,22 +510,22 @@ function getMissingRefsFromGroups(pluginCfg) {
 }
 
 // packages/models/src/lib/upload-config.ts
-import { z as z12 } from "zod";
-var uploadConfigSchema = z12.object({
+import { z as z13 } from "zod";
+var uploadConfigSchema = z13.object({
   server: urlSchema.describe("URL of deployed portal API"),
-  apiKey: z12.string({
+  apiKey: z13.string({
     description: "API key with write access to portal (use `process.env` for security)"
   }),
   organization: slugSchema.describe(
     "Organization slug from Code PushUp portal"
   ),
   project: slugSchema.describe("Project slug from Code PushUp portal"),
-  timeout: z12.number({ description: "Request timeout in minutes (default is 5)" }).positive().int().optional()
+  timeout: z13.number({ description: "Request timeout in minutes (default is 5)" }).positive().int().optional()
 });
 
 // packages/models/src/lib/core-config.ts
-var unrefinedCoreConfigSchema = z13.object({
-  plugins: z13.array(pluginConfigSchema, {
+var unrefinedCoreConfigSchema = z14.object({
+  plugins: z14.array(pluginConfigSchema, {
     description: "List of plugins to be used (official, community-provided, or custom)"
   }).min(1),
   /** portal configuration for persisting results */
@@ -554,7 +557,7 @@ var DEFAULT_PERSIST_FILENAME = "report";
 var DEFAULT_PERSIST_FORMAT = ["json", "md"];
 
 // packages/models/src/lib/report.ts
-import { z as z14 } from "zod";
+import { z as z15 } from "zod";
 var auditReportSchema = auditSchema.merge(auditOutputSchema);
 var pluginReportSchema = pluginMetaSchema.merge(
   executionMetaSchema({
@@ -562,9 +565,9 @@ var pluginReportSchema = pluginMetaSchema.merge(
     descriptionDuration: "Duration of the plugin run in ms"
   })
 ).merge(
-  z14.object({
-    audits: z14.array(auditReportSchema).min(1),
-    groups: z14.array(groupSchema).optional()
+  z15.object({
+    audits: z15.array(auditReportSchema).min(1),
+    groups: z15.array(groupSchema).optional()
   })
 ).refine(
   (pluginReport) => !getMissingRefsFromGroups2(pluginReport.audits, pluginReport.groups ?? []),
@@ -598,10 +601,10 @@ var reportSchema = packageVersionSchema({
     descriptionDuration: "Duration of the collect run in ms"
   })
 ).merge(
-  z14.object(
+  z15.object(
     {
-      categories: z14.array(categoryConfigSchema),
-      plugins: z14.array(pluginReportSchema).min(1),
+      categories: z15.array(categoryConfigSchema),
+      plugins: z15.array(pluginReportSchema).min(1),
       commit: commitSchema.describe("Git commit for which report was collected").nullable()
     },
     { description: "Collect output data" }
@@ -617,40 +620,40 @@ var reportSchema = packageVersionSchema({
 );
 
 // packages/models/src/lib/reports-diff.ts
-import { z as z15 } from "zod";
+import { z as z16 } from "zod";
 function makeComparisonSchema(schema) {
   const sharedDescription = schema.description || "Result";
-  return z15.object({
+  return z16.object({
     before: schema.describe(`${sharedDescription} (source commit)`),
     after: schema.describe(`${sharedDescription} (target commit)`)
   });
 }
 function makeArraysComparisonSchema(diffSchema, resultSchema, description) {
-  return z15.object(
+  return z16.object(
     {
-      changed: z15.array(diffSchema),
-      unchanged: z15.array(resultSchema),
-      added: z15.array(resultSchema),
-      removed: z15.array(resultSchema)
+      changed: z16.array(diffSchema),
+      unchanged: z16.array(resultSchema),
+      added: z16.array(resultSchema),
+      removed: z16.array(resultSchema)
     },
     { description }
   );
 }
-var scorableMetaSchema = z15.object({
+var scorableMetaSchema = z16.object({
   slug: slugSchema,
   title: titleSchema,
   docsUrl: docsUrlSchema
 });
 var scorableWithPluginMetaSchema = scorableMetaSchema.merge(
-  z15.object({
+  z16.object({
     plugin: pluginMetaSchema.pick({ slug: true, title: true, docsUrl: true }).describe("Plugin which defines it")
   })
 );
 var scorableDiffSchema = scorableMetaSchema.merge(
-  z15.object({
+  z16.object({
     scores: makeComparisonSchema(scoreSchema).merge(
-      z15.object({
-        diff: z15.number().min(-1).max(1).describe("Score change (`scores.after - scores.before`)")
+      z16.object({
+        diff: z16.number().min(-1).max(1).describe("Score change (`scores.after - scores.before`)")
       })
     ).describe("Score comparison")
   })
@@ -661,10 +664,10 @@ var scorableWithPluginDiffSchema = scorableDiffSchema.merge(
 var categoryDiffSchema = scorableDiffSchema;
 var groupDiffSchema = scorableWithPluginDiffSchema;
 var auditDiffSchema = scorableWithPluginDiffSchema.merge(
-  z15.object({
+  z16.object({
     values: makeComparisonSchema(auditValueSchema).merge(
-      z15.object({
-        diff: z15.number().int().describe("Value change (`values.after - values.before`)")
+      z16.object({
+        diff: z16.number().int().describe("Value change (`values.after - values.before`)")
       })
     ).describe("Audit `value` comparison"),
     displayValues: makeComparisonSchema(auditDisplayValueSchema).describe(
@@ -673,18 +676,18 @@ var auditDiffSchema = scorableWithPluginDiffSchema.merge(
   })
 );
 var categoryResultSchema = scorableMetaSchema.merge(
-  z15.object({ score: scoreSchema })
+  z16.object({ score: scoreSchema })
 );
 var groupResultSchema = scorableWithPluginMetaSchema.merge(
-  z15.object({ score: scoreSchema })
+  z16.object({ score: scoreSchema })
 );
 var auditResultSchema = scorableWithPluginMetaSchema.merge(
   auditOutputSchema.pick({ score: true, value: true, displayValue: true })
 );
-var reportsDiffSchema = z15.object({
+var reportsDiffSchema = z16.object({
   commits: makeComparisonSchema(commitSchema).nullable().describe("Commits identifying compared reports"),
   portalUrl: urlSchema.optional().describe("Link to comparison page in Code PushUp portal"),
-  label: z15.string().optional().describe("Label (e.g. project name)"),
+  label: z16.string().optional().describe("Label (e.g. project name)"),
   categories: makeArraysComparisonSchema(
     categoryDiffSchema,
     categoryResultSchema,
@@ -857,9 +860,17 @@ function severityMarker(severity) {
   }
   return "\u2139\uFE0F";
 }
+var MIN_NON_ZERO_RESULT = 0.1;
+function roundValue(value) {
+  const roundedValue = Math.round(value * 10) / 10;
+  if (roundedValue === 0 && value !== 0) {
+    return MIN_NON_ZERO_RESULT * Math.sign(value);
+  }
+  return roundedValue;
+}
 function formatScoreChange(diff) {
   const marker = getDiffMarker(diff);
-  const text = formatDiffNumber(Math.round(diff * 1e3) / 10);
+  const text = formatDiffNumber(roundValue(diff * 100));
   return colorByScoreDiff(`${marker} ${text}`, diff);
 }
 function formatValueChange({
@@ -867,7 +878,7 @@ function formatValueChange({
   scores
 }) {
   const marker = getDiffMarker(values.diff);
-  const percentage = values.before === 0 ? values.diff > 0 ? Number.POSITIVE_INFINITY : Number.NEGATIVE_INFINITY : Math.round(100 * values.diff / values.before);
+  const percentage = values.before === 0 ? values.diff > 0 ? Number.POSITIVE_INFINITY : Number.NEGATIVE_INFINITY : roundValue(values.diff / values.before * 100);
   const text = `${formatDiffNumber(percentage)}\u2009%`;
   return colorByScoreDiff(`${marker} ${text}`, scores.diff);
 }
@@ -1595,6 +1606,29 @@ import {
   MarkdownDocument,
   md as md2
 } from "build-md";
+import { posix as pathPosix } from "node:path";
+
+// packages/utils/src/lib/reports/ide-environment.ts
+function getEnvironmentType() {
+  if (isVSCode()) {
+    return "vscode";
+  }
+  if (isGitHub()) {
+    return "github";
+  }
+  return "other";
+}
+function isVSCode() {
+  return process.env["TERM_PROGRAM"] === "vscode";
+}
+function isGitHub() {
+  return process.env["GITHUB_ACTIONS"] === "true";
+}
+function getGitHubBaseUrl() {
+  return `${process.env["GITHUB_SERVER_URL"]}/${process.env["GITHUB_REPOSITORY"]}/blob/${process.env["GITHUB_SHA"]}`;
+}
+
+// packages/utils/src/lib/reports/formatting.ts
 function tableSection(tableData, options2) {
   if (tableData.rows.length === 0) {
     return null;
@@ -1632,6 +1666,44 @@ function metaDescription(audit) {
   }
   return "";
 }
+function linkToLocalSourceForIde(source, options2) {
+  const { file, position } = source;
+  const { outputDir } = options2 ?? {};
+  if (!outputDir) {
+    return md2.code(file);
+  }
+  return md2.link(formatFileLink(file, position, outputDir), md2.code(file));
+}
+function formatSourceLine(position) {
+  if (!position) {
+    return "";
+  }
+  const { startLine, endLine } = position;
+  return endLine && startLine !== endLine ? `${startLine}-${endLine}` : `${startLine}`;
+}
+function formatGitHubLink(file, position) {
+  const baseUrl = getGitHubBaseUrl();
+  if (!position) {
+    return `${baseUrl}/${file}`;
+  }
+  const { startLine, endLine, startColumn, endColumn } = position;
+  const start = startColumn ? `L${startLine}C${startColumn}` : `L${startLine}`;
+  const end = endLine ? endColumn ? `L${endLine}C${endColumn}` : `L${endLine}` : "";
+  const lineRange = end && start !== end ? `${start}-${end}` : start;
+  return `${baseUrl}/${file}#${lineRange}`;
+}
+function formatFileLink(file, position, outputDir) {
+  const relativePath = pathPosix.relative(outputDir, file);
+  const env = getEnvironmentType();
+  switch (env) {
+    case "vscode":
+      return position ? `${relativePath}#L${position.startLine}` : relativePath;
+    case "github":
+      return formatGitHubLink(file, position);
+    default:
+      return relativePath;
+  }
+}
 
 // packages/utils/src/lib/reports/generate-md-report-categoy-section.ts
 import { MarkdownDocument as MarkdownDocument2, md as md3 } from "build-md";
@@ -1833,16 +1905,16 @@ function auditDetailsAuditValue({
     String(displayValue ?? value)
   )} (score: ${formatReportScore(score)})`;
 }
-function generateMdReport(report) {
+function generateMdReport(report, options2) {
   return new MarkdownDocument3().heading(HIERARCHY.level_1, REPORT_HEADLINE_TEXT).$if(
     report.categories.length > 0,
     (doc) => doc.$concat(
       categoriesOverviewSection(report),
       categoriesDetailsSection(report)
     )
-  ).$concat(auditsSection(report), aboutSection(report)).rule().paragraph(md4`${FOOTER_PREFIX} ${md4.link(README_LINK, "Code PushUp")}`).toString();
+  ).$concat(auditsSection(report, options2), aboutSection(report)).rule().paragraph(md4`${FOOTER_PREFIX} ${md4.link(README_LINK, "Code PushUp")}`).toString();
 }
-function auditDetailsIssues(issues = []) {
+function auditDetailsIssues(issues = [], options2) {
   if (issues.length === 0) {
     return null;
   }
@@ -1858,39 +1930,36 @@ function auditDetailsIssues(issues = []) {
       if (!source) {
         return [severity, message];
       }
-      const file = md4.code(source.file);
+      const file = linkToLocalSourceForIde(source, options2);
       if (!source.position) {
         return [severity, message, file];
       }
-      const { startLine, endLine } = source.position;
-      const line = `${startLine || ""}${endLine && startLine !== endLine ? `-${endLine}` : ""}`;
+      const line = formatSourceLine(source.position);
       return [severity, message, file, line];
     })
   );
 }
-function auditDetails(audit) {
+function auditDetails(audit, options2) {
   const { table: table2, issues = [] } = audit.details ?? {};
   const detailsValue = auditDetailsAuditValue(audit);
   if (issues.length === 0 && !table2?.rows.length) {
     return new MarkdownDocument3().paragraph(detailsValue);
   }
   const tableSectionContent = table2 && tableSection(table2);
-  const issuesSectionContent = issues.length > 0 && auditDetailsIssues(issues);
+  const issuesSectionContent = issues.length > 0 && auditDetailsIssues(issues, options2);
   return new MarkdownDocument3().details(
     detailsValue,
     new MarkdownDocument3().$concat(tableSectionContent, issuesSectionContent)
   );
 }
-function auditsSection({
-  plugins
-}) {
+function auditsSection({ plugins }, options2) {
   return new MarkdownDocument3().heading(HIERARCHY.level_2, "\u{1F6E1}\uFE0F Audits").$foreach(
     plugins.flatMap(
       (plugin) => plugin.audits.map((audit) => ({ ...audit, plugin }))
     ),
     (doc, { plugin, ...audit }) => {
       const auditTitle = `${audit.title} (${plugin.title})`;
-      const detailsContent = auditDetails(audit);
+      const detailsContent = auditDetails(audit, options2);
       const descriptionContent = metaDescription(audit);
       return doc.heading(HIERARCHY.level_3, auditTitle).$concat(detailsContent).paragraph(descriptionContent);
     }
@@ -2152,15 +2221,6 @@ function createDiffCategoriesSection(diff, options2) {
 function createCategoriesTable(diff, options2) {
   const { changed, unchanged, added } = diff.categories;
   const { hasChanges, skipUnchanged } = options2;
-  const columns = [
-    { heading: "\u{1F3F7}\uFE0F Category", alignment: "left" },
-    {
-      heading: hasChanges ? "\u2B50 Previous score" : "\u2B50 Score",
-      alignment: "center"
-    },
-    { heading: "\u2B50 Current score", alignment: "center" },
-    { heading: "\u{1F504} Score change", alignment: "center" }
-  ];
   const rows = [
     ...sortChanges(changed).map((category) => [
       formatTitle(category),
@@ -2183,6 +2243,18 @@ function createCategoriesTable(diff, options2) {
       "\u2013"
     ])
   ];
+  if (rows.length === 0) {
+    return [[], []];
+  }
+  const columns = [
+    { heading: "\u{1F3F7}\uFE0F Category", alignment: "left" },
+    {
+      heading: hasChanges ? "\u2B50 Previous score" : "\u2B50 Score",
+      alignment: "center"
+    },
+    { heading: "\u2B50 Current score", alignment: "center" },
+    { heading: "\u{1F504} Score change", alignment: "center" }
+  ];
   return [
     hasChanges ? columns : columns.slice(0, 2),
     rows.map((row) => hasChanges ? row : row.slice(0, 2))
@@ -2273,11 +2345,11 @@ import { bold as bold4, cyan, cyanBright, green as green2, red } from "ansis";
 function log(msg = "") {
   ui().logger.log(msg);
 }
-function logStdoutSummary(report) {
+function logStdoutSummary(report, verbose = false) {
   const printCategories = report.categories.length > 0;
   log(reportToHeaderSection(report));
   log();
-  logPlugins(report);
+  logPlugins(report.plugins, verbose);
   if (printCategories) {
     logCategories(report);
   }
@@ -2288,36 +2360,49 @@ function reportToHeaderSection(report) {
   const { packageName, version: version3 } = report;
   return `${bold4(REPORT_HEADLINE_TEXT)} - ${packageName}@${version3}`;
 }
-function logPlugins(report) {
-  const { plugins } = report;
+function logPlugins(plugins, verbose) {
   plugins.forEach((plugin) => {
     const { title, audits } = plugin;
+    const filteredAudits = verbose ? audits : audits.filter(({ score }) => score !== 1);
+    const diff = audits.length - filteredAudits.length;
+    logAudits(title, filteredAudits);
+    if (diff > 0) {
+      const notice = filteredAudits.length === 0 ? `... All ${diff} audits have perfect scores ...` : `... ${diff} audits with perfect scores omitted for brevity ...`;
+      logRow(1, notice);
+    }
     log();
-    log(bold4.magentaBright(`${title} audits`));
-    log();
-    audits.forEach((audit) => {
-      ui().row([
-        {
-          text: applyScoreColor({ score: audit.score, text: "\u25CF" }),
-          width: 2,
-          padding: [0, 1, 0, 0]
-        },
-        {
-          text: audit.title,
-          // eslint-disable-next-line no-magic-numbers
-          padding: [0, 3, 0, 0]
-        },
-        {
-          text: cyanBright(audit.displayValue || `${audit.value}`),
-          // eslint-disable-next-line no-magic-numbers
-          width: 20,
-          padding: [0, 0, 0, 0]
-        }
-      ]);
-    });
-    log();
   });
 }
+function logAudits(pluginTitle, audits) {
+  log();
+  log(bold4.magentaBright(`${pluginTitle} audits`));
+  log();
+  audits.forEach(({ score, title, displayValue, value }) => {
+    logRow(score, title, displayValue || `${value}`);
+  });
+}
+function logRow(score, title, value) {
+  ui().row([
+    {
+      text: applyScoreColor({ score, text: "\u25CF" }),
+      width: 2,
+      padding: [0, 1, 0, 0]
+    },
+    {
+      text: title,
+      // eslint-disable-next-line no-magic-numbers
+      padding: [0, 3, 0, 0]
+    },
+    ...value ? [
+      {
+        text: cyanBright(value),
+        // eslint-disable-next-line no-magic-numbers
+        width: 20,
+        padding: [0, 0, 0, 0]
+      }
+    ] : []
+  ]);
+}
 function logCategories({ categories, plugins }) {
   const hAlign = (idx) => idx === 0 ? "left" : "right";
   const rows = categories.map(({ title, score, refs, isBinary }) => [
@@ -2463,7 +2548,7 @@ var verboseUtils = (verbose = false) => ({
 
 // packages/core/package.json
 var name = "@code-pushup/core";
-var version = "0.50.0";
+var version = "0.52.0";
 
 // packages/core/src/lib/implementation/execute-plugin.ts
 import { bold as bold5 } from "ansis";
@@ -2658,10 +2743,8 @@ var PersistError = class extends Error {
     super(`fileName: ${reportPath} could not be saved.`);
   }
 };
-async function persistReport(report, options2) {
+async function persistReport(report, sortedScoredReport, options2) {
   const { outputDir, filename, format } = options2;
-  const sortedScoredReport = sortReport(scoreReport(report));
-  logStdoutSummary(sortedScoredReport);
   const results = format.map((reportType) => {
     switch (reportType) {
       case "json":
@@ -2672,7 +2755,7 @@ async function persistReport(report, options2) {
       case "md":
         return {
           format: "md",
-          content: generateMdReport(sortedScoredReport)
+          content: generateMdReport(sortedScoredReport, { outputDir })
         };
     }
   });
@@ -2707,7 +2790,13 @@ function logPersistedResults(persistResults) {
 async function collectAndPersistReports(options2) {
   const { exec } = verboseUtils(options2.verbose);
   const report = await collect(options2);
-  const persistResults = await persistReport(report, options2.persist);
+  const sortedScoredReport = sortReport(scoreReport(report));
+  const persistResults = await persistReport(
+    report,
+    sortedScoredReport,
+    options2.persist
+  );
+  logStdoutSummary(sortedScoredReport, options2.verbose);
   exec(() => {
     logPersistedResults(persistResults);
   });
@@ -2719,10 +2808,6 @@ async function collectAndPersistReports(options2) {
 // packages/core/src/lib/compare.ts
 import { writeFile as writeFile2 } from "node:fs/promises";
 import { join as join5 } from "node:path";
-import {
-  PortalOperationError,
-  getPortalComparisonLink
-} from "@code-pushup/portal-client";
 
 // packages/core/src/lib/implementation/compare-scorables.ts
 function compareCategories(reports) {
@@ -2858,6 +2943,18 @@ function selectMeta(meta) {
   };
 }
 
+// packages/core/src/lib/load-portal-client.ts
+async function loadPortalClient() {
+  try {
+    return await import("@code-pushup/portal-client");
+  } catch {
+    ui().logger.error(
+      "Optional peer dependency @code-pushup/portal-client is not available. Make sure it is installed to enable upload functionality."
+    );
+    return null;
+  }
+}
+
 // packages/core/src/lib/compare.ts
 async function compareReportFiles(inputPaths, persistConfig, uploadConfig, label) {
   const { outputDir, filename, format } = persistConfig;
@@ -2922,6 +3019,11 @@ function reportsDiffToFileContent(reportsDiff, format) {
 }
 async function fetchPortalComparisonLink(uploadConfig, commits) {
   const { server, apiKey, organization, project } = uploadConfig;
+  const portalClient = await loadPortalClient();
+  if (!portalClient) {
+    return;
+  }
+  const { PortalOperationError, getPortalComparisonLink } = portalClient;
   try {
     return await getPortalComparisonLink({
       server,
@@ -2944,11 +3046,6 @@ async function fetchPortalComparisonLink(uploadConfig, commits) {
   }
 }
 
-// packages/core/src/lib/upload.ts
-import {
-  uploadToPortal
-} from "@code-pushup/portal-client";
-
 // packages/core/src/lib/implementation/report-to-gql.ts
 import {
   CategoryConfigRefType as PortalCategoryRefType,
@@ -3095,10 +3192,15 @@ function tableAlignmentToGQL(alignment) {
 }
 
 // packages/core/src/lib/upload.ts
-async function upload(options2, uploadFn = uploadToPortal) {
+async function upload(options2) {
   if (options2.upload == null) {
     throw new Error("Upload configuration is not set.");
   }
+  const portalClient = await loadPortalClient();
+  if (!portalClient) {
+    return;
+  }
+  const { uploadToPortal } = portalClient;
   const { apiKey, server, organization, project, timeout } = options2.upload;
   const report = await loadReport({
     ...options2.persist,
@@ -3113,7 +3215,7 @@ async function upload(options2, uploadFn = uploadToPortal) {
     commit: report.commit.hash,
     ...reportToGQL(report)
   };
-  return uploadFn({ apiKey, server, data, timeout });
+  return uploadToPortal({ apiKey, server, data, timeout });
 }
 
 // packages/core/src/lib/history.ts
@@ -3296,8 +3398,10 @@ function yargsAutorunCommandObject() {
         renderConfigureCategoriesHint();
       }
       if (options2.upload) {
-        const { url } = await upload(options2);
-        uploadSuccessfulLog(url);
+        const report = await upload(options2);
+        if (report?.url) {
+          uploadSuccessfulLog(report.url);
+        }
       } else {
         ui().logger.warning("Upload skipped because configuration is not set.");
         renderIntegratePortalHint();
@@ -3398,6 +3502,94 @@ function yargsCompareCommandObject() {
 // packages/cli/src/lib/history/history-command.ts
 import { bold as bold10, gray as gray7 } from "ansis";
 
+// packages/cli/src/lib/implementation/global.utils.ts
+import yargs from "yargs";
+
+// packages/cli/src/lib/implementation/validate-filter-options.utils.ts
+var OptionValidationError = class extends Error {
+};
+function validateFilterOption(option, { plugins, categories }, { itemsToFilter, verbose }) {
+  const itemsToFilterSet = new Set(itemsToFilter);
+  const validItems = isCategoryOption(option) ? categories : isPluginOption(option) ? plugins : [];
+  const invalidItems = itemsToFilter.filter(
+    (item) => !validItems.some(({ slug }) => slug === item)
+  );
+  const message = createValidationMessage(option, invalidItems, validItems);
+  if (isOnlyOption(option) && itemsToFilterSet.size > 0 && itemsToFilterSet.size === invalidItems.length) {
+    throw new OptionValidationError(message);
+  }
+  if (invalidItems.length > 0) {
+    ui().logger.warning(message);
+  }
+  if (isPluginOption(option) && categories.length > 0 && verbose) {
+    const removedCategorySlugs = filterItemRefsBy(
+      categories,
+      ({ plugin }) => isOnlyOption(option) ? !itemsToFilterSet.has(plugin) : itemsToFilterSet.has(plugin)
+    ).map(({ slug }) => slug);
+    if (removedCategorySlugs.length > 0) {
+      ui().logger.info(
+        `The --${option} argument removed the following categories: ${removedCategorySlugs.join(
+          ", "
+        )}.`
+      );
+    }
+  }
+}
+function validateFinalState(filteredItems, originalItems) {
+  const { categories: filteredCategories, plugins: filteredPlugins } = filteredItems;
+  const { categories: originalCategories, plugins: originalPlugins } = originalItems;
+  if (filteredCategories.length === 0 && filteredPlugins.length === 0 && (originalPlugins.length > 0 || originalCategories.length > 0)) {
+    const availablePlugins = originalPlugins.map((p) => p.slug).join(", ") || "none";
+    const availableCategories = originalCategories.map((c) => c.slug).join(", ") || "none";
+    throw new OptionValidationError(
+      `Nothing to report. No plugins or categories are available after filtering. Available plugins: ${availablePlugins}. Available categories: ${availableCategories}.`
+    );
+  }
+}
+function isCategoryOption(option) {
+  return option.endsWith("Categories");
+}
+function isPluginOption(option) {
+  return option.endsWith("Plugins");
+}
+function isOnlyOption(option) {
+  return option.startsWith("only");
+}
+function getItemType(option, count) {
+  const itemType = isCategoryOption(option) ? "category" : isPluginOption(option) ? "plugin" : "item";
+  return pluralize(itemType, count);
+}
+function createValidationMessage(option, invalidItems, validItems) {
+  const invalidItem = getItemType(option, invalidItems.length);
+  const invalidItemText = invalidItems.length === 1 ? `a ${invalidItem} that does not exist:` : `${invalidItem} that do not exist:`;
+  const invalidSlugs = invalidItems.join(", ");
+  const validItem = getItemType(option, validItems.length);
+  const validItemText = validItems.length === 1 ? `The only valid ${validItem} is` : `Valid ${validItem} are`;
+  const validSlugs = validItems.map(({ slug }) => slug).join(", ");
+  return `The --${option} argument references ${invalidItemText} ${invalidSlugs}. ${validItemText} ${validSlugs}.`;
+}
+function handleConflictingOptions(type, onlyItems, skipItems) {
+  const conflictingItems = onlyItems.filter((item) => skipItems.includes(item));
+  if (conflictingItems.length > 0) {
+    const conflictSubject = () => {
+      switch (type) {
+        case "categories":
+          return conflictingItems.length > 1 ? "categories are" : "category is";
+        case "plugins":
+          return conflictingItems.length > 1 ? "plugins are" : "plugin is";
+      }
+    };
+    const conflictingSlugs = conflictingItems.join(", ");
+    throw new OptionValidationError(
+      `The following ${conflictSubject()} specified in both --only${capitalize(
+        type
+      )} and --skip${capitalize(
+        type
+      )}: ${conflictingSlugs}. Please choose one option.`
+    );
+  }
+}
+
 // packages/cli/src/lib/implementation/global.utils.ts
 function filterKebabCaseKeys(obj) {
   return Object.entries(obj).filter(([key]) => !key.includes("-")).reduce(
@@ -3413,9 +3605,15 @@ function logErrorBeforeThrow(fn) {
     try {
       return await fn(...args);
     } catch (error) {
-      console.error(error);
-      await new Promise((resolve) => process.stdout.write("", resolve));
-      throw error;
+      if (error instanceof OptionValidationError) {
+        ui().logger.error(error.message);
+        await new Promise((resolve) => process.stdout.write("", resolve));
+        yargs().exit(1, error);
+      } else {
+        console.error(error);
+        await new Promise((resolve) => process.stdout.write("", resolve));
+        throw error;
+      }
     }
   };
 }
@@ -3423,29 +3621,39 @@ function coerceArray(param) {
   return [...new Set(toArray(param).flatMap((f) => f.split(",")))];
 }
 
-// packages/cli/src/lib/implementation/only-plugins.options.ts
-var onlyPluginsOption = {
-  describe: "List of plugins to run. If not set all plugins are run.",
+// packages/cli/src/lib/implementation/filter.options.ts
+var skipCategoriesOption = {
+  describe: "List of categories to skip. If not set all categories are run.",
+  type: "array",
+  default: [],
+  coerce: coerceArray
+};
+var onlyCategoriesOption = {
+  describe: "List of categories to run. If not set all categories are run.",
   type: "array",
   default: [],
   coerce: coerceArray
 };
-function yargsOnlyPluginsOptionsDefinition() {
-  return {
-    onlyPlugins: onlyPluginsOption
-  };
-}
-
-// packages/cli/src/lib/implementation/skip-plugins.options.ts
 var skipPluginsOption = {
   describe: "List of plugins to skip. If not set all plugins are run.",
   type: "array",
   default: [],
-  coerce: coerceArray
+  coerce: coerceArray,
+  alias: "P"
 };
-function yargsSkipPluginsOptionsDefinition() {
+var onlyPluginsOption = {
+  describe: "List of plugins to run. If not set all plugins are run.",
+  type: "array",
+  default: [],
+  coerce: coerceArray,
+  alias: "p"
+};
+function yargsFilterOptionsDefinition() {
   return {
-    skipPlugins: skipPluginsOption
+    skipCategories: skipCategoriesOption,
+    onlyCategories: onlyCategoriesOption,
+    skipPlugins: skipPluginsOption,
+    onlyPlugins: onlyPluginsOption
   };
 }
 
@@ -3556,17 +3764,16 @@ function yargsHistoryCommandObject() {
   return {
     command,
     describe: "Collect reports for commit history",
-    builder: (yargs2) => {
-      yargs2.options({
+    builder: (yargs3) => {
+      yargs3.options({
         ...yargsHistoryOptionsDefinition(),
-        ...yargsOnlyPluginsOptionsDefinition(),
-        ...yargsSkipPluginsOptionsDefinition()
+        ...yargsFilterOptionsDefinition()
       });
-      yargs2.group(
+      yargs3.group(
         Object.keys(yargsHistoryOptionsDefinition()),
         "History Options:"
       );
-      return yargs2;
+      return yargs3;
     },
     handler
   };
@@ -3633,8 +3840,10 @@ function yargsUploadCommandObject() {
         renderIntegratePortalHint();
         throw new Error("Upload configuration not set");
       }
-      const { url } = await upload(options2);
-      uploadSuccessfulLog(url);
+      const report = await upload(options2);
+      if (report?.url) {
+        uploadSuccessfulLog(report.url);
+      }
     }
   };
 }
@@ -3691,102 +3900,98 @@ async function coreConfigMiddleware(processArgs) {
 }
 var normalizeFormats = (formats) => (formats ?? []).flatMap((format) => format.split(","));
 
-// packages/cli/src/lib/implementation/validate-plugin-filter-options.utils.ts
-import { yellow } from "ansis";
-function validatePluginFilterOption(filterOption, {
-  plugins,
-  categories
-}, {
-  pluginsToFilter = [],
-  verbose = false
-} = {}) {
-  const pluginsToFilterSet = new Set(pluginsToFilter);
-  const missingPlugins = pluginsToFilter.filter(
-    (plugin) => !plugins.some(({ slug }) => slug === plugin)
-  );
-  const isSkipOption = filterOption === "skipPlugins";
-  const filterFunction = (plugin) => isSkipOption ? pluginsToFilterSet.has(plugin) : !pluginsToFilterSet.has(plugin);
-  if (missingPlugins.length > 0 && verbose) {
-    ui().logger.info(
-      `${yellow(
-        "\u26A0"
-      )} The --${filterOption} argument references plugins with "${missingPlugins.join(
-        '", "'
-      )}" slugs, but no such plugins are present in the configuration. Expected one of the following plugin slugs: "${plugins.map(({ slug }) => slug).join('", "')}".`
-    );
-  }
-  if (categories.length > 0 && verbose) {
-    const removedCategorySlugs = filterItemRefsBy(
-      categories,
-      ({ plugin }) => filterFunction(plugin)
-    ).map(({ slug }) => slug);
-    ui().logger.info(
-      `The --${filterOption} argument removed categories with "${removedCategorySlugs.join(
-        '", "'
-      )}" slugs.
-    `
-    );
-  }
-}
-
-// packages/cli/src/lib/implementation/only-plugins.middleware.ts
-function onlyPluginsMiddleware(originalProcessArgs) {
-  const { categories = [], onlyPlugins: originalOnlyPlugins } = originalProcessArgs;
-  if (originalOnlyPlugins && originalOnlyPlugins.length > 0) {
-    const { verbose, plugins, onlyPlugins = [] } = originalProcessArgs;
-    validatePluginFilterOption(
-      "onlyPlugins",
-      { plugins, categories },
-      { pluginsToFilter: onlyPlugins, verbose }
-    );
-    const validOnlyPlugins = onlyPlugins.filter(
-      (oP) => plugins.find((p) => p.slug === oP)
-    );
-    const onlyPluginsSet = new Set(validOnlyPlugins);
-    return {
-      ...originalProcessArgs,
-      plugins: onlyPluginsSet.size > 0 ? plugins.filter(({ slug }) => onlyPluginsSet.has(slug)) : plugins,
-      categories: onlyPluginsSet.size > 0 ? filterItemRefsBy(
-        categories,
-        ({ plugin }) => onlyPluginsSet.has(plugin)
-      ) : categories
-    };
+// packages/cli/src/lib/implementation/filter.middleware.ts
+function filterMiddleware(originalProcessArgs) {
+  const {
+    plugins,
+    categories = [],
+    skipCategories = [],
+    onlyCategories = [],
+    skipPlugins = [],
+    onlyPlugins = [],
+    verbose = false
+  } = originalProcessArgs;
+  if (skipCategories.length === 0 && onlyCategories.length === 0 && skipPlugins.length === 0 && onlyPlugins.length === 0) {
+    return { ...originalProcessArgs, categories };
   }
+  handleConflictingOptions("categories", onlyCategories, skipCategories);
+  handleConflictingOptions("plugins", onlyPlugins, skipPlugins);
+  const filteredCategories = applyCategoryFilters(
+    { categories, plugins },
+    skipCategories,
+    onlyCategories,
+    verbose
+  );
+  const filteredPlugins = applyPluginFilters(
+    { categories: filteredCategories, plugins },
+    skipPlugins,
+    onlyPlugins,
+    verbose
+  );
+  const finalCategories = filterItemRefsBy(
+    filteredCategories,
+    (ref) => filteredPlugins.some((plugin) => plugin.slug === ref.plugin)
+  );
+  validateFinalState(
+    { categories: finalCategories, plugins: filteredPlugins },
+    { categories, plugins }
+  );
   return {
     ...originalProcessArgs,
-    // if undefined fill categories with empty array
-    categories
+    plugins: filteredPlugins,
+    categories: finalCategories
   };
 }
-
-// packages/cli/src/lib/implementation/skip-plugins.middleware.ts
-function skipPluginsMiddleware(originalProcessArgs) {
-  const { categories = [], skipPlugins: originalSkipPlugins } = originalProcessArgs;
-  if (originalSkipPlugins && originalSkipPlugins.length > 0) {
-    const { verbose, plugins, skipPlugins = [] } = originalProcessArgs;
-    validatePluginFilterOption(
-      "skipPlugins",
-      { plugins, categories },
-      { pluginsToFilter: skipPlugins, verbose }
-    );
-    const validSkipPlugins = skipPlugins.filter(
-      (sP) => plugins.find((p) => p.slug === sP)
-    );
-    const skipPluginsSet = new Set(validSkipPlugins);
-    return {
-      ...originalProcessArgs,
-      plugins: skipPluginsSet.size > 0 ? plugins.filter(({ slug }) => !skipPluginsSet.has(slug)) : plugins,
-      categories: skipPluginsSet.size > 0 ? filterItemRefsBy(
-        categories,
-        ({ plugin }) => !skipPluginsSet.has(plugin)
-      ) : categories
-    };
+function applyFilters(items, skipItems, onlyItems, key) {
+  return items.filter((item) => {
+    const itemKey = item[key];
+    return !skipItems.includes(itemKey) && (onlyItems.length === 0 || onlyItems.includes(itemKey));
+  });
+}
+function applyCategoryFilters({ categories, plugins }, skipCategories, onlyCategories, verbose) {
+  if (skipCategories.length === 0 && onlyCategories.length === 0) {
+    return categories;
   }
-  return {
-    ...originalProcessArgs,
-    // if undefined fill categories with empty array
-    categories
-  };
+  validateFilterOption(
+    "skipCategories",
+    { plugins, categories },
+    { itemsToFilter: skipCategories, verbose }
+  );
+  validateFilterOption(
+    "onlyCategories",
+    { plugins, categories },
+    { itemsToFilter: onlyCategories, verbose }
+  );
+  return applyFilters(categories, skipCategories, onlyCategories, "slug");
+}
+function applyPluginFilters({ categories, plugins }, skipPlugins, onlyPlugins, verbose) {
+  const filteredPlugins = filterPluginsFromCategories({
+    categories,
+    plugins
+  });
+  if (skipPlugins.length === 0 && onlyPlugins.length === 0) {
+    return filteredPlugins;
+  }
+  validateFilterOption(
+    "skipPlugins",
+    { plugins: filteredPlugins, categories },
+    { itemsToFilter: skipPlugins, verbose }
+  );
+  validateFilterOption(
+    "onlyPlugins",
+    { plugins: filteredPlugins, categories },
+    { itemsToFilter: onlyPlugins, verbose }
+  );
+  return applyFilters(filteredPlugins, skipPlugins, onlyPlugins, "slug");
+}
+function filterPluginsFromCategories({
+  categories,
+  plugins
+}) {
+  const validPluginSlugs = new Set(
+    categories.flatMap((category) => category.refs.map((ref) => ref.plugin))
+  );
+  return categories.length > 0 ? plugins.filter((plugin) => validPluginSlugs.has(plugin.slug)) : plugins;
 }
 
 // packages/cli/src/lib/middlewares.ts
@@ -3796,11 +4001,7 @@ var middlewares = [
     applyBeforeValidation: false
   },
   {
-    middlewareFunction: onlyPluginsMiddleware,
-    applyBeforeValidation: false
-  },
-  {
-    middlewareFunction: skipPluginsMiddleware,
+    middlewareFunction: filterMiddleware,
     applyBeforeValidation: false
   }
 ];
@@ -3877,14 +4078,12 @@ function yargsGlobalOptionsDefinition() {
 var options = {
   ...yargsGlobalOptionsDefinition(),
   ...yargsCoreConfigOptionsDefinition(),
-  ...yargsOnlyPluginsOptionsDefinition(),
-  ...yargsSkipPluginsOptionsDefinition()
+  ...yargsFilterOptionsDefinition()
 };
 var groups = {
   "Global Options:": [
     ...Object.keys(yargsGlobalOptionsDefinition()),
-    ...Object.keys(yargsOnlyPluginsOptionsDefinition()),
-    ...Object.keys(yargsSkipPluginsOptionsDefinition())
+    ...Object.keys(yargsFilterOptionsDefinition())
   ],
   "Persist Options:": Object.keys(yargsPersistConfigOptionsDefinition()),
   "Upload Options:": Object.keys(yargsUploadConfigOptionsDefinition())
@@ -3892,10 +4091,10 @@ var groups = {
 
 // packages/cli/src/lib/yargs-cli.ts
 import { blue, dim as dim2, green as green4 } from "ansis";
-import yargs from "yargs";
+import yargs2 from "yargs";
 
 // packages/cli/package.json
-var version2 = "0.50.0";
+var version2 = "0.52.0";
 
 // packages/cli/src/lib/implementation/formatting.ts
 import { bold as bold13, dim, green as green3 } from "ansis";
@@ -3947,7 +4146,7 @@ function yargsCli(argv, cfg) {
   const options2 = cfg.options ?? {};
   const groups2 = cfg.groups ?? {};
   const examples = cfg.examples ?? [];
-  const cli2 = yargs(argv);
+  const cli2 = yargs2(argv);
   cli2.updateLocale(yargsDecorator).wrap(Math.max(TERMINAL_WIDTH, cli2.terminalWidth())).help("help", descriptionStyle("Show help")).alias("h", "help").showHelpOnFail(false).version("version", dim2`Show version`, version2).check((args) => {
     const persist = args["persist"];
     return persist == null || validatePersistFormat(persist);