pi-posthorse 0.10.17 → 0.10.18

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-posthorse",
-	"version": "0.10.17",
+	"version": "0.10.18",
 	"type": "module",
 	"description": "Posthorse: fresh context, same journey. No-summary context rollover for Pi, with sparse budget reminders, handoffs, notes, and history.",
 	"keywords": [

package/src/note-provenance.ts

@@ -7,6 +7,7 @@ import { parseSessionLine } from "./session-files.ts";
 import { sessionNoteTouches } from "./note-evidence.ts";
 import { mapBatch, readManifest, snapshot, type SnapshotNote } from "./note-snapshots.ts";
 import {
+	addressIn,
 	addressOf,
 	bindingsOf,
 	canonicalPath,
@@ -130,7 +131,7 @@ export async function resolveReference(
 		}
 		visited.add(directory);
 		if (existsSync(notePath(current, path))) {
-			return { ...current, path };
+			return addressIn(current, path);
 		}
 		// A manifest includes later adoptions; the journal includes later writes and deletions.
 		const binding: NoteBinding | undefined =
@@ -204,7 +205,7 @@ function seedCandidates(
 			) {
 				selected.set(seed.path, {
 					...seed,
-					source: { root: binding.root, scope: binding.scope, path: seed.path },
+					source: addressIn(binding, seed.path),
 					cleared: false,
 				});
 			}

package/src/note-scopes.ts

@@ -83,6 +83,13 @@ export function forkScope(owner: NoteOwner): string {
 export function scopeDirectory(scope: NoteScope): string {
 	return join(scope.root, scope.scope);
 }
+/**
+ * An address is stored in the journal, and a scope value is often a whole binding. Build an
+ * address here, never by spreading a scope, so it holds the two location fields and nothing else.
+ */
+export function addressIn(scope: NoteScope, path: string): NoteAddress {
+	return { root: scope.root, scope: scope.scope, path };
+}
 export function sameScope(left: NoteScope, right: NoteScope): boolean {
 	return left.root === right.root && left.scope === right.scope;
 }
@@ -278,7 +285,7 @@ export function addressOf(path: string, scopes: readonly NoteScope[]): NoteAddre
 				? undefined
 				: candidates.find((item) => item.directory === match.directory);
 		if (match !== undefined && candidate !== undefined) {
-			return { ...candidate.scope, path: match.path };
+			return addressIn(candidate.scope, match.path);
 		}
 		if (
 			scopes.some(

package/src/note-snapshots.ts

@@ -18,6 +18,7 @@ import { withFileMutationQueue } from "@earendil-works/pi-coding-agent";
 import { isRecord } from "./contracts.ts";
 import { publishFile } from "./files.ts";
 import {
+	addressIn,
 	notePath,
 	parseBinding,
 	sameOwner,
@@ -127,7 +128,19 @@ async function copyNote(note: SnapshotNote, destination: string): Promise<CopyRe
 		}
 		await utimes(destination, before.atimeMs / 1000, before.mtimeMs / 1000);
 		const [digest, destInfo] = await Promise.all([fileDigest(destination), stat(destination)]);
-		return { kind: "verified", seed: { ...note, digest, identity: fileIdentity(destInfo) } };
+		return {
+			kind: "verified",
+			// Journals written by 0.10.4 through 0.10.17 hold whole bindings in seed addresses.
+			// A new seed keeps each location only, so that data is not copied into this fork.
+			seed: {
+				path: note.path,
+				source: addressIn(note.source, note.source.path),
+				lineage: addressIn(note.lineage, note.lineage.path),
+				digest,
+				identity: fileIdentity(destInfo),
+				anchors: note.anchors,
+			},
+		};
 	} catch (error) {
 		return {
 			kind: "unverified",

package/src/note-store.ts

@@ -13,6 +13,7 @@ import {
 import {
 	NOTES_BINDING,
 	NOTES_TOUCH,
+	addressIn,
 	bindingsOf,
 	canonicalPath,
 	inside,
@@ -154,7 +155,7 @@ export class SessionNotes {
 		if (options.scope !== undefined) {
 			const scope = await this.selectScope(options.scope);
 			return {
-				address: { ...scope, path: relative },
+				address: addressIn(scope, relative),
 				path: notePath(scope, relative),
 				writable: sameScope(scope, this.binding),
 			};
@@ -162,11 +163,7 @@ export class SessionNotes {
 		const reference = this.owns(relative)
 			? undefined
 			: await this.#reference(relative, options.signal);
-		const address = reference ?? {
-			root: this.binding.root,
-			scope: this.binding.scope,
-			path: relative,
-		};
+		const address = reference ?? addressIn(this.binding, relative);
 		return { address, path: notePath(address, relative), writable: reference === undefined };
 	}
 	async adopt(path: string, call: NoteCall): Promise<Adoption> {