agentxchain 2.129.0 → 2.130.0

package/bin/agentxchain.js

@@ -71,6 +71,7 @@ import { unblockCommand } from '../src/commands/unblock.js';
 import { injectCommand } from '../src/commands/inject.js';
 import { escalateCommand } from '../src/commands/escalate.js';
 import { acceptTurnCommand } from '../src/commands/accept-turn.js';
+import { checkpointTurnCommand } from '../src/commands/checkpoint-turn.js';
 import { rejectTurnCommand } from '../src/commands/reject-turn.js';
 import { reissueTurnCommand } from '../src/commands/reissue-turn.js';
 import { proposalListCommand, proposalDiffCommand, proposalApplyCommand, proposalRejectCommand } from '../src/commands/proposal.js';
@@ -672,9 +673,16 @@ program
   .command('accept-turn')
   .description('Accept the currently staged governed turn result')
   .option('--turn <id>', 'Target a specific active turn when multiple turns exist')
+  .option('--checkpoint', 'Checkpoint the accepted turn to git immediately after acceptance')
   .option('--resolution <mode>', 'Conflict resolution mode for conflicted turns (standard, human_merge)', 'standard')
   .action(acceptTurnCommand);
 
+program
+  .command('checkpoint-turn')
+  .description('Checkpoint the latest accepted turn into git so the next writable turn has a clean baseline')
+  .option('--turn <id>', 'Checkpoint a specific accepted turn from history')
+  .action(checkpointTurnCommand);
+
 program
   .command('reject-turn')
   .description('Reject the current governed turn result and retry or escalate')
@@ -727,6 +735,8 @@ program
   .option('--triage-approval <mode>', 'Triage policy for vision-derived intents: auto or human (default: config or auto)')
   .option('--max-idle-cycles <n>', 'Stop after N consecutive idle cycles with no derivable work (default: 3)', parseInt)
   .option('--session-budget <usd>', 'Cumulative session-level budget cap in USD for continuous mode', parseFloat)
+  .option('--auto-checkpoint', 'Auto-commit accepted writable turns after acceptance')
+  .option('--no-auto-checkpoint', 'Disable automatic checkpointing after accepted writable turns')
   .action(runCommand);
 
 program

package/package.json

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

package/src/commands/accept-turn.js

@@ -2,6 +2,7 @@ import chalk from 'chalk';
 import { loadProjectContext } from '../lib/config.js';
 import { acceptGovernedTurn } from '../lib/governed-state.js';
 import { deriveRecoveryDescriptor } from '../lib/blocked-state.js';
+import { checkpointAcceptedTurn } from '../lib/turn-checkpoint.js';
 
 export async function acceptTurnCommand(opts = {}) {
   const context = loadProjectContext();
@@ -166,6 +167,19 @@ export async function acceptTurnCommand(opts = {}) {
   if (accepted?.cost?.usd != null) {
     console.log(`  ${chalk.dim('Cost:')}     $${formatUsd(accepted.cost.usd)}`);
   }
+  if (opts.checkpoint) {
+    const checkpoint = checkpointAcceptedTurn(root, { turnId });
+    if (!checkpoint.ok) {
+      console.log(`  ${chalk.yellow('Checkpoint:')} accepted but checkpoint failed`);
+      console.log(`  ${chalk.dim('Action:')}   ${checkpoint.error}`);
+      console.log(`  ${chalk.dim('Retry:')}    agentxchain checkpoint-turn --turn ${turnId}`);
+      console.log('');
+      process.exit(1);
+    }
+    if (!checkpoint.skipped) {
+      console.log(`  ${chalk.dim('Checkpoint:')} ${checkpoint.checkpoint_sha}`);
+    }
+  }
   if (accepted?.verification_replay) {
     const verifiedAt = accepted.verification_replay.verified_at
       ? ` at ${accepted.verification_replay.verified_at}`

package/src/commands/checkpoint-turn.js

@@ -0,0 +1,35 @@
+import chalk from 'chalk';
+import { loadProjectContext } from '../lib/config.js';
+import { checkpointAcceptedTurn } from '../lib/turn-checkpoint.js';
+
+export async function checkpointTurnCommand(opts = {}) {
+  const context = loadProjectContext();
+  if (!context) {
+    console.log(chalk.red('No agentxchain.json found. Run `agentxchain init` first.'));
+    process.exit(1);
+  }
+
+  const { root, config } = context;
+  if (config.protocol_mode !== 'governed') {
+    console.log(chalk.red('The checkpoint-turn command is only available for governed projects.'));
+    process.exit(1);
+  }
+
+  const result = checkpointAcceptedTurn(root, { turnId: opts.turn });
+  if (!result.ok) {
+    console.log(chalk.red(result.error || 'Failed to checkpoint accepted turn.'));
+    process.exit(1);
+  }
+
+  if (result.already_checkpointed) {
+    console.log(chalk.yellow(`Turn ${result.turn.turn_id} already has checkpoint ${result.checkpoint_sha}.`));
+    return;
+  }
+
+  if (result.skipped) {
+    console.log(chalk.dim(result.reason));
+    return;
+  }
+
+  console.log(chalk.green(`Checkpointed ${result.turn.turn_id} at ${result.checkpoint_sha}.`));
+}

package/src/commands/doctor.js

@@ -17,7 +17,7 @@ import {
   summarizeRoleRuntimeCapability,
   summarizeRuntimeCapabilityContract,
 } from '../lib/runtime-capabilities.js';
-import { detectActiveTurnBindingDrift } from '../lib/governed-state.js';
+import { detectActiveTurnBindingDrift, detectStateBundleDesync } from '../lib/governed-state.js';
 import { findPendingApprovedIntents } from '../lib/intake.js';
 import { checkCleanBaseline } from '../lib/repo-observer.js';
 
@@ -152,7 +152,36 @@ function governedDoctor(root, rawConfig, opts) {
     }
   }
 
-  // 5c. Clean working tree pre-flight for authoritative/proposed roles
+  // 5c. BUG-18: State/bundle integrity — active turns must have dispatch bundles
+  if (normalized && existsSync(join(root, '.agentxchain', 'state.json'))) {
+    try {
+      const stateData = loadProjectState(root, normalized);
+      const desync = detectStateBundleDesync(root, stateData);
+      if (!desync.ok) {
+        const desyncSummary = desync.desynced
+          .map(d => `${d.turn_id} (${d.role}): missing ${d.expected_path}`)
+          .join('; ');
+        checks.push({
+          id: 'bundle_integrity',
+          name: 'Dispatch bundle integrity',
+          level: 'fail',
+          detail: `Ghost turn(s): ${desyncSummary}. Run: agentxchain reissue-turn`,
+          desynced: desync.desynced,
+        });
+      } else if (Object.keys(stateData?.active_turns || {}).length > 0) {
+        checks.push({
+          id: 'bundle_integrity',
+          name: 'Dispatch bundle integrity',
+          level: 'pass',
+          detail: 'All active turns have dispatch bundles on disk',
+        });
+      }
+    } catch {
+      // State couldn't be loaded — skip integrity check
+    }
+  }
+
+  // 5d. Clean working tree pre-flight for authoritative/proposed roles
   if (normalized?.roles) {
     const writableRoles = Object.entries(normalized.roles)
       .filter(([, role]) => role.write_authority === 'authoritative' || role.write_authority === 'proposed')