@fitlab-ai/agent-infra 0.9.14 → 0.10.0

package/lib/task/commit-operation.ts

@@ -3,6 +3,7 @@ import { execFileSync } from 'node:child_process';
 
 import { commitExplicitPaths, inspectGitWorkflow, pushGitRefs } from '../git/workflow.ts';
 import { parseTaskFrontmatter } from './frontmatter.ts';
+import { checkpointCommitMatches } from './commit-identity.ts';
 import { resolveTaskContext, resolveTaskRef } from './resolve-ref.ts';
 import { commitPushDecision } from './commit-policy.ts';
 import { mergeOperationWarnings, type OperationWarning } from './operation-outcome.ts';
@@ -31,6 +32,8 @@ type CommitOperationInput = Readonly<{
   agent?: string;
   mode?: CommitExecutionMode;
   round?: number;
+  /** Permit one retry to rebase a prepared intent's expected tree while HEAD and intent identity remain unchanged. */
+  recoverPreparedIntent?: boolean;
   delivery?: Readonly<{
     mode: 'local' | 'push';
     remote: string;
@@ -261,21 +264,6 @@ function syncTaskCommit(
   }
 }
 
-function checkpointChildMatches(task: BoundTask, intent: NonNullable<ReturnType<typeof readCheckpointIntent>>, head: string): boolean {
-  try {
-    const parent = gitText(task.repoRoot, ['rev-parse', `${head}^`]);
-    const tree = gitText(task.repoRoot, ['rev-parse', `${head}^{tree}`]);
-    const message = gitText(task.repoRoot, ['show', '-s', '--format=%s', head]);
-    const changed = gitText(task.repoRoot, ['diff-tree', '--no-commit-id', '--name-only', '-r', head]).split('\n').filter(Boolean).sort();
-    return parent === intent.expectedHead
-      && tree === intent.expectedTree
-      && message === intent.message
-      && JSON.stringify(changed) === JSON.stringify([...intent.paths].sort());
-  } catch {
-    return false;
-  }
-}
-
 function checkpointIdentity(input: CommitOperationInput, task: BoundTask, delivery: CommitDelivery): Parameters<typeof checkpointIntentDigest>[0] {
   if (delivery.mode !== 'local') throw new Error('checkpoint identity requires local delivery');
   return {
@@ -294,6 +282,20 @@ function checkpointTimestamp(): string {
   return new Date().toISOString();
 }
 
+function samePreparedCheckpointIdentity(
+  pending: NonNullable<ReturnType<typeof readCheckpointIntent>>,
+  identity: Parameters<typeof checkpointIntentDigest>[0]
+): boolean {
+  return pending.state === 'prepared'
+    && pending.taskId === identity.taskId
+    && pending.branch === identity.branch
+    && pending.mode === identity.mode
+    && pending.expectedHead === identity.expectedHead
+    && pending.message === identity.message
+    && pending.round === identity.round
+    && JSON.stringify(pending.paths) === JSON.stringify(identity.paths);
+}
+
 function executeUnlocked(input: CommitOperationInput, task: BoundTask | null, mode: CommitExecutionMode): CommitOperationResult {
   const inspected = inspectGitWorkflow(input.cwd);
   if (!inspected.snapshot) return failure(input, mode, task?.taskId ?? null, 'GIT_INSPECT_FAILED', 'Unable to inspect Git repository');
@@ -327,10 +329,25 @@ function executeUnlocked(input: CommitOperationInput, task: BoundTask | null, mo
           error: { code: 'COMMIT_INTENT_INVALID', message: error instanceof Error ? error.message : String(error) }
         };
       }
-      if (pendingIntent && !sameCheckpointIntent(pendingIntent, identity)) return {
-        status: 'failed' as const, changed: false, snapshot: inspected.snapshot, operations: [],
-        error: { code: 'COMMIT_INTENT_CONFLICT', message: 'A different checkpoint intent is still pending for this task' }
-      };
+      if (pendingIntent && !sameCheckpointIntent(pendingIntent, identity)) {
+        if (!input.recoverPreparedIntent || !samePreparedCheckpointIdentity(pendingIntent, identity)) return {
+          status: 'failed' as const, changed: false, snapshot: inspected.snapshot, operations: [],
+          error: { code: 'COMMIT_INTENT_CONFLICT', message: 'A different checkpoint intent is still pending for this task' }
+        };
+        pendingIntent = {
+          ...pendingIntent,
+          expectedTree: identity.expectedTree,
+          digest: checkpointIntentDigest(identity),
+          updatedAt: checkpointTimestamp()
+        };
+        try { writeCheckpointIntent(task!.repoRoot, pendingIntent); }
+        catch (error) {
+          return {
+            status: 'failed' as const, changed: false, snapshot: inspected.snapshot, operations: [],
+            error: { code: 'COMMIT_INTENT_WRITE_FAILED', message: error instanceof Error ? error.message : String(error) }
+          };
+        }
+      }
       if (!pendingIntent) {
         const timestamp = checkpointTimestamp();
         pendingIntent = {
@@ -352,7 +369,7 @@ function executeUnlocked(input: CommitOperationInput, task: BoundTask | null, mo
           operations: [{ name: 'commit', status: 'no-op' as const }], error: null
         };
       }
-      if (inspected.snapshot.head !== identity.expectedHead && !checkpointChildMatches(task!, pendingIntent, inspected.snapshot.head)) return {
+      if (inspected.snapshot.head !== identity.expectedHead && !checkpointCommitMatches(task!.repoRoot, pendingIntent, inspected.snapshot.head)) return {
         status: 'failed' as const, changed: false, snapshot: inspected.snapshot, operations: [],
         error: { code: 'COMMIT_INTENT_HEAD_CONFLICT', message: 'Current HEAD does not match the pending checkpoint intent' }
       };