@dbx-tools/projen 0.8.0 → 0.9.0

package/README.md

@@ -454,16 +454,20 @@ a new package is covered without a re-synth. Work from the root:
 before notes, AI, commits, pushes, or PR creation. It commits dirty source,
 writes custom `--notes` / `--notes-file` content or a bounded Cursor, Codex,
 Claude, then Git fallback to `.release-notes/requests/<branch>.md`, adds one
-request commit, and pushes. The generated request workflow creates or updates
-the source PR. `--approve` enables auto-merge after checks.
+request commit, and pushes. The generated workflow creates or updates the source
+PR, merges it directly with `GITHUB_TOKEN`, and dispatches release planning, so
+no UI approval or merge is required. GitHub may briefly record
+`action_required` for the bot-authored PR validation; it is not a required gate.
 
 After the source PR merges, Release Please retains direct conventional semantic
 increments and applies required dependent patches. Reconciliation copies the
 readable request Markdown into one temporary
 `.release-notes/final/<component>-v<version>.md` per affected component and
-deletes the consumed request file in the release PR. Publication applies each
-file to its matching GitHub Release, then removes the temporary notes tree in a
-cleanup commit. Request and final notes never count as source changes.
+deletes the consumed request file in the release PR, then merges that generated
+PR and explicitly dispatches publication. A source merge with no affected
+release units creates no release PR or publication work. Publication applies
+each file to its matching GitHub Release, then removes the temporary notes tree
+in a cleanup commit. Request and final notes never count as source changes.
 
 The GitHub PR workflow runs the explicit `pr:validate` task through Projen's
 public `BuildWorkflow` `buildTask` option. That task runs synth plus the

package/index.ts

@@ -3,7 +3,7 @@
 // Hand edits are overwritten on the next watch; this file is read-only.
 
 export const PACKAGE_IDENTIFIER = "@dbx-tools/projen";
-export const PACKAGE_VERSION = "0.8.0";
+export const PACKAGE_VERSION = "0.9.0";
 export * as barrels from "./src/barrels.ts";
 export * as bunApp from "./src/bun-app.ts";
 export * as bunWorkflow from "./src/bun-workflow.ts";

package/package.json

@@ -50,7 +50,7 @@
   },
   "main": "index.ts",
   "license": "Apache-2.0",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "types": "index.ts",
   "type": "module",
   "exports": {

package/src/codegen.ts

@@ -67,6 +67,16 @@ interface CodegenInput {
   name: string;
 }
 
+function packageName(dir: string): string {
+  const name = readPackageManifest(dir)?.name;
+  return typeof name === "string" && name.length > 0 ? name : basename(dir);
+}
+
+function sourceLabel(source: string): string {
+  const nodeModulesPrefix = "node_modules/";
+  return source.startsWith(nodeModulesPrefix) ? source.slice(nodeModulesPrefix.length) : source;
+}
+
 /** Read a package's `package.json` `codegen.inputs`, or `undefined` if absent. */
 function codegenInputs(dir: string): string[] | undefined {
   const codegen = readPackageManifest(dir)?.codegen;
@@ -282,6 +292,7 @@ function generatePackage(
 ): string {
   const parsed = inputs.map(parseInputArg);
   const srcDir = resolve(dir, "src");
+  const destinationPackage = packageName(dir);
   mkdirSync(srcDir, { recursive: true });
 
   // Remove prior generated modules (read-only + our header) so a dropped input
@@ -295,12 +306,13 @@ function generatePackage(
     }
   }
 
-  let warnings = 0;
   for (const input of parsed) {
     const sourcePath = resolveInputSource(input.source, dir, projectRoot);
     if (!existsSync(sourcePath)) {
       throw new Error(`codegen input not found: ${input.source}`);
     }
+    const destination = `${destinationPackage}/src/${input.name}.ts`;
+    const source = sourceLabel(input.source);
 
     const sourceText = preprocess(stripImports(tsRuntime, sourcePath));
     const { getZodSchemasFile, getInferredTypes, errors } = generate({
@@ -310,8 +322,7 @@ function generatePackage(
       keepComments: true,
     });
     if (errors.length) {
-      warnings += errors.length;
-      for (const err of errors) logger.warn(`  ! ${err}`);
+      for (const err of errors) logger.warn(`${destination} from ${source}: ${err}`);
     }
 
     // ts-to-zod adds an import line only when the source references external
@@ -324,11 +335,12 @@ function generatePackage(
     makeWritable(outPath);
     writeFileSync(outPath, content);
     makeReadonly(outPath);
+    logger.success(
+      `generated ${destination} from ${source}` +
+        (errors.length ? ` (${errors.length} warning(s))` : ""),
+    );
   }
 
-  logger.success(
-    `${basename(dir)}: ${parsed.length} module(s)` + (warnings ? ` (${warnings} warning(s))` : ""),
-  );
   return dir;
 }
 

package/src/project-js.ts

@@ -15,7 +15,7 @@ import { type IConstruct } from "constructs";
 import { Component, IgnoreFile, Project, type TaskOptions, javascript, typescript } from "projen";
 import { BuildWorkflow } from "projen/lib/build";
 import { AutoMerge } from "projen/lib/github";
-import { JobPermission, type JobStep } from "projen/lib/github/workflows-model";
+import { JobPermission, type JobStep, type Triggers } from "projen/lib/github/workflows-model";
 import type { ReleaseProjectOptions } from "projen/lib/release";
 import { mixin } from "..";
 import { generateBarrels } from "./barrels.ts";
@@ -943,7 +943,35 @@ function configureBuildWorkflow(
   });
   validation.exec("bunx projen default");
   validation.exec("bun run compile");
-  const configured = options.buildWorkflowOptions ?? {};
+  const configured = {
+    ...options.buildWorkflowOptions,
+    ...(!options.buildWorkflowOptions?.workflowTriggers &&
+    project.releaseCatalog.mode === "independent"
+      ? {
+          workflowTriggers: {
+            pullRequest: {
+              types: ["opened", "synchronize", "reopened", "closed"],
+              paths: [
+                "**",
+                "!.projen/release-units.json",
+                "!.release-please-manifest.json",
+                "!.release-units/**",
+                "!.release-notes/**",
+                "!docs/releases/**",
+                "!Cargo.lock",
+                "!**/Cargo.toml",
+                "!**/package.json",
+                "!**/pyproject.toml",
+                "!**/index.ts",
+                "!packages/js/node/rust-binary/src/_rust-release-binaries.ts",
+                "!packages/js/node/appkit-graphiti/src/_python-runtime.ts",
+              ],
+            },
+            workflowDispatch: {},
+          } satisfies Triggers,
+        }
+      : {}),
+  };
   const compatibility = nodeWorkflowCompatibility(project);
   const configuredRunner = configured.runsOn !== undefined || configured.runsOnGroup !== undefined;
   const workflow = new BuildWorkflow(project, {

package/src/release-catalog.ts

@@ -800,12 +800,26 @@ function gitReleaseFiles(root: string, paths: readonly string[]): string[] | und
       .filter(Boolean)
       .map((path) => resolve(root, path))
       .filter((path) => existsSync(path))
+      .filter((path) => paths.some((sourcePath) => trackedReleaseFile(sourcePath, path)))
       .sort();
   } catch {
     return undefined;
   }
 }
 
+function trackedReleaseFile(sourcePath: string, path: string): boolean {
+  const sourceRelative = toPosix(relative(sourcePath, path));
+  if (sourceRelative.startsWith("../") || sourceRelative === "..") return false;
+  const parts = sourceRelative.split("/");
+  const file = parts.pop();
+  if (!file) return false;
+  if (parts.some((part) => IGNORED_DIRECTORIES.has(part))) return false;
+  if (IGNORED_FILES.has(file) || file.endsWith(".lock") || file.startsWith("tsconfig")) {
+    return false;
+  }
+  return sourceRelative !== "index.ts";
+}
+
 function releaseFiles(path: string): string[] {
   if (!existsSync(path)) return [];
   const entries = readdirSync(path, { withFileTypes: true });

package/src/release.ts

@@ -352,9 +352,10 @@ function addDocsJobs(
 
 function independentReleasePleaseJob(project: DBXToolsJavaScriptProject, branch: string): Job {
   return {
-    if: "${{ github.event_name == 'push' }}",
+    if: "${{ github.event_name == 'push' || inputs.automatic == true }}",
     runsOn: ["ubuntu-latest"],
     permissions: {
+      actions: JobPermission.WRITE,
       contents: JobPermission.WRITE,
       pullRequests: JobPermission.WRITE,
     },
@@ -419,7 +420,11 @@ function independentReleasePleaseJob(project: DBXToolsJavaScriptProject, branch:
       {
         name: "Reconcile generated release PR files",
         if: "${{ steps.release.outputs.prs_created == 'true' }}",
-        env: { RELEASE_PRS: "${{ steps.release.outputs.prs }}" },
+        env: {
+          GH_TOKEN: "${{ github.token }}",
+          RELEASE_BRANCH: branch,
+          RELEASE_PRS: "${{ steps.release.outputs.prs }}",
+        },
         shell: "bash",
         run: [
           'BRANCH="$(jq -r \'.[0].headBranchName\' <<<"$RELEASE_PRS")"',
@@ -438,6 +443,26 @@ function independentReleasePleaseJob(project: DBXToolsJavaScriptProject, branch:
           '  git commit -m "chore: reconcile release metadata"',
           '  git push origin "HEAD:$BRANCH"',
           "fi",
+          'MERGED="false"',
+          "for ATTEMPT in $(seq 1 15); do",
+          '  STATE="$(gh pr view "$BRANCH" --json state,mergeable --jq \'[.state,.mergeable] | join(" ")\')"',
+          '  if [[ "$STATE" == MERGED* ]]; then MERGED="true"; break; fi',
+          '  if [ "$STATE" = "OPEN CONFLICTING" ]; then',
+          '    echo "::error::release pull request has merge conflicts"',
+          "    exit 1",
+          "  fi",
+          '  if [ "$STATE" = "OPEN MERGEABLE" ] && gh pr merge "$BRANCH" --merge; then',
+          '    MERGED="true"',
+          "    break",
+          "  fi",
+          '  echo "release pull request is not mergeable yet (attempt $ATTEMPT/15)"',
+          "  sleep 2",
+          "done",
+          'if [ "$MERGED" != "true" ]; then',
+          '  echo "::error::release pull request did not become mergeable"',
+          "  exit 1",
+          "fi",
+          'gh workflow run release.yml --ref "$RELEASE_BRANCH" -f automatic=true',
         ].join("\n"),
       },
     ],
@@ -464,7 +489,8 @@ function configureReleaseRequestWorkflow(
     if: `\${{ github.ref_name != '${baseBranch}' }}`,
     runsOn: ["ubuntu-latest"],
     permissions: {
-      contents: JobPermission.READ,
+      actions: JobPermission.WRITE,
+      contents: JobPermission.WRITE,
       pullRequests: JobPermission.WRITE,
     },
     steps: [
@@ -489,14 +515,13 @@ function configureReleaseRequestWorkflow(
           "  exit 0",
           "fi",
           'echo "requested=true" >> "$GITHUB_OUTPUT"',
-          'echo "branch=$(git branch --show-current)" >> "$GITHUB_OUTPUT"',
-          'echo "approve=$(sed -n \'s/^Release-Approve: //p\' <<<"$MESSAGE" | tail -1)" >> "$GITHUB_OUTPUT"',
+          'echo "branch=$GITHUB_REF_NAME" >> "$GITHUB_OUTPUT"',
           'echo "notes_path=$(sed -n \'s/^Release-Notes-Path: //p\' <<<"$MESSAGE" | tail -1)" >> "$GITHUB_OUTPUT"',
           'echo "title=$(git log -1 --skip=1 --format=%s)" >> "$GITHUB_OUTPUT"',
         ].join("\n"),
       },
       {
-        name: "Create or update source pull request",
+        name: "Create, merge, and release source pull request",
         if: "${{ steps.request.outputs.requested == 'true' }}",
         env: {
           GH_TOKEN: "${{ github.token }}",
@@ -504,7 +529,6 @@ function configureReleaseRequestWorkflow(
           BASE_BRANCH: baseBranch,
           TITLE: "${{ steps.request.outputs.title }}",
           NOTES_PATH: "${{ steps.request.outputs.notes_path }}",
-          APPROVE: "${{ steps.request.outputs.approve }}",
         },
         shell: "bash",
         run: [
@@ -515,9 +539,11 @@ function configureReleaseRequestWorkflow(
           'if [ -n "$PR" ]; then',
           '  gh pr edit "$PR" --title "$TITLE" --body "$BODY"',
           "else",
-          '  PR="$(gh pr create --head "$SOURCE_BRANCH" --base "$BASE_BRANCH" --title "$TITLE" --body "$BODY" --json number --jq .number)"',
+          '  gh pr create --head "$SOURCE_BRANCH" --base "$BASE_BRANCH" --title "$TITLE" --body "$BODY"',
+          '  PR="$(gh pr list --head "$SOURCE_BRANCH" --base "$BASE_BRANCH" --state open --json number --jq \'.[0].number\')"',
           "fi",
-          'if [ "$APPROVE" = "true" ]; then gh pr merge "$PR" --auto --merge; fi',
+          'gh pr merge "$PR" --merge',
+          'gh workflow run release.yml --repo "$GITHUB_REPOSITORY" --ref "$BASE_BRANCH" -f automatic=true',
         ].join("\n"),
       },
     ],
@@ -526,7 +552,7 @@ function configureReleaseRequestWorkflow(
 
 function independentReleasePlanJob(project: DBXToolsJavaScriptProject): Job {
   return {
-    if: "${{ always() && (github.event_name == 'workflow_dispatch' || needs.release-please.outputs.releases_created == 'true' || needs.release-please.outputs.docs_changed == 'true' || needs.release-please.outputs.recovery_requested == 'true') }}",
+    if: "${{ always() && ((github.event_name == 'workflow_dispatch' && inputs.automatic != true) || needs.release-please.outputs.releases_created == 'true' || (needs.release-please.outputs.docs_changed == 'true' && needs.release-please.outputs.prs_created != 'true') || needs.release-please.outputs.recovery_requested == 'true') }}",
     needs: ["release-please"],
     runsOn: ["ubuntu-latest"],
     permissions: { contents: JobPermission.READ },
@@ -721,41 +747,67 @@ function addIndependentDocsJobs(
   });
 }
 
-function addIndependentBranchSyncJob(workflow: GithubWorkflow, branch: string): void {
+function addIndependentBranchSyncJob(
+  workflow: GithubWorkflow,
+  project: DBXToolsJavaScriptProject,
+  branch: string,
+): void {
+  const releaseBranch = projectReleaseBranch(project);
   workflow.addJob("sync-release-branch", {
-    if: "${{ always() && github.event_name == 'push' && needs['publication-complete'].result == 'success' }}",
+    if: "${{ always() && (github.event_name == 'push' || inputs.automatic == true) && needs['publication-complete'].result == 'success' }}",
     needs: ["publication-complete"],
     runsOn: ["ubuntu-latest"],
     permissions: { contents: JobPermission.WRITE },
+    env: { BUN_VERSION },
     steps: [
       {
         name: "Checkout released main",
         uses: "actions/checkout@v6",
         with: { "fetch-depth": 0 },
       },
+      ...bunCacheRestoreSteps(project, {
+        ignorePaths: project.workflowCacheIgnorePaths,
+      }),
+      { name: "Install dependencies", run: "bun install" },
       {
         name: `Safely sync ${branch}`,
         shell: "bash",
-        env: { SOURCE_BRANCH: branch },
+        env: { SOURCE_BRANCH: branch, RELEASE_BRANCH: releaseBranch },
         run: [
           'if ! git ls-remote --exit-code --heads origin "refs/heads/$SOURCE_BRANCH" >/dev/null 2>&1; then',
           '  echo "source branch $SOURCE_BRANCH no longer exists; nothing to sync"',
           "  exit 0",
           "fi",
           'git fetch origin "refs/heads/$SOURCE_BRANCH:refs/remotes/origin/$SOURCE_BRANCH"',
-          'if git merge-base --is-ancestor "origin/$SOURCE_BRANCH" HEAD; then',
-          '  git push origin "HEAD:refs/heads/$SOURCE_BRANCH"',
-          'elif git merge-base --is-ancestor HEAD "origin/$SOURCE_BRANCH"; then',
+          'git fetch origin "refs/heads/$RELEASE_BRANCH:refs/remotes/origin/$RELEASE_BRANCH"',
+          'if git merge-base --is-ancestor "origin/$SOURCE_BRANCH" "origin/$RELEASE_BRANCH"; then',
+          '  git push origin "refs/remotes/origin/$RELEASE_BRANCH:refs/heads/$SOURCE_BRANCH"',
+          'elif git merge-base --is-ancestor "origin/$RELEASE_BRANCH" "origin/$SOURCE_BRANCH"; then',
           '  echo "source branch $SOURCE_BRANCH already contains released main"',
           "else",
           '  git config user.name "github-actions[bot]"',
           '  git config user.email "41898282+github-actions[bot]@users.noreply.github.com"',
           '  git switch --force-create "$SOURCE_BRANCH" "origin/$SOURCE_BRANCH"',
-          '  if git merge --no-ff --no-edit "$GITHUB_SHA"; then',
+          '  if git merge --no-ff --no-edit "origin/$RELEASE_BRANCH"; then',
           '    git push origin "HEAD:refs/heads/$SOURCE_BRANCH"',
           "  else",
+          '    SAFE_GENERATED="true"',
+          "    while IFS= read -r FILE; do",
+          '      case "$FILE" in',
+          "        .projen/release-units.json|.release-please-manifest.json|.release-units/*/source.json|.release-units/*/version.txt|.release-units/*/CHANGELOG.md|Cargo.lock|*/Cargo.toml|*/package.json|*/pyproject.toml|*/index.ts) ;;",
+          '        *) SAFE_GENERATED="false" ;;',
+          "      esac",
+          "    done < <(git diff --name-only --diff-filter=U)",
+          '    if [ "$SAFE_GENERATED" = "true" ] && bunx projen; then',
+          "      git add -A",
+          '      if [ -z "$(git diff --name-only --diff-filter=U)" ]; then',
+          "        git commit --no-edit",
+          '        git push origin "HEAD:refs/heads/$SOURCE_BRANCH"',
+          "        exit 0",
+          "      fi",
+          "    fi",
           "    git merge --abort",
-          '    echo "::warning::source branch $SOURCE_BRANCH has merge conflicts with released main; leaving it untouched"',
+          '    echo "::warning::source branch $SOURCE_BRANCH has handwritten or unresolved conflicts with released main; leaving it untouched"',
           "  fi",
           "fi",
         ].join("\n"),
@@ -794,7 +846,11 @@ class IndependentReleaseFinalizer extends Component {
       addIndependentDocsJobs(this.workflow, this.project as DBXToolsJavaScriptProject, this.docs);
     }
     if (this.syncBranch) {
-      addIndependentBranchSyncJob(this.workflow, this.syncBranch);
+      addIndependentBranchSyncJob(
+        this.workflow,
+        this.project as DBXToolsJavaScriptProject,
+        this.syncBranch,
+      );
     }
   }
 }
@@ -833,11 +889,18 @@ function configureIndependentRelease(
     concurrencyOptions: { group: "release", cancelInProgress: false },
   });
   workflow.runName =
-    "release units " + "${{ github.event_name == 'push' && github.sha || inputs.component }}";
+    "release units " +
+    "${{ github.event_name == 'push' && github.sha || inputs.automatic && 'automatic' || inputs.component }}";
   workflow.on({
     push: { branches: [branch] },
     workflowDispatch: {
       inputs: {
+        automatic: {
+          description: "Continue an automatically merged Release Please pull request",
+          type: "boolean",
+          default: "false",
+          required: false,
+        },
         component: {
           description: "Component to recover",
           type: "string",
@@ -860,6 +923,7 @@ function configureIndependentRelease(
       },
     },
   });
+  workflow.file?.addOverride("on.workflow_dispatch.inputs.automatic.default", false);
   workflow.file?.addOverride("permissions.contents", "read");
   workflow.addJob("release-please", independentReleasePleaseJob(project, branch));
   workflow.addJob("release-plan", independentReleasePlanJob(project));

package/tasks/release-please.ts

@@ -112,7 +112,6 @@ if (import.meta.main) {
       "Release Please version manifest",
       ".release-please-manifest.json",
     )
-    .option("--approve", "compatibility alias for the Release Please release pass")
     .action(
       async (options: {
         owner?: string;

package/tasks/release-request.ts

@@ -13,7 +13,6 @@ const logger = log.logger("projen:release-request");
 export interface PrepareReleaseRequestOptions {
   readonly root: string;
   readonly baseBranch: string;
-  readonly approve?: boolean;
   readonly message?: string;
   readonly notes?: string;
   readonly notesFile?: string;
@@ -94,12 +93,11 @@ export async function prepareReleaseRequest(
     [
       "Release-Request: true",
       `Release-Source-Branch: ${branch}`,
-      `Release-Approve: ${options.approve === true}`,
       `Release-Notes-Path: ${notesPath}`,
     ].join("\n"),
   ]);
   if (options.push !== false) run(root, ["push", "--set-upstream", "origin", branch]);
-  logger.success("release request pushed", { branch, approve: options.approve === true });
+  logger.success("release request pushed", { branch });
   return true;
 }
 
@@ -155,19 +153,22 @@ function run(root: string, args: string[]): void {
   });
 }
 
+/** Restore option text after Projen forwards task arguments without shell quoting. */
+function optionText(values?: readonly string[]): string | undefined {
+  return values?.join(" ");
+}
+
 if (import.meta.main) {
   await new Command()
     .option("--base <branch>", "release target branch", "main")
-    .option("--approve", "enable merge-queue or auto-merge for the source PR")
-    .option("--message <message>", "commit message for uncommitted source changes")
-    .option("--notes <notes>", "custom release notes")
+    .option("--message <message...>", "commit message for uncommitted source changes")
+    .option("--notes <notes...>", "custom release notes")
     .option("--notes-file <path>", "read custom release notes from a file")
     .action(
       async (options: {
         base: string;
-        approve?: boolean;
-        message?: string;
-        notes?: string;
+        message?: string[];
+        notes?: string[];
         notesFile?: string;
       }) => {
         if (options.notes && options.notesFile) {
@@ -176,9 +177,8 @@ if (import.meta.main) {
         await prepareReleaseRequest({
           root: project.root() ?? process.cwd(),
           baseBranch: options.base,
-          approve: options.approve,
-          message: options.message,
-          notes: options.notes,
+          message: optionText(options.message),
+          notes: optionText(options.notes),
           notesFile: options.notesFile,
         });
       },