@astrosheep/square 0.3.92 → 0.3.94

package/dist/square-index.js

@@ -5,8 +5,7 @@ import { randomUUID } from 'node:crypto';
 import { withFileLock } from './file-lock.js';
 import { canonicalPath } from './canonical-path.js';
 import { observeFileMetadata } from './file-changes.js';
-import { sameBody, validateBody } from './model.js';
-/** The index is the only host-side Square state. Its path is test/configuration plumbing, not authority. */
+import { validateOwner } from './model.js';
 export function squareIndexPath(env = process.env) {
     const configured = env.SQUARE_INDEX?.trim();
     return path.resolve(configured ?? path.join(os.homedir(), '.square', 'index.ndjsonl'));
@@ -18,24 +17,17 @@ function validEntry(value) {
     if (value === null || typeof value !== 'object' || Array.isArray(value))
         return undefined;
     const row = value;
-    if (typeof row.location !== 'string' || !path.isAbsolute(row.location)
-        || row.body === null || typeof row.body !== 'object' || Array.isArray(row.body))
+    if (typeof row.location !== 'string' || !path.isAbsolute(row.location) || typeof row.owner !== 'string')
         return undefined;
-    const raw = row.body;
-    const body = {
-        channel: raw.channel,
-        session: raw.session,
-        ...(raw.agent === undefined ? {} : { agent: raw.agent }),
-    };
     try {
-        validateBody(body);
+        validateOwner(row.owner);
     }
     catch {
         return undefined;
     }
-    if (Object.keys(raw).some((key) => !['channel', 'session', 'agent'].includes(key)))
+    if (Object.keys(row).some((key) => !['location', 'owner'].includes(key)))
         return undefined;
-    return { location: row.location, body };
+    return { location: row.location, owner: row.owner };
 }
 async function readEntries(index) {
     let content;
@@ -56,25 +48,13 @@ async function readEntries(index) {
             if (entry !== undefined)
                 entries.push(entry);
         }
-        catch {
-            // The index is disposable discovery input. A malformed line is ignored rather than
-            // becoming a second authority or preventing access to valid entries beside it.
-        }
+        catch { /* Disposable discovery input. */ }
     }
     return entries;
 }
 function matches(entry, query) {
-    if (query.body !== undefined && !sameBody(entry.body, query.body))
-        return false;
-    if (query.channel !== undefined && entry.body.channel !== query.channel)
-        return false;
-    if (query.session !== undefined && entry.body.session !== query.session)
-        return false;
-    if (query.agent !== undefined && entry.body.agent !== query.agent)
-        return false;
-    return true;
+    return query.owner === undefined || entry.owner === query.owner;
 }
-/** Read and verify the disposable index. Paths are canonicalized on access and duplicates collapse. */
 export async function indexedSquareEntries(query = {}, env = process.env) {
     const entries = await readEntries(squareIndexPath(env));
     const result = [];
@@ -89,11 +69,11 @@ export async function indexedSquareEntries(query = {}, env = process.env) {
         catch {
             continue;
         }
-        const key = JSON.stringify([location, entry.body.channel, entry.body.session, entry.body.agent ?? null]);
+        const key = JSON.stringify([location, entry.owner]);
         if (seen.has(key))
             continue;
         seen.add(key);
-        result.push({ location, body: entry.body });
+        result.push({ location, owner: entry.owner });
     }
     return result;
 }
@@ -101,15 +81,15 @@ export async function indexedSquarePaths(query = {}, env = process.env) {
     return [...new Set((await indexedSquareEntries(query, env)).map((entry) => entry.location))];
 }
 /** Best-effort discovery only: a busy index skips publication, never queues or delays artifact work. */
-export async function rememberSquarePath(location, body, index) {
-    validateBody(body);
+export async function rememberSquarePath(location, owner, index) {
+    validateOwner(owner);
     const canonical = await canonicalPath(location);
     await fs.mkdir(path.dirname(index), { recursive: true });
     return await withFileLock(lockPath(index), { retryMs: 10, skipIfBusy: true }, async () => {
         const entries = await readEntries(index);
-        if (entries.some((entry) => entry.location === canonical && sameBody(entry.body, body)))
+        if (entries.some((entry) => entry.location === canonical && entry.owner === owner))
             return false;
-        const next = [...entries, { location: canonical, body }];
+        const next = [...entries, { location: canonical, owner }];
         const temporary = `${index}.${process.pid}.${randomUUID()}.tmp`;
         try {
             await fs.writeFile(temporary, next.map((entry) => JSON.stringify(entry)).join('\n') + '\n', { flag: 'wx', mode: 0o600 });
@@ -121,11 +101,6 @@ export async function rememberSquarePath(location, body, index) {
         return true;
     }) ?? false;
 }
-/** Index loss is tolerated by every caller; this observer is only a wake hint for rediscovery. */
 export function observeSquareIndex(env = process.env) {
     return observeFileMetadata(squareIndexPath(env));
 }
-export function bodyKey(body) {
-    validateBody(body);
-    return JSON.stringify([body.channel, body.session, body.agent ?? null]);
-}

package/dist/square-location.d.ts

@@ -1,15 +1,2 @@
-import type { SquareAtInput, SquareLocation } from './square-facade.js';
-import type { SquareBackends } from './square-backend.js';
-export type ParsedSquareLocation = {
-    readonly kind: 'local';
-    readonly path: string;
-} | {
-    readonly kind: 'stdio';
-    readonly backend: string;
-    readonly key: string;
-    readonly uri: string;
-};
-export declare function parseSquareLocation(value: string): ParsedSquareLocation;
+import type { SquareLocation } from './square-facade.js';
 export declare function squareLocation(input: SquareLocation): string;
-export declare function localSquareLocation(input: SquareLocation): string;
-export declare function backendConfiguration(input: SquareAtInput): Promise<SquareBackends>;

package/dist/square-location.js

@@ -1,76 +1,11 @@
 import path from 'node:path';
-import os from 'node:os';
-import { readFile } from 'node:fs/promises';
 import { SquareError } from './model.js';
-export function parseSquareLocation(value) {
-    if (!/^[A-Za-z][A-Za-z0-9+.-]*:/.test(value))
-        return { kind: 'local', path: value };
-    // Parse the raw components, before URL dot-segment normalization or host lowercasing.
-    const match = /^stdio:\/\/([A-Za-z0-9_-]+)\/([^/?#]+)$/.exec(value);
-    if (!match)
-        throw new SquareError('invalid_args', 'Expected a local path or stdio://<configured-name>/<encoded-square-key>; no credentials, port, query or fragment');
-    let key;
-    try {
-        key = decodeURIComponent(match[2]);
-    }
-    catch {
-        throw new SquareError('invalid_args', 'Invalid percent encoding in stdio square key');
-    }
-    if (!key || key === '.' || key === '..' || /[/\\\x00-\x1f\x7f]/.test(key))
-        throw new SquareError('invalid_args', 'A stdio square key must be one nonempty name, not a path');
-    return { kind: 'stdio', backend: match[1], key, uri: `stdio://${match[1]}/${encodeURIComponent(key)}` };
-}
 export function squareLocation(input) {
     const selected = input.path ?? (input.env ?? process.env).SQUARE_LOCATION;
     if (selected === undefined || selected.trim() === '')
         throw new SquareError('invalid_args', 'Square needs a location');
-    const location = parseSquareLocation(selected);
-    return location.kind === 'local' ? path.resolve(input.cwd ?? process.cwd(), location.path) : location.uri;
-}
-export function localSquareLocation(input) {
-    const location = squareLocation(input);
-    if (parseSquareLocation(location).kind !== 'local')
-        throw new SquareError('invalid_args', 'This file operation requires a local square artifact; backend URIs are not supported');
-    return location;
-}
-function validateBackends(value) {
-    const object = (v) => v !== null && typeof v === 'object' && !Array.isArray(v);
-    const invalid = () => new SquareError('invalid_args', 'Invalid backend configuration: expected {backends:{name:{command,args?,cwd?,env?}}}');
-    if (!object(value))
-        throw invalid();
-    for (const [name, entry] of Object.entries(value)) {
-        if (!/^[A-Za-z0-9_-]+$/.test(name) || !object(entry) || typeof entry.command !== 'string' || !entry.command.trim()
-            || Object.keys(entry).some(key => !['command', 'args', 'cwd', 'env'].includes(key))
-            || (entry.args !== undefined && (!Array.isArray(entry.args) || entry.args.some(arg => typeof arg !== 'string')))
-            || (entry.cwd !== undefined && typeof entry.cwd !== 'string')
-            || (entry.env !== undefined && (!object(entry.env) || Object.values(entry.env).some(v => typeof v !== 'string'))))
-            throw invalid();
-    }
-    return value;
-}
-export async function backendConfiguration(input) {
-    if (input.backends !== undefined)
-        return validateBackends(input.backends);
-    const env = input.env ?? process.env;
-    const configured = env.SQUARE_BACKENDS_CONFIG;
-    const file = configured === undefined ? path.join(env.HOME ?? os.homedir(), '.config/square/backends.json')
-        : path.resolve(input.cwd ?? process.cwd(), configured);
-    let text;
-    try {
-        text = await readFile(file, 'utf8');
-    }
-    catch (error) {
-        if (configured === undefined && error.code === 'ENOENT')
-            return {};
-        throw new SquareError('invalid_args', 'Cannot read backend configuration; check SQUARE_BACKENDS_CONFIG');
-    }
-    try {
-        const parsed = JSON.parse(text);
-        if (!parsed || Array.isArray(parsed) || typeof parsed !== 'object' || Object.keys(parsed).some(key => key !== 'backends') || parsed.backends === undefined)
-            throw new Error();
-        return validateBackends(parsed.backends);
-    }
-    catch {
-        throw new SquareError('invalid_args', 'Invalid backend configuration; expected {backends:{name:{command,args?,cwd?,env?}}}');
-    }
+    // Windows roots include drive-relative prefixes such as D:.
+    if (path.win32.parse(selected).root === '' && /^[A-Za-z][A-Za-z0-9+.-]*:/.test(selected))
+        throw new SquareError('invalid_args', 'Expected a local square artifact path');
+    return path.resolve(input.cwd ?? process.cwd(), selected);
 }

package/dist/square-migration-host-ledger.d.ts

@@ -1,8 +1,8 @@
-import { type Body } from './model.js';
+import { type HarnessCoordinate } from './owner.js';
 /** Offline conversion input only; never a runtime ownership or evidence reader. */
 export interface LegacyOwner {
     readonly participant: string;
-    readonly body: Body;
+    readonly coordinate: HarnessCoordinate;
 }
 export interface LegacyHostData {
     readonly owners: readonly LegacyOwner[];

package/dist/square-migration-host-ledger.js

@@ -5,7 +5,8 @@ import path from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { canonicalPath } from './canonical-path.js';
 import { inSqliteTransaction } from './sqlite-transaction.js';
-import { nameKey, validateBody } from './model.js';
+import { harnessOwner } from './owner.js';
+import { nameKey } from './model.js';
 const LEDGER_FILENAME = 'host-ledger.sqlite';
 const LEDGER_APPLICATION_ID = 0x5351484c;
 const LEDGER_VERSION = 2;
@@ -144,11 +145,11 @@ export async function readLegacyHostData(location, env = process.env, signal) {
                 if (value.v !== 1 || value.location !== canonical || typeof value.participant !== 'string'
                     || !finite(at))
                     throw invalid('owner fields are malformed.');
-                const body = { channel: value.channel, session: value.session, ...(value.agent === undefined ? {} : { agent: value.agent }) };
-                validateBody(body);
+                const coordinate = { channel: value.channel, session: value.session, ...(value.agent === undefined ? {} : { agent: value.agent }) };
+                harnessOwner(coordinate);
                 projections(row, { location_key: recordKey(canonical), participant_key: recordKey(nameKey(value.participant)),
-                    channel_key: recordKey(body.channel), session_key: recordKey(body.session), effective_at: at });
-                return { participant: value.participant, body };
+                    channel_key: recordKey(coordinate.channel), session_key: recordKey(coordinate.session), effective_at: at });
+                return { participant: value.participant, coordinate };
             });
             const evidence = database.prepare("SELECT * FROM host_evidence WHERE location_key=? AND kind IN ('wake','presentation') ORDER BY seq").all(recordKey(canonical)).map(row => {
                 const value = decodeEvidence(record(row));

package/dist/square-migration.d.ts

@@ -20,7 +20,8 @@ export interface MigrationOutcome {
 /**
  * Explicit conversion of the supported legacy formats. Row-backed versions 2 and 3 are
  * preflighted read-only, then receive ownership/evidence and deferral storage in one
- * format-5 transaction. Format 4 adds only the empty deferral table and its index.
+ * format-7 transaction. Formats 4/5 gain attachment; format 4 also gains empty deferrals.
+ * All legacy seats are encoded as opaque owners, preserving format-6 attachment.
  * Legacy delivery evidence is copied from HostLedger only when its owner/session mapping is
  * unique; no source record is retired. Version 1 is not a supported source for this format transition.
  */

package/dist/square-migration.js

@@ -2,11 +2,12 @@ import { createHash } from 'node:crypto';
 import { openExistingSquareDatabase } from './artifact.js';
 import { inSqliteTransaction } from './sqlite-transaction.js';
 import { canonicalPath, canonicalPathSync } from './canonical-path.js';
-import { formatActivityId, isWakeRouteKind, nameKey, sameBody, validateBody } from './model.js';
+import { harnessOwner, decodeHarnessOwner } from './owner.js';
+import { formatActivityId, isWakeRouteKind, nameKey } from './model.js';
 import { parseActivityId } from './square-core.js';
 import { readLegacyHostData } from './square-migration-host-ledger.js';
 import { legacyRowFramingIssue, FORMAT4_ADDED_OBJECTS } from './square-legacy-framing.js';
-import { APPLICATION_ID, ACTIVITIES_TABLE_SQL, ACTIVITY_INDEXES_SQL, CURRENT_USER_VERSION, V2_USER_VERSION, V3_USER_VERSION, V4_USER_VERSION, SCHEMA_SQL, FORMAT4_SCHEMA_SQL, DELIVERY_DEFERRALS_SQL, validateRowFraming, inspectSqlite, createSqliteDriver, invalidArtifact, validateStoredActivity } from './square-sqlite.js';
+import { APPLICATION_ID, ACTIVITIES_TABLE_SQL, ACTIVITY_INDEXES_SQL, CURRENT_USER_VERSION, V2_USER_VERSION, V3_USER_VERSION, V4_USER_VERSION, V5_USER_VERSION, V6_USER_VERSION, SCHEMA_SQL, FORMAT4_SCHEMA_SQL, DELIVERY_DEFERRALS_SQL, validateRowFraming, inspectSqlite, createSqliteDriver, invalidArtifact, validateStoredActivity } from './square-sqlite.js';
 function isObject(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
@@ -23,6 +24,9 @@ function isNonNegativeInteger(value) {
 function isStringArray(value) {
     return Array.isArray(value) && value.every((item) => typeof item === 'string');
 }
+function sameCoordinate(left, right) {
+    return left.channel === right.channel && left.session === right.session && left.agent === right.agent;
+}
 function validateRecord(value, item) {
     return isObject(value) && Object.entries(value).every(([key, candidate]) => key.length > 0 && item(candidate));
 }
@@ -142,7 +146,7 @@ function rebuildV2Activities(database) {
 }
 function validateCurrentFraming(database, location) {
     validateRowFraming(database, CURRENT_USER_VERSION, location);
-    createSqliteDriver(database).header();
+    inspectSqlite(database);
 }
 function assertSource(condition, detail = 'row is malformed.') {
     if (!condition)
@@ -190,12 +194,12 @@ function decodeLegacyRoute(row) {
     assertSource(row.participant_key_json === JSON.stringify(nameKey(participant)), 'route participant key is malformed.');
     const sessionId = decodeJsonString(row.session_json);
     sourceFinite(row.updated_at);
-    const body = { channel: parsed.channel, session: sessionId, ...(parsed.extra.agent === undefined ? {} : { agent: parsed.extra.agent }) };
-    validateBody(body);
+    const coordinate = { channel: parsed.channel, session: sessionId, ...(parsed.extra.agent === undefined ? {} : { agent: parsed.extra.agent }) };
+    harnessOwner(coordinate);
     const address = parsed.address;
     if (row.kind === 'claude-native')
         assertSource(address.sessionId === undefined || address.sessionId === sessionId, 'native route session conflicts with its body.');
-    return { location: parsed.location, participant, body,
+    return { location: parsed.location, participant, coordinate,
         wakeAddress: { kind: row.kind, address: { ...address, ...(row.kind === 'claude-native' ? { sessionId } : {}) } } };
 }
 function validateLegacyLease(value) {
@@ -235,14 +239,15 @@ function planSeats(location, roster, routes, owners, driver) {
         const joined = establishingJoin(driver, participant);
         const candidates = localRoutes.filter((route) => nameKey(route.participant) === nameKey(participant.name));
         const owner = owners.find(row => nameKey(row.participant) === nameKey(participant.name));
-        const body = owner?.body ?? candidates[0]?.body;
-        if (body === undefined || !candidates.every(route => sameBody(route.body, body)))
+        const coordinates = [...candidates.map(route => route.coordinate), ...(owner === undefined ? [] : [owner.coordinate])];
+        if (coordinates.length === 0 || !coordinates.every(coordinate => sameCoordinate(coordinate, coordinates[0])))
             continue;
         const address = uniqueSeatAddress(candidates);
         seats.push({
             participant: participant.name,
-            body,
+            owner: harnessOwner(coordinates[0]),
             generation: formatActivityId(joined),
+            attachment: 'attached',
             ...(address === undefined ? {} : { wakeAddress: address }),
         });
     }
@@ -321,7 +326,7 @@ function inspectLegacyRowArtifact(database, location, host) {
         routes: routes.length,
         recoveredSeats: seats.length,
         unownedStanding: standingCount - seats.length,
-        sharedBodySeats: seats.filter(seat => seats.some(other => other !== seat && sameBody(other.body, seat.body))).length,
+        sharedBodySeats: seats.filter(seat => seats.some(other => other !== seat && other.owner === seat.owner)).length,
         skippedEvidence: host.evidence.length - deliveries.length,
     };
     const sourceToken = legacySourceToken(database);
@@ -373,12 +378,14 @@ function planLegacyDeliveries(records, seats, driver) {
         const native = source.kind === 'wake' && source.nativeDelivery !== undefined;
         if (!participant?.joined && !(participant?.done && native))
             continue;
-        if (participant.joined && (seat === undefined || seat.body.session !== source.session
-            || source.agent !== seat.body.agent || source.channel !== undefined && source.channel !== seat.body.channel))
+        const seatCoordinate = seat === undefined ? undefined : decodeHarnessOwner(seat.owner);
+        if (participant.joined && (seatCoordinate === undefined || seatCoordinate.session !== source.session
+            || seatCoordinate.agent !== source.agent || source.channel !== undefined && seatCoordinate.channel !== source.channel))
             continue;
         const harness = source.nativeDelivery?.harness;
-        if (native && seat !== undefined && harness !==
-            (seat.body.channel === 'claude-code' ? 'claude' : seat.body.channel === 'opencode' ? 'opencode' : undefined))
+        if (native && source.channel !== undefined && source.channel !== (harness === 'claude' ? 'claude-code' : 'opencode'))
+            continue;
+        if (native && seat !== undefined && harness !== undefined && seat.owner !== harnessOwner({ channel: harness === 'claude' ? 'claude-code' : 'opencode', session: source.session, ...(source.agent === undefined ? {} : { agent: source.agent }) }))
             continue;
         const joined = establishingJoin(driver, participant);
         const generation = formatActivityId(joined);
@@ -388,11 +395,9 @@ function planLegacyDeliveries(records, seats, driver) {
             const done = driver.activityHeads({ actors: [participant.name], kinds: ['done'] }, { edge: 'newest', limit: 1 }).items[0];
             if (done === undefined || index >= done.index)
                 continue;
-            const body = { channel: harness === 'claude' ? 'claude-code' : 'opencode', session: source.session,
-                ...(source.agent === undefined ? {} : { agent: source.agent }) };
-            if (source.channel !== undefined && source.channel !== body.channel)
-                continue;
-            const coordinate = JSON.stringify([body.channel, body.session, body.agent]);
+            const owner = harnessOwner({ channel: harness === 'claude' ? 'claude-code' : 'opencode', session: source.session,
+                ...(source.agent === undefined ? {} : { agent: source.agent }) });
+            const coordinate = JSON.stringify([owner]);
             const key = nameKey(participant.name), previous = completedBodies.get(key);
             completedBodies.set(key, previous === undefined || previous === coordinate ? coordinate : null);
         }
@@ -429,7 +434,6 @@ function planLegacyDeliveries(records, seats, driver) {
     }
     return deliveries.filter(row => row.claimToken === undefined || tokens.get(row.claimToken) === 1);
 }
-const V4_REBUILT_TABLES = ['square_meta', 'catch_leases'];
 function tableDefinition(name) {
     const definition = SCHEMA_SQL.split(';').map((statement) => statement.trim()).find((statement) => statement.startsWith(`CREATE TABLE ${name} (`));
     if (definition === undefined)
@@ -439,16 +443,32 @@ function tableDefinition(name) {
 function currentAdditionStatements() {
     return SCHEMA_SQL.split(';').map((statement) => statement.trim()).filter((statement) => {
         const match = /^(?:CREATE (?:UNIQUE )?TABLE|CREATE (?:UNIQUE )?INDEX)\s+([a-z_]+)/i.exec(statement);
-        return match !== null && FORMAT4_ADDED_OBJECTS.has(match[1]);
+        return match !== null && (FORMAT4_ADDED_OBJECTS.has(match[1]) || match[1] === 'seat_owner');
     }).map((statement) => `${statement};`);
 }
+function migrateSeatOwnership(database, source) {
+    const rows = database.prepare('SELECT * FROM seats ORDER BY participant_key_json').all();
+    database.exec('ALTER TABLE seats RENAME TO seats_legacy;');
+    database.exec(tableDefinition('seats'));
+    database.exec('CREATE INDEX seat_owner ON seats(owner_json);');
+    const insert = database.prepare('INSERT INTO seats(participant_key_json,participant_json,owner_json,generation_json,wake_address_json,attachment) VALUES(?,?,?,?,?,?)');
+    for (const row of rows) {
+        const channel = decodeJsonString(row.channel_json, true), session = decodeJsonString(row.session_json, true);
+        const agent = row.agent_json === null ? undefined : decodeJsonString(row.agent_json, true);
+        const owner = harnessOwner({ channel, session, ...(agent === undefined ? {} : { agent }) });
+        const attachment = source === 6 ? row.attachment : 'attached';
+        assertSource(attachment === 'attached' || attachment === 'detached', 'seat attachment is malformed.');
+        insert.run(row.participant_key_json, row.participant_json, JSON.stringify(owner), row.generation_json, row.wake_address_json, attachment);
+    }
+    database.exec('DROP TABLE seats_legacy;');
+}
 function importOwnershipAndEvidence(database, plan) {
     for (const generation of plan.leaseGenerations) {
         database.prepare('UPDATE catch_leases SET generation_json=? WHERE owner_json=?').run(JSON.stringify(generation.generation), generation.ownerJson);
     }
-    const insertSeat = database.prepare('INSERT INTO seats(participant_key_json,participant_json,channel_json,session_json,agent_json,generation_json,wake_address_json) VALUES(?,?,?,?,?,?,?)');
+    const insertSeat = database.prepare('INSERT INTO seats(participant_key_json,participant_json,owner_json,generation_json,wake_address_json,attachment) VALUES(?,?,?,?,?,?)');
     for (const seat of plan.seats) {
-        insertSeat.run(JSON.stringify(nameKey(seat.participant)), JSON.stringify(seat.participant), JSON.stringify(seat.body.channel), JSON.stringify(seat.body.session), seat.body.agent === undefined ? null : JSON.stringify(seat.body.agent), JSON.stringify(seat.generation), seat.wakeAddress === undefined ? null : JSON.stringify(seat.wakeAddress));
+        insertSeat.run(JSON.stringify(nameKey(seat.participant)), JSON.stringify(seat.participant), JSON.stringify(seat.owner), JSON.stringify(seat.generation), seat.wakeAddress === undefined ? null : JSON.stringify(seat.wakeAddress), seat.attachment);
     }
     const insertDelivery = database.prepare('INSERT INTO delivery_evidence(participant_key_json,participant_json,generation_json,act_index,kind,attempt_n,outcome,at,expires_at,claim_token_json,payload_json) VALUES(?,?,?,?,?,?,?,?,?,?,?)');
     for (const evidence of plan.deliveries) {
@@ -481,10 +501,9 @@ function validateMigrationSource(database, location) {
             throw invalidArtifact(issue);
         return before.userVersion;
     }
-    if (before.userVersion === V4_USER_VERSION) {
-        validateRowFraming(database, V4_USER_VERSION, location);
-        inspectSqlite(database);
-        return V4_USER_VERSION;
+    if (before.userVersion === V4_USER_VERSION || before.userVersion === V5_USER_VERSION || before.userVersion === V6_USER_VERSION) {
+        validateRowFraming(database, before.userVersion, location);
+        return before.userVersion;
     }
     if (before.userVersion === CURRENT_USER_VERSION) {
         validateCurrentFraming(database, location);
@@ -495,7 +514,8 @@ function validateMigrationSource(database, location) {
 /**
  * Explicit conversion of the supported legacy formats. Row-backed versions 2 and 3 are
  * preflighted read-only, then receive ownership/evidence and deferral storage in one
- * format-5 transaction. Format 4 adds only the empty deferral table and its index.
+ * format-7 transaction. Formats 4/5 gain attachment; format 4 also gains empty deferrals.
+ * All legacy seats are encoded as opaque owners, preserving format-6 attachment.
  * Legacy delivery evidence is copied from HostLedger only when its owner/session mapping is
  * unique; no source record is retired. Version 1 is not a supported source for this format transition.
  */
@@ -506,11 +526,13 @@ export async function migrateSquareFile(location, signal, env = process.env) {
         const source = await inSqliteTransaction(database, false, () => validateMigrationSource(database, squarePath), value => value, signal);
         if (source === undefined)
             return { status: 'already-current', standing: standing(database) };
-        if (source === V4_USER_VERSION) {
+        if (source === V4_USER_VERSION || source === V5_USER_VERSION || source === V6_USER_VERSION) {
             return await inSqliteTransaction(database, true, () => {
                 assertSource(validateMigrationSource(database, squarePath) === source, 'source format changed during migration preflight.');
             }, () => {
-                database.exec(DELIVERY_DEFERRALS_SQL);
+                if (source === V4_USER_VERSION)
+                    database.exec(DELIVERY_DEFERRALS_SQL);
+                migrateSeatOwnership(database, source);
                 database.exec(`PRAGMA user_version = ${CURRENT_USER_VERSION};`);
                 validateCurrentFraming(database, squarePath);
                 return { status: 'migrated', standing: standing(database) };

package/dist/square-sqlite.d.ts

@@ -21,7 +21,9 @@ export declare const APPLICATION_ID = 1397838405;
 export declare const V2_USER_VERSION = 2;
 export declare const V3_USER_VERSION = 3;
 export declare const V4_USER_VERSION = 4;
-export declare const CURRENT_USER_VERSION = 5;
+export declare const V5_USER_VERSION = 5;
+export declare const V6_USER_VERSION = 6;
+export declare const CURRENT_USER_VERSION = 7;
 export declare const V1_SNAPSHOT_TABLE = "square_snapshot";
 export interface LegacyFraming {
     readonly applicationId: number;
@@ -39,11 +41,13 @@ export declare const ACTIVITIES_TABLE_SQL = "CREATE TABLE activities (\n  act_in
 export declare const ACTIVITY_INDEXES_SQL: readonly ["CREATE INDEX activity_kind_index ON activities(kind, act_index)", "CREATE INDEX activity_actor_index ON activities(actor_key_json, act_index)", "CREATE INDEX activity_say_actor_index ON activities(actor_key_json, act_index) WHERE kind='say'", "CREATE INDEX activity_say_time ON activities(at, act_index) WHERE kind='say'", "CREATE INDEX activity_bell_actor_time ON activities(actor_key_json, at, act_index) WHERE kind='say' AND reach='bell'"];
 export declare const DELIVERY_DEFERRALS_SQL = "CREATE TABLE delivery_deferrals (\n  participant_key_json TEXT COLLATE BINARY NOT NULL,\n  participant_json TEXT NOT NULL,\n  generation_json TEXT NOT NULL,\n  deferral_id_json TEXT NOT NULL,\n  match_json TEXT NOT NULL CHECK (json_valid(match_json)),\n  expires_at REAL NOT NULL,\n  PRIMARY KEY (participant_key_json,generation_json,deferral_id_json)\n) WITHOUT ROWID;\nCREATE INDEX delivery_deferral_expiry ON delivery_deferrals(participant_key_json,generation_json,expires_at);";
 export declare const SCHEMA_SQL: string;
+export declare const FORMAT6_SCHEMA_SQL: string;
+export declare const FORMAT5_SCHEMA_SQL: string;
 export declare const FORMAT4_SCHEMA_SQL: string;
 export declare function invalidArtifact(detail: string): SquareError;
 export declare function validateStoredActivity(value: unknown): StoredAct;
 export declare function validateWatchLease(value: unknown): WatchLease;
-export declare function validateRowFraming(db: DatabaseSync, version: 2 | 3 | 4 | 5, location?: string): void;
+export declare function validateRowFraming(db: DatabaseSync, version: 2 | 3 | 4 | 5 | 6 | 7, location?: string): void;
 export declare function validateSqliteHeader(db: DatabaseSync, location?: string): SquareHeader;
 export interface SqliteDriver extends SquareRead, LandingWriter {
     readonly changed: boolean;