@jonathan0823/pi-sonarqube 0.3.1 → 0.3.2

package/src/commands.ts

@@ -231,10 +231,21 @@ export function formatMetricsOutput(metrics: {
   measures?: SonarDuplicationMeasures;
   issueCounts?: IssueSeverityCounts;
   issueQualityCounts?: IssueQualityCounts;
+  cleanCodeMode?: "STANDARD" | "MQR";
 }): string {
   const lines: string[] = [`Metrics for ${metrics.projectKey}`];
 
   if (metrics.measures) {
+    if (metrics.measures.coverage === undefined) {
+      lines.push("Coverage: n/a");
+    } else {
+      const pct = metrics.measures.coverage.toFixed(1);
+      const covered = (metrics.measures.linesToCover ?? 0) - (metrics.measures.uncoveredLines ?? 0);
+      const uncovered = metrics.measures.uncoveredLines ?? 0;
+      const total = metrics.measures.linesToCover ?? 0;
+      lines.push(`Coverage: ${pct}%  covered=${covered}  uncovered=${uncovered}  lines=${total}`);
+    }
+
     const density = metrics.measures.duplicatedLinesDensity.toFixed(1);
     lines.push(
       metrics.measures.duplicatedBlocks > 0
@@ -244,13 +255,21 @@ export function formatMetricsOutput(metrics: {
   }
 
   if (metrics.issueCounts) {
-    const counts = [
-      `BLOCKER ${metrics.issueCounts.blocker}`,
-      `CRITICAL ${metrics.issueCounts.critical}`,
-      `MAJOR ${metrics.issueCounts.major}`,
-      `MINOR ${metrics.issueCounts.minor}`,
-      `INFO ${metrics.issueCounts.info}`,
-    ];
+    const counts = metrics.cleanCodeMode === "MQR"
+      ? [
+          `BLOCKER ${metrics.issueCounts.blocker}`,
+          `HIGH ${metrics.issueCounts.critical}`,
+          `MEDIUM ${metrics.issueCounts.major}`,
+          `LOW ${metrics.issueCounts.minor}`,
+          `INFO ${metrics.issueCounts.info}`,
+        ]
+      : [
+          `BLOCKER ${metrics.issueCounts.blocker}`,
+          `CRITICAL ${metrics.issueCounts.critical}`,
+          `MAJOR ${metrics.issueCounts.major}`,
+          `MINOR ${metrics.issueCounts.minor}`,
+          `INFO ${metrics.issueCounts.info}`,
+        ];
     lines.push(`Issues:  ${counts.join("  ")}`);
   }
 

package/src/index.ts

@@ -51,7 +51,6 @@ import {
   formatSummary,
   formatMetricsOutput,
   formatDuplicationsList,
-  formatDuplicationBlockDetail,
   formatReport,
   helpText,
   targetLabel,
@@ -62,6 +61,7 @@ import {
   startAnalysisUi,
   showIssueBrowser,
   buildIssuePreview,
+  buildDuplicationPreview,
   openIssuePreview,
   resolveTargetState,
   showDuplicationBrowser,
@@ -533,9 +533,10 @@ async function commandMetrics(
   targetInput?: string,
 ): Promise<void> {
   const config = await resolveConfig(ctx, targetInput);
+  const cleanCodeMode = await fetchCleanCodeMode(config.serverUrl, config.token, ctx.signal);
   const [measures, issueCounts, qualityCounts] = await Promise.all([
     fetchDuplicationMeasures(config.serverUrl, config.token, config.projectKey, ctx.signal),
-    fetchIssueSeverityCounts(config.serverUrl, config.token, config.projectKey, ctx.signal),
+    fetchIssueSeverityCounts(config.serverUrl, config.token, config.projectKey, ctx.signal, cleanCodeMode),
     fetchIssueQualityCounts(config.serverUrl, config.token, config.projectKey, ctx.signal),
   ]);
   if (!measures && !issueCounts && !qualityCounts) {
@@ -544,7 +545,7 @@ async function commandMetrics(
     }
     return;
   }
-  const text = formatMetricsOutput({ projectKey: config.projectKey, measures, issueCounts, issueQualityCounts: qualityCounts });
+  const text = formatMetricsOutput({ projectKey: config.projectKey, measures, issueCounts, issueQualityCounts: qualityCounts, cleanCodeMode });
   if (ctx.hasUI) {
     ctx.ui.notify(text, "info");
   }
@@ -594,7 +595,7 @@ async function showDuplicationDrillDown(
     return;
   }
   const groups = await fetchFileDuplicationBlocks(config.serverUrl, config.token, file.fileKey, config.projectKey, ctx.signal);
-  const text = formatDuplicationBlockDetail(file.filePath, groups);
+  const text = await buildDuplicationPreview(config.baseDir, file.filePath, groups);
   if (ctx.mode === "tui") {
     await ctx.ui.editor(`Duplications in ${file.filePath}`, text);
   } else if (ctx.hasUI) {
@@ -615,7 +616,7 @@ async function showDuplicationListOrBrowser(
   if (choice == null) return;
   const file = files[choice];
   const groups = await fetchFileDuplicationBlocks(config.serverUrl, config.token, file.fileKey, config.projectKey, ctx.signal);
-  await ctx.ui.editor(`Duplications in ${file.filePath}`, formatDuplicationBlockDetail(file.filePath, groups));
+  await ctx.ui.editor(`Duplications in ${file.filePath}`, await buildDuplicationPreview(config.baseDir, file.filePath, groups));
 }
 
 async function commandIssuesOrOpen(
@@ -701,8 +702,47 @@ async function toolDuplications(ctx: any, path: string | undefined): Promise<{ c
       details: { error: `No duplications found for ${config.projectKey}.` },
     };
   }
-  const text = formatDuplicationsList(files);
-  return { content: [{ type: "text", text }], details: { projectKey: config.projectKey, files } };
+
+  const topFiles = files.slice(0, 5);
+  const topContexts = await Promise.all(
+    topFiles.map(async (file) => {
+      try {
+        const groups = await fetchFileDuplicationBlocks(config.serverUrl, config.token, file.fileKey, config.projectKey, ctx.signal);
+        const preview = await buildDuplicationPreview(config.baseDir, file.filePath, groups);
+        return {
+          filePath: file.filePath,
+          duplicatedBlocks: file.duplicatedBlocks,
+          duplicatedLines: file.duplicatedLines,
+          preview,
+        };
+      } catch (error) {
+        return {
+          filePath: file.filePath,
+          duplicatedBlocks: file.duplicatedBlocks,
+          duplicatedLines: file.duplicatedLines,
+          preview: `Duplications in ${file.filePath}\n\n<failed to load duplicated lines: ${sonarErrorMessage(error)}>`,
+        };
+      }
+    }),
+  );
+  const remaining = files.length - topContexts.length;
+  const content: Array<{ type: "text"; text: string }> = [
+    { type: "text", text: `Duplicated files for ${config.projectKey}: ${files.length}. Showing top ${topContexts.length}.` },
+    ...topContexts.map((item, index) => ({
+      type: "text" as const,
+      text: `#${index + 1} ${item.filePath}  blocks=${item.duplicatedBlocks}  lines=${item.duplicatedLines}\n${item.preview}`,
+    })),
+    ...(remaining > 0 ? [{ type: "text" as const, text: `+ ${remaining} more file(s) not shown` }] : []),
+  ];
+  return {
+    content,
+    details: {
+      projectKey: config.projectKey,
+      totalFiles: files.length,
+      topFiles: topContexts,
+      moreFiles: remaining,
+    },
+  };
 }
 
 async function toolMetrics(ctx: any, path: string | undefined): Promise<{ content: Array<{ type: "text"; text: string }>; details: Record<string, unknown> }> {
@@ -715,9 +755,10 @@ async function toolMetrics(ctx: any, path: string | undefined): Promise<{ conten
       details: { error: "Project not configured." },
     };
   }
+  const cleanCodeMode = await fetchCleanCodeMode(config.serverUrl, config.token, ctx.signal);
   const [measures, issueCounts, qualityCounts] = await Promise.all([
     fetchDuplicationMeasures(config.serverUrl, config.token, config.projectKey, ctx.signal),
-    fetchIssueSeverityCounts(config.serverUrl, config.token, config.projectKey, ctx.signal),
+    fetchIssueSeverityCounts(config.serverUrl, config.token, config.projectKey, ctx.signal, cleanCodeMode),
     fetchIssueQualityCounts(config.serverUrl, config.token, config.projectKey, ctx.signal),
   ]);
   if (!measures && !issueCounts && !qualityCounts) {
@@ -726,8 +767,8 @@ async function toolMetrics(ctx: any, path: string | undefined): Promise<{ conten
       details: { error: `Project "${config.projectKey}" has not been analyzed yet. Run /sonarqube analyze first.` },
     };
   }
-  const text = formatMetricsOutput({ projectKey: config.projectKey, measures, issueCounts, issueQualityCounts: qualityCounts });
-  return { content: [{ type: "text", text }], details: { projectKey: config.projectKey, measures, issueCounts, issueQualityCounts: qualityCounts } };
+  const text = formatMetricsOutput({ projectKey: config.projectKey, measures, issueCounts, issueQualityCounts: qualityCounts, cleanCodeMode });
+  return { content: [{ type: "text", text }], details: { projectKey: config.projectKey, measures, issueCounts, issueQualityCounts: qualityCounts, cleanCodeMode } };
 }
 
 // ── Re-exports for public API ───────────────────────────────────────────────

package/src/types.ts

@@ -18,6 +18,9 @@ export interface SonarDuplicationMeasures {
   duplicatedLines: number;
   duplicatedBlocks: number;
   duplicatedFiles: number;
+  coverage?: number;
+  linesToCover?: number;
+  uncoveredLines?: number;
 }
 
 export interface IssueSeverityCounts {

package/src/ui.ts

@@ -2,7 +2,7 @@ import type { Theme, ExtensionContext, ExtensionCommandContext } from "@earendil
 import { Key, matchesKey, truncateToWidth } from "@earendil-works/pi-tui";
 import { readFile } from "node:fs/promises";
 import { resolve } from "node:path";
-import type { SonarIssue, SonarAnalysisState, SonarIssueFetchOptions, FileDuplication } from "./types.js";
+import type { SonarIssue, SonarAnalysisState, SonarIssueFetchOptions, FileDuplication, DuplicationBlockGroup } from "./types.js";
 import { issueFilterLabel, fetchIssues, createAnalysisState, normalizeIssueFilters, fetchCleanCodeMode } from "./api.js";
 import { resolveConfig, resolveTarget } from "./config.js";
 
@@ -26,6 +26,54 @@ export async function buildIssuePreview(baseDir: string, issue: SonarIssue, radi
   return rendered.join("\n");
 }
 
+export async function buildDuplicationPreview(
+  baseDir: string,
+  filePath: string,
+  groups: DuplicationBlockGroup[],
+): Promise<string> {
+  const cache = new Map<string, string>();
+  const loadLines = async (relativePath: string): Promise<string[]> => {
+    const absolutePath = resolve(baseDir, relativePath);
+    const cached = cache.get(absolutePath);
+    if (cached !== undefined) return cached.split(/\r?\n/);
+    const content = await readFile(absolutePath, "utf8");
+    cache.set(absolutePath, content);
+    return content.split(/\r?\n/);
+  };
+  const renderRange = (lines: string[], from: number, size: number): string[] => {
+    const start = Math.max(1, from);
+    const end = Math.min(lines.length, from + size - 1);
+    const width = String(end).length;
+    const rendered: string[] = [];
+    for (let line = start; line <= end; line++) {
+      const num = String(line).padStart(width, " ");
+      rendered.push(`${num} | ${lines[line - 1] ?? ""}`);
+    }
+    return rendered;
+  };
+
+  const rendered: string[] = [`Duplications in ${filePath}`];
+  for (const [groupIndex, group] of groups.entries()) {
+    rendered.push("", `Block ${groupIndex + 1}:`);
+    for (const block of group.blocks) {
+      try {
+        const lines = await loadLines(block.filePath);
+        const end = block.from + block.size - 1;
+        rendered.push(`  ${block.filePath}:${block.from}-${end}`);
+        for (const line of renderRange(lines, block.from, block.size)) {
+          rendered.push(`  ${line}`);
+        }
+      } catch {
+        rendered.push(
+          `  ${block.filePath}:${block.from}-${block.from + block.size - 1}`,
+          "  <unable to read duplicated lines>",
+        );
+      }
+    }
+  }
+  return rendered.join("\n");
+}
+
 // ── Analysis UI ─────────────────────────────────────────────────────────────
 
 const ANALYSIS_SPINNER = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"] as const;
@@ -81,95 +129,35 @@ export class IssueBrowser {
   invalidate(): void {} // NOSONAR - required by TUI interface
 
   handleInput(data: string): void {
-    if (matchesKey(data, Key.escape) || matchesKey(data, "ctrl+c")) {
-      this.done(null);
-      return;
-    }
-    if (matchesKey(data, Key.up)) {
-      this.selected = Math.max(0, this.selected - 1);
-      return;
-    }
-    if (matchesKey(data, Key.down)) {
-      this.selected = Math.min(this.state.issues.length - 1, this.selected + 1);
-      return;
-    }
-    if (matchesKey(data, Key.enter)) {
-      this.done(this.selected);
-    }
+    this.selected = handleListBrowserInput(data, this.selected, this.state.issues.length, this.done);
   }
 
   render(width: number): string[] {
-    const lines: string[] = [];
-    const title = this.theme.fg("accent", this.theme.bold(" SonarQube Issues "));
     const filterSuffix = this.state.filters ? ` • ${issueFilterLabel(this.state.filters)}` : "";
-    const subtitle = this.theme.fg(
-      "dim",
-      `${this.state.projectKey} • ${this.state.totalIssues} issue(s)${filterSuffix}`,
-    );
-    lines.push(
-      truncateToWidth(title, width),
-      truncateToWidth(subtitle, width),
-      "",
-    );
-
-    const pageSize = Math.min(20, this.state.issues.length);
-    const halfWindow = Math.floor(pageSize / 2);
-    const maxStart = Math.max(0, this.state.issues.length - pageSize);
-    const start = Math.max(0, Math.min(this.selected - halfWindow, maxStart));
-    const end = Math.min(this.state.issues.length, start + pageSize);
-    const visibleIssues = this.state.issues.slice(start, end);
-
-    if (visibleIssues.length === 0) {
-      lines.push(
-        truncateToWidth(this.theme.fg("success", "No open issues found."), width),
-        "",
-        truncateToWidth(
-          this.theme.fg("dim", "Up/Down to move, Enter to preview, Esc to close"),
-          width,
-        ),
-      );
-      return lines;
-    }
-
-    if (start > 0) {
-      lines.push(truncateToWidth(this.theme.fg("dim", `... ${start} more above`), width));
-    }
-    for (const [offset, issue] of visibleIssues.entries()) {
-      const issueIndex = start + offset;
-      const isSelected = issueIndex === this.selected;
-      const marker = isSelected ? this.theme.fg("accent", ">") : this.theme.fg("dim", " ");
-      const location = issue.line ? `${issue.filePath}:${issue.line}` : issue.filePath;
-      const rule = issue.ruleName ? `${issue.rule} (${issue.ruleName})` : issue.rule;
-      const severity = severityColor(this.theme, issue.severity);
-      const summary = [
-        marker,
-        String(issueIndex + 1).padStart(2, " "),
-        ".",
-        severity,
-        this.theme.fg("accent", location),
-        this.theme.fg("muted", rule),
-        this.theme.fg("text", `— ${issue.message}`),
-      ].join(" ");
-      lines.push(truncateToWidth(summary, width));
-    }
-    if (end < this.state.issues.length) {
-      lines.push(
-        truncateToWidth(
-          this.theme.fg("dim", `... ${this.state.issues.length - end} more below`),
-          width,
-        ),
-      );
-    }
-
-    lines.push(
-      "",
-      truncateToWidth(
-        this.theme.fg("dim", "Up/Down to move, Enter to preview, Esc to close"),
-        width,
-      ),
-    );
-
-    return lines;
+    return renderListBrowser(this.theme, width, {
+      title: "SonarQube Issues",
+      subtitle: `${this.state.projectKey} • ${this.state.totalIssues} issue(s)${filterSuffix}`,
+      items: this.state.issues,
+      selected: this.selected,
+      pageSize: 20,
+      emptyMessage: "No open issues found.",
+      footer: "Up/Down to move, Enter to preview, Esc to close",
+      renderItem: (issue, issueIndex, isSelected) => {
+        const marker = isSelected ? this.theme.fg("accent", ">") : this.theme.fg("dim", " ");
+        const location = issue.line ? `${issue.filePath}:${issue.line}` : issue.filePath;
+        const rule = issue.ruleName ? `${issue.rule} (${issue.ruleName})` : issue.rule;
+        const severity = severityColor(this.theme, issue.severity);
+        return [
+          marker,
+          String(issueIndex + 1).padStart(2, " "),
+          ".",
+          severity,
+          this.theme.fg("accent", location),
+          this.theme.fg("muted", rule),
+          this.theme.fg("text", `— ${issue.message}`),
+        ].join(" ");
+      },
+    });
   }
 }
 
@@ -189,6 +177,86 @@ function severityColor(theme: Theme, severity: string): string {
   }
 }
 
+function handleListBrowserInput(
+  data: string,
+  selected: number,
+  count: number,
+  done: (result: number | null) => void,
+): number {
+  if (matchesKey(data, Key.escape) || matchesKey(data, "ctrl+c")) {
+    done(null);
+    return selected;
+  }
+  if (matchesKey(data, Key.up)) {
+    return Math.max(0, selected - 1);
+  }
+  if (matchesKey(data, Key.down)) {
+    return Math.min(Math.max(0, count - 1), selected + 1);
+  }
+  if (matchesKey(data, Key.enter)) {
+    done(selected);
+  }
+  return selected;
+}
+
+function getBrowserWindow(selected: number, total: number, pageSize: number): { start: number; end: number } {
+  const halfWindow = Math.floor(pageSize / 2);
+  const maxStart = Math.max(0, total - pageSize);
+  const start = Math.max(0, Math.min(selected - halfWindow, maxStart));
+  const end = Math.min(total, start + pageSize);
+  return { start, end };
+}
+
+interface ListBrowserRenderConfig<T> {
+  title: string;
+  subtitle: string;
+  items: readonly T[];
+  selected: number;
+  pageSize: number;
+  emptyMessage: string;
+  footer: string;
+  renderItem: (item: T, index: number, isSelected: boolean) => string;
+}
+
+function renderListBrowser<T>(
+  theme: Theme,
+  width: number,
+  config: ListBrowserRenderConfig<T>,
+): string[] {
+  const lines: string[] = [
+    truncateToWidth(theme.fg("accent", theme.bold(` ${config.title} `)), width),
+    truncateToWidth(theme.fg("dim", config.subtitle), width),
+    "",
+  ];
+
+  const pageSize = Math.min(config.pageSize, config.items.length);
+  const { start, end } = getBrowserWindow(config.selected, config.items.length, pageSize);
+  const visible = config.items.slice(start, end);
+
+  if (visible.length === 0) {
+    lines.push(
+      truncateToWidth(theme.fg("success", config.emptyMessage), width),
+      "",
+      truncateToWidth(theme.fg("dim", config.footer), width),
+    );
+    return lines;
+  }
+
+  if (start > 0) {
+    lines.push(truncateToWidth(theme.fg("dim", `... ${start} more above`), width));
+  }
+  for (const [offset, item] of visible.entries()) {
+    const index = start + offset;
+    lines.push(truncateToWidth(config.renderItem(item, index, index === config.selected), width));
+  }
+  if (end < config.items.length) {
+    lines.push(truncateToWidth(theme.fg("dim", `... ${config.items.length - end} more below`), width));
+  }
+
+  lines.push("", truncateToWidth(theme.fg("dim", config.footer), width));
+  return lines;
+}
+
 // ── Duplication browser (used by index.ts) ─────────────────────────────────
 
 export class DuplicationBrowser {
@@ -203,51 +271,24 @@ export class DuplicationBrowser {
   invalidate(): void {} // NOSONAR - required by TUI interface
 
   handleInput(data: string): void {
-    if (matchesKey(data, Key.escape) || matchesKey(data, "ctrl+c")) {
-      this.done(null);
-      return;
-    }
-    if (matchesKey(data, Key.up)) {
-      this.selected = Math.max(0, this.selected - 1);
-      return;
-    }
-    if (matchesKey(data, Key.down)) {
-      this.selected = Math.min(this.files.length - 1, this.selected + 1);
-      return;
-    }
-    if (matchesKey(data, Key.enter)) {
-      this.done(this.selected);
-    }
+    this.selected = handleListBrowserInput(data, this.selected, this.files.length, this.done);
   }
 
   render(width: number): string[] {
-    const lines: string[] = [
-      this.theme.fg("accent", this.theme.bold(" SonarQube Duplications ")),
-      this.theme.fg("dim", `${this.files.length} file(s) with duplicate code`),
-      "",
-    ];
-
-    const pageSize = Math.min(15, this.files.length);
-    const halfWindow = Math.floor(pageSize / 2);
-    const maxStart = Math.max(0, this.files.length - pageSize);
-    const start = Math.max(0, Math.min(this.selected - halfWindow, maxStart));
-    const end = Math.min(this.files.length, start + pageSize);
-    const visible = this.files.slice(start, end);
-
-    for (const [offset, file] of visible.entries()) {
-      const index = start + offset;
-      const isSelected = index === this.selected;
-      const marker = isSelected ? this.theme.fg("accent", ">") : this.theme.fg("dim", " ");
-      const detail = `blocks=${file.duplicatedBlocks}  lines=${file.duplicatedLines}`;
-      const line = `${marker} ${String(index + 1).padStart(2, " ")}. ${this.theme.fg("accent", file.filePath)}  ${this.theme.fg("dim", detail)}`;
-      lines.push(truncateToWidth(line, width));
-    }
-
-    lines.push(
-      "",
-      this.theme.fg("dim", "Up/Down to move, Enter for details, Esc to close"),
-    );
-    return lines;
+    return renderListBrowser(this.theme, width, {
+      title: "SonarQube Duplications",
+      subtitle: `${this.files.length} file(s) with duplicate code`,
+      items: this.files,
+      selected: this.selected,
+      pageSize: 15,
+      emptyMessage: "No duplicate code found.",
+      footer: "Up/Down to move, Enter for details, Esc to close",
+      renderItem: (file, index, isSelected) => {
+        const marker = isSelected ? this.theme.fg("accent", ">") : this.theme.fg("dim", " ");
+        const detail = `blocks=${file.duplicatedBlocks}  lines=${file.duplicatedLines}`;
+        return `${marker} ${String(index + 1).padStart(2, " ")}. ${this.theme.fg("accent", file.filePath)}  ${this.theme.fg("dim", detail)}`;
+      },
+    });
   }
 }