Skip to content

Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS

fix: fetch missing proof before cleanup policy review

Adam Eivy82d3465f7fdd
diff --git a/server/services/heldCheckoutRecovery.js b/server/services/heldCheckoutRecovery.js
index e67dbb0dd5..83eddeac25 100644
--- a/server/services/heldCheckoutRecovery.js
+++ b/server/services/heldCheckoutRecovery.js
@@ -382,6 +382,7 @@ const policyReviewIdentity = (release, prUrl, forge) => ({
});
async function integratedPolicyReviewIdentity(repoPath, release, prUrl, forge) {
+ if (!forge || !await execGit(['cat-file', '-e', `${forge.defaultHead}^{commit}`], repoPath).then(() => true, () => false)) return null;
return { ...policyReviewIdentity(release, prUrl, forge),
// Older pinned claims missed completion capture. Fresh inclusion of every
// commit settles cleanup-only outcomes without manufacturing receipts.
@@ -400,7 +401,9 @@ async function reviewCurrentCheckout({ repoPath, release, prUrl, unlocked = fals
const forge = await (opts.readForge || readRetirementForgeEvidence)(repoPath, release.branch, prUrl, { forgeAccount: opts.forgeAccount })
.catch(error => ({ error }));
if (forge?.error) return { ok: false, reason: /^retirement-[a-z-]+$/.test(forge.error.message) ? forge.error.message : 'retirement-forge-unavailable' };
- const policy = await retirementPolicy(repoPath, release.branch, opts, await integratedPolicyReviewIdentity(repoPath, release, prUrl, forge));
+ const identity = await integratedPolicyReviewIdentity(repoPath, release, prUrl, forge);
+ if (!identity) return { ok: false, reason: 'retirement-local-objects-missing' };
+ const policy = await retirementPolicy(repoPath, release.branch, opts, identity);
if (policy.reason) return { ok: false, reason: policy.reason };
return archiveSnapshots(matched.tree, repoPath)
.then(([content, administration]) => buildCheckoutRetirementReview({ repoPath, release, prUrl,
@@ -1003,7 +1006,8 @@ async function finishHeldCheckoutRetirement({ repoPath, release, review, reviewe
if (review) {
const { readRetirementForgeEvidence } = await import('./heldCheckoutReview.js');
const forge = await (opts.readForge || readRetirementForgeEvidence)(repoPath, branch, review.prUrl, { forgeAccount: opts.forgeAccount }).catch(() => null);
- const policy = await retirementPolicy(repoPath, branch, opts, await integratedPolicyReviewIdentity(repoPath, release, review.prUrl, forge));
+ const identity = await integratedPolicyReviewIdentity(repoPath, release, review.prUrl, forge);
+ const policy = identity ? await retirementPolicy(repoPath, branch, opts, identity) : null;
if (JSON.stringify(policy) !== JSON.stringify(reviewed.review.policy) || JSON.stringify(forge) !== JSON.stringify(reviewed.review.forge)) {
return { ok: true, archiveDir: archive.dir, branchDeleted: false, branchRetainedReason: 'retirement-evidence-changed' };
}
diff --git a/server/services/heldCheckoutRecovery.test.js b/server/services/heldCheckoutRecovery.test.js
index 2f3d7e4d03..3621ba5234 100644
--- a/server/services/heldCheckoutRecovery.test.js
+++ b/server/services/heldCheckoutRecovery.test.js
@@ -1459,11 +1459,22 @@ describe.skipIf(SKIP_HEAVY_INTEGRATION)('held checkout recovery (real git)', ()
expect(injected.policies[0].metadata.branchCompletionPolicy).toBeUndefined();
});
- it('reviews and retires a legacy pinned cleanup handoff against fresh default proof while local main lags', async () => {
+ it.each([false, true])('retires legacy pinned cleanup with lagging main and missing remote proof=%s', async missingProof => {
const c = await reviewedCheckout('pinned-cleanup', { normalMerge: true });
injected.policies[0].result = { success: false, executionSuccess: true,
taskOutcome: { status: 'incomplete', recovery: { mode: 'cleanup' } } };
- const shippedDefault = c.forge.defaultHead;
+ let shippedDefault = c.forge.defaultHead;
+ if (missingProof) {
+ const remote = join(scratch, 'proof-remote');
+ await execGit(['clone', '--no-hardlinks', repo, remote], scratch);
+ await execGit(['config', 'user.email', '[email protected]'], remote);
+ await execGit(['config', 'user.name', 'Test'], remote);
+ await execGit(['commit', '--allow-empty', '-m', 'new remote default'], remote);
+ shippedDefault = (await execGit(['rev-parse', 'HEAD'], remote)).stdout.trim();
+ expect((await execGit(['cat-file', '-e', `${shippedDefault}^{commit}`], repo, { ignoreExitCode: true })).exitCode).not.toBe(0);
+ await execGit(['remote', 'add', 'origin', 'https://github.com/example/repo.git'], repo);
+ injected.fetchRemote = remote;
+ }
await execGit(['reset', '--hard', 'HEAD^'], repo);
const localMain = (await execGit(['rev-parse', 'main'], repo)).stdout.trim();
c.forge.defaultHead = localMain;
@@ -1483,6 +1494,7 @@ describe.skipIf(SKIP_HEAVY_INTEGRATION)('held checkout recovery (real git)', ()
expect((await getBranchReconcileOutcome('app-1')).retired).toContainEqual(expect.objectContaining({
branch: c.release.branch, head: c.release.head, archiveDir: result.archiveDir, branchDeleted: true,
}));
+ expect(injected.fetches).toHaveLength(missingProof ? 1 : 0);
});
it('settles a review obligation for unattended retirement only once every commit is on the default branch', async () => {