agentxchain 2.155.50 → 2.155.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentxchain",
-  "version": "2.155.50",
+  "version": "2.155.52",
   "description": "CLI for AgentXchain — governed multi-agent software delivery",
   "type": "module",
   "bin": {

package/src/lib/dispatch-bundle.js

@@ -489,7 +489,7 @@ function renderPrompt(role, roleId, turn, state, config, root) {
   lines.push('### Field Rules');
   lines.push('');
   lines.push('- `schema_version`: always `"1.0"`');
-  lines.push('- `run_id`, `turn_id`, `role`, `runtime_id`: must match the values above exactly');
+  lines.push('- `run_id`, `turn_id`, `role`, `runtime_id`: must match the current assignment values above exactly. Do NOT copy `run_id` from old reports, history entries, previous dispatch bundles, or retained staging JSON.');
   lines.push('- `status`: one of `completed`, `blocked`, `needs_human`, `failed`. Do NOT use `complete`, `success`, `done`, or any other synonym — use the exact enum value `completed`.');
   lines.push('- `decisions`: REQUIRED array. Use `[]` when no new decisions were made; do not omit the field.');
   lines.push('- `objections`: REQUIRED array. Use `[]` when no objections are raised; review_only roles must include at least one objection.');
@@ -523,6 +523,7 @@ function renderPrompt(role, roleId, turn, state, config, root) {
   if (phaseNames.length > 0) {
     lines.push(`- \`phase_transition_request\`: set to a **phase name** when gate requirements are met, or \`null\`. Valid phases: ${phaseNames.map((p) => `\`"${p}"\``).join(', ')}`);
     lines.push('- **Do NOT use exit gate names** (e.g., `planning_signoff`, `implementation_complete`, `qa_ship_verdict`) as `phase_transition_request` values — those are gate identifiers, not phase names');
+    lines.push('- **Do NOT skip ahead to later phases**. Use only the immediate next phase named below for the current phase.');
   } else {
     lines.push('- `phase_transition_request`: set to next phase name when gate requirements are met, or `null`');
   }

package/src/lib/turn-result-validator.js

@@ -78,6 +78,9 @@ export function validateStagedTurnResult(root, state, config, opts = {}) {
   const normContext = {};
   if (state) {
     normContext.phase = state.phase;
+    if (state.run_id) {
+      normContext.runId = state.run_id;
+    }
     // Prefer active_turns (the persisted schema field); fall back to the
     // current_turn compatibility alias for callers that pass a state shape
     // built outside loadProjectState() (e.g. raw fixtures). Both surfaces are
@@ -85,6 +88,12 @@ export function validateStagedTurnResult(root, state, config, opts = {}) {
     if (activeTurn) {
       const roleKey = activeTurn.assigned_role || activeTurn.role;
       normContext.assignedRole = roleKey;
+      if (activeTurn.turn_id) {
+        normContext.turnId = activeTurn.turn_id;
+      }
+      if (activeTurn.run_id) {
+        normContext.activeTurnRunId = activeTurn.run_id;
+      }
       if (activeTurn.runtime_id) {
         normContext.runtimeId = activeTurn.runtime_id;
       }
@@ -1006,6 +1015,29 @@ export function normalizeTurnResult(tr, config, context = {}) {
 
   const normalized = { ...tr };
 
+  // ── BUG-97: recover stale run_id for retained active turns ────────────
+  // run_id is state-owned identity. A staged result may safely inherit it
+  // only when the staged turn_id proves it belongs to the active retained
+  // turn and the active-turn/state run identity is coherent.
+  const stagedTurnMatchesActive = Boolean(
+    context.runId
+    && context.turnId
+    && typeof normalized.turn_id === 'string'
+    && normalized.turn_id === context.turnId
+  );
+  const activeTurnRunIdCoherent = !context.activeTurnRunId || context.activeTurnRunId === context.runId;
+  const stagedRunId = typeof normalized.run_id === 'string' ? normalized.run_id.trim() : '';
+  if (stagedTurnMatchesActive && activeTurnRunIdCoherent && stagedRunId !== context.runId) {
+    corrections.push(`run_id: rewritten from "${stagedRunId || '(missing)'}" to active state run_id "${context.runId}"`);
+    normalizationEvents.push({
+      field: 'run_id',
+      original_value: normalized.run_id ?? null,
+      normalized_value: context.runId,
+      rationale: 'run_id_rewritten_from_active_turn_context',
+    });
+    normalized.run_id = context.runId;
+  }
+
   // ── BUG-95: rename synonym fields before variable computation ────────
   // files_modified is an unambiguous synonym for files_changed.
   if (!('files_changed' in normalized) && Array.isArray(normalized.files_modified)) {
@@ -1358,6 +1390,9 @@ export function normalizeTurnResult(tr, config, context = {}) {
     if (allowedNextRoles.length === 0) return null;
     return allowedNextRoles.find((role) => role !== assignedRole) || allowedNextRoles[0] || null;
   };
+  const nextPhaseEntryRole = nextPhase && routing?.[nextPhase]?.entry_role
+    ? routing[nextPhase].entry_role
+    : null;
 
   // ── Rule 0: infer missing status only when intent is unambiguous ──────
   if (!('status' in normalized)) {
@@ -1505,6 +1540,54 @@ export function normalizeTurnResult(tr, config, context = {}) {
   }
 
   // ── Rule 5: correct invalid or non-forward lifecycle requests ─────────
+  if (
+    isKnownPhase &&
+    !isTerminalPhase &&
+    !isReviewOnly &&
+    normalized.status === 'completed' &&
+    typeof normalized.phase_transition_request === 'string' &&
+    !normalized.run_completion_request
+  ) {
+    const requested = normalized.phase_transition_request;
+    const requestedIndex = phaseNames.indexOf(requested);
+    const skipsImmediateNextPhase = requestedIndex > currentPhaseIndex + 1;
+
+    if (skipsImmediateNextPhase && nextPhase) {
+      normalized.phase_transition_request = nextPhase;
+      corrections.push(
+        `phase_transition_request: corrected skip-forward "${requested}" to immediate next phase "${nextPhase}"`
+      );
+      normalizationEvents.push({
+        field: 'phase_transition_request',
+        original_value: requested,
+        normalized_value: nextPhase,
+        rationale: 'skip_forward_phase_corrected_to_next_phase',
+      });
+
+      const proposedRoleIsStalePhase = normalized.proposed_next_role === requested;
+      const proposedRoleIsRoutingIllegal = typeof normalized.proposed_next_role === 'string'
+        && normalized.proposed_next_role !== 'human'
+        && allowedNextRoles.length > 0
+        && !allowedNextRoles.includes(normalized.proposed_next_role);
+      if (
+        nextPhaseEntryRole &&
+        allowedNextRoles.includes(nextPhaseEntryRole) &&
+        (proposedRoleIsStalePhase || proposedRoleIsRoutingIllegal)
+      ) {
+        corrections.push(
+          `proposed_next_role: corrected "${normalized.proposed_next_role}" to entry role "${nextPhaseEntryRole}" for corrected phase "${nextPhase}"`
+        );
+        normalizationEvents.push({
+          field: 'proposed_next_role',
+          original_value: normalized.proposed_next_role,
+          normalized_value: nextPhaseEntryRole,
+          rationale: 'aligned_to_corrected_phase_entry_role',
+        });
+        normalized.proposed_next_role = nextPhaseEntryRole;
+      }
+    }
+  }
+
   if (
     isKnownPhase &&
     isReviewOnly &&