nx 23.3.0-beta.2 → 23.3.0-beta.4

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

@@ -47,7 +47,7 @@ export interface IssueApplication {
  * Pure. Must run on state read fresh inside the fold's locked write, or ids
  * collide and the claim checks test state that is no longer on disk.
  */
-export declare function applyReportedIssues(state: MigrateRunState, reportingStep: MigrateStep, issues: ReportedIssue[], updates: ReportedIssueUpdate[]): IssueApplication;
+export declare function applyReportedIssues(state: MigrateRunState, reportingStep: MigrateStep, issues: ReportedIssue[], updates: ReportedIssueUpdate[], resolvedAtCommitCount?: number): IssueApplication;
 /**
  * The issue ids a landed commit naming `stepIds` carries. Attribution rides on
  * the persisted `resolvedByStepId`, so a resolution whose own commit attempt
@@ -60,6 +60,12 @@ export declare function issueIdsForCommit(state: MigrateRunState, stepIds: strin
  * attribution cannot diverge between terminal paths.
  */
 export declare function attachIssueIdsToCommitEntry(state: MigrateRunState, entry: MigrateCommitLedgerEntry): MigrateCommitLedgerEntry;
+/**
+ * Adds to a landed entry the resolutions it can now carry, keeping the ids it
+ * has; other entries pass through. Repeating it is a no-op, since
+ * `issueIdsForCommit` skips resolutions an entry already carries.
+ */
+export declare function enrichCommitEntryIssueIds(state: MigrateRunState, index: number): MigrateRunState;
 /**
  * Reverts resolutions not carried by a landed commit and releases claims
  * during a reset-backed retry. Returned disposition changes form the archive
@@ -89,6 +95,7 @@ export declare function settleUnclaimableIssues(state: MigrateRunState): Migrate
 export declare function renderIssueDigestLines(state: MigrateRunState, currentStepId: string, runId: string): string[];
 export declare function renderUnresolvedIssueLines(state: MigrateRunState, runId: string): string[];
 export declare function issueArchivePath(runDirPath: string, issueId: string): string;
+export declare function warnReconstructedArchives(issueIds: string[]): void;
 /**
  * Archives an application's new issues (with the detail the ledger does not
  * carry) and appends its updates to the archived files. Failures propagate;

package/dist/src/command-line/migrate/run/issues.js

@@ -7,12 +7,14 @@ exports.parseHandoffIssues = parseHandoffIssues;
 exports.applyReportedIssues = applyReportedIssues;
 exports.issueIdsForCommit = issueIdsForCommit;
 exports.attachIssueIdsToCommitEntry = attachIssueIdsToCommitEntry;
+exports.enrichCommitEntryIssueIds = enrichCommitEntryIssueIds;
 exports.reopenResolutionsForStep = reopenResolutionsForStep;
 exports.claimIssuesForStep = claimIssuesForStep;
 exports.settleUnclaimableIssues = settleUnclaimableIssues;
 exports.renderIssueDigestLines = renderIssueDigestLines;
 exports.renderUnresolvedIssueLines = renderUnresolvedIssueLines;
 exports.issueArchivePath = issueArchivePath;
+exports.warnReconstructedArchives = warnReconstructedArchives;
 exports.archiveIssues = archiveIssues;
 exports.applicationArchivesIntact = applicationArchivesIntact;
 const fs_1 = require("fs");
@@ -21,6 +23,7 @@ const fileutils_1 = require("../../../utils/fileutils");
 const atomic_write_1 = require("./atomic-write");
 const types_1 = require("../agentic/types");
 const text_1 = require("../text");
+const agent_output_1 = require("./agent-output");
 const run_state_1 = require("./run-state");
 Object.defineProperty(exports, "issueFingerprint", { enumerable: true, get: function () { return run_state_1.issueFingerprint; } });
 const state_machine_1 = require("./state-machine");
@@ -242,7 +245,10 @@ function mappedStepIds(identifier, state) {
  * Pure. Must run on state read fresh inside the fold's locked write, or ids
  * collide and the claim checks test state that is no longer on disk.
  */
-function applyReportedIssues(state, reportingStep, issues, updates) {
+function applyReportedIssues(state, reportingStep, issues, updates, 
+// The index of the entry that will carry this application's resolutions:
+// the next append, unless a parent session already recorded it.
+resolvedAtCommitCount = state.commits.length) {
     const ledger = [...(state.issues ?? [])];
     const newIssues = [];
     const archiveUpdates = [];
@@ -258,7 +264,7 @@ function applyReportedIssues(state, reportingStep, issues, updates) {
         const existingIndex = ledger.findIndex((i) => i.fingerprint === fingerprint);
         if (existingIndex !== -1) {
             const existing = ledger[existingIndex];
-            const outcome = applyDuplicateReport(existing, report, reportingStep, state);
+            const outcome = applyDuplicateReport(existing, report, reportingStep, state, resolvedAtCommitCount);
             if (outcome.entry !== existing) {
                 ledger[existingIndex] = outcome.entry;
             }
@@ -295,7 +301,7 @@ function applyReportedIssues(state, reportingStep, issues, updates) {
             ...(disposition === 'resolved'
                 ? {
                     resolvedByStepId: reportingStep.id,
-                    resolvedAtCommitCount: state.commits.length,
+                    resolvedAtCommitCount,
                 }
                 : {}),
         };
@@ -318,7 +324,7 @@ function applyReportedIssues(state, reportingStep, issues, updates) {
                         ...rest,
                         disposition: 'resolved',
                         resolvedByStepId: reportingStep.id,
-                        resolvedAtCommitCount: state.commits.length,
+                        resolvedAtCommitCount,
                     }
                     : { ...rest, disposition: update.disposition };
         }
@@ -358,7 +364,7 @@ function reportIntent(report) {
  * report carrying detail, must archive: the fold removes the handoff, so
  * unarchived detail is lost.
  */
-function applyDuplicateReport(existing, report, reportingStep, state) {
+function applyDuplicateReport(existing, report, reportingStep, state, resolvedAtCommitCount) {
     const intent = reportIntent(report);
     const merged = mergedApplicableStepIds(existing, report, state);
     // Set inclusion, not a length compare: a corrupt entry with duplicate scope
@@ -392,7 +398,7 @@ function applyDuplicateReport(existing, report, reportingStep, state) {
                 ...(disposition === 'resolved'
                     ? {
                         resolvedByStepId: reportingStep.id,
-                        resolvedAtCommitCount: state.commits.length,
+                        resolvedAtCommitCount,
                     }
                     : {}),
             },
@@ -485,6 +491,24 @@ function attachIssueIdsToCommitEntry(state, entry) {
     const issueIds = issueIdsForCommit(state, entry.stepIds);
     return issueIds.length > 0 ? { ...entry, issueIds } : entry;
 }
+/**
+ * Adds to a landed entry the resolutions it can now carry, keeping the ids it
+ * has; other entries pass through. Repeating it is a no-op, since
+ * `issueIdsForCommit` skips resolutions an entry already carries.
+ */
+function enrichCommitEntryIssueIds(state, index) {
+    const entry = state.commits[index];
+    if (entry.kind !== 'landed')
+        return state;
+    const existing = entry.issueIds ?? [];
+    const added = issueIdsForCommit(state, entry.stepIds).filter((id) => !existing.includes(id));
+    if (added.length === 0)
+        return state;
+    return {
+        ...state,
+        commits: state.commits.map((c, i) => i === index ? { ...c, issueIds: [...existing, ...added] } : c),
+    };
+}
 /**
  * Reverts resolutions not carried by a landed commit and releases claims
  * during a reset-backed retry. Returned disposition changes form the archive
@@ -774,6 +798,16 @@ function issuesDir(runDirPath) {
 function issueArchivePath(runDirPath, issueId) {
     return (0, path_1.join)(issuesDir(runDirPath), `${issueId}.json`);
 }
+// The runbook points every later consumer at issues/<id>.json for the full
+// details, so a rebuild from run-state fields (the reported detail is gone
+// with the lost file) must not stay silent.
+function warnReconstructedArchives(issueIds) {
+    if (issueIds.length === 0)
+        return;
+    (0, agent_output_1.warnToAgent)({
+        title: `The archived details for ${issueIds.join(', ')} were missing or unreadable and were rebuilt from the run state; the originally reported detail is lost.`,
+    });
+}
 /**
  * Archives an application's new issues (with the detail the ledger does not
  * carry) and appends its updates to the archived files. Failures propagate;

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

@@ -1,3 +1,4 @@
+import { type MigrateRunState } from './run-state';
 import { type StepAction } from './state-machine';
 import { type PlannedMigration } from '../migration-shape';
 export interface RunOrchestratorInitInput {
@@ -11,11 +12,27 @@ export interface RunOrchestratorInitInput {
     skipInstall: boolean;
     installedNxVersion: string;
     validate: boolean | undefined;
+    emitAgentInstructions?: boolean;
 }
+export type OrchestratorInitResult = {
+    kind: 'ready';
+    runId: string;
+    runRoot: string;
+    runbookPath: string;
+    reconcileCommand: string;
+} | {
+    kind: 'refused';
+};
 export interface RunOrchestratorReconcileInput {
     root: string;
     runId: string;
     stepAction?: StepAction;
 }
-export declare function runOrchestratorInit(input: RunOrchestratorInitInput): Promise<void>;
+export declare function runOrchestratorInit(input: RunOrchestratorInitInput): Promise<OrchestratorInitResult>;
 export declare function runOrchestratorReconcile(input: RunOrchestratorReconcileInput): Promise<void>;
+/**
+ * What a completed run leaves behind for whoever reads its summary, one line
+ * group per warning: commit debt, uninstalled dependency changes, unresolved
+ * issues. Empty when nothing is left.
+ */
+export declare function completionWarnings(root: string, runId: string, state: MigrateRunState): string[][];