dsh-git-worktree 0.3.2 → 0.4.0

package/lib/console-remote/schemas.js

@@ -47,6 +47,20 @@ const capabilitiesSchema = strict({
     retryCleanup: z.boolean(),
     beginNextIteration: z.boolean(),
 });
+const acceptanceBlockerSchema = strict({
+    checkoutId: checkoutIdSchema,
+    ownerSessionId: sessionIdSchema,
+    state: z.enum(['preview_active', 'preview_detached', 'finalized', 'retained', 'working', 'ready_for_review', 'delivered']),
+});
+const deliveryProofSchema = strict({
+    localBranch: z.string().nullable(),
+    localHeadBefore: oidSchema,
+    localHeadAfter: oidSchema,
+    changedFiles: z.array(z.string()),
+    validationStatus: z.enum(['passed', 'failed', 'partial', 'not_run']).optional(),
+    validationSummary: z.string().optional(),
+    commitInLocalHistory: z.boolean().nullable(),
+});
 const targetSummarySchema = strict({
     project: projectSchema,
     checkoutId: checkoutIdSchema.nullable(),
@@ -64,9 +78,11 @@ const targetSummarySchema = strict({
     retainedAt: z.number().finite().optional(),
     expiresAt: z.number().finite().nullable().optional(),
     cleanupMessage: z.string().optional(),
+    deliveryProof: deliveryProofSchema.optional(),
     review: reviewSchema.optional(),
     reviewSlot: z.enum(['available', 'waiting']).optional(),
     reviewSlotOwnerSessionId: sessionIdSchema.optional(),
+    reviewSlotHolder: acceptanceBlockerSchema.optional(),
     previewRecovery: strict({
         reason: z.enum(['stale_local', 'preview_modified']),
         attemptedAction: z.enum(['rollback_preview', 'finalize_preview', 'discard']),
@@ -75,6 +91,7 @@ const targetSummarySchema = strict({
 });
 const targetDetailsSchema = targetSummarySchema.extend({
     managedRoot: z.string().min(1).nullable(),
+    sourceRoot: z.string().min(1).nullable(),
     sourceOid: oidSchema,
     currentBranch: z.string().nullable(),
 }).strict();
@@ -131,8 +148,9 @@ const preflightSchema = z.union([
         checkoutId: z.string(),
         reviewId: reviewIdSchema.nullable(),
         revision: revisionSchema,
-        reason: z.enum(['not_owner', 'not_ready_for_review', 'stale_target', 'stale_isolated', 'project_acceptance_busy', 'checkout_unavailable', 'git_error']),
+        reason: z.enum(['not_owner', 'not_ready_for_review', 'stale_target', 'stale_local', 'stale_isolated', 'project_acceptance_busy', 'checkout_unavailable', 'git_error']),
         message: z.string(),
+        blocker: acceptanceBlockerSchema.optional(),
     }),
 ]);
 export const preflightResponseSchema = strict({ preflight: preflightSchema });

package/lib/console-remote/schemas.js.map

@@ -1 +1 @@
-{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../src/console-remote/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EACL,4BAA4B,EAC5B,8BAA8B,GAS/B,MAAM,wBAAwB,CAAA;AAE/B,MAAM,MAAM,GAAG,CAAkC,KAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAA;AAEtF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;AAChD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,oBAAoB,CAAC,CAAA;AACzI,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;AAC/C,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;AACpE,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAA;AAC5D,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC;IAC/B,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC;IACxB,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,mCAAmC,CAAC;CACtD,CAAC,CAAA;AACF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,OAAO,EAAE,CAAA;AACxC,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAA;AAC5E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC,CAAA;AAC9F,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC,CAAA;AAEtF,MAAM,aAAa,GAAG,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;AAChF,MAAM,oBAAoB,GAAG,MAAM,CAAC;IAClC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;IACnB,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC/C,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC/B,CAAC,CAAA;AACF,MAAM,YAAY,GAAG,MAAM,CAAC;IAC1B,QAAQ,EAAE,cAAc;IACxB,QAAQ,EAAE,cAAc;IACxB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE;IACzC,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE;IAC/B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;IACnB,gBAAgB,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IACpE,iBAAiB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACxC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC;IACpC,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IACjC,sBAAsB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CAC1C,CAAC,CAAA;AACF,MAAM,kBAAkB,GAAG,MAAM,CAAC;IAChC,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE;IACnB,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE;IACjB,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE;IACpB,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE;IACpB,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE;IACtB,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE;IACpB,cAAc,EAAE,CAAC,CAAC,OAAO,EAAE;IAC3B,eAAe,EAAE,CAAC,CAAC,OAAO,EAAE;IAC5B,QAAQ,EAAE,CAAC,CAAC,OAAO,EAAE;IACrB,eAAe,EAAE,CAAC,CAAC,OAAO,EAAE;IAC5B,YAAY,EAAE,CAAC,CAAC,OAAO,EAAE;IACzB,YAAY,EAAE,CAAC,CAAC,OAAO,EAAE;IACzB,kBAAkB,EAAE,CAAC,CAAC,OAAO,EAAE;CAChC,CAAC,CAAA;AACF,MAAM,mBAAmB,GAAG,MAAM,CAAC;IACjC,OAAO,EAAE,aAAa;IACtB,UAAU,EAAE,gBAAgB,CAAC,QAAQ,EAAE;IACvC,eAAe,EAAE,eAAe;IAChC,cAAc,EAAE,eAAe;IAC/B,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE;IAC3C,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE;IACzC,QAAQ,EAAE,cAAc;IACxB,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,8BAA8B,CAAC;IAC7C,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,mBAAmB,EAAE,WAAW,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IACjI,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE;IAClB,UAAU,EAAE,SAAS;IACrB,SAAS,EAAE,SAAS,CAAC,QAAQ,EAAE;IAC/B,SAAS,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IACxC,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1C,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IACpD,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACrC,MAAM,EAAE,YAAY,CAAC,QAAQ,EAAE;IAC/B,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE;IACvD,wBAAwB,EAAE,eAAe,CAAC,QAAQ,EAAE;IACpD,eAAe,EAAE,MAAM,CAAC;QACtB,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC;QACnD,eAAe,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,EAAE,SAAS,CAAC,CAAC;KAC7E,CAAC,CAAC,QAAQ,EAAE;IACb,YAAY,EAAE,kBAAkB;CACjC,CAAC,CAAA;AACF,MAAM,mBAAmB,GAAG,mBAAmB,CAAC,MAAM,CAAC;IACrD,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACzC,SAAS,EAAE,SAAS;IACpB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACrC,CAAC,CAAC,MAAM,EAAE,CAAA;AAEX,MAAM,kBAAkB,GAAG,MAAM,CAAC;IAChC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,4BAA4B,CAAC;IAC1C,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;IACnB,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;CACnG,CAAC,CAAA;AAEF,MAAM,UAAU,aAAa,CAAI,KAAmB;IAClD,OAAO,CAAC,CAAC,kBAAkB,CAAC,IAAI,EAAE;QAChC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC;QACtC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC;KAC5D,CAAyC,CAAA;AAC5C,CAAC;AAED,MAAM,CAAC,MAAM,qBAAqB,GAA8C,MAAM,CAAC,EAAE,MAAM,EAAE,mBAAmB,EAAE,CAAC,CAAA;AACvH,MAAM,CAAC,MAAM,oBAAoB,GAA6C,MAAM,CAAC;IACnF,MAAM,EAAE,mBAAmB;IAC3B,eAAe,EAAE,eAAe;IAChC,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CAC/B,CAAC,CAAA;AACF,MAAM,CAAC,MAAM,qBAAqB,GAA8C,MAAM,CAAC,EAAE,MAAM,EAAE,mBAAmB,EAAE,CAAC,CAAA;AACvH,MAAM,CAAC,MAAM,kBAAkB,GAA2C,MAAM,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAA;AACrJ,MAAM,CAAC,MAAM,sBAAsB,GAA+C,MAAM,CAAC;IACvF,MAAM,EAAE,mBAAmB;IAC3B,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IAC5C,SAAS,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;CAC3C,CAAC,CAAA;AACF,MAAM,cAAc,GAAG,MAAM,CAAC;IAC5B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACnC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;IACrE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE;CACvB,CAAC,CAAA;AACF,MAAM,oBAAoB,GAAG;IAC3B,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IAC/B,UAAU,EAAE,gBAAgB;IAC5B,QAAQ,EAAE,cAAc;IACxB,QAAQ,EAAE,cAAc;IACxB,iBAAiB,EAAE,SAAS;IAC5B,gBAAgB,EAAE,SAAS;IAC3B,YAAY,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,8BAA8B,EAAE,8BAA8B,CAAC,CAAC;IACvG,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,YAAY,EAAE,SAAS;IACvB,eAAe,EAAE,SAAS;IAC1B,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;CAClC,CAAA;AACD,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAC,EAAE,GAAG,oBAAoB,EAAE,CAAC;IACpG,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG,oBAAoB,EAAE,gBAAgB,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;IACzG,MAAM,CAAC;QACL,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;QAC5B,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;QAC/B,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;QACtB,QAAQ,EAAE,cAAc,CAAC,QAAQ,EAAE;QACnC,QAAQ,EAAE,cAAc;QACxB,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,sBAAsB,EAAE,cAAc,EAAE,gBAAgB,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,WAAW,CAAC,CAAC;QACvJ,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;KACpB,CAAC;CACH,CAAC,CAAA;AACF,MAAM,CAAC,MAAM,uBAAuB,GAAgD,MAAM,CAAC,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC,CAAA;AAE1H,MAAM,CAAC,MAAM,wBAAwB,GAAiD,MAAM,CAAC;IAC3F,QAAQ,EAAE,cAAc;IACxB,QAAQ,EAAE,cAAc;IACxB,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC;IACvC,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE;CACvB,CAAC,CAAA"}
+{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../src/console-remote/schemas.ts"],"names":[],"mappings":"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"}

package/lib/ports.d.ts

@@ -147,6 +147,9 @@ export interface ManagedDeliveryProof {
     localHeadBefore: string;
     localHeadAfter: string;
     changedFiles: string[];
+    /** Optional for backward compatibility with historical version-2 registries. */
+    validationStatus?: WorktreeValidationStatus;
+    validationSummary?: string;
 }
 export type ManagedCheckoutDelivery = {
     state: 'working';

package/lib/session-checkout-module.js

@@ -148,6 +148,8 @@ export function createSessionCheckoutModule(dependencies) {
                 localHeadBefore: proof.localHeadBefore,
                 localHeadAfter: proof.localHeadAfter,
                 changedFiles: [...proof.changedFiles],
+                ...(proof.validationStatus === undefined ? {} : { validationStatus: proof.validationStatus }),
+                ...(proof.validationSummary === undefined ? {} : { validationSummary: proof.validationSummary }),
                 commitInLocalHistory,
             }
             : undefined;
@@ -866,6 +868,10 @@ export function createSessionCheckoutModule(dependencies) {
                                     localHeadBefore: current.delivery.preview.localHeadOid,
                                     localHeadAfter: current.journal.commitOid,
                                     changedFiles: [...current.delivery.preview.changedFiles],
+                                    validationStatus: current.delivery.review.validationStatus,
+                                    ...(current.delivery.review.validationSummary === undefined
+                                        ? {}
+                                        : { validationSummary: current.delivery.review.validationSummary }),
                                 },
                                 isolatedFingerprint: current.delivery.preview.isolatedFingerprint,
                                 finalizedAt: recoveredAt,
@@ -889,6 +895,10 @@ export function createSessionCheckoutModule(dependencies) {
                                     localHeadBefore: current.delivery.preview.localHeadOid,
                                     localHeadAfter: current.journal.commitOid,
                                     changedFiles: [...current.delivery.preview.changedFiles],
+                                    validationStatus: current.delivery.review.validationStatus,
+                                    ...(current.delivery.review.validationSummary === undefined
+                                        ? {}
+                                        : { validationSummary: current.delivery.review.validationSummary }),
                                 },
                                 isolatedFingerprint: current.delivery.preview.isolatedFingerprint,
                                 retention,
@@ -1280,7 +1290,7 @@ export function createSessionCheckoutModule(dependencies) {
             console.warn('[session-checkout] 清理 Preview refs 失败，已保守保留不可见引用');
         }
     }
-    function blockedPreflight(record, reason, message) {
+    function blockedPreflight(record, reason, message, blocker) {
         return {
             status: 'blocked',
             localModified: false,
@@ -1289,6 +1299,13 @@ export function createSessionCheckoutModule(dependencies) {
             revision: record?.revision ?? 0,
             reason,
             message,
+            ...(blocker === undefined ? {} : {
+                blocker: {
+                    checkoutId: blocker.checkoutId,
+                    ownerSessionId: blocker.ownerSessionId,
+                    state: blocker.delivery.state,
+                },
+            }),
         };
     }
     async function preflightTarget(sessionId, expectedRevision) {
@@ -1305,8 +1322,9 @@ export function createSessionCheckoutModule(dependencies) {
         if (record.phase !== 'ready' || record.delivery.state !== 'ready_for_review') {
             return blockedPreflight(record, 'not_ready_for_review', '当前 Worktree 尚未处于可验收状态');
         }
-        if (findProjectAcceptanceHolder(record)) {
-            return blockedPreflight(record, 'project_acceptance_busy', '另一个任务正在占用该项目的 Local 验收槽位');
+        const holder = findProjectAcceptanceHolder(record);
+        if (holder) {
+            return blockedPreflight(record, 'project_acceptance_busy', '另一个任务正在占用该项目的 Local 验收槽位', holder);
         }
         const validated = await validateManagedCheckoutDetailed(binding, record, false);
         if (validated.status !== 'valid') {
@@ -1325,7 +1343,12 @@ export function createSessionCheckoutModule(dependencies) {
             || current.delivery.review.reviewId !== review.reviewId)
             return blockedPreflight(current, 'stale_target', 'Session Target 在预检期间发生变化，请刷新后重试');
         if (result.status === 'error') {
-            return blockedPreflight(current, result.error.code === 'stale_isolated' ? 'stale_isolated' : 'git_error', result.error.message);
+            const reason = result.error.code === 'stale_isolated'
+                ? 'stale_isolated'
+                : result.error.code === 'stale_local'
+                    ? 'stale_local'
+                    : 'git_error';
+            return blockedPreflight(current, reason, result.error.message);
         }
         const isolatedFingerprint = result.status === 'ready'
             ? result.plan.isolatedFingerprint
@@ -1860,6 +1883,8 @@ export function createSessionCheckoutModule(dependencies) {
                     localHeadBefore: preview.localHeadOid,
                     localHeadAfter: result.commitOid ?? preview.localHeadOid,
                     changedFiles: [...result.changedFiles],
+                    validationStatus: review.validationStatus,
+                    ...(review.validationSummary === undefined ? {} : { validationSummary: review.validationSummary }),
                 },
                 isolatedFingerprint: preview.isolatedFingerprint,
                 finalizedAt: Date.now(),
@@ -2140,6 +2165,8 @@ export function createSessionCheckoutModule(dependencies) {
                     localHeadBefore: receipt.localHeadOid,
                     localHeadAfter: finishResult.commitOid ?? receipt.localHeadOid,
                     changedFiles: [...finishResult.changedFiles],
+                    validationStatus: review.validationStatus,
+                    ...(review.validationSummary === undefined ? {} : { validationSummary: review.validationSummary }),
                 },
                 isolatedFingerprint: receipt.isolatedFingerprint,
                 finalizedAt: Date.now(),