@codedrifters/configulator 0.0.429 → 0.0.431

package/lib/index.js

@@ -280,7 +280,12 @@ __export(index_exports, {
   DEFAULT_UNBLOCK_DEPENDENTS_ENABLED: () => DEFAULT_UNBLOCK_DEPENDENTS_ENABLED,
   DEFAULT_UPSTREAM_CONFIGULATOR_ENABLED: () => DEFAULT_UPSTREAM_CONFIGULATOR_ENABLED,
   DEPLOY_GATE: () => DEPLOY_GATE,
+  DIFF_ARTIFACT_NAME: () => DIFF_ARTIFACT_NAME,
+  DIFF_OUTPUT_DIRECTORY: () => DIFF_OUTPUT_DIRECTORY,
+  DIFF_PART_ARTIFACT_PREFIX: () => DIFF_PART_ARTIFACT_PREFIX,
+  DIFF_REPORT_JOB_ID: () => DIFF_REPORT_JOB_ID,
   DOCS_SYNC_AUDIT_SCHEMA_VERSION: () => DOCS_SYNC_AUDIT_SCHEMA_VERSION,
+  DiffReportJob: () => DiffReportJob,
   GITHUB_ISSUE_TYPES: () => GITHUB_ISSUE_TYPES,
   GITHUB_ISSUE_TYPE_BY_TITLE_PREFIX: () => GITHUB_ISSUE_TYPE_BY_TITLE_PREFIX,
   ISSUE_TEMPLATES_GENERATED_SUFFIX: () => ISSUE_TEMPLATES_GENERATED_SUFFIX,
@@ -460,6 +465,7 @@ __export(index_exports, {
   renderCheckLinksProcedure: () => renderCheckLinksProcedure,
   renderCustomDocSectionBlock: () => renderCustomDocSectionBlock,
   renderCustomDocSections: () => renderCustomDocSections,
+  renderDiffPartUploadStep: () => renderDiffPartUploadStep,
   renderExtractApiProcedure: () => renderExtractApiProcedure,
   renderFocusSection: () => renderFocusSection,
   renderGithubIssueTypeSection: () => renderGithubIssueTypeSection,
@@ -491,6 +497,8 @@ __export(index_exports, {
   renderScopeGateSection: () => renderScopeGateSection,
   renderScopeGateShellHelpers: () => renderScopeGateShellHelpers,
   renderSetIssueTypeFallbackLines: () => renderSetIssueTypeFallbackLines,
+  renderSetupNode: () => renderSetupNode,
+  renderSetupPnpm: () => renderSetupPnpm,
   renderSharedEditingBundleHook: () => renderSharedEditingBundleHook,
   renderSharedEditingHelperScript: () => renderSharedEditingHelperScript,
   renderSharedEditingRuleContent: () => renderSharedEditingRuleContent,
@@ -42292,17 +42300,17 @@ var DEFAULT_FAVICON_SVG = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0
 `;
 
 // src/projects/aws-cdk-project.ts
-var import_projen30 = require("projen");
+var import_projen31 = require("projen");
 var import_javascript5 = require("projen/lib/javascript");
 var import_release2 = require("projen/lib/release");
 var import_ts_deepmerge4 = require("ts-deepmerge");
 
 // src/workflows/aws-deploy-workflow.ts
 var import_utils11 = __toESM(require_lib());
-var import_projen28 = require("projen");
+var import_projen29 = require("projen");
 var import_build = require("projen/lib/build");
-var import_github7 = require("projen/lib/github");
-var import_workflows_model6 = require("projen/lib/github/workflows-model");
+var import_github8 = require("projen/lib/github");
+var import_workflows_model7 = require("projen/lib/github/workflows-model");
 
 // src/workflows/apply-workflow.ts
 var import_projen26 = require("projen");
@@ -42594,8 +42602,260 @@ var resolveEnvironmentGate = (gate, environmentName, componentName) => {
   return trimmed;
 };
 
-// src/workflows/home-repository.ts
+// src/workflows/diff-report-job.ts
 var import_projen27 = require("projen");
+var import_github7 = require("projen/lib/github");
+var import_workflows_model6 = require("projen/lib/github/workflows-model");
+var DIFF_REPORT_JOB_ID = "diff-report";
+var DIFF_OUTPUT_DIRECTORY = "cdk-diff";
+var DIFF_PART_ARTIFACT_PREFIX = "cdk-diff-part";
+var DIFF_ARTIFACT_NAME = "cdk-diff";
+var DIFF_PART_RETENTION_DAYS = 1;
+var DIFF_SUMMARY_BYTE_LIMIT = 9e5;
+var RUN_URL = "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}";
+var DiffReportJob = class _DiffReportJob extends import_projen27.Component {
+  constructor(project, options) {
+    super(project);
+    /**
+     * Every contributed target, in attach order.
+     */
+    this.targets = [];
+    /**
+     * Publish settings are OR-ed rather than first-wins: one report means one
+     * answer, and a component that asked for a summary should get one even when
+     * a sibling did not.
+     */
+    this.summary = false;
+    this.artifact = false;
+    /**
+     * Fold one component's contribution in.
+     */
+    this.record = (options) => {
+      this.targets.push(...options.targets);
+      this.summary = this.summary || options.summary;
+      this.artifact = this.artifact || options.artifact;
+    };
+    /**
+     * Compose the report's own condition.
+     *
+     * `!cancelled()` leads, and it is load-bearing: a job whose `needs` failed or
+     * were skipped is skipped by default, so without a status function the report
+     * would vanish in exactly the cases it is most wanted — one target's diff
+     * failing, or some targets not applying to this branch.
+     */
+    this.renderJobCondition = () => {
+      const branchConditions = this.targets.map(
+        (target) => target.branchCondition
+      );
+      const anyBranch = branchConditions.some((condition) => !condition);
+      const branchClause = anyBranch ? void 0 : Array.from(new Set(branchConditions)).join(" || ");
+      return "${{ " + [
+        "!cancelled()",
+        "!needs.build.outputs.self_mutation_happened",
+        ...this.homeRepositoryCondition ? [this.homeRepositoryCondition] : [],
+        ...branchClause ? [`(${branchClause})`] : []
+      ].join(" && ") + " }}";
+    };
+    /**
+     * Pull every target's part into one directory.
+     *
+     * `continueOnError` because a run where every target's diff job was skipped
+     * by its branch filter matches no parts at all, and a report with nothing to
+     * report is not a failure.
+     */
+    this.renderDownloadStep = () => {
+      return [
+        import_github7.WorkflowSteps.downloadArtifact({
+          name: "Download target diffs",
+          continueOnError: true,
+          with: {
+            pattern: `${DIFF_PART_ARTIFACT_PREFIX}-*`,
+            mergeMultiple: true,
+            path: DIFF_OUTPUT_DIRECTORY
+          }
+        })
+      ];
+    };
+    /**
+     * Render every target's diff into the job summary, one collapsed `<details>`
+     * block per target.
+     *
+     * A target whose part is absent renders as "did not run", which is what
+     * distinguishes a target that was skipped or whose diff failed before it
+     * captured anything from one that simply had no changes — the latter has a
+     * file, carrying the CDK CLI's own no-differences wording, rather than being
+     * detected by matching on it.
+     */
+    this.renderSummaryStep = () => {
+      if (!this.summary || this.targets.length === 0) {
+        return [];
+      }
+      const budget = Math.floor(DIFF_SUMMARY_BYTE_LIMIT / this.targets.length);
+      const rows = this.targets.map(
+        (target) => `'${target.label}|${target.outputFile}'`
+      );
+      return [
+        {
+          name: "Render diff report",
+          if: "!cancelled()",
+          shell: "bash",
+          run: [
+            "{",
+            "  while IFS='|' read -r label file; do",
+            '    echo "## cdk diff \u2014 $label"',
+            '    echo ""',
+            '    if [ ! -f "$file" ]; then',
+            "      echo '_Did not run._'",
+            '      echo ""',
+            "      continue",
+            "    fi",
+            "    echo '<details><summary>cdk diff output</summary>'",
+            '    echo ""',
+            "    echo '```'",
+            `    if [ "$(wc -c < "$file")" -gt ${budget} ]; then`,
+            `      head -c ${budget} "$file"`,
+            `      printf '\\n... truncated at ${budget} bytes ...\\n'`,
+            "    else",
+            '      cat "$file"',
+            "    fi",
+            "    echo '```'",
+            '    echo ""',
+            "    echo '</details>'",
+            '    echo ""',
+            `  done < <(printf '%s\\n' ${rows.join(" ")})`,
+            ...this.artifact ? [
+              `  echo 'Full diff: the \`${DIFF_ARTIFACT_NAME}\` artifact on [this run](${RUN_URL}).'`
+            ] : [],
+            '} >> "$GITHUB_STEP_SUMMARY"'
+          ].join("\n")
+        }
+      ];
+    };
+    /**
+     * Fail the report when any target's diff failed.
+     *
+     * Runs last, so the summary and the artifact are published first — a reviewer
+     * still gets the whole picture, including whatever the failing target managed
+     * to capture. But the report must not end up green: everything gated behind
+     * it `needs` it, and a job whose `needs` failed is skipped, which is what
+     * keeps a failed diff from letting a gated deploy through to *Waiting for
+     * approval*. Without this the report would always succeed and a diff failure
+     * would only soft-block behind a human.
+     *
+     * Only `failure` counts. A target skipped by its branch filter reports
+     * `skipped`, which is normal and must not fail the report.
+     */
+    this.renderFailureStep = () => {
+      const jobNames = Array.from(
+        new Set(this.targets.map((target) => target.jobName))
+      );
+      if (jobNames.length === 0) {
+        return [];
+      }
+      return [
+        {
+          name: "Fail if any target's diff failed",
+          if: "!cancelled()",
+          shell: "bash",
+          run: [
+            ...jobNames.map(
+              (jobName) => `if [ "\${{ needs.${jobName}.result }}" = "failure" ]; then echo "::error::Diff job ${jobName} failed"; failed=1; fi`
+            ),
+            'if [ "${failed:-0}" = "1" ]; then exit 1; fi'
+          ].join("\n")
+        }
+      ];
+    };
+    /**
+     * Upload the merged directory as the one artifact meant to be read.
+     */
+    this.renderUploadStep = () => {
+      if (!this.artifact || this.targets.length === 0) {
+        return [];
+      }
+      return [
+        import_github7.WorkflowSteps.uploadArtifact({
+          name: "Upload combined diff",
+          if: "!cancelled()",
+          with: {
+            name: DIFF_ARTIFACT_NAME,
+            path: DIFF_OUTPUT_DIRECTORY,
+            ifNoFilesFound: "ignore"
+          }
+        })
+      ];
+    };
+    this.buildWorkflow = options.buildWorkflow;
+    this.homeRepositoryCondition = options.homeRepositoryCondition;
+    this.record(options);
+    this.buildWorkflow.workflow.addJob(DIFF_REPORT_JOB_ID, {
+      name: "Diff report",
+      needs: ["build"],
+      runsOn: ["ubuntu-latest"],
+      permissions: {
+        contents: import_workflows_model6.JobPermission.READ
+      },
+      steps: []
+    });
+  }
+  static of(project, buildWorkflow) {
+    const isDefined = (c) => c instanceof _DiffReportJob && c.buildWorkflow === buildWorkflow;
+    return project.components.find(isDefined);
+  }
+  /**
+   * Add a component's targets to the plan workflow's diff report, creating the
+   * report job the first time it is called for that workflow.
+   */
+  static attach(project, options) {
+    const existing = _DiffReportJob.of(project, options.buildWorkflow);
+    if (existing) {
+      existing.record(options);
+      return existing;
+    }
+    return new _DiffReportJob(project, options);
+  }
+  preSynthesize() {
+    this.buildWorkflow.workflow.updateJob(DIFF_REPORT_JOB_ID, {
+      name: "Diff report",
+      /**
+       * `build` is a direct dependency so the job can read its
+       * self-mutation output, which is otherwise unreachable — the `needs`
+       * context only carries direct dependencies, not transitive ones.
+       */
+      needs: [
+        "build",
+        ...Array.from(new Set(this.targets.map((target) => target.jobName)))
+      ],
+      runsOn: ["ubuntu-latest"],
+      permissions: {
+        contents: import_workflows_model6.JobPermission.READ
+      },
+      if: this.renderJobCondition(),
+      steps: [
+        ...this.renderDownloadStep(),
+        ...this.renderSummaryStep(),
+        ...this.renderUploadStep(),
+        ...this.renderFailureStep()
+      ]
+    });
+    super.preSynthesize();
+  }
+};
+var renderDiffPartUploadStep = (options) => {
+  return import_github7.WorkflowSteps.uploadArtifact({
+    name: `Upload diff ${options.label}`,
+    if: "!cancelled()",
+    with: {
+      name: options.artifactName,
+      path: options.outputFile,
+      ifNoFilesFound: "ignore",
+      retentionDays: DIFF_PART_RETENTION_DAYS
+    }
+  });
+};
+
+// src/workflows/home-repository.ts
+var import_projen28 = require("projen");
 var HOME_REPOSITORY_PATTERN = /^[A-Za-z0-9._-]+\/[A-Za-z0-9._-]+$/;
 var renderHomeRepositoryCondition = (homeRepository, componentName) => {
   if (homeRepository === void 0) {
@@ -42609,7 +42869,7 @@ var renderHomeRepositoryCondition = (homeRepository, componentName) => {
   return `github.repository == '${homeRepository}'`;
 };
 var describePin = (homeRepository) => homeRepository === void 0 ? "unset" : `"${homeRepository}"`;
-var WorkflowHomeRepository = class _WorkflowHomeRepository extends import_projen27.Component {
+var WorkflowHomeRepository = class _WorkflowHomeRepository extends import_projen28.Component {
   static of(project, workflow) {
     const isDefined = (c) => c instanceof _WorkflowHomeRepository && c.workflow === workflow;
     return project.components.find(isDefined);
@@ -42641,11 +42901,35 @@ var WorkflowHomeRepository = class _WorkflowHomeRepository extends import_projen
   }
 };
 
+// src/workflows/node-setup.ts
+var renderSetupNode = () => {
+  return [
+    {
+      name: "Setup Node",
+      uses: `actions/setup-node@${VERSION.SETUP_NODE_ACTION_VERSION}`,
+      with: {
+        ["node-version"]: VERSION.NODE_WORKFLOWS
+      },
+      timeoutMinutes: 1
+    }
+  ];
+};
+var renderSetupPnpm = (pnpmVersion) => {
+  return [
+    {
+      name: "Setup PNPM",
+      uses: `pnpm/action-setup@${VERSION.PNPM_ACTION_SETUP_VERSION}`,
+      with: {
+        version: pnpmVersion
+      }
+    }
+  ];
+};
+
 // src/workflows/aws-deploy-workflow.ts
 var PROD_DEPLOY_NAME = "prod-deploy";
-var DIFF_OUTPUT_FILE = "cdk-diff.txt";
-var DIFF_SUMMARY_BYTE_LIMIT = 9e5;
-var AwsDeployWorkflow = class _AwsDeployWorkflow extends import_projen28.Component {
+var BRANCH_NAME_EXPRESSION = "${{ github.head_ref || github.ref_name }}";
+var AwsDeployWorkflow = class _AwsDeployWorkflow extends import_projen29.Component {
   constructor(project, options = {}) {
     super(project);
     this.project = project;
@@ -42657,30 +42941,8 @@ var AwsDeployWorkflow = class _AwsDeployWorkflow extends import_projen28.Compone
      * @default 'primary' (this is the only type supported currently)
      */
     this.awsEnvironmentType = import_utils11.DEPLOYMENT_TARGET_ROLE.PRIMARY;
-    this.setupNode = () => {
-      return [
-        {
-          name: "Setup Node",
-          uses: `actions/setup-node@${VERSION.SETUP_NODE_ACTION_VERSION}`,
-          with: {
-            ["node-version"]: VERSION.NODE_WORKFLOWS
-          },
-          // occasionally this step fails due to internal issues at github
-          timeoutMinutes: 1
-        }
-      ];
-    };
-    this.setupPnpm = () => {
-      return [
-        {
-          name: "Setup PNPM",
-          uses: `pnpm/action-setup@${VERSION.PNPM_ACTION_SETUP_VERSION}`,
-          with: {
-            version: this.rootProject.pnpmVersion
-          }
-        }
-      ];
-    };
+    this.setupNode = () => renderSetupNode();
+    this.setupPnpm = () => renderSetupPnpm(this.rootProject.pnpmVersion);
     /**
      * Build the deterministic GitHub Actions job name for a deploy target.
      *
@@ -42698,45 +42960,65 @@ var AwsDeployWorkflow = class _AwsDeployWorkflow extends import_projen28.Compone
       ].join("-");
     };
     /**
-     * Build the deterministic GitHub Actions job name for a target's `cdk diff`
-     * job. Mirrors {@link buildJobName} with a `diff` verb so the diff and deploy
-     * jobs for one target sort next to each other in the run view.
+     * Build a deploy job's `concurrency` setting from its job name.
+     *
+     * Two shapes, deliberately:
+     *
+     * - Unscoped (the default) stays the bare string the job has always carried,
+     *   so an existing consumer's workflow is byte-identical.
+     * - Branch-scoped spells out `cancel-in-progress: false` rather than leaning
+     *   on GitHub's default, the same way the apply job does. A group keyed on
+     *   the branch reads like a "cancel superseded pushes" group, and that is the
+     *   one thing it must not be — cancelling a half-finished `cdk deploy`
+     *   strands a CloudFormation stack mid-update.
      */
-    this.buildDiffJobName = (target) => {
+    this.buildDeployConcurrency = (deployJobName) => {
+      if (!this.branchScopedConcurrency) {
+        return deployJobName;
+      }
+      return {
+        group: `${deployJobName}-${BRANCH_NAME_EXPRESSION}`,
+        "cancel-in-progress": false
+      };
+    };
+    /**
+     * Build the deterministic GitHub Actions job name for a target's apply job.
+     * Mirrors {@link buildJobName} with an `apply` verb.
+     */
+    this.buildApplyJobName = (target) => {
       return [
         target.awsStageType,
         target.deploymentTargetRole,
-        "diff",
+        "apply",
         target.project.name,
         target.account,
         target.region
       ].join("-");
     };
     /**
-     * Build the deterministic GitHub Actions job name for a target's apply job.
-     * Mirrors {@link buildJobName} with an `apply` verb.
+     * Build the deterministic GitHub Actions job name for a target's `cdk diff`
+     * job. Mirrors {@link buildJobName} with a `diff` verb so the diff and deploy
+     * jobs for one target sort next to each other in the run view.
      */
-    this.buildApplyJobName = (target) => {
+    this.buildDiffJobName = (target) => {
       return [
         target.awsStageType,
         target.deploymentTargetRole,
-        "apply",
+        "diff",
         target.project.name,
         target.account,
         target.region
       ].join("-");
     };
     /**
-     * Build the CI artifact name for a target's captured diff.
+     * Build the slug that makes a target unique among every target in the plan
+     * workflow, across every deploy component feeding it.
      *
-     * Carries every component that makes a target unique — including
-     * `deploymentTargetRole`, which two otherwise-identical targets can differ
-     * on. `actions/upload-artifact` v4+ treats artifacts as immutable and rejects
-     * a duplicate name within a run, so parallel diff jobs cannot share one.
+     * Includes `deploymentTargetRole`, which two otherwise-identical targets can
+     * differ on.
      */
-    this.buildDiffArtifactName = (target) => {
+    this.buildDiffSlug = (target) => {
       return [
-        "cdk-diff",
         target.awsStageType,
         target.deploymentTargetRole,
         target.project.name,
@@ -42744,6 +43026,23 @@ var AwsDeployWorkflow = class _AwsDeployWorkflow extends import_projen28.Compone
         target.region
       ].join("-");
     };
+    /**
+     * Build the file a target's captured diff is written to, both in its own diff
+     * job's workspace and in the merged directory the report job assembles.
+     */
+    this.buildDiffOutputFile = (target) => {
+      return `${DIFF_OUTPUT_DIRECTORY}/${this.buildDiffSlug(target)}.txt`;
+    };
+    /**
+     * Build the intermediate artifact name carrying one target's captured diff.
+     *
+     * The diff jobs run in parallel and `actions/upload-artifact` v4+ rejects a
+     * duplicate name within a run, so each target needs its own. The report job
+     * merges them into a single artifact, which is the one meant to be read.
+     */
+    this.buildDiffPartArtifactName = (target) => {
+      return `${DIFF_PART_ARTIFACT_PREFIX}-${this.buildDiffSlug(target)}`;
+    };
     /**
      * Join an apply workflow another `AwsDeployWorkflow` already created, so this
      * component's apply jobs land in that file rather than a second one.
@@ -42801,9 +43100,9 @@ var AwsDeployWorkflow = class _AwsDeployWorkflow extends import_projen28.Compone
         ],
         runsOn: ["ubuntu-latest"],
         permissions: {
-          actions: import_workflows_model6.JobPermission.READ,
-          contents: import_workflows_model6.JobPermission.READ,
-          idToken: import_workflows_model6.JobPermission.WRITE
+          actions: import_workflows_model7.JobPermission.READ,
+          contents: import_workflows_model7.JobPermission.READ,
+          idToken: import_workflows_model7.JobPermission.WRITE
         },
         ...this.environmentName ? { environment: this.environmentName } : void 0,
         /**
@@ -42811,6 +43110,13 @@ var AwsDeployWorkflow = class _AwsDeployWorkflow extends import_projen28.Compone
          * same-target deploy. `cancel-in-progress` is spelled out rather than
          * left to GitHub's default: cancelling a half-finished `cdk deploy`
          * strands a CloudFormation stack mid-update.
+         *
+         * `branchScopedConcurrency` deliberately does not reach here. An apply is
+         * dispatched from whatever ref the operator happens to be on — unrelated
+         * to the branch the nominated plan ran against, which is the only branch
+         * that describes what is about to be deployed. Keying on the dispatch ref
+         * would hand out separate locks to applies of the same target, so the
+         * unsuffixed group stays.
          */
         concurrency: {
           group: this.buildJobName(target),
@@ -42993,9 +43299,7 @@ var AwsDeployWorkflow = class _AwsDeployWorkflow extends import_projen28.Compone
       const { roleArn, stackPattern } = ciDeploymentConfig ?? {};
       const { rootCdkOut, cdkCli } = awsDeploymentConfig;
       const label = `${awsStageType}/${deploymentTargetRole}/${account}/${region}`;
-      const artifactName = this.buildDiffArtifactName(target);
-      const capturedFileGuard = `always() && hashFiles('${DIFF_OUTPUT_FILE}') != ''`;
-      const runUrl = "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}";
+      const outputFile = this.buildDiffOutputFile(target);
       return [
         ...this.setupPnpm(),
         ...this.setupNode(),
@@ -43015,69 +43319,36 @@ var AwsDeployWorkflow = class _AwsDeployWorkflow extends import_projen28.Compone
         /**
          * Run CDK Diff, capturing the output while leaving it visible in the job
          * log. `pipefail` keeps the CLI's exit code from being masked by `tee`.
+         *
+         * The capture lands under the same path the report job will merge it
+         * back to, so a target's file name is identical in both places.
          */
         {
           name: `Diff ${label}`,
           shell: "bash",
           run: [
             "set -o pipefail",
+            `mkdir -p ${DIFF_OUTPUT_DIRECTORY}`,
             `pnpm dlx "aws-cdk@${cdkCli.cliVersion}" ${renderCdkDiff({
               ...cdkCli.diffOptionsFor(target),
               app: rootCdkOut,
               ci: true,
               noColor: true,
               stackPatterns: stackPattern ? [stackPattern] : void 0
-            })} 2>&1 | tee ${DIFF_OUTPUT_FILE}`
+            })} 2>&1 | tee ${outputFile}`
           ].join("\n")
         },
         /**
-         * Render the captured diff into the job summary inside a collapsed
-         * `<details>` block, truncated below GitHub's 1 MiB per-step cap — a
-         * summary that exceeds the cap is dropped in full rather than clipped.
-         */
-        ...this.diffOptions.summary ? [
-          {
-            name: `Render diff summary ${label}`,
-            if: capturedFileGuard,
-            shell: "bash",
-            run: [
-              `size=$(wc -c < ${DIFF_OUTPUT_FILE})`,
-              "{",
-              `  echo '## cdk diff \u2014 ${label}'`,
-              '  echo ""',
-              "  echo '<details><summary>cdk diff output</summary>'",
-              '  echo ""',
-              "  echo '```'",
-              `  if [ "$size" -gt ${DIFF_SUMMARY_BYTE_LIMIT} ]; then`,
-              `    head -c ${DIFF_SUMMARY_BYTE_LIMIT} ${DIFF_OUTPUT_FILE}`,
-              `    printf '\\n... truncated at ${DIFF_SUMMARY_BYTE_LIMIT} bytes ...\\n'`,
-              "  else",
-              `    cat ${DIFF_OUTPUT_FILE}`,
-              "  fi",
-              "  echo '```'",
-              '  echo ""',
-              "  echo '</details>'",
-              ...this.diffOptions.artifact ? [
-                '  echo ""',
-                `  echo 'Full diff: the \`${artifactName}\` artifact on [this run](${runUrl}).'`
-              ] : [],
-              '} >> "$GITHUB_STEP_SUMMARY"'
-            ].join("\n")
-          }
-        ] : [],
-        /**
-         * Upload the untruncated diff as a per-run artifact.
+         * Hand the capture to the report job. Guarded on `!cancelled()` rather
+         * than success, so a diff that exits non-zero — a synth error, or a
+         * consumer who opted into `--fail` — still contributes what it captured
+         * instead of leaving a hole in the report.
          */
-        ...this.diffOptions.artifact ? [
-          import_github7.WorkflowSteps.uploadArtifact({
-            name: `Upload diff ${label}`,
-            if: capturedFileGuard,
-            with: {
-              name: artifactName,
-              path: DIFF_OUTPUT_FILE
-            }
-          })
-        ] : []
+        renderDiffPartUploadStep({
+          label,
+          artifactName: this.buildDiffPartArtifactName(target),
+          outputFile
+        })
       ];
     };
     if (!(project.root instanceof MonorepoProject)) {
@@ -43086,7 +43357,7 @@ var AwsDeployWorkflow = class _AwsDeployWorkflow extends import_projen28.Compone
       );
     }
     this.rootProject = project.root;
-    const github = import_github7.GitHub.of(this.rootProject);
+    const github = import_github8.GitHub.of(this.rootProject);
     if (!github) {
       throw new Error(
         "AwsDeployWorkflow requires a GitHub component in the root project"
@@ -43111,6 +43382,7 @@ var AwsDeployWorkflow = class _AwsDeployWorkflow extends import_projen28.Compone
       artifact: options.diff?.artifact ?? true,
       summary: options.diff?.summary ?? true
     };
+    this.branchScopedConcurrency = options.branchScopedConcurrency ?? false;
     this.environmentName = resolveEnvironmentGate(
       options.gate,
       options.environmentName,
@@ -43143,14 +43415,20 @@ var AwsDeployWorkflow = class _AwsDeployWorkflow extends import_projen28.Compone
       buildTask: this.rootProject.buildTask,
       /**
        * Use push triggers based n the branch config for each environment.
+       *
+       * Deduped: targets in one workflow routinely share a branch — two prod
+       * targets both default to `main` — and a repeated entry is only noise
+       * in the generated file, since GitHub treats this as a filter list.
        */
       workflowTriggers: {
         push: {
-          branches: [
-            ...this.awsDeploymentTargets.flatMap(
-              (t) => t.branches.map((b) => b.branch)
+          branches: Array.from(
+            new Set(
+              this.awsDeploymentTargets.flatMap(
+                (t) => t.branches.map((b) => b.branch)
+              )
             )
-          ]
+          )
         },
         workflowDispatch: {},
         ...options.buildWorkflowOptions?.workflowTriggers
@@ -43168,7 +43446,7 @@ var AwsDeployWorkflow = class _AwsDeployWorkflow extends import_projen28.Compone
        * Set GIT_BRANCH_NAME so Turborepo remote cache hashes match between local and CI.
        */
       env: {
-        GIT_BRANCH_NAME: "${{ github.head_ref || github.ref_name }}",
+        GIT_BRANCH_NAME: BRANCH_NAME_EXPRESSION,
         ...options.buildWorkflowOptions?.env,
         ...buildWorkflowOptions?.env
       },
@@ -43246,19 +43524,19 @@ var AwsDeployWorkflow = class _AwsDeployWorkflow extends import_projen28.Compone
           name: `Deploy ${this.project.name} ${target.awsStageType}/${target.deploymentTargetRole}/${target.account}/${target.region}`,
           needs: [
             "build",
-            ...gatedOnDiff ? [this.buildDiffJobName(target)] : [],
+            ...gatedOnDiff ? [DIFF_REPORT_JOB_ID] : [],
             ...this.deployAfterTargets.map((p) => {
               return this.buildJobName(p);
             })
           ],
           runsOn: ["ubuntu-latest"],
           permissions: {
-            contents: import_workflows_model6.JobPermission.READ,
-            idToken: import_workflows_model6.JobPermission.WRITE,
-            pullRequests: import_workflows_model6.JobPermission.WRITE
+            contents: import_workflows_model7.JobPermission.READ,
+            idToken: import_workflows_model7.JobPermission.WRITE,
+            pullRequests: import_workflows_model7.JobPermission.WRITE
           },
           ...this.environmentName ? { environment: this.environmentName } : void 0,
-          concurrency: deployJobName,
+          concurrency: this.buildDeployConcurrency(deployJobName),
           if: jobCondition,
           steps: [...this.deploySteps(target)]
         });
@@ -43270,14 +43548,28 @@ var AwsDeployWorkflow = class _AwsDeployWorkflow extends import_projen28.Compone
           needs: ["build"],
           runsOn: ["ubuntu-latest"],
           permissions: {
-            contents: import_workflows_model6.JobPermission.READ,
-            idToken: import_workflows_model6.JobPermission.WRITE
+            contents: import_workflows_model7.JobPermission.READ,
+            idToken: import_workflows_model7.JobPermission.WRITE
           },
           if: jobCondition,
           steps: [...this.diffSteps(target)]
         });
       }
     });
+    if (this.diffOptions.enabled && this.awsDeploymentTargets.length > 0) {
+      DiffReportJob.attach(this.rootProject, {
+        buildWorkflow: this.buildWorkflow,
+        homeRepositoryCondition,
+        summary: this.diffOptions.summary,
+        artifact: this.diffOptions.artifact,
+        targets: this.awsDeploymentTargets.map((target) => ({
+          label: `${this.project.name} ${target.awsStageType}/${target.deploymentTargetRole}/${target.account}/${target.region}`,
+          jobName: this.buildDiffJobName(target),
+          outputFile: this.buildDiffOutputFile(target),
+          branchCondition: this.buildBranchFilterCondition(target.branches)
+        }))
+      });
+    }
     addBuildCompleteJob(this.buildWorkflow);
   }
   static of(project, buildWorkflow) {
@@ -43291,7 +43583,7 @@ var AwsDeployWorkflow = class _AwsDeployWorkflow extends import_projen28.Compone
           name: "Build Sub Projects",
           run: `pnpm exec projen ${ROOT_CI_TASK_NAME}`
         },
-        import_github7.WorkflowSteps.uploadArtifact({
+        import_github8.WorkflowSteps.uploadArtifact({
           name: "Upload Turbo runs",
           if: "always()",
           continueOnError: true,
@@ -43307,9 +43599,9 @@ var AwsDeployWorkflow = class _AwsDeployWorkflow extends import_projen28.Compone
 };
 
 // src/workflows/aws-teardown-workflow.ts
-var import_projen29 = require("projen");
-var import_github8 = require("projen/lib/github");
-var import_workflows_model7 = require("projen/lib/github/workflows-model");
+var import_projen30 = require("projen");
+var import_github9 = require("projen/lib/github");
+var import_workflows_model8 = require("projen/lib/github/workflows-model");
 var DEFAULT_TEARDOWN_BRANCH_PATTERNS = [
   "feat/*",
   "fix/*",
@@ -43329,7 +43621,7 @@ var resolveBranchPatterns = (explicit, targets) => {
   }
   return [...DEFAULT_TEARDOWN_BRANCH_PATTERNS];
 };
-var AwsTeardownWorkflow = class extends import_projen29.Component {
+var AwsTeardownWorkflow = class extends import_projen30.Component {
   constructor(rootProject, options) {
     super(rootProject);
     this.rootProject = rootProject;
@@ -43359,7 +43651,7 @@ var AwsTeardownWorkflow = class extends import_projen29.Component {
         "AwsTeardownWorkflow requires the root project to be a MonorepoProject"
       );
     }
-    const github = import_github8.GitHub.of(this.rootProject);
+    const github = import_github9.GitHub.of(this.rootProject);
     if (!github) {
       throw new Error(
         "AwsTeardownWorkflow requires a GitHub component in the root project"
@@ -43373,7 +43665,7 @@ var AwsTeardownWorkflow = class extends import_projen29.Component {
       homeRepository,
       "AwsTeardownWorkflow"
     );
-    const workflow = new import_github8.GithubWorkflow(github, "teardown-dev");
+    const workflow = new import_github9.GithubWorkflow(github, "teardown-dev");
     workflow.on({
       workflowDispatch: {},
       schedule: [
@@ -43401,8 +43693,8 @@ var AwsTeardownWorkflow = class extends import_projen29.Component {
           runsOn: ["ubuntu-latest"],
           ...homeRepositoryCondition ? { if: `\${{ ${homeRepositoryCondition} }}` } : {},
           permissions: {
-            contents: import_workflows_model7.JobPermission.READ,
-            idToken: import_workflows_model7.JobPermission.WRITE
+            contents: import_workflows_model8.JobPermission.READ,
+            idToken: import_workflows_model8.JobPermission.WRITE
           },
           env: {
             REPO: "${{ github.repository }}",
@@ -43517,7 +43809,7 @@ var AwsTeardownWorkflow = class extends import_projen29.Component {
 };
 
 // src/projects/aws-cdk-project.ts
-var AwsCdkProject = class extends import_projen30.awscdk.AwsCdkTypeScriptApp {
+var AwsCdkProject = class extends import_projen31.awscdk.AwsCdkTypeScriptApp {
   constructor(userOptions) {
     if (!(userOptions.parent instanceof MonorepoProject)) {
       throw new Error(
@@ -43733,7 +44025,7 @@ var AwsCdkProject = class extends import_projen30.awscdk.AwsCdkTypeScriptApp {
 };
 
 // src/projects/react-vite-site-project.ts
-var import_projen31 = require("projen");
+var import_projen32 = require("projen");
 var import_ts_deepmerge5 = require("ts-deepmerge");
 var ReactViteSiteProject = class extends TypeScriptProject {
   constructor(userOptions) {
@@ -43772,7 +44064,7 @@ var ReactViteSiteProject = class extends TypeScriptProject {
     };
     super(options);
     this.package.addField("type", "module");
-    new import_projen31.TextFile(this, ".nvmrc", { lines: ["v24.11.0"] });
+    new import_projen32.TextFile(this, ".nvmrc", { lines: ["v24.11.0"] });
     this.tsconfig?.file.addOverride("compilerOptions.target", "ES2020");
     this.tsconfig?.file.addOverride("compilerOptions.lib", [
       "ES2020",
@@ -43807,7 +44099,7 @@ var ReactViteSiteProject = class extends TypeScriptProject {
       "vitest/globals",
       "vite/client"
     ]);
-    new import_projen31.SampleFile(this, "vite.config.ts", {
+    new import_projen32.SampleFile(this, "vite.config.ts", {
       contents: `import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
 import tailwindcss from '@tailwindcss/vite';
@@ -43819,7 +44111,7 @@ export default defineConfig({
 });
 `
     });
-    new import_projen31.SampleFile(this, "src/vite-env.d.ts", {
+    new import_projen32.SampleFile(this, "src/vite-env.d.ts", {
       contents: `/// <reference types="vite/client" />
 
 interface ImportMetaEnv {
@@ -43834,7 +44126,7 @@ interface ImportMeta {
     });
     if (options.testRunner !== TestRunner.JEST) {
       this.tryRemoveFile("vitest.config.ts");
-      new import_projen31.SampleFile(this, "vitest.config.ts", {
+      new import_projen32.SampleFile(this, "vitest.config.ts", {
         contents: `import { defineConfig, mergeConfig } from 'vitest/config';
 import react from '@vitejs/plugin-react';
 import viteConfig from './vite.config';
@@ -43978,7 +44270,7 @@ export default mergeConfig(
     }
     if (userOptions.sampleCode === true) {
       const siteName = options.name;
-      new import_projen31.SampleFile(this, "index.html", {
+      new import_projen32.SampleFile(this, "index.html", {
         contents: `<!doctype html>
 <html>
   <head>
@@ -43993,7 +44285,7 @@ export default mergeConfig(
 </html>
 `
       });
-      new import_projen31.SampleFile(this, "src/routes.tsx", {
+      new import_projen32.SampleFile(this, "src/routes.tsx", {
         contents: `import { createBrowserRouter } from 'react-router-dom';
 import App from './App';
 
@@ -44002,7 +44294,7 @@ export const router = createBrowserRouter([
 ]);
 `
       });
-      new import_projen31.SampleFile(this, "src/main.tsx", {
+      new import_projen32.SampleFile(this, "src/main.tsx", {
         contents: `import React from 'react';
 import ReactDOM from 'react-dom/client';
 import { RouterProvider } from 'react-router-dom';
@@ -44016,7 +44308,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
 );
 `
       });
-      new import_projen31.SampleFile(this, "src/App.tsx", {
+      new import_projen32.SampleFile(this, "src/App.tsx", {
         contents: `export default function App() {
   return (
     <main className="p-4">
@@ -44026,11 +44318,11 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
 }
 `
       });
-      new import_projen31.SampleFile(this, "src/index.css", {
+      new import_projen32.SampleFile(this, "src/index.css", {
         contents: `@import "tailwindcss";
 `
       });
-      new import_projen31.SampleFile(this, "src/setupTests.ts", {
+      new import_projen32.SampleFile(this, "src/setupTests.ts", {
         contents: `import '@testing-library/jest-dom';
 `
       });
@@ -44039,7 +44331,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
 };
 
 // src/projects/starlight-project.ts
-var import_projen32 = require("projen");
+var import_projen33 = require("projen");
 var STARLIGHT_ROLE = {
   DOCS: "docs",
   SITE: "site"
@@ -44081,10 +44373,10 @@ var StarlightProject = class extends AstroProject {
       turbo.compileTask.inputs.push("src/content/**");
     }
     if (userOptions.sampleContent === true) {
-      new import_projen32.SampleFile(this, "src/content/docs/index.mdx", {
+      new import_projen33.SampleFile(this, "src/content/docs/index.mdx", {
         contents: DEFAULT_INDEX_MDX
       });
-      new import_projen32.SampleFile(this, "src/content.config.ts", {
+      new import_projen33.SampleFile(this, "src/content.config.ts", {
         contents: DEFAULT_CONTENT_CONFIG_TS
       });
     }
@@ -44263,7 +44555,12 @@ export const collections = {
   DEFAULT_UNBLOCK_DEPENDENTS_ENABLED,
   DEFAULT_UPSTREAM_CONFIGULATOR_ENABLED,
   DEPLOY_GATE,
+  DIFF_ARTIFACT_NAME,
+  DIFF_OUTPUT_DIRECTORY,
+  DIFF_PART_ARTIFACT_PREFIX,
+  DIFF_REPORT_JOB_ID,
   DOCS_SYNC_AUDIT_SCHEMA_VERSION,
+  DiffReportJob,
   GITHUB_ISSUE_TYPES,
   GITHUB_ISSUE_TYPE_BY_TITLE_PREFIX,
   ISSUE_TEMPLATES_GENERATED_SUFFIX,
@@ -44443,6 +44740,7 @@ export const collections = {
   renderCheckLinksProcedure,
   renderCustomDocSectionBlock,
   renderCustomDocSections,
+  renderDiffPartUploadStep,
   renderExtractApiProcedure,
   renderFocusSection,
   renderGithubIssueTypeSection,
@@ -44474,6 +44772,8 @@ export const collections = {
   renderScopeGateSection,
   renderScopeGateShellHelpers,
   renderSetIssueTypeFallbackLines,
+  renderSetupNode,
+  renderSetupPnpm,
   renderSharedEditingBundleHook,
   renderSharedEditingHelperScript,
   renderSharedEditingRuleContent,