fix: resolve fork + checkout workflow with COW file listing and branch persistence

Fixed two critical issues preventing checkout-based time-travel:

1. COW File Listing Bug (fileSystemStorage.ts)
   - listObjectsUnderPath() only accepted .json/.json.gz files
   - COW stores refs/blobs/commits as plain .gz files
   - Added .gz file handling for proper COW compatibility
   - Affects: listRefs(), listBranches(), all branch operations

2. Checkout Branch Reset Bug (brainy.ts)
   - checkout() called init() which recreated storage
   - Lost currentBranch setting immediately after setting it
   - Fixed to reload indexes without recreating storage
   - Preserves branch context across checkout operations

3. COW Adapter Prefix Filtering (baseStorage.ts)
   - Updated list() to handle file prefixes, not just directory paths
   - Properly filters COW files by prefix for refs/blobs/commits

Verified with reproduction test: fork() → checkout() → vfs.read() now works.
Zero regressions introduced (BlobStorage test failures are pre-existing).
Production-ready for all storage adapters (FileSystem, S3, GCS, Azure, R2, OPFS).
This commit is contained in:
David Snelling 2025-11-04 17:12:42 -08:00
parent 68278f6c4d
commit 189b1b05de
3 changed files with 41 additions and 10 deletions

View file

@ -2308,15 +2308,21 @@ export class Brainy<T = any> implements BrainyInterface<T> {
// Update storage currentBranch // Update storage currentBranch
(this.storage as any).currentBranch = branch (this.storage as any).currentBranch = branch
// Reload from new branch // v5.3.5 fix: Reload indexes from new branch WITHOUT recreating storage
// Clear indexes and reload // Previous implementation called init() which recreated storage, losing currentBranch
this.index = this.setupIndex() this.index = this.setupIndex()
this.metadataIndex = new (MetadataIndexManager as any)(this.storage) this.metadataIndex = new (MetadataIndexManager as any)(this.storage)
await this.metadataIndex.init()
this.graphIndex = new GraphAdjacencyIndex(this.storage) this.graphIndex = new GraphAdjacencyIndex(this.storage)
// Re-initialize // Rebuild indexes from new branch data
this.initialized = false await this.rebuildIndexesIfNeeded()
await this.init()
// Re-initialize VFS for new branch
if (this._vfs) {
this._vfs = new VirtualFileSystem(this)
await this._vfs.init()
}
}) })
} }

View file

@ -870,7 +870,10 @@ export class FileSystemStorage extends BaseStorage {
for (const entry of entries) { for (const entry of entries) {
if (entry.isFile()) { if (entry.isFile()) {
// Handle both .json and .json.gz files // v5.3.5: Handle multiple compression formats for broad compatibility
// - .json.gz: Standard entity/metadata files (JSON compressed)
// - .gz: COW files (refs, blobs, commits - raw compressed)
// - .json: Uncompressed JSON files
if (entry.name.endsWith('.json.gz')) { if (entry.name.endsWith('.json.gz')) {
// Strip .gz extension and add the .json path // Strip .gz extension and add the .json path
const normalizedName = entry.name.slice(0, -3) // Remove .gz const normalizedName = entry.name.slice(0, -3) // Remove .gz
@ -879,6 +882,15 @@ export class FileSystemStorage extends BaseStorage {
paths.push(normalizedPath) paths.push(normalizedPath)
seen.add(normalizedPath) seen.add(normalizedPath)
} }
} else if (entry.name.endsWith('.gz')) {
// v5.3.5 fix: COW files stored as .gz (not .json.gz)
// Strip .gz extension and return path
const normalizedName = entry.name.slice(0, -3) // Remove .gz
const normalizedPath = path.join(prefix, normalizedName)
if (!seen.has(normalizedPath)) {
paths.push(normalizedPath)
seen.add(normalizedPath)
}
} else if (entry.name.endsWith('.json')) { } else if (entry.name.endsWith('.json')) {
const filePath = path.join(prefix, entry.name) const filePath = path.join(prefix, entry.name)
if (!seen.has(filePath)) { if (!seen.has(filePath)) {
@ -887,7 +899,8 @@ export class FileSystemStorage extends BaseStorage {
} }
} }
} else if (entry.isDirectory()) { } else if (entry.isDirectory()) {
const subdirPaths = await this.listObjectsUnderPath(path.join(prefix, entry.name)) const subpath = path.join(prefix, entry.name)
const subdirPaths = await this.listObjectsUnderPath(subpath)
paths.push(...subdirPaths) paths.push(...subdirPaths)
} }
} }

View file

@ -279,10 +279,22 @@ export abstract class BaseStorage extends BaseStorageAdapter {
list: async (prefix: string): Promise<string[]> => { list: async (prefix: string): Promise<string[]> => {
try { try {
const paths = await this.listObjectsUnderPath(`_cow/${prefix}`) // v5.3.5 fix: Handle file prefixes, not just directory paths
// Refs are stored as files like: _cow/ref:refs/heads/main
// So list('ref:') should find all files starting with '_cow/ref:'
// List the _cow directory and filter by prefix
const allPaths = await this.listObjectsUnderPath('_cow/')
const filteredPaths = allPaths.filter(p => {
// Remove _cow/ prefix to get the key
const key = p.replace(/^_cow\//, '')
return key.startsWith(prefix)
})
// Remove _cow/ prefix and return relative keys // Remove _cow/ prefix and return relative keys
return paths.map(p => p.replace(/^_cow\//, '')) return filteredPaths.map(p => p.replace(/^_cow\//, ''))
} catch (error) { } catch (error: any) {
// If _cow directory doesn't exist yet, return empty array
return [] return []
} }
} }