@ohos-ports/nx 23.2.1-beta.1 → 23.3.0-beta.0

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

@@ -13,7 +13,11 @@ exports.reportMigrateRunComplete = reportMigrateRunComplete;
 exports.reportMigrateRunError = reportMigrateRunError;
 exports.reportMigrateOrchestratorInit = reportMigrateOrchestratorInit;
 exports.reportMigrateOrchestratorDispense = reportMigrateOrchestratorDispense;
+exports.reportMigrateOrchestratorStepDispensed = reportMigrateOrchestratorStepDispensed;
 exports.reportMigrateOrchestratorComplete = reportMigrateOrchestratorComplete;
+exports.reportMigrateOrchestratorAbandoned = reportMigrateOrchestratorAbandoned;
+exports.reportMigrateOrchestratorResume = reportMigrateOrchestratorResume;
+exports.reportMigrateOrchestratorExistingRun = reportMigrateOrchestratorExistingRun;
 exports.reportMigrateSingleMigrationInvocation = reportMigrateSingleMigrationInvocation;
 exports.computeMajorsCrossed = computeMajorsCrossed;
 exports.safeReport = safeReport;
@@ -195,10 +199,12 @@ function reportMigrateOrchestratorInit(opts) {
     });
 }
 /**
- * One event per orchestrator dispense. The `action` (dispense case) is a
- * closed enum carried on a reused dimension, read conditioned on the event
- * name (the same multiplexing pattern as {@link reportMigratePrompt});
- * `attempt` rides the migration-count dimension.
+ * One event per dispense response, repeated on every reconcile until the
+ * step moves. The `action` (dispense case) is a closed enum carried on a
+ * reused dimension, read conditioned on the event name (the same
+ * multiplexing pattern as {@link reportMigratePrompt}); `attempt` rides the
+ * migration-count dimension and `ordinal` (the run's dispense count) the
+ * task-count one.
  */
 function reportMigrateOrchestratorDispense(opts) {
     safeReport(() => {
@@ -207,21 +213,76 @@ function reportMigrateOrchestratorDispense(opts) {
         (0, analytics_1.reportEvent)('migrate_orchestrator_dispense', {
             [analytics_1.customDimensions.promptChoice]: opts.action,
             [analytics_1.customDimensions.migrationCount]: opts.attempt,
+            [analytics_1.customDimensions.taskCount]: opts.ordinal,
+        });
+    });
+}
+/** Once per durable dispense transition. */
+function reportMigrateOrchestratorStepDispensed(opts) {
+    safeReport(() => {
+        if (!analytics_1.customDimensions)
+            return;
+        (0, analytics_1.reportEvent)('migrate_orchestrator_step_dispensed', {
+            [analytics_1.customDimensions.migrationCount]: opts.attempt,
+            [analytics_1.customDimensions.taskCount]: opts.ordinal,
         });
     });
 }
 /**
- * Terminal funnel event. The two step tallies and the total dispense count
- * ride reused numeric dimensions, read conditioned on the event name.
+ * The three step tallies and the total dispense count ride reused numeric
+ * dimensions, read conditioned on the event name.
  */
+function orchestratorTallyParams(tallies) {
+    return {
+        [analytics_1.customDimensions.appliedCount]: tallies.completed,
+        [analytics_1.customDimensions.taskCount]: tallies.skipped,
+        [analytics_1.customDimensions.majorsCrossed]: tallies.unresolved,
+        [analytics_1.customDimensions.migrationCount]: tallies.dispenseCount,
+    };
+}
 function reportMigrateOrchestratorComplete(opts) {
     safeReport(() => {
         if (!analytics_1.customDimensions)
             return;
-        (0, analytics_1.reportEvent)('migrate_orchestrator_complete', {
-            [analytics_1.customDimensions.appliedCount]: opts.completed,
-            [analytics_1.customDimensions.taskCount]: opts.skipped,
-            [analytics_1.customDimensions.migrationCount]: opts.dispenseCount,
+        (0, analytics_1.reportEvent)('migrate_orchestrator_complete', orchestratorTallyParams(opts));
+    });
+}
+/** The agent session nx spawned ended with the run still active. */
+function reportMigrateOrchestratorAbandoned(opts) {
+    safeReport(() => {
+        if (!analytics_1.customDimensions)
+            return;
+        (0, analytics_1.reportEvent)('migrate_orchestrator_abandoned', {
+            ...orchestratorTallyParams(opts),
+            [analytics_1.customDimensions.agentUsed]: opts.agentUsed,
+        });
+    });
+}
+/**
+ * An explicit continue (`--run-migrations --run-id`, or "continue" at the
+ * master prompt) took up an active run; every resume reports. A bare
+ * `--run-id` reconcile is not a resume: nothing in run state marks the first
+ * call after a lost session.
+ */
+function reportMigrateOrchestratorResume(opts) {
+    safeReport(() => {
+        if (!analytics_1.customDimensions)
+            return;
+        (0, analytics_1.reportEvent)('migrate_orchestrator_resume', orchestratorTallyParams(opts));
+    });
+}
+/**
+ * An invocation found an active run and started nothing. `activity` says
+ * whether another nx migrate process held the run; 'unknown' where nx cannot
+ * tell.
+ */
+function reportMigrateOrchestratorExistingRun(opts) {
+    safeReport(() => {
+        if (!analytics_1.customDimensions)
+            return;
+        (0, analytics_1.reportEvent)('migrate_orchestrator_existing_run', {
+            ...orchestratorTallyParams(opts),
+            [analytics_1.customDimensions.promptChoice]: opts.activity,
         });
     });
 }

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

@@ -1,4 +1,5 @@
 import type { ResolvedAgentic } from './agentic/types';
+import { type MigrateOutputSink } from './deferred-output';
 /**
  * Discriminated result for `commitMigrationIfRequested`. Distinguishes the
  * shapes the executor needs to react to:
@@ -7,9 +8,8 @@ import type { ResolvedAgentic } from './agentic/types';
  *   HEAD` failed transiently — by contract the diff is no longer in the
  *   working tree.
  * - `no-changes`: commits were requested but there was nothing to commit.
- * - `failed`: the commit attempt itself errored. The diff remains in the
- *   working tree; the executor uses this signal to track pending migrations
- *   so the next successful commit can annotate its body.
+ * - `failed`: the attempt errored, possibly after the commit landed; tracked
+ *   as pending so the next successful commit can annotate its body.
  * - `disabled`: commits are off for this run.
  */
 export type CommitResult = {
@@ -37,7 +37,7 @@ export declare function commitMigrationIfRequested(root: string, migration: {
 }, shouldCreateCommits: boolean, commitPrefix: string, installDepsIfChanged: () => Promise<void>, pendingMigrations?: ReadonlyArray<{
     package: string;
     name: string;
-}>, failureGuidance?: string): Promise<CommitResult>;
+}>, failureGuidance?: string, out?: MigrateOutputSink): Promise<CommitResult>;
 /**
  * Commits any pre-existing working-tree state into a dedicated "checkpoint"
  * commit before the first migration runs. Without this, the first migration's
@@ -64,6 +64,7 @@ export declare function resolveCreateCommits(args: {
     warning?: string;
     error?: string;
 };
+export declare function currentBranchIfDefault(root: string): string | null;
 /**
  * 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.

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.commitMigrationIfRequested = commitMigrationIfRequested;
 exports.commitCheckpointBeforeMigrations = commitCheckpointBeforeMigrations;
 exports.resolveCreateCommits = resolveCreateCommits;
+exports.currentBranchIfDefault = currentBranchIfDefault;
 exports.confirmMigrationCommitsOnDefaultBranch = confirmMigrationCommitsOnDefaultBranch;
 exports.confirmCommitsOnDefaultBranch = confirmCommitsOnDefaultBranch;
 const tslib_1 = require("tslib");
@@ -14,6 +15,7 @@ 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");
+const deferred_output_1 = require("./deferred-output");
 // `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).
@@ -27,7 +29,7 @@ const MIGRATE_COMMIT_EXCLUDES = [types_1.MIGRATE_RUNS_RELATIVE_DIR];
  * behavior; a caller with no later commit or recap to absorb the diff (the
  * standalone single-migration worker) passes its own.
  */
-async function commitMigrationIfRequested(root, migration, shouldCreateCommits, commitPrefix, installDepsIfChanged, pendingMigrations = [], failureGuidance = 'The next successful commit will absorb it and reference this migration in its body; if no later commit lands, the end-of-run output will list this migration so you can commit or revert manually.') {
+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) {
     if (!shouldCreateCommits)
         return { status: 'disabled' };
     await installDepsIfChanged();
@@ -35,22 +37,22 @@ async function commitMigrationIfRequested(root, migration, shouldCreateCommits,
     // 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}.`));
+        out.line('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, MIGRATE_COMMIT_EXCLUDES);
+        const sha = await (0, git_utils_1.tryCommitChangesAsync)(commitMessage, root, MIGRATE_COMMIT_EXCLUDES);
         if (sha)
             return { status: 'committed', sha };
         // null = commit landed but `git rev-parse HEAD` failed (see
-        // `tryCommitChanges`). Degraded-but-correct — log yellow, not red.
-        logger_1.logger.info(pc.yellow(`The commit for ${migration.name} was created, but its sha could not be resolved (\`git rev-parse HEAD\` failed transiently). Continuing without recording the sha for this step.`));
+        // `tryCommitChangesAsync`). Degraded-but-correct — log yellow, not red.
+        out.line('yellow', `The commit for ${migration.name} was created, but its sha could not be resolved (\`git rev-parse HEAD\` failed transiently). Continuing without recording the sha for this step.`);
         return { status: 'committed', sha: null };
     }
     catch (err) {
         const reason = err instanceof Error ? err.message : String(err);
-        logger_1.logger.info(pc.red(`Could not create a commit for ${migration.name}:\n${reason}\nThe migration's diff remains in the working tree; inspect with \`git status\` / \`git diff\` to review. ${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}`);
         return { status: 'failed', reason };
     }
 }
@@ -180,6 +182,14 @@ function defaultBranchToCompare(baseRef, currentBranch, root) {
         .sort((a, b) => b.length - a.length)[0];
     return remote ? baseRef.slice(remote.length + 1) : baseRef;
 }
+function currentBranchIfDefault(root) {
+    const currentBranch = (0, git_utils_1.getGitCurrentBranch)(root);
+    if (!currentBranch) {
+        return null;
+    }
+    const defaultBranch = defaultBranchToCompare((0, command_line_utils_1.getBaseRef)((0, configuration_1.readNxJson)(root)), currentBranch, root);
+    return currentBranch === defaultBranch ? currentBranch : null;
+}
 /**
  * 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.

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

@@ -10,8 +10,11 @@ import { type MigrateArgs } from './command-object';
  * `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` invocation takes none of them: a recorded run takes its commit
- * config from run.json and is driven by the outer agent.
+ * `--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.
  *
  * `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

@@ -15,8 +15,11 @@ const MULTI_MAJOR_MODE_ENV = 'NX_MULTI_MAJOR_MODE';
  * `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` invocation takes none of them: a recorded run takes its commit
- * config from run.json and is driven by the outer agent.
+ * `--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.
  *
  * `include` is carried as `includeFromConfig` so it is never mistaken for an
  * explicit `--include`: `resolveInclude` applies it only when the resolved
@@ -33,11 +36,12 @@ function applyNxJsonMigrateDefaults(args, migrateConfig, env = process.env) {
     // 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) {
+    // These overlays are for an invocation that decides the options for itself,
+    // which a `--run-id` invocation only does when it starts fresh: the recorded
+    // worker and the reconcile both read the commit config from run.json.
+    const startsRun = (isRunMigrations || isSingleMigration) &&
+        (merged.runId === undefined || merged.startFresh === true);
+    if (startsRun) {
         if (merged.createCommits === undefined &&
             migrateConfig.createCommits !== undefined) {
             assertType(migrateConfig.createCommits, 'boolean', 'createCommits');
@@ -52,15 +56,19 @@ function applyNxJsonMigrateDefaults(args, migrateConfig, env = process.env) {
             assertType(migrateConfig.commitPrefix, 'string', 'commitPrefix');
             merged.commitPrefix = migrateConfig.commitPrefix;
         }
-        if (merged.agentic === undefined && migrateConfig.agentic !== undefined) {
-            assertValidAgentic(migrateConfig.agentic);
-            merged.agentic = (0, cli_args_1.coerceAgenticArg)(migrateConfig.agentic);
-        }
         if (merged.validate === undefined && migrateConfig.validate !== undefined) {
             assertType(migrateConfig.validate, 'boolean', 'validate');
             merged.validate = migrateConfig.validate;
         }
     }
+    // A continue takes `agentic` too; the reconcile and the worker must not:
+    // there it trips the `--agentic`/`--run-id` parse conflict.
+    if ((startsRun || isRunMigrations) &&
+        merged.agentic === undefined &&
+        migrateConfig.agentic !== undefined) {
+        assertValidAgentic(migrateConfig.agentic);
+        merged.agentic = (0, cli_args_1.coerceAgenticArg)(migrateConfig.agentic);
+    }
     if (!isRunMigrations && !isSingleMigration) {
         if (merged.include === undefined && migrateConfig.include !== undefined) {
             assertOneOf(migrateConfig.include, command_object_1.MIGRATE_INCLUDE_VALUES, 'include');

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

@@ -24,13 +24,9 @@ export declare function logMigrationBoundary(index: number, total: number, pkg:
  */
 export declare function logAgenticSuccessOutcome(label: string, sha: string | null, summary: string): void;
 /**
- * Logs the skip line for a migration that waived its AI step through
- * `skipAgentic`, plus a verbose note for any `agentContext` the waiver
- * dropped. A hybrid waives its paired prompt; a generator-only migration
- * waives the validation pass, so callers must reach here only once they know
- * one was on the table. Under `inside-agent` only a hybrid can, so the
- * hand-off dropped alongside is always a prompt's; a waived generator-only
- * migration keeps its own. The note is author-facing, hence `--verbose`.
+ * Callers must already know an agentic step was owed; this only picks which one
+ * the waiver dropped. The dropped-`agentContext` note is aimed at the migration
+ * author, hence `--verbose`.
  */
 export declare function logWaivedAgenticStep(migration: {
     package: string;

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

@@ -52,13 +52,9 @@ function logAgenticSuccessOutcome(label, sha, summary) {
     logger_1.logger.info(`${pc.green('✓')} ${label}${shaPart}: ${summary}`);
 }
 /**
- * Logs the skip line for a migration that waived its AI step through
- * `skipAgentic`, plus a verbose note for any `agentContext` the waiver
- * dropped. A hybrid waives its paired prompt; a generator-only migration
- * waives the validation pass, so callers must reach here only once they know
- * one was on the table. Under `inside-agent` only a hybrid can, so the
- * hand-off dropped alongside is always a prompt's; a waived generator-only
- * migration keeps its own. The note is author-facing, hence `--verbose`.
+ * Callers must already know an agentic step was owed; this only picks which one
+ * the waiver dropped. The dropped-`agentContext` note is aimed at the migration
+ * author, hence `--verbose`.
  */
 function logWaivedAgenticStep(migration, agentContext) {
     logger_1.logger.info(pc.dim((0, migration_shape_1.isHybridMigration)(migration)

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

@@ -170,7 +170,10 @@ type RunMigrations = {
     ifExists: boolean;
     agentic: AgenticArg;
     validate?: boolean;
+    finalValidation?: boolean;
     interactive?: boolean;
+    runId?: string;
+    startFresh?: boolean;
 };
 type RunSingleMigration = {
     type: 'runSingleMigration';