agentxchain 2.155.1 → 2.155.3

package/package.json

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

package/src/lib/continuous-run.js

@@ -1155,7 +1155,30 @@ export async function advanceContinuousRunOnce(context, session, contOpts, execu
     return { ok: true, status: 'session_budget', action: 'session_budget_exhausted', stop_reason: 'session_budget' };
   }
 
-  // Idle-cycle check: on_idle policy determines behavior
+  reconcileContinuousStartupState(context, session, contOpts, log);
+
+  const reconcileBlock = maybeAutoReconcileOperatorCommits(context, session, contOpts, log);
+  if (reconcileBlock) return reconcileBlock;
+
+  const startupGovernedState = loadProjectState(root, context.config);
+  if (startupGovernedState?.status === 'blocked') {
+    const retried = await maybeAutoRetryGhostBlocker(context, session, contOpts, startupGovernedState, log);
+    if (retried) return retried;
+    session.status = 'paused';
+    writeContinuousSession(root, session);
+    return {
+      ok: true,
+      status: 'blocked',
+      action: 'still_blocked',
+      run_id: session.current_run_id || startupGovernedState.run_id || null,
+      recovery_action: getBlockedRecoveryAction(startupGovernedState),
+      blocked_category: getBlockedCategory(startupGovernedState),
+    };
+  }
+
+  // Idle-cycle check: on_idle policy determines behavior. This MUST run after
+  // startup blocked/reconcile checks so perpetual mode cannot enqueue new
+  // idle-expansion work into a run that is already ineligible to start.
   if (session.idle_cycles >= contOpts.maxIdleCycles) {
     if (contOpts.onIdle === 'perpetual' && contOpts.idleExpansion) {
       // BUG-60: perpetual mode — dispatch PM idle-expansion instead of exiting
@@ -1193,11 +1216,6 @@ export async function advanceContinuousRunOnce(context, session, contOpts, execu
     return { ok: true, status: 'idle_exit', action: 'max_idle_reached', stop_reason: 'idle_exit' };
   }
 
-  reconcileContinuousStartupState(context, session, contOpts, log);
-
-  const reconcileBlock = maybeAutoReconcileOperatorCommits(context, session, contOpts, log);
-  if (reconcileBlock) return reconcileBlock;
-
   // Paused-session guard: if session is paused (blocked run awaiting unblock),
   // check governed state before attempting to advance. Without this guard, the
   // loop would try to startIntent() on a blocked project, hit the blocked-state

package/src/lib/operator-commit-reconcile.js

@@ -10,6 +10,16 @@ const CRITICAL_DELETION_PATHS = new Set([
   '.planning/acceptance-matrix.md',
 ]);
 
+// Files under .agentxchain/ that are documentation or operator-customizable
+// configuration, NOT core governed state. Modifications to these should not
+// block operator-commit reconciliation.
+const RECONCILE_SAFE_AGENTXCHAIN_PATHS = new Set([
+  '.agentxchain/SESSION_RECOVERY.md',
+]);
+const RECONCILE_SAFE_AGENTXCHAIN_PREFIXES = [
+  '.agentxchain/prompts/',
+];
+
 function git(root, args) {
   return execFileSync('git', args, {
     cwd: root,
@@ -90,16 +100,26 @@ function summarizeCommit(root, sha) {
   };
 }
 
+function isReconcileSafeAgentxchainPath(pathName) {
+  if (RECONCILE_SAFE_AGENTXCHAIN_PATHS.has(pathName)) return true;
+  for (const prefix of RECONCILE_SAFE_AGENTXCHAIN_PREFIXES) {
+    if (pathName.startsWith(prefix)) return true;
+  }
+  return false;
+}
+
 function classifyUnsafeCommit(commit) {
   for (const entry of commit.name_status) {
     for (const pathName of entry.paths) {
       if (pathName === '.agentxchain' || pathName.startsWith('.agentxchain/')) {
-        return {
-          error_class: 'governance_state_modified',
-          message: `Commit ${commit.sha.slice(0, 8)} modifies governed state path ${pathName}; reconcile cannot auto-accept .agentxchain edits.`,
-          commit: commit.sha,
-          path: pathName,
-        };
+        if (!isReconcileSafeAgentxchainPath(pathName)) {
+          return {
+            error_class: 'governance_state_modified',
+            message: `Commit ${commit.sha.slice(0, 8)} modifies governed state path ${pathName}; reconcile cannot auto-accept .agentxchain edits.`,
+            commit: commit.sha,
+            path: pathName,
+          };
+        }
       }
       if (entry.status.startsWith('D') && CRITICAL_DELETION_PATHS.has(pathName)) {
         return {
@@ -239,6 +259,8 @@ export function reconcileOperatorHead(root, opts = {}) {
       safety_checks: {
         baseline_is_ancestor: true,
         rejected_state_paths: ['.agentxchain/'],
+        reconcile_safe_paths: [...RECONCILE_SAFE_AGENTXCHAIN_PATHS],
+        reconcile_safe_prefixes: [...RECONCILE_SAFE_AGENTXCHAIN_PREFIXES],
         rejected_deletions: [...CRITICAL_DELETION_PATHS],
       },
     },