nx 23.2.0-beta.7 → 23.2.0-beta.9

package/dist/src/command-line/migrate/migrate-commits.js

@@ -3,13 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.commitMigrationIfRequested = commitMigrationIfRequested;
 exports.commitCheckpointBeforeMigrations = commitCheckpointBeforeMigrations;
 exports.resolveCreateCommits = resolveCreateCommits;
+exports.confirmMigrationCommitsOnDefaultBranch = confirmMigrationCommitsOnDefaultBranch;
 exports.confirmCommitsOnDefaultBranch = confirmCommitsOnDefaultBranch;
 const tslib_1 = require("tslib");
 const pc = tslib_1.__importStar(require("picocolors"));
+const configuration_1 = require("../../config/configuration");
+const command_line_utils_1 = require("../../utils/command-line-utils");
 const git_utils_1 = require("../../utils/git-utils");
 const logger_1 = require("../../utils/logger");
 const output_1 = require("../../utils/output");
+const types_1 = require("./agentic/types");
 const safe_prompt_1 = require("./safe-prompt");
+// `git add -A` captures an orchestrated run's scratch state whenever the
+// ignore rule that normally hides it goes missing mid-run (a checkout, a
+// .gitignore edit, or the migration's own changes).
+const MIGRATE_COMMIT_EXCLUDES = [types_1.MIGRATE_RUNS_RELATIVE_DIR];
 /**
  * `pendingMigrations` are listed in the commit body so a `git log -p` reader
  * can see which earlier migrations' diffs this commit absorbed (their own
@@ -23,15 +31,16 @@ async function commitMigrationIfRequested(root, migration, shouldCreateCommits,
     if (!shouldCreateCommits)
         return { status: 'disabled' };
     await installDepsIfChanged();
-    // Generator may have only touched gitignored paths, or the prompt half
-    // made no change — log neutrally instead of as an error.
-    if (!(0, git_utils_1.hasUncommittedChanges)(root)) {
+    // Generator may have only touched gitignored paths or the excluded scratch
+    // dir, or the prompt half made no change: log neutrally, not as an error.
+    // The probe excludes what the commit excludes, else the commit fails empty.
+    if (!(0, git_utils_1.hasUncommittedChanges)(root, MIGRATE_COMMIT_EXCLUDES)) {
         logger_1.logger.info(pc.dim(`- No changes to commit for ${migration.name}.`));
         return { status: 'no-changes' };
     }
     const commitMessage = buildCommitMessage(`${commitPrefix}${migration.name}`, pendingMigrations);
     try {
-        const sha = (0, git_utils_1.tryCommitChanges)(commitMessage, root);
+        const sha = (0, git_utils_1.tryCommitChanges)(commitMessage, root, MIGRATE_COMMIT_EXCLUDES);
         if (sha)
             return { status: 'committed', sha };
         // null = commit landed but `git rev-parse HEAD` failed (see
@@ -74,10 +83,10 @@ function buildCommitMessage(subject, pendingMigrations) {
  * the working tree is already clean.
  */
 function commitCheckpointBeforeMigrations(root, commitPrefix) {
-    if (!(0, git_utils_1.hasUncommittedChanges)(root))
+    if (!(0, git_utils_1.hasUncommittedChanges)(root, MIGRATE_COMMIT_EXCLUDES))
         return;
     try {
-        const sha = (0, git_utils_1.tryCommitChanges)(`${commitPrefix}checkpoint before running migrations`, root);
+        const sha = (0, git_utils_1.tryCommitChanges)(`${commitPrefix}checkpoint before running migrations`, root, MIGRATE_COMMIT_EXCLUDES);
         if (sha) {
             logger_1.logger.info(pc.dim(`- Checkpoint commit created: ${sha}`));
             return;
@@ -108,7 +117,11 @@ function commitCheckpointBeforeMigrations(root, commitPrefix) {
  * pointing at git.
  */
 function resolveCreateCommits(args) {
-    const { createCommits, agenticKind, isGitRepo, commitPrefixIsCustom } = args;
+    const { createCommits, mode, isGitRepo, commitPrefixIsCustom } = args;
+    // The orchestrator forces the agentic defaults without the `--agentic` flag,
+    // so its warnings must not name a flag the user never passed.
+    const orchestrated = mode === 'orchestrated';
+    const agenticKind = orchestrated ? 'enabled' : mode;
     if (createCommits === true && !isGitRepo) {
         return {
             effective: false,
@@ -121,7 +134,9 @@ function resolveCreateCommits(args) {
             return {
                 effective: false,
                 agenticHasDiffContext: false,
-                warning: "--no-create-commits was passed alongside --agentic. Without per-migration commits, the agent can't isolate the current migration's changes from earlier migrations in this run. Drop --no-create-commits for accurate per-migration review." +
+                warning: (orchestrated
+                    ? "--no-create-commits was passed, but orchestrated migrate runs create per-migration commits by default. Without them, the agent can't isolate the current migration's changes from earlier migrations in this run. Drop --no-create-commits for accurate per-migration review."
+                    : "--no-create-commits was passed alongside --agentic. Without per-migration commits, the agent can't isolate the current migration's changes from earlier migrations in this run. Drop --no-create-commits for accurate per-migration review.") +
                     (commitPrefixIsCustom
                         ? ' Note: the custom --commit-prefix value will have no effect because commits are disabled.'
                         : ''),
@@ -133,7 +148,9 @@ function resolveCreateCommits(args) {
             return {
                 effective: false,
                 agenticHasDiffContext: false,
-                warning: '`--agentic` enables per-migration commits by default, but the workspace is not a git repository. Continuing without commits, so the agent will not receive per-file diff context. Run `git init` to enable.' +
+                warning: (orchestrated
+                    ? 'Orchestrated migrate runs create per-migration commits by default, but the workspace is not a git repository. Continuing without commits, so the agent will not receive per-file diff context. Run `git init` to enable.'
+                    : '`--agentic` enables per-migration commits by default, but the workspace is not a git repository. Continuing without commits, so the agent will not receive per-file diff context. Run `git init` to enable.') +
                     (commitPrefixIsCustom
                         ? ' The custom --commit-prefix value will have no effect.'
                         : ''),
@@ -149,22 +166,52 @@ function resolveCreateCommits(args) {
             : undefined,
     };
 }
+// The branch to hold `getBaseRef`'s value against. It may name a remote-tracking
+// ref whose local counterpart drops the remote (the CI-workflow generator writes
+// `origin/<branch>`), yet a local branch can be named `up/feature` while `up` is
+// a remote, so an exact match wins before any stripping and the longest matching
+// remote wins after. `origin` counts even undeclared: the generator assumes it.
+function defaultBranchToCompare(baseRef, currentBranch, root) {
+    if (currentBranch === baseRef) {
+        return baseRef;
+    }
+    const remote = [...(0, git_utils_1.getGitRemoteNames)(root), 'origin']
+        .filter((name) => baseRef.startsWith(`${name}/`))
+        .sort((a, b) => b.length - a.length)[0];
+    return remote ? baseRef.slice(remote.length + 1) : baseRef;
+}
 /**
+ * Asks before a run starts committing on the workspace's default branch, and
+ * reports the decision when the answer is no. Returns whether to proceed.
+ *
  * Callers gate this on commits being effective and on prompting being
- * possible, so non-interactive runs (CI, `--no-interactive`) never reach here.
+ * possible, so non-interactive runs (CI, `--no-interactive`) never reach here;
+ * `confirmCommitsOnDefaultBranch` has no guard of its own and would block on a
+ * prompt nobody can answer.
  */
+async function confirmMigrationCommitsOnDefaultBranch(root, whatWouldRun) {
+    const currentBranch = (0, git_utils_1.getGitCurrentBranch)(root);
+    const proceed = await confirmCommitsOnDefaultBranch({
+        currentBranch,
+        defaultBranch: defaultBranchToCompare((0, command_line_utils_1.getBaseRef)((0, configuration_1.readNxJson)(root)), currentBranch, root),
+    });
+    if (!proceed) {
+        output_1.output.log({
+            title: `Skipped ${whatWouldRun} to avoid committing to the default branch '${currentBranch}'.`,
+            bodyLines: [
+                'Switch to a different branch and re-run, or re-run and confirm to proceed.',
+            ],
+        });
+    }
+    return proceed;
+}
 async function confirmCommitsOnDefaultBranch(args) {
     const { currentBranch, defaultBranch } = args;
     if (!currentBranch || !defaultBranch || currentBranch !== defaultBranch) {
         return true;
     }
-    const { proceed } = await (0, safe_prompt_1.migratePrompt)([
-        {
-            name: 'proceed',
-            type: 'confirm',
-            message: `You're on the default branch '${currentBranch}'. nx migrate will create a commit for each migration on this branch. Continue?`,
-            initial: false,
-        },
-    ]);
-    return proceed;
+    return (0, safe_prompt_1.migrateConfirm)({
+        message: `You're on the default branch '${currentBranch}'. nx migrate will create a commit for each migration on this branch. Continue?`,
+        initial: false,
+    });
 }

package/dist/src/command-line/migrate/migrate-config.d.ts

@@ -8,8 +8,10 @@ import { type MigrateArgs } from './command-object';
  * Phase-aware so each option is only filled where it is consumed, and so a
  * config value never trips the mutually-exclusive-flag guards in
  * `parseMigrationsOptions`: `include` and `multiMajorMode` in the generate
- * phase only, `agentic` / `validate` / `createCommits` / `commitPrefix` when
- * running the whole migrations file or a single migration.
+ * phase only; `createCommits` / `commitPrefix` and `agentic` / `validate` when
+ * running the whole migrations file or a standalone single migration. A
+ * `--run-id` invocation takes none of them: a recorded run takes its commit
+ * config from run.json and is driven by the outer agent.
  *
  * `include` is carried as `includeFromConfig` so it is never mistaken for an
  * explicit `--include`: `resolveInclude` applies it only when the resolved

package/dist/src/command-line/migrate/migrate-config.js

@@ -13,8 +13,10 @@ const MULTI_MAJOR_MODE_ENV = 'NX_MULTI_MAJOR_MODE';
  * Phase-aware so each option is only filled where it is consumed, and so a
  * config value never trips the mutually-exclusive-flag guards in
  * `parseMigrationsOptions`: `include` and `multiMajorMode` in the generate
- * phase only, `agentic` / `validate` / `createCommits` / `commitPrefix` when
- * running the whole migrations file or a single migration.
+ * phase only; `createCommits` / `commitPrefix` and `agentic` / `validate` when
+ * running the whole migrations file or a standalone single migration. A
+ * `--run-id` invocation takes none of them: a recorded run takes its commit
+ * config from run.json and is driven by the outer agent.
  *
  * `include` is carried as `includeFromConfig` so it is never mistaken for an
  * explicit `--include`: `resolveInclude` applies it only when the resolved
@@ -28,8 +30,14 @@ function applyNxJsonMigrateDefaults(args, migrateConfig, env = process.env) {
     // `--run-migrations` with no value is normalized to '' by yargs, so a defined
     // (even empty-string) value means we're in the run-migrations phase.
     const isRunMigrations = merged.runMigrations !== undefined;
-    const isSingleMigration = merged.runMigration !== undefined;
-    if (isRunMigrations || isSingleMigration) {
+    // A bare `--run-id` (orchestrated reconcile) must never take the
+    // generate-options overlay, which would leak `include` etc. from nx.json.
+    const isSingleMigration = merged.runMigration !== undefined || merged.runId !== undefined;
+    // Both overlays are for an invocation that decides these options for
+    // itself, which a `--run-id` invocation never does: the recorded worker and
+    // the reconcile both read the commit config from run.json, and overlaying
+    // `agentic` would trip the `--agentic`/`--run-id` parse conflict.
+    if ((isRunMigrations || isSingleMigration) && merged.runId === undefined) {
         if (merged.createCommits === undefined &&
             migrateConfig.createCommits !== undefined) {
             assertType(migrateConfig.createCommits, 'boolean', 'createCommits');

package/dist/src/command-line/migrate/migrate.d.ts

@@ -10,6 +10,7 @@ import type { ResolvedAgentic } from './agentic/types';
 import { isHybridMigration, isPromptOnlyMigration, type PlannedMigration } from './migration-shape';
 import { filterDowngradedUpdates } from './update-filters';
 import { normalizeVersion } from './version-utils';
+import { type StepAction } from './step-actions';
 export * from './execute-migration';
 export { normalizeVersion };
 export interface ResolvedMigrationConfiguration extends MigrationsJson {
@@ -64,6 +65,8 @@ export declare class Migrator {
     private readonly packageUpdates;
     private readonly collectedVersions;
     private readonly promptAnswers;
+    private readonly pendingPackageJsonUpdates;
+    private readonly appliedPackageJsonUpdates;
     private readonly nxInstallation;
     private minVersionWithSkippedUpdates;
     constructor(opts: MigratorOptions);
@@ -86,6 +89,8 @@ export declare class Migrator {
     }>;
     private createMigrateJson;
     private buildPackageJsonUpdates;
+    private applyPackageJsonUpdate;
+    private applyPendingPackageJsonUpdates;
     private resolveVersionForCascade;
     private populatePackageJsonUpdatesAndGetPackagesToCheck;
     private getPackageJsonUpdatesFromMigrationConfig;
@@ -170,11 +175,17 @@ type RunMigrations = {
 type RunSingleMigration = {
     type: 'runSingleMigration';
     runMigration: string;
+    runId?: string;
     agentic: AgenticArg;
     validate?: boolean;
     interactive?: boolean;
 };
-export declare function parseMigrationsOptions(options: MigrateArgs, fetch?: MigratorOptions['fetch']): Promise<GenerateMigrations | RunMigrations | RunSingleMigration>;
+type OrchestratorReconcile = {
+    type: 'orchestratorReconcile';
+    runId: string;
+    stepAction?: StepAction;
+};
+export declare function parseMigrationsOptions(options: MigrateArgs, fetch?: MigratorOptions['fetch']): Promise<GenerateMigrations | RunMigrations | RunSingleMigration | OrchestratorReconcile>;
 export declare function createFetcher(pmc: PackageManagerCommands): ((pkg: string, version: string) => Promise<ResolvedMigrationConfiguration>) & {
     stats?: MigrateFetchStats;
 };
@@ -193,7 +204,7 @@ export declare function executeMigrations(root: string, migrations: PlannedMigra
     waivedAgenticStepsCount: number;
     retainedAtSuccess: string[];
 }>;
-export declare function isSingleMigrationInvocation(args: Pick<MigrateArgs, 'runMigration'>): boolean;
+export declare function isRunPhaseInvocation(args: Pick<MigrateArgs, 'runMigration' | 'runId' | 'stepAction'>): boolean;
 export declare function migrate(root: string, args: {
     [k: string]: any;
 }, rawArgs: string[]): Promise<number>;