diff --git a/package-lock.json b/package-lock.json index 8e40db7..c03fd43 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@gildforge/kit", - "version": "0.7.10", + "version": "0.7.11", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@gildforge/kit", - "version": "0.7.10", + "version": "0.7.11", "license": "Apache-2.0", "dependencies": { "diff": "8", diff --git a/package.json b/package.json index b896fcf..fc15dc7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@gildforge/kit", - "version": "0.7.10", + "version": "0.7.11", "description": "The shared engine, views and server behind gild: the git forge for agents on Cloudflare.", "license": "Apache-2.0", "type": "module", diff --git a/src/engine/repo-refs.test.ts b/src/engine/repo-refs.test.ts new file mode 100644 index 0000000..992fc36 --- /dev/null +++ b/src/engine/repo-refs.test.ts @@ -0,0 +1,20 @@ +import { test } from 'node:test' +import assert from 'node:assert/strict' +import { settleAdvertisedRefs } from '../../dist/engine/repo-refs.js' + +const tagObject='8670bac8'.padEnd(40,'0'),peeled='0ae1ffac'.padEnd(40,'0'),pr='0de688f0'.padEnd(40,'0'),main='c1a89c38'.padEnd(40,'0') +const advertised=[ + {ref:'refs/heads/main',oid:main}, + {ref:'refs/tags/v0.1.0',oid:tagObject}, + {ref:'refs/heads/_meta',oid:'b'.repeat(40)}, +] + +test('an annotated tag pushed as its tag object is settled by the advertisement', () => { + assert.deepEqual(settleAdvertisedRefs({'v0.1.0':tagObject},advertised),{'v0.1.0':tagObject}) +}) +test('a ref deleted outside the push path (import cleanup) is settled', () => { + assert.deepEqual(settleAdvertisedRefs({'import/pr/1':pr},advertised),{'import/pr/1':pr}) +}) +test('a ref advertised at another oid, and _meta, stay outstanding', () => { + assert.deepEqual(settleAdvertisedRefs({main:peeled,_meta:'c'.repeat(40)},advertised),{}) +}) diff --git a/src/engine/repo-refs.ts b/src/engine/repo-refs.ts index 68ba6f2..e4bcfad 100644 --- a/src/engine/repo-refs.ts +++ b/src/engine/repo-refs.ts @@ -20,3 +20,15 @@ export function sameTips(a: Refs, b: Refs) { ]) return key(a) === key(b) } + +/** Pushed refs (short name → pushed oid) that an advertisement read after the + * push accounts for: advertised with exactly that oid (an annotated tag's own + * object, a hidden import ref) or no longer present (deleted). `_meta` is + * settled only by the index. Returns `settled` with them added. */ +export function settleAdvertisedRefs(pushed: Record, advertised: { ref: string; oid: string }[], settled: Record = {}) { + const short = /^refs\/(heads|tags)\// + const oids = new Map(advertised.filter((r) => short.test(r.ref)).map((r) => [r.ref.replace(short, ''), r.oid])) + for (const [ref, sha] of Object.entries(pushed)) + if (ref !== '_meta' && (oids.get(ref) === sha || !oids.has(ref))) settled[ref] = sha + return settled +} diff --git a/src/server/repo-index-do.ts b/src/server/repo-index-do.ts index 9061355..f42046a 100644 --- a/src/server/repo-index-do.ts +++ b/src/server/repo-index-do.ts @@ -29,6 +29,7 @@ import { type CFamilyIssue, } from './cqx-heavy-limits.js' import { scoreCacheKey } from './cqx-score-cache.js' +import {settleAdvertisedRefs} from '../engine/repo-refs.js' import {fencePreparedRefs,preparedRefsEpoch,publishPreparedRefs,publishPreparedHealth,publishPreparedDiff,publishPreparedPullHeads} from './prepared-repository-producer.js' import type { HeavyBinding } from './cqx-module.js' import type { Change, CommitChange } from './changes.js' @@ -352,7 +353,9 @@ export class RepoIndex extends DurableObject { const last = Number(this.index.setting('conversations:nudged') ?? 0) if (Date.now() - last < 5 * 60_000) return this.index.setting('conversations:nudged', String(Date.now())) - if (!this.index.setting('owner')) return this.refresh(owner, repo) + // Outstanding pushes settle only against a fresh ref advertisement. + if (!this.index.setting('owner') || Object.keys(JSON.parse(this.index.setting('fragments:pending-refs') ?? '{}')).length) + return this.refresh(owner, repo) await this.wake(Date.now() + 1) } async refresh(owner: string, repo: string, target?: Target) { @@ -402,13 +405,23 @@ export class RepoIndex extends DurableObject { } /** A push fence is satisfied by authoritative indexed refs, independently * of HTML rendering. Never clear a newer/unobserved ref or metadata push. */ + /** A push the index can never observe by commit: an annotated tag (indexed + * peeled, pushed as the tag object), a hidden import ref, or a ref deleted + * outside the push path. The advertisement read after the push settles it. */ + protected settleAdvertised(pushed:Record,advertised:{ref:string;oid:string}[]){ + const settled=JSON.parse(this.index.setting('fragments:settled-refs')??'{}') as Record + this.index.setting('fragments:settled-refs',JSON.stringify(settleAdvertisedRefs(pushed,advertised,settled))) + } protected acknowledgeIndexedRefs(){ const raw=this.index.setting('fragments:pending-refs')??'{}' const pending=JSON.parse(raw) as Record + const settled=JSON.parse(this.index.setting('fragments:settled-refs')??'{}') as Record for(const [ref,sha] of Object.entries(pending)){ const observed=ref==='_meta'?this.index.setting('meta'):this.index.resolve(ref) - if(observed===sha||/^0+$/.test(sha)&&!observed)delete pending[ref] + if(observed===sha||/^0+$/.test(sha)&&!observed||settled[ref]===sha)delete pending[ref] } + for(const ref of Object.keys(settled))if(!(ref in pending))delete settled[ref] + this.index.setting('fragments:settled-refs',JSON.stringify(settled)) const next=JSON.stringify(pending) if(next!==raw)this.index.setting('fragments:pending-refs',next) } @@ -1846,14 +1859,18 @@ export class RepoIndex extends DurableObject { // one smart HTTP advertisement gives branches, peeled tags and _meta. const { refsFromAdvertisement } = await import('../engine/repo-refs.js') const { internalPrefix } = await import('../engine/import/visibility.js') + // Pushes recorded before this advertisement was read. + const pushed = JSON.parse(this.index.setting('fragments:pending-refs') ?? '{}') as Record + const advertisement = await git.listServerRefs({ + http, + url, + ...(token ? { headers: { authorization: `Bearer ${token}` } } : {}), + symrefs: true, + peelTags: true, + }) + this.settleAdvertised(pushed, advertisement) const refs = refsFromAdvertisement( - await git.listServerRefs({ - http, - url, - ...(token ? { headers: { authorization: `Bearer ${token}` } } : {}), - symrefs: true, - peelTags: true, - }), + advertisement, await internalPrefix(this.env.DB,`${this.index.setting('owner')}/${this.index.setting('repo')}`), ) refs.defaultBranch =