@aspruyt/xfg 3.9.0 → 3.9.1

package/dist/cli/sync-command.js

@@ -9,8 +9,9 @@ import { logger } from "../shared/logger.js";
 import { generateWorkspaceName } from "../shared/workspace-utils.js";
 import { defaultProcessorFactory } from "./types.js";
 import { buildSyncReport } from "./sync-report-builder.js";
-import { formatSyncReportCLI, writeSyncReportSummary, } from "../output/sync-report.js";
-import { buildLifecycleReport, formatLifecycleReportCLI, writeLifecycleReportSummary, hasLifecycleChanges, } from "../output/lifecycle-report.js";
+import { formatSyncReportCLI } from "../output/sync-report.js";
+import { buildLifecycleReport, formatLifecycleReportCLI, hasLifecycleChanges, } from "../output/lifecycle-report.js";
+import { writeUnifiedSummary } from "../output/unified-summary.js";
 import { RepoLifecycleManager, runLifecycleCheck, toCreateRepoSettings, } from "../lifecycle/index.js";
 /**
  * Get unique file names from all repos in the config
@@ -238,14 +239,14 @@ export async function runSync(options, processorFactory = defaultProcessorFactor
             console.log(line);
         }
     }
-    writeLifecycleReportSummary(lifecycleReport, options.dryRun ?? false);
     // Build and display sync report
     const report = buildSyncReport(reportResults);
     console.log("");
     for (const line of formatSyncReportCLI(report)) {
         console.log(line);
     }
-    writeSyncReportSummary(report, options.dryRun ?? false);
+    // Write unified summary to GITHUB_STEP_SUMMARY
+    writeUnifiedSummary(lifecycleReport, report, options.dryRun ?? false);
     // Exit with error if any failures
     const hasErrors = reportResults.some((r) => r.error);
     if (hasErrors) {

package/dist/output/lifecycle-report.js

@@ -1,12 +1,6 @@
 // src/output/lifecycle-report.ts
 import { appendFileSync } from "node:fs";
 import chalk from "chalk";
-function escapeHtml(text) {
-    return text
-        .replace(/&/g, "&")
-        .replace(/</g, "&lt;")
-        .replace(/>/g, "&gt;");
-}
 // =============================================================================
 // Builder
 // =============================================================================
@@ -103,35 +97,35 @@ export function formatLifecycleReportMarkdown(report, dryRun) {
         lines.push("> This was a dry run — no changes were applied");
         lines.push("");
     }
-    // Colored diff output using HTML <pre> with inline styles
+    // Diff block
     const diffLines = [];
     for (const action of report.actions) {
         if (action.action === "existed")
             continue;
         switch (action.action) {
             case "created":
-                diffLines.push(`<span style="color:#3fb950">+ CREATE ${escapeHtml(action.repoName)}</span>`);
+                diffLines.push(`+ CREATE ${action.repoName}`);
                 break;
             case "forked":
-                diffLines.push(`<span style="color:#3fb950">+ FORK ${escapeHtml(action.upstream ?? "upstream")} -&gt; ${escapeHtml(action.repoName)}</span>`);
+                diffLines.push(`+ FORK ${action.upstream ?? "upstream"} -> ${action.repoName}`);
                 break;
             case "migrated":
-                diffLines.push(`<span style="color:#3fb950">+ MIGRATE ${escapeHtml(action.source ?? "source")} -&gt; ${escapeHtml(action.repoName)}</span>`);
+                diffLines.push(`+ MIGRATE ${action.source ?? "source"} -> ${action.repoName}`);
                 break;
         }
         if (action.settings) {
             if (action.settings.visibility) {
-                diffLines.push(`<span style="color:#3fb950">    visibility: ${escapeHtml(action.settings.visibility)}</span>`);
+                diffLines.push(`    visibility: ${action.settings.visibility}`);
             }
             if (action.settings.description) {
-                diffLines.push(`<span style="color:#3fb950">    description: "${escapeHtml(action.settings.description)}"</span>`);
+                diffLines.push(`    description: "${action.settings.description}"`);
             }
         }
     }
     if (diffLines.length > 0) {
-        lines.push("<pre>");
+        lines.push("```diff");
         lines.push(...diffLines);
-        lines.push("</pre>");
+        lines.push("```");
         lines.push("");
     }
     // Summary

package/dist/output/settings-report.js

@@ -1,12 +1,6 @@
 import { appendFileSync } from "node:fs";
 import chalk from "chalk";
 import { formatPropertyTree, } from "../settings/rulesets/formatter.js";
-function escapeHtml(text) {
-    return text
-        .replace(/&/g, "&")
-        .replace(/</g, "&lt;")
-        .replace(/>/g, "&gt;");
-}
 // =============================================================================
 // Helpers
 // =============================================================================
@@ -239,57 +233,55 @@ export function formatSettingsReportMarkdown(report, dryRun) {
             !repo.error) {
             continue;
         }
-        diffLines.push(`<span style="color:#d29922">~ ${escapeHtml(repo.repoName)}</span>`);
+        diffLines.push(`@@ ${repo.repoName} @@`);
         for (const setting of repo.settings) {
             // Skip settings where both values are undefined
             if (setting.oldValue === undefined && setting.newValue === undefined) {
                 continue;
             }
             if (setting.action === "add") {
-                diffLines.push(`<span style="color:#3fb950">    + ${escapeHtml(setting.name)}: ${escapeHtml(formatValuePlain(setting.newValue))}</span>`);
+                diffLines.push(`+ ${setting.name}: ${formatValuePlain(setting.newValue)}`);
             }
             else {
-                diffLines.push(`<span style="color:#d29922">    ~ ${escapeHtml(setting.name)}: ${escapeHtml(formatValuePlain(setting.oldValue))} → ${escapeHtml(formatValuePlain(setting.newValue))}</span>`);
+                diffLines.push(`! ${setting.name}: ${formatValuePlain(setting.oldValue)} → ${formatValuePlain(setting.newValue)}`);
             }
         }
         for (const ruleset of repo.rulesets) {
             if (ruleset.action === "create") {
-                diffLines.push(`<span style="color:#3fb950">    + ruleset "${escapeHtml(ruleset.name)}"</span>`);
+                diffLines.push(`+ ruleset "${ruleset.name}"`);
                 if (ruleset.config) {
-                    for (const line of formatRulesetConfigPlain(ruleset.config)) {
-                        diffLines.push(`<span style="color:#3fb950">${escapeHtml(line)}</span>`);
-                    }
+                    diffLines.push(...formatRulesetConfigPlain(ruleset.config));
                 }
             }
             else if (ruleset.action === "update") {
-                diffLines.push(`<span style="color:#d29922">    ~ ruleset "${escapeHtml(ruleset.name)}"</span>`);
+                diffLines.push(`! ruleset "${ruleset.name}"`);
                 if (ruleset.propertyDiffs && ruleset.propertyDiffs.length > 0) {
                     for (const diff of ruleset.propertyDiffs) {
                         const path = diff.path.join(".");
                         if (diff.action === "add") {
-                            diffLines.push(`<span style="color:#3fb950">        + ${escapeHtml(path)}: ${escapeHtml(formatValuePlain(diff.newValue))}</span>`);
+                            diffLines.push(`+   ${path}: ${formatValuePlain(diff.newValue)}`);
                         }
                         else if (diff.action === "change") {
-                            diffLines.push(`<span style="color:#d29922">        ~ ${escapeHtml(path)}: ${escapeHtml(formatValuePlain(diff.oldValue))} → ${escapeHtml(formatValuePlain(diff.newValue))}</span>`);
+                            diffLines.push(`!   ${path}: ${formatValuePlain(diff.oldValue)} → ${formatValuePlain(diff.newValue)}`);
                         }
                         else if (diff.action === "remove") {
-                            diffLines.push(`<span style="color:#f85149">        - ${escapeHtml(path)}</span>`);
+                            diffLines.push(`-   ${path}`);
                         }
                     }
                 }
             }
             else if (ruleset.action === "delete") {
-                diffLines.push(`<span style="color:#f85149">    - ruleset "${escapeHtml(ruleset.name)}"</span>`);
+                diffLines.push(`- ruleset "${ruleset.name}"`);
             }
         }
         if (repo.error) {
-            diffLines.push(`<span style="color:#f85149">    ! Error: ${escapeHtml(repo.error)}</span>`);
+            diffLines.push(`- Error: ${repo.error}`);
         }
     }
     if (diffLines.length > 0) {
-        lines.push("<pre>");
+        lines.push("```diff");
         lines.push(...diffLines);
-        lines.push("</pre>");
+        lines.push("```");
         lines.push("");
     }
     // Summary

package/dist/output/sync-report.js

@@ -1,12 +1,6 @@
 // src/output/sync-report.ts
 import { appendFileSync } from "node:fs";
 import chalk from "chalk";
-function escapeHtml(text) {
-    return text
-        .replace(/&/g, "&")
-        .replace(/</g, "&lt;")
-        .replace(/>/g, "&gt;");
-}
 function formatSummary(totals) {
     const total = totals.files.create + totals.files.update + totals.files.delete;
     if (total === 0) {
@@ -64,33 +58,32 @@ export function formatSyncReportMarkdown(report, dryRun) {
         lines.push("> This was a dry run — no changes were applied");
         lines.push("");
     }
-    // Colored diff output using HTML <pre> with inline styles
-    // Colors: green (#3fb950) for creates, yellow (#d29922) for changes, red (#f85149) for deletes
+    // Diff block
     const diffLines = [];
     for (const repo of report.repos) {
         if (repo.files.length === 0 && !repo.error) {
             continue;
         }
-        diffLines.push(`<span style="color:#d29922">~ ${escapeHtml(repo.repoName)}</span>`);
+        diffLines.push(`@@ ${repo.repoName} @@`);
         for (const file of repo.files) {
             if (file.action === "create") {
-                diffLines.push(`<span style="color:#3fb950">    + ${escapeHtml(file.path)}</span>`);
+                diffLines.push(`+ ${file.path}`);
             }
             else if (file.action === "update") {
-                diffLines.push(`<span style="color:#d29922">    ~ ${escapeHtml(file.path)}</span>`);
+                diffLines.push(`! ${file.path}`);
             }
             else if (file.action === "delete") {
-                diffLines.push(`<span style="color:#f85149">    - ${escapeHtml(file.path)}</span>`);
+                diffLines.push(`- ${file.path}`);
             }
         }
         if (repo.error) {
-            diffLines.push(`<span style="color:#f85149">    ! Error: ${escapeHtml(repo.error)}</span>`);
+            diffLines.push(`- Error: ${repo.error}`);
         }
     }
     if (diffLines.length > 0) {
-        lines.push("<pre>");
+        lines.push("```diff");
         lines.push(...diffLines);
-        lines.push("</pre>");
+        lines.push("```");
         lines.push("");
     }
     // Summary

package/dist/output/unified-summary.d.ts

@@ -0,0 +1,4 @@
+import type { LifecycleReport } from "./lifecycle-report.js";
+import type { SyncReport } from "./sync-report.js";
+export declare function formatUnifiedSummaryMarkdown(lifecycle: LifecycleReport, sync: SyncReport, dryRun: boolean): string;
+export declare function writeUnifiedSummary(lifecycle: LifecycleReport, sync: SyncReport, dryRun: boolean): void;

package/dist/output/unified-summary.js

@@ -0,0 +1,147 @@
+// src/output/unified-summary.ts
+import { appendFileSync } from "node:fs";
+import { hasLifecycleChanges } from "./lifecycle-report.js";
+// =============================================================================
+// Helpers
+// =============================================================================
+function formatCombinedSummary(lifecycleTotals, syncTotals) {
+    const parts = [];
+    // Lifecycle totals
+    const repoTotal = lifecycleTotals.created + lifecycleTotals.forked + lifecycleTotals.migrated;
+    if (repoTotal > 0) {
+        const repoParts = [];
+        if (lifecycleTotals.created > 0)
+            repoParts.push(`${lifecycleTotals.created} to create`);
+        if (lifecycleTotals.forked > 0)
+            repoParts.push(`${lifecycleTotals.forked} to fork`);
+        if (lifecycleTotals.migrated > 0)
+            repoParts.push(`${lifecycleTotals.migrated} to migrate`);
+        const repoWord = repoTotal === 1 ? "repo" : "repos";
+        parts.push(`${repoTotal} ${repoWord} (${repoParts.join(", ")})`);
+    }
+    // Sync totals
+    const fileTotal = syncTotals.files.create + syncTotals.files.update + syncTotals.files.delete;
+    if (fileTotal > 0) {
+        const fileParts = [];
+        if (syncTotals.files.create > 0)
+            fileParts.push(`${syncTotals.files.create} to create`);
+        if (syncTotals.files.update > 0)
+            fileParts.push(`${syncTotals.files.update} to update`);
+        if (syncTotals.files.delete > 0)
+            fileParts.push(`${syncTotals.files.delete} to delete`);
+        const fileWord = fileTotal === 1 ? "file" : "files";
+        parts.push(`${fileTotal} ${fileWord} (${fileParts.join(", ")})`);
+    }
+    if (parts.length === 0) {
+        return "No changes";
+    }
+    return `Plan: ${parts.join(", ")}`;
+}
+// =============================================================================
+// Markdown Formatter
+// =============================================================================
+export function formatUnifiedSummaryMarkdown(lifecycle, sync, dryRun) {
+    const hasLifecycle = hasLifecycleChanges(lifecycle);
+    const hasSync = sync.repos.some((r) => r.files.length > 0 || r.error);
+    if (!hasLifecycle && !hasSync) {
+        return "";
+    }
+    const lines = [];
+    // Title
+    const titleSuffix = dryRun ? " (Dry Run)" : "";
+    lines.push(`## xfg Sync Summary${titleSuffix}`);
+    lines.push("");
+    // Dry-run warning
+    if (dryRun) {
+        lines.push("> [!WARNING]");
+        lines.push("> This was a dry run — no changes were applied");
+        lines.push("");
+    }
+    // Build lookup maps by repoName
+    const lifecycleByRepo = new Map(lifecycle.actions.map((a) => [a.repoName, a]));
+    const syncByRepo = new Map(sync.repos.map((r) => [r.repoName, r]));
+    // Collect all repo names in order (lifecycle first, then sync-only)
+    const allRepos = [];
+    for (const action of lifecycle.actions) {
+        if (!allRepos.includes(action.repoName)) {
+            allRepos.push(action.repoName);
+        }
+    }
+    for (const repo of sync.repos) {
+        if (!allRepos.includes(repo.repoName)) {
+            allRepos.push(repo.repoName);
+        }
+    }
+    // Diff block
+    const diffLines = [];
+    for (const repoName of allRepos) {
+        const lcAction = lifecycleByRepo.get(repoName);
+        const syncRepo = syncByRepo.get(repoName);
+        const hasLcChange = lcAction && lcAction.action !== "existed";
+        const hasSyncChanges = syncRepo && (syncRepo.files.length > 0 || syncRepo.error);
+        if (!hasLcChange && !hasSyncChanges)
+            continue;
+        // Repo header
+        diffLines.push(`@@ ${repoName} @@`);
+        // Lifecycle action
+        if (lcAction && lcAction.action !== "existed") {
+            switch (lcAction.action) {
+                case "created":
+                    diffLines.push(`+ CREATE`);
+                    break;
+                case "forked":
+                    diffLines.push(`+ FORK ${lcAction.upstream ?? "upstream"} -> ${repoName}`);
+                    break;
+                case "migrated":
+                    diffLines.push(`+ MIGRATE ${lcAction.source ?? "source"} -> ${repoName}`);
+                    break;
+            }
+            if (lcAction.settings) {
+                if (lcAction.settings.visibility) {
+                    diffLines.push(`+   visibility: ${lcAction.settings.visibility}`);
+                }
+                if (lcAction.settings.description) {
+                    diffLines.push(`+   description: "${lcAction.settings.description}"`);
+                }
+            }
+        }
+        // File changes
+        if (syncRepo) {
+            for (const file of syncRepo.files) {
+                if (file.action === "create") {
+                    diffLines.push(`+ ${file.path}`);
+                }
+                else if (file.action === "update") {
+                    diffLines.push(`! ${file.path}`);
+                }
+                else if (file.action === "delete") {
+                    diffLines.push(`- ${file.path}`);
+                }
+            }
+            if (syncRepo.error) {
+                diffLines.push(`- Error: ${syncRepo.error}`);
+            }
+        }
+    }
+    if (diffLines.length > 0) {
+        lines.push("```diff");
+        lines.push(...diffLines);
+        lines.push("```");
+        lines.push("");
+    }
+    // Combined summary
+    lines.push(`**${formatCombinedSummary(lifecycle.totals, sync.totals)}**`);
+    return lines.join("\n");
+}
+// =============================================================================
+// File Writer
+// =============================================================================
+export function writeUnifiedSummary(lifecycle, sync, dryRun) {
+    const summaryPath = process.env.GITHUB_STEP_SUMMARY;
+    if (!summaryPath)
+        return;
+    const markdown = formatUnifiedSummaryMarkdown(lifecycle, sync, dryRun);
+    if (!markdown)
+        return;
+    appendFileSync(summaryPath, "\n" + markdown + "\n");
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aspruyt/xfg",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "description": "CLI tool for repository-as-code: sync files and manage settings across GitHub, Azure DevOps, and GitLab",
   "type": "module",
   "main": "dist/index.js",