nx 24.0.0-beta.0 → 24.0.0-beta.2

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

@@ -20,6 +20,9 @@ const deferred_output_1 = require("./deferred-output");
 // 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];
+// Without it the agent continues as the absorb guidance says, and a cause that
+// fails every commit leaves the whole run uncommitted.
+const AGENT_SESSION_COMMIT_FAILURE = "Commits in this session cannot ask for input, such as a signing passphrase or a hook's prompt, so later commits may fail the same way until the cause is fixed. Before the next step, tell the user what failed and ask whether to fix the cause first or to continue as is. Either way nx tries every later commit, and the first one that lands includes these changes.";
 /**
  * `pendingMigrations` are listed in the commit body so a `git log -p` reader
  * can see which earlier migrations' diffs this commit absorbed (their own
@@ -28,10 +31,14 @@ const MIGRATE_COMMIT_EXCLUDES = [types_1.MIGRATE_RUNS_RELATIVE_DIR];
  * The default `failureGuidance` describes the classic loop's absorb-and-recap
  * behavior; a caller with no later commit or recap to absorb the diff (the
  * standalone single-migration worker) passes its own.
+ *
+ * A `sink` collects the output for a caller sharing the terminal with an
+ * agent, and the commit then runs without the terminal.
  */
-async function commitMigrationIfRequested(root, migration, shouldCreateCommits, commitPrefix, installDepsIfChanged, pendingMigrations = [], failureGuidance = 'Any uncommitted changes will be included in the next successful commit, which will reference this migration; if they remain uncommitted, the end-of-run output will list this migration so you can commit or revert them manually.', out = deferred_output_1.terminalOutput) {
+async function commitMigrationIfRequested(root, migration, shouldCreateCommits, commitPrefix, installDepsIfChanged, pendingMigrations = [], failureGuidance = 'Any uncommitted changes will be included in the next successful commit, which will reference this migration; if they remain uncommitted, the end-of-run output will list this migration so you can commit or revert them manually.', sink) {
     if (!shouldCreateCommits)
         return { status: 'disabled' };
+    const out = sink ?? deferred_output_1.terminalOutput;
     await installDepsIfChanged();
     // 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.
@@ -42,7 +49,7 @@ async function commitMigrationIfRequested(root, migration, shouldCreateCommits,
     }
     const commitMessage = buildCommitMessage(`${commitPrefix}${migration.name}`, pendingMigrations);
     try {
-        const sha = await (0, git_utils_1.tryCommitChangesAsync)(commitMessage, root, MIGRATE_COMMIT_EXCLUDES);
+        const sha = await (0, git_utils_1.tryCommitChangesAsync)(commitMessage, root, MIGRATE_COMMIT_EXCLUDES, { withoutTerminal: sink !== undefined });
         if (sha)
             return { status: 'committed', sha };
         // null = commit landed but `git rev-parse HEAD` failed (see
@@ -52,7 +59,7 @@ async function commitMigrationIfRequested(root, migration, shouldCreateCommits,
     }
     catch (err) {
         const reason = err instanceof Error ? err.message : String(err);
-        out.line('red', `The commit for ${migration.name} failed:\n${reason}\nCheck \`git status\` and \`git log\`; the commit may have landed despite this error. ${failureGuidance}`);
+        out.line('red', `The commit for ${migration.name} failed:\n${reason}\nCheck \`git status\` and \`git log\`; the commit may have landed despite this error. ${failureGuidance}${sink ? ` ${AGENT_SESSION_COMMIT_FAILURE}` : ''}`);
         return { status: 'failed', reason };
     }
 }

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

@@ -9,12 +9,12 @@ import { type MigrateArgs } from './command-object';
  * config value never trips the mutually-exclusive-flag guards in
  * `parseMigrationsOptions`: `include` and `multiMajorMode` in the generate
  * phase only; `createCommits` / `commitPrefix` and `agentic` / `validate` when
- * running the whole migrations file or a standalone single migration. A
- * `--run-id` reconcile or recorded worker takes none of them: a recorded run
- * takes its commit config from run.json and is driven by the outer agent. A
- * `--run-migrations --run-id` continue takes `agentic` only, to select the
- * agent of the new session. A `--start-fresh` starts a new run and takes all
- * four.
+ * running the whole migrations file or a standalone single migration, and
+ * `finalValidation` for the whole file only. A `--run-id` reconcile or
+ * recorded worker takes none of them: a recorded run takes its commit config
+ * from run.json and is driven by the outer agent. A `--run-migrations
+ * --run-id` continue takes `agentic` only, to select the agent of the new
+ * session. A `--start-fresh` starts a new run and takes all five.
  *
  * `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

@@ -14,12 +14,12 @@ const MULTI_MAJOR_MODE_ENV = 'NX_MULTI_MAJOR_MODE';
  * config value never trips the mutually-exclusive-flag guards in
  * `parseMigrationsOptions`: `include` and `multiMajorMode` in the generate
  * phase only; `createCommits` / `commitPrefix` and `agentic` / `validate` when
- * running the whole migrations file or a standalone single migration. A
- * `--run-id` reconcile or recorded worker takes none of them: a recorded run
- * takes its commit config from run.json and is driven by the outer agent. A
- * `--run-migrations --run-id` continue takes `agentic` only, to select the
- * agent of the new session. A `--start-fresh` starts a new run and takes all
- * four.
+ * running the whole migrations file or a standalone single migration, and
+ * `finalValidation` for the whole file only. A `--run-id` reconcile or
+ * recorded worker takes none of them: a recorded run takes its commit config
+ * from run.json and is driven by the outer agent. A `--run-migrations
+ * --run-id` continue takes `agentic` only, to select the agent of the new
+ * session. A `--start-fresh` starts a new run and takes all five.
  *
  * `include` is carried as `includeFromConfig` so it is never mistaken for an
  * explicit `--include`: `resolveInclude` applies it only when the resolved
@@ -60,6 +60,12 @@ function applyNxJsonMigrateDefaults(args, migrateConfig, env = process.env) {
             assertType(migrateConfig.validate, 'boolean', 'validate');
             merged.validate = migrateConfig.validate;
         }
+        if (isRunMigrations &&
+            merged.finalValidation === undefined &&
+            migrateConfig.finalValidation !== undefined) {
+            assertType(migrateConfig.finalValidation, 'boolean', 'finalValidation');
+            merged.finalValidation = migrateConfig.finalValidation;
+        }
     }
     // A continue takes `agentic` too; the reconcile and the worker must not:
     // there it trips the `--agentic`/`--run-id` parse conflict.

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

@@ -196,7 +196,9 @@ export { filterDowngradedUpdates };
 export declare function generateMigrationsJsonAndUpdatePackageJson(root: string, opts: GenerateMigrations, fetch?: MigratorOptions['fetch']): Promise<void>;
 export { isPromptOnlyMigration, isHybridMigration };
 export declare function formatSkippedPromptsNextStep(skipped: PlannedMigration[]): string;
-export declare function executeMigrations(root: string, migrations: PlannedMigration[], isVerbose: boolean, shouldCreateCommits: boolean, commitPrefix: string, shouldSkipInstall?: boolean, agentic?: ResolvedAgentic, agenticHasDiffContext?: boolean, shouldRunValidation?: boolean): Promise<{
+export declare function executeMigrations(root: string, migrations: PlannedMigration[], isVerbose: boolean, shouldCreateCommits: boolean, commitPrefix: string, shouldSkipInstall?: boolean, agentic?: Exclude<ResolvedAgentic, {
+    kind: 'enabled';
+}>): Promise<{
     migrationsWithNoChanges: PlannedMigration[];
     skippedPromptsCount: number;
     notRunMigrationsCount: number;
@@ -213,33 +215,4 @@ export declare function migrate(root: string, args: {
 }, rawArgs: string[]): Promise<number>;
 export declare function readLocalNxVersion(root: string): string | undefined;
 export declare function runMigration(): Promise<number>;
-/**
- * Resolves a migration's collection once and derives everything the run loop
- * needs from that single read: the implementation context (`collection` +
- * `collectionPath`, handed to `runNxOrAngularMigration`) and, for agentic runs,
- * the workspace-relative documentation path handed to the agent.
- *
- * Read fresh per migration (not cached across the loop) so a prior migration's
- * reinstall is reflected, exactly as before. Error handling matches each field's
- * role:
- * - Migrations that run an implementation REQUIRE the collection; an unreadable
- *   collection throws and aborts that migration (caught by the run loop).
- * - Prompt-only migrations don't run an implementation, so the collection is
- *   read only to resolve documentation - a failure there is non-fatal: the
- *   prompt still runs and the supplementary doc is skipped with a warning.
- */
-export declare function resolveMigrationForRun(root: string, migration: {
-    package: string;
-    name: string;
-    documentation?: string;
-    implementation?: string;
-    factory?: string;
-    prompt?: string;
-}, resolveDocumentation: boolean): {
-    resolvedCollection?: {
-        collection: MigrationsJson;
-        collectionPath: string;
-    };
-    documentationPath?: string;
-};
 export declare function nxCliPath(nxWorkspaceRoot?: string): Promise<string>;