mptyl/ThothII
1
0
Fork 0
Code Issues 25 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

allow absent base during addressed recovery

Browse Source
This commit is contained in:
marcopan
2026-08-12 00:23:43 +02:00
parent a3e2276bef
commit e5c081e55f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/workspaces/registry.ts
+2 -3
View File
@@ -439,9 +439,8 @@ export class WorkspaceRegistry {
if (state.phase === "publication_intent_durable") { if (state.phase === "publication_intent_durable") {
const activeBefore = await this.#tryActiveState(); const activeBefore = await this.#tryActiveState();
const activeDigest = activeBefore ? registryDigest(activeBefore) : undefined; const activeDigest = activeBefore ? registryDigest(activeBefore) : undefined;
const baseAllowed = operation === "registry_bootstrap" const baseAllowed = activeBefore === undefined
? activeBefore === undefined || (operation === "registry_pull" && activeBefore.head === state.baseCommit && activeDigest === state.baseManifestSha256);
: (activeBefore !== undefined && activeBefore.head === state.baseCommit && activeDigest === state.baseManifestSha256);
const targetAllowed = activeBefore !== undefined && activeBefore.head === target && activeDigest === state.targetManifestSha256; const targetAllowed = activeBefore !== undefined && activeBefore.head === target && activeDigest === state.targetManifestSha256;
if (!baseAllowed && !targetAllowed) throw new WorkspaceRegistryError("registry_bootstrap_recovery_conflict", "Active registry identity conflicts with addressed publication"); if (!baseAllowed && !targetAllowed) throw new WorkspaceRegistryError("registry_bootstrap_recovery_conflict", "Active registry identity conflicts with addressed publication");
if (targetAllowed) publication = operation === "registry_pull" && state.baseCommit === target ? "unchanged" : "reconciled_target"; if (targetAllowed) publication = operation === "registry_pull" && state.baseCommit === target ? "unchanged" : "reconciled_target";