@depup/nx 23.1.2-depup.1 → 23.2.0-depup.0

package/dist/src/command-line/migrate/migrate-ui-api.js

@@ -148,11 +148,15 @@ async function runSingleMigration(workspacePath, migration, configuration) {
         if (result.type === 'error') {
             throw new Error(result.message);
         }
-        const { fileChanges, gitRefAfter, nextSteps } = result;
+        const { fileChanges, gitRefAfter, nextSteps, skipAgentic } = result;
         modifyMigrationsJsonMetadata(workspacePath, addSuccessfulMigration(migration.id, fileChanges.map((change) => ({
             path: change.path,
             type: change.type,
-        })), gitRefAfter, nextSteps));
+        })), gitRefAfter, nextSteps, 
+        // Only a hybrid has a prompt phase to waive. A generator-only
+        // migration has no prompt affordance in the UI, so recording it there
+        // would mark a state the UI never shows.
+        skipAgentic === true && (0, migrate_1.isHybridMigration)(migration)));
         if (gitRefBefore !== gitRefAfter) {
             try {
                 (0, child_process_1.execSync)('git add migrations.json', {
@@ -225,17 +229,21 @@ function modifyMigrationsJsonMetadata(workspacePath, modify) {
     migrationsJson['nx-console'] = modify(migrationsJson['nx-console']);
     (0, fs_1.writeFileSync)(migrationsJsonPath, JSON.stringify(migrationsJson, null, 2));
 }
-function addSuccessfulMigration(id, fileChanges, ref, nextSteps) {
+function addSuccessfulMigration(id, fileChanges, ref, nextSteps, skipAgentic = false) {
     return (migrationsJsonMetadata) => {
         const copied = { ...migrationsJsonMetadata };
         if (!copied.completedMigrations) {
             copied.completedMigrations = {};
         }
-        // Carry forward a previously-set acknowledgedPrompt so any caller that
-        // re-records a successful entry for the same id (no current trigger; this
-        // is defensive against future paths) cannot silently drop the user's ack.
+        // A rerun re-records the same id. Carry an ack forward only off a record
+        // that carries no waiver: once a waiving run writes one it is
+        // byte-identical to a user's, so a rerun that owes the prompt again re-asks
+        // rather than trust it. Waiving sets the ack because nothing is owed.
         const existing = copied.completedMigrations[id];
-        const acknowledgedPrompt = existing?.type === 'successful' && existing.acknowledgedPrompt;
+        const acknowledgedPrompt = skipAgentic ||
+            (existing?.type === 'successful' &&
+                existing.acknowledgedPrompt &&
+                !existing.skipAgentic);
         copied.completedMigrations = {
             ...copied.completedMigrations,
             [id]: {
@@ -245,6 +253,7 @@ function addSuccessfulMigration(id, fileChanges, ref, nextSteps) {
                 ref,
                 nextSteps,
                 ...(acknowledgedPrompt && { acknowledgedPrompt: true }),
+                ...(skipAgentic && { skipAgentic: true }),
             },
         };
         return copied;

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

@@ -5,10 +5,12 @@ import { PackageManagerCommands } from '../../utils/package-manager';
 import { type MigrateFetchStats, type MigrateMultiMajorChoice } from './migrate-analytics';
 import { type MultiMajorMode } from './multi-major';
 import type { AgenticArg } from './agentic/select';
+import { MigrateArgs } from './command-object';
 import type { ResolvedAgentic } from './agentic/types';
-import { isHybridMigration, isPromptOnlyMigration } from './migration-shape';
+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 {
@@ -170,75 +172,43 @@ type RunMigrations = {
     validate?: boolean;
     interactive?: boolean;
 };
-export declare function parseMigrationsOptions(options: {
-    [k: string]: any;
-}, fetch?: MigratorOptions['fetch']): Promise<GenerateMigrations | RunMigrations>;
+type RunSingleMigration = {
+    type: 'runSingleMigration';
+    runMigration: string;
+    runId?: string;
+    agentic: AgenticArg;
+    validate?: boolean;
+    interactive?: boolean;
+};
+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;
 };
 export { filterDowngradedUpdates };
 export declare function generateMigrationsJsonAndUpdatePackageJson(root: string, opts: GenerateMigrations, fetch?: MigratorOptions['fetch']): Promise<void>;
-type ExecutableMigration = {
-    package: string;
-    name: string;
-    description?: string;
-    version: string;
-    implementation?: string;
-    factory?: string;
-    prompt?: string;
-    documentation?: string;
-};
 export { isPromptOnlyMigration, isHybridMigration };
-export declare function resolveAgenticRunId(migrations: ExecutableMigration[]): string;
-export declare function formatSkippedPromptsNextStep(skipped: ExecutableMigration[]): string;
-/**
- * Resolves the effective `--create-commits` state once the agentic flow has
- * been resolved. The agent's outer prompt only embeds the impl-phase file list
- * when per-migration commits isolate each migration's diff, so the diff-context
- * flag returned here gates that section.
- */
-export declare function resolveCreateCommits(args: {
-    createCommits: boolean | undefined;
-    agenticKind: ResolvedAgentic['kind'];
-    isGitRepo: boolean;
-    /**
-     * Whether `--commit-prefix` was given a non-default value. When commits
-     * end up disabled, the prefix has no effect — the warning copy below
-     * surfaces that so the user isn't silently misled.
-     */
-    commitPrefixIsCustom?: boolean;
-}): {
-    effective: boolean;
-    agenticHasDiffContext: boolean;
-    warning?: string;
-    error?: string;
-};
-/**
- * Resolves whether the framework-owned generic-validation agent step should run
- * after generator-only migrations.
- *
- * Default-on when the agentic flow resolved to `enabled`; silently ignored
- * otherwise (no warning emitted) — `--validate` requires an active agent
- * session by definition. An explicit `--no-validate` (`validate === false`)
- * opts out even when agentic is enabled.
- */
-export declare function resolveShouldRunValidation(args: {
-    validate: boolean | undefined;
-    agenticKind: ResolvedAgentic['kind'];
-}): boolean;
-export declare function executeMigrations(root: string, migrations: ExecutableMigration[], isVerbose: boolean, shouldCreateCommits: boolean, commitPrefix: string, shouldSkipInstall?: boolean, agentic?: ResolvedAgentic, agenticHasDiffContext?: boolean, shouldRunValidation?: boolean): Promise<{
-    migrationsWithNoChanges: ExecutableMigration[];
+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<{
+    migrationsWithNoChanges: PlannedMigration[];
     skippedPromptsCount: number;
     notRunMigrationsCount: number;
     nextSteps: string[];
-    skippedPrompts: ExecutableMigration[];
+    skippedPrompts: PlannedMigration[];
     migrationEmittedNextSteps: string[];
     committedShasCount: number;
+    waivedAgenticStepsCount: number;
     retainedAtSuccess: string[];
 }>;
+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>;
+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
@@ -269,5 +239,4 @@ export declare function resolveMigrationForRun(root: string, migration: {
     };
     documentationPath?: string;
 };
-export declare function resolveDocumentationFileToWorkspacePath(root: string, migrationsDir: string, documentation: string): string | undefined;
 export declare function nxCliPath(nxWorkspaceRoot?: string): Promise<string>;