@cleocode/core 2026.9.24 → 2026.9.26

package/dist/doctor/row-identity.js

@@ -0,0 +1,151 @@
+/**
+ * `cleo doctor` view of row uids (T12341; spec `t12341-uid-scheme` §5, §6).
+ *
+ * Reads the project store read-only, WITHOUT binding a domain, and reports:
+ *
+ * - rows still without a uid or birth fingerprint (an older build wrote them;
+ *   the next open by this build fills them);
+ * - rows the uid recipes flag: an unknown birth (uid timestamp 0), a natural
+ *   row whose key references a missing row (`dangling:` uid), and the reversed
+ *   twin of a symmetric relation stored both ways (a duplicate to drop).
+ *
+ * @module
+ * @task T12341
+ */
+import { existsSync } from 'node:fs';
+import { resolveDualScopeDbPath } from '../store/dual-scope-db.js';
+import { openCleoDbSnapshot } from '../store/open-cleo-db.js';
+import { BIRTH_FP_COLUMN, missingRowIdentitySchema, ROW_IDENTITY, readRowIdentityHealReceipt, rowIdentityFindings, UID_COLUMN, } from '../store/row-identity.js';
+import { ROW_UID_FILL_FLAG, rowUidFillEnabled } from '../store/row-identity-flag.js';
+/**
+ * The `row_identity` check of the default `cleo doctor` report: `warning` when
+ * rows lack a uid or fingerprint, or when the recipes flag rows.
+ *
+ * @param projectRoot - Project directory.
+ * @returns The check row.
+ * @task T12341
+ */
+export function rowIdentityDoctorCheck(projectRoot) {
+    const dbPath = resolveDualScopeDbPath('project', projectRoot);
+    if (!existsSync(dbPath)) {
+        return { check: 'row_identity', status: 'ok', message: 'no project store yet' };
+    }
+    // T12878: the identity SCHEMA is checked whatever the fill flag; every open
+    // heals it and leaves a receipt, shown here.
+    let missing = [];
+    let receipt;
+    try {
+        const snap = openCleoDbSnapshot(dbPath, { readOnly: true });
+        try {
+            missing = missingRowIdentitySchema(snap.db);
+            receipt = readRowIdentityHealReceipt(snap.db);
+        }
+        finally {
+            snap.close();
+        }
+    }
+    catch {
+        // Unreadable here: the fill branch below reports it when the flag is on.
+    }
+    const schemaNote = missing.length > 0
+        ? `identity schema incomplete (${missing.join(', ')}); the next open by a released build heals it`
+        : receipt
+            ? `identity schema healed on ${receipt.at} (${receipt.objects.join(', ')})`
+            : '';
+    const schemaDetails = { missingSchema: missing, healReceipt: receipt ?? null };
+    if (!rowUidFillEnabled()) {
+        const off = `row uids are off (set ${ROW_UID_FILL_FLAG}=1 to enable them)`;
+        return {
+            check: 'row_identity',
+            status: missing.length > 0 ? 'warning' : 'ok',
+            message: schemaNote ? `${off}; ${schemaNote}` : off,
+            details: schemaDetails,
+        };
+    }
+    let unfilled;
+    let findings;
+    let held = {};
+    try {
+        const snap = openCleoDbSnapshot(dbPath, { readOnly: true });
+        try {
+            const has = (column, table) => (snap.db.prepare('SELECT 1 FROM pragma_table_info(?) WHERE name = ?').get(table, column) ??
+                null) !== null;
+            unfilled = {};
+            for (const spec of ROW_IDENTITY.project) {
+                if (!has(UID_COLUMN, spec.table))
+                    continue;
+                const fp = spec.kind === 'minted' && has(BIRTH_FP_COLUMN, spec.table);
+                const row = snap.db
+                    .prepare(`SELECT count(*) AS n FROM "${spec.table}" WHERE ${UID_COLUMN} IS NULL${fp ? ` OR ${BIRTH_FP_COLUMN} IS NULL` : ''}`)
+                    .get();
+                if (row.n > 0)
+                    unfilled[spec.table] = row.n;
+            }
+            findings = rowIdentityFindings(snap.db, 'project');
+            held = heldRowCounts(snap.db);
+        }
+        finally {
+            snap.close();
+        }
+    }
+    catch (error) {
+        return {
+            check: 'row_identity',
+            status: 'warning',
+            message: `row uid state unreadable: ${error instanceof Error ? error.message : String(error)}`,
+        };
+    }
+    const list = (counts) => Object.entries(counts)
+        .map(([table, n]) => `${table} (${n})`)
+        .join(', ');
+    const heldTotal = Object.values(held).reduce((a, n) => a + n, 0);
+    const parts = [
+        missing.length > 0 ? schemaNote : '',
+        // A row the store refused (invalid) needs a person; the rest wait for sync.
+        (held.invalid ?? 0) > 0 ? `received rows refused as invalid: ${held.invalid}` : '',
+        Object.keys(unfilled).length > 0
+            ? `rows without a uid or birth fingerprint, filled at the next open: ${list(unfilled)}`
+            : '',
+        Object.keys(findings.unknownBirth).length > 0
+            ? `rows with an unknown birth (uid timestamp 0): ${list(findings.unknownBirth)}`
+            : '',
+        Object.keys(findings.danglingRefs).length > 0
+            ? `rows referencing a missing row (dangling uid): ${list(findings.danglingRefs)}`
+            : '',
+        Object.keys(findings.mirrorEdges).length > 0
+            ? `symmetric relations stored in both directions (duplicates to drop): ${list(findings.mirrorEdges)}`
+            : '',
+    ].filter(Boolean);
+    const details = { dbPath, unfilled, findings, held, ...schemaDetails };
+    const uids = heldTotal > 0
+        ? `every row has a uid; rows held for sync: ${list(held)}`
+        : 'every row has a uid';
+    const ok = receipt ? `${uids}; ${schemaNote}` : uids;
+    return parts.length > 0
+        ? { check: 'row_identity', status: 'warning', message: parts.join('; '), details }
+        : { check: 'row_identity', status: 'ok', message: ok, details };
+}
+/**
+ * Received rows held in the identity quarantine, per reason (`invalid`,
+ * `ref-pending`, `uid-collision`, ...). Read-only; empty when the table is
+ * absent (T12801 review).
+ *
+ * @param db - Connection on the project store (read-only is fine).
+ * @returns Count per reason.
+ * @task T12801
+ */
+export function heldRowCounts(db) {
+    const has = db
+        .prepare("SELECT 1 AS x FROM sqlite_master WHERE type = 'table' AND name = 'tasks_identity_quarantine'")
+        .get();
+    if (!has)
+        return {};
+    const out = {};
+    for (const r of db
+        .prepare('SELECT reason, count(*) AS n FROM tasks_identity_quarantine GROUP BY reason ORDER BY reason')
+        .all()) {
+        out[r.reason] = r.n;
+    }
+    return out;
+}
+//# sourceMappingURL=row-identity.js.map

package/dist/doctor/row-identity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"row-identity.js","sourceRoot":"","sources":["../../src/doctor/row-identity.ts"],"names":[],"mappings":"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"}

package/dist/doctor/twin-collapse.d.ts

@@ -31,7 +31,7 @@
  * @module
  * @task T12535
  */
-import { type TwinCollapseReceipt, type TwinCollapseRecoveryPlan, type TwinCollapseRecoveryReceipt, type TwinCollapseRecoveryRollback, type TwinCollapseStatus } from '../store/twin-collapse.js';
+import { type TwinCollapseReceipt, type TwinCollapseRecoveryPlan, type TwinCollapseRecoveryReceipt, type TwinCollapseRecoveryRollback, type TwinCollapseSnapshotRelease, type TwinCollapseSnapshotReleasePlan, type TwinCollapseSnapshotRepoint, type TwinCollapseStatus } from '../store/twin-collapse.js';
 import { type OwnerStoreRewriteOptions } from '../store/worktree-isolation-guard.js';
 /** Preflight of the snapshot a pending initial collapse needs. */
 export interface TwinCollapsePreflight {
@@ -87,12 +87,18 @@ export interface TwinCollapseRecoveryResult {
     readonly plan: TwinCollapseRecoveryPlan;
     /** The receipt of this apply, or `null` (dry run, or nothing to recover). */
     readonly receipt: TwinCollapseRecoveryReceipt | null;
+    /** Markers re-pointed at a moved store's snapshot (T12788), or `null`/absent. */
+    readonly repointed?: TwinCollapseSnapshotRepoint | null;
 }
 /** Options of {@link recoverTwinCollapse} and {@link rollbackTwinCollapse}. */
 export interface TwinCollapseRecoveryOptions extends OwnerStoreRewriteOptions {
     /** Plan only; the live store is opened read-only. */
     readonly dryRun?: boolean;
+    /** Pin an unpinned snapshot (its sidecar only) before applying; without it the apply refuses. */
+    readonly pinSnapshot?: boolean;
 }
+/** Audit log of markers re-pointed at a moved store's snapshot (T12788). */
+export declare const TWIN_COLLAPSE_REPOINT_AUDIT_FILE = "twin-collapse-repoint.jsonl";
 /**
  * Recover the twin values a 2026.9.21 collapse dropped or replaced (T12727):
  * `cleo doctor twin-collapse --recover [--dry-run]`.
@@ -104,7 +110,11 @@ export interface TwinCollapseRecoveryOptions extends OwnerStoreRewriteOptions {
  * opens the live store read-only and writes nothing. An apply re-plans under
  * the write lock, writes in one transaction and records a receipt that
  * `--rollback` undoes; a second apply finds nothing to do. A store never
- * collapsed has nothing to recover. No network.
+ * collapsed has nothing to recover. An unpinned snapshot is reported by the
+ * plan, and an apply refuses it unless `pinSnapshot` pins it first. A moved
+ * store's snapshot is found by file name in its own backup directory; an
+ * apply re-points the markers and appends a row to
+ * `.cleo/audit/twin-collapse-repoint.jsonl` (T12788). No network.
  *
  * @param projectRoot - Project directory.
  * @param options - `cwd` the command runs from (a worktree needs
@@ -126,6 +136,52 @@ export declare function recoverTwinCollapse(projectRoot: string, options: TwinCo
  * @task T12727
  */
 export declare function rollbackTwinCollapse(projectRoot: string, id: string, options: OwnerStoreRewriteOptions): Promise<TwinCollapseRecoveryRollback>;
+/** Audit log of snapshot releases, under the project's `.cleo/audit/`. */
+export declare const TWIN_COLLAPSE_RELEASE_AUDIT_FILE = "twin-collapse-release.jsonl";
+/** Result of {@link releaseProjectTwinCollapseSnapshot}. */
+export interface TwinCollapseSnapshotReleaseResult {
+    /** The project store. */
+    readonly dbPath: string;
+    /** `true`: only planned, nothing written. */
+    readonly dryRun: boolean;
+    /** What a release would do, and why it may or may not. */
+    readonly plan: TwinCollapseSnapshotReleasePlan;
+    /** The release, or `null` on a dry run. */
+    readonly release: TwinCollapseSnapshotRelease | null;
+    /** The audit log the release was recorded in, or `null` on a dry run. */
+    readonly auditFile: string | null;
+}
+/** Options of {@link releaseProjectTwinCollapseSnapshot}. */
+export interface TwinCollapseSnapshotReleaseOptions extends OwnerStoreRewriteOptions {
+    /** Plan only; the live store is opened read-only. */
+    readonly dryRun?: boolean;
+    /**
+     * The owner's decision to release, which the calling agent obtained through
+     * its ask tool. The CLI never prompts; without it nothing is written.
+     */
+    readonly confirm?: boolean;
+}
+/**
+ * Release a pre-collapse snapshot (T12767):
+ * `cleo doctor twin-collapse --release-snapshot <id> [--dry-run] --confirm`.
+ *
+ * Allowed only after a verified recovery or a no-recovery-needed check (see
+ * `planSnapshotRelease`): the recovery plan against the snapshot must find
+ * nothing left to recover. A release clears the markers' reference to the
+ * snapshot and its sidecar pin, and appends a row to
+ * `.cleo/audit/twin-collapse-release.jsonl`. The snapshot file is never
+ * touched; it rotates normally afterwards. A dry run reports the bytes
+ * reclaimed once it rotates and writes nothing.
+ *
+ * @param projectRoot - Project directory.
+ * @param id - The snapshot: backup id (`migration-<timestamp>`), file name or path.
+ * @param options - `cwd`, `confirmOwnerStore`, `dryRun`, `confirm`.
+ * @returns The plan and, for a release, what was released.
+ * @throws {CleoError} `E_TWIN_COLLAPSE_RELEASE` (not confirmed, or not
+ *   releasable) and the owner-store guard's errors; nothing is written.
+ * @task T12767
+ */
+export declare function releaseProjectTwinCollapseSnapshot(projectRoot: string, id: string, options: TwinCollapseSnapshotReleaseOptions): Promise<TwinCollapseSnapshotReleaseResult>;
 /** One row of the default `cleo doctor` report (the `DoctorCheck` shape). */
 export interface TwinCollapseDoctorCheck {
     readonly check: 'twin_collapse';

package/dist/doctor/twin-collapse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"twin-collapse.d.ts","sourceRoot":"","sources":["../../src/doctor/twin-collapse.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAYH,OAAO,EAOL,KAAK,mBAAmB,EACxB,KAAK,wBAAwB,EAC7B,KAAK,2BAA2B,EAChC,KAAK,4BAA4B,EACjC,KAAK,kBAAkB,EACxB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAEL,KAAK,wBAAwB,EAC9B,MAAM,sCAAsC,CAAC;AAE9C,kEAAkE;AAClE,MAAM,WAAW,qBAAqB;IACpC,+BAA+B;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,+DAA+D;IAC/D,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,iEAAiE;IACjE,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,6DAA6D;IAC7D,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,sFAAsF;IACtF,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC;CACtB;AAED,6CAA6C;AAC7C,MAAM,WAAW,kBAAkB;IACjC,yBAAyB;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,qCAAqC;IACrC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,oCAAoC;IACpC,QAAQ,CAAC,KAAK,EAAE,SAAS,kBAAkB,EAAE,CAAC;IAC9C,oEAAoE;IACpE,QAAQ,CAAC,SAAS,EAAE,qBAAqB,GAAG,IAAI,CAAC;IACjD,6CAA6C;IAC7C,QAAQ,CAAC,YAAY,EAAE,mCAAmC,CAAC;CAC5D;AAcD;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,MAAM,GAAG,kBAAkB,CA4BlF;AAED;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CACrC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAQhC;AAED,6CAA6C;AAC7C,MAAM,WAAW,0BAA0B;IACzC,yBAAyB;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,6CAA6C;IAC7C,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,0FAA0F;IAC1F,QAAQ,CAAC,IAAI,EAAE,wBAAwB,CAAC;IACxC,6EAA6E;IAC7E,QAAQ,CAAC,OAAO,EAAE,2BAA2B,GAAG,IAAI,CAAC;CACtD;AAED,+EAA+E;AAC/E,MAAM,WAAW,2BAA4B,SAAQ,wBAAwB;IAC3E,qDAAqD;IACrD,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;CAC3B;AAeD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,2BAA2B,GACnC,OAAO,CAAC,0BAA0B,CAAC,CAoBrC;AAED;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,MAAM,EACnB,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,4BAA4B,CAAC,CAMvC;AAED,6EAA6E;AAC7E,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,IAAI,GAAG,SAAS,GAAG,OAAO,CAAC;IAC5C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,uBAAuB,CAoFpF"}
+{"version":3,"file":"twin-collapse.d.ts","sourceRoot":"","sources":["../../src/doctor/twin-collapse.ts"],"names":[],"mappings":"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"}

package/dist/doctor/twin-collapse.js

@@ -31,12 +31,15 @@
  * @module
  * @task T12535
  */
-import { existsSync, statSync } from 'node:fs';
-import { dirname } from 'node:path';
+import { appendFileSync, closeSync, existsSync, mkdirSync, openSync, readSync, realpathSync, statSync, } from 'node:fs';
+import { basename, dirname, join, resolve } from 'node:path';
+import { ExitCode } from '@cleocode/contracts';
+import { CleoError } from '../errors.js';
+import { readMarkerSnapshots } from '../store/backup-sidecar.js';
 import { getDualScopeNativeDb, openDualScopeDb, resolveDualScopeDbPath, } from '../store/dual-scope-db.js';
 import { openCleoDbSnapshot } from '../store/open-cleo-db.js';
 import { planMigrationSnapshot } from '../store/pre-repair-snapshot.js';
-import { applyTwinCollapseRecovery, collapseTwinTables, inspectTwinCollapse, missingSnapshot, planTwinCollapseRecovery, rollbackTwinCollapseRecovery, } from '../store/twin-collapse.js';
+import { applyTwinCollapseRecovery, collapseTwinTables, E_TWIN_COLLAPSE_RECOVER, E_TWIN_COLLAPSE_RELEASE, inspectTwinCollapse, missingSnapshot, pinRecoverySnapshot, planSnapshotRelease, planTwinCollapseRecovery, releaseRefused, releaseTwinCollapseSnapshot, rollbackTwinCollapseRecovery, unpinnedSnapshot, } from '../store/twin-collapse.js';
 import { assertOwnerStoreRewriteConfirmed, } from '../store/worktree-isolation-guard.js';
 /** Why `backupDir` (or a parent) cannot hold a snapshot, or `null`. */
 function backupDirProblem(backupDir) {
@@ -101,16 +104,75 @@ export async function retryTwinCollapse(projectRoot, options) {
     const handle = await openDualScopeDb('project', projectRoot);
     return collapseTwinTables(getDualScopeNativeDb(handle), handle.dbPath);
 }
+/** A path with symlinks resolved as far as it exists (macOS `/var` is `/private/var`). */
+function realDir(dir) {
+    try {
+        return realpathSync(dir);
+    }
+    catch {
+        return resolve(dir);
+    }
+}
+/** Audit log of markers re-pointed at a moved store's snapshot (T12788). */
+export const TWIN_COLLAPSE_REPOINT_AUDIT_FILE = 'twin-collapse-repoint.jsonl';
+/** The SQLite file header every snapshot starts with. */
+const SQLITE_HEADER = 'SQLite format 3\u0000';
+/** Whether `path` is a migration backup that starts with the SQLite header. */
+function looksLikeStoreSnapshot(path) {
+    if (!/\.migration-/.test(basename(path)))
+        return false;
+    let fd;
+    try {
+        fd = openSync(path, 'r');
+        const header = Buffer.alloc(SQLITE_HEADER.length);
+        return (readSync(fd, header, 0, header.length, 0) === header.length &&
+            header.toString('latin1') === SQLITE_HEADER);
+    }
+    catch {
+        return false;
+    }
+    finally {
+        if (fd !== undefined)
+            closeSync(fd);
+    }
+}
+/**
+ * The snapshot file to read for a marker path. The recovery reads it and
+ * `--pin-snapshot` writes a sidecar next to it, so it must be this store's own
+ * backup (T12772): a path in `<db dir>/backups/sqlite/` is used as is; a path
+ * elsewhere (the store moved: `/mnt` → `/home`, Linux → Mac) resolves to
+ * `<db dir>/backups/sqlite/<basename>` when that file is a migration backup
+ * starting with the SQLite header (T12788). Anything else is refused.
+ *
+ * @returns The file to use, and the marker path it replaces (`null` when the same).
+ */
+function resolveStoreSnapshot(snapshot, dbPath, code = E_TWIN_COLLAPSE_RECOVER) {
+    const expected = join(dirname(dbPath), 'backups', 'sqlite');
+    if (realDir(dirname(snapshot)) === realDir(expected))
+        return { path: snapshot, movedFrom: null };
+    const local = join(expected, basename(snapshot));
+    if (existsSync(local) && looksLikeStoreSnapshot(local))
+        return { path: local, movedFrom: snapshot };
+    throw new CleoError(ExitCode.VALIDATION_ERROR, `${code}: the marker names ${snapshot}, outside this store's backup directory ${expected}` +
+        (existsSync(local)
+            ? `, and ${local} is not a migration snapshot`
+            : `, and ${local} does not exist`) +
+        '; refusing to read or pin it, nothing was changed', {
+        fix: `Copy that snapshot into ${expected} (same file name) and re-run; the markers are re-pointed at it.`,
+        details: { field: 'snapshot', expected, actual: snapshot },
+    });
+}
 /** Open the live store's snapshot read-only around `fn`; `null` when none is recorded. */
-function withRecoverySnapshot(live, fn) {
+function withRecoverySnapshot(live, dbPath, fn) {
     const probe = planTwinCollapseRecovery(live, null);
     if (probe.snapshot === null)
         return fn(probe); // never collapsed: nothing to recover
-    if (!existsSync(probe.snapshot))
-        throw missingSnapshot(probe.snapshot);
-    const snap = openCleoDbSnapshot(probe.snapshot, { readOnly: true, applyPragmas: false });
+    const { path } = resolveStoreSnapshot(probe.snapshot, dbPath);
+    if (!existsSync(path))
+        throw missingSnapshot(path);
+    const snap = openCleoDbSnapshot(path, { readOnly: true, applyPragmas: false });
     try {
-        return fn(planTwinCollapseRecovery(live, snap.db));
+        return fn(planTwinCollapseRecovery(live, snap.db, { snapshotPath: path }));
     }
     finally {
         snap.close();
@@ -127,7 +189,11 @@ function withRecoverySnapshot(live, fn) {
  * opens the live store read-only and writes nothing. An apply re-plans under
  * the write lock, writes in one transaction and records a receipt that
  * `--rollback` undoes; a second apply finds nothing to do. A store never
- * collapsed has nothing to recover. No network.
+ * collapsed has nothing to recover. An unpinned snapshot is reported by the
+ * plan, and an apply refuses it unless `pinSnapshot` pins it first. A moved
+ * store's snapshot is found by file name in its own backup directory; an
+ * apply re-points the markers and appends a row to
+ * `.cleo/audit/twin-collapse-repoint.jsonl` (T12788). No network.
  *
  * @param projectRoot - Project directory.
  * @param options - `cwd` the command runs from (a worktree needs
@@ -145,19 +211,51 @@ export async function recoverTwinCollapse(projectRoot, options) {
     if (dryRun) {
         const live = openCleoDbSnapshot(dbPath, { readOnly: true });
         try {
-            return withRecoverySnapshot(live.db, (plan) => ({ dbPath, dryRun, plan, receipt: null }));
+            return withRecoverySnapshot(live.db, dbPath, (plan) => ({
+                dbPath,
+                dryRun,
+                plan,
+                receipt: null,
+            }));
         }
         finally {
             live.close();
         }
     }
     assertOwnerStoreRewriteConfirmed('doctor twin-collapse --recover', dbPath, options);
+    // Checked before the store opens (a collapse run during the open may pin
+    // it), and only when there is something to recover (T12772).
+    const ro = openCleoDbSnapshot(dbPath, { readOnly: true });
+    let probe;
+    try {
+        probe = withRecoverySnapshot(ro.db, dbPath, (plan) => plan);
+    }
+    finally {
+        ro.close();
+    }
+    if (probe.snapshot !== null &&
+        probe.changes &&
+        !probe.snapshotPinned &&
+        !(options.pinSnapshot === true && pinRecoverySnapshot(probe.snapshot)))
+        throw unpinnedSnapshot(probe.snapshot);
     const handle = await openDualScopeDb('project', projectRoot);
     const live = getDualScopeNativeDb(handle);
-    return withRecoverySnapshot(live, (preview) => ({
+    const auditFile = join(dirname(dbPath), 'audit', TWIN_COLLAPSE_REPOINT_AUDIT_FILE);
+    return withRecoverySnapshot(live, dbPath, (preview) => ({
         dbPath,
         dryRun,
-        ...applyTwinCollapseRecovery(live, preview),
+        ...applyTwinCollapseRecovery(live, preview, (repoint) => {
+            mkdirSync(dirname(auditFile), { recursive: true });
+            appendFileSync(auditFile, `${JSON.stringify({
+                timestamp: new Date().toISOString(),
+                operation: 'doctor twin-collapse --recover',
+                from: repoint.from,
+                to: repoint.to,
+                markers: repoint.markers,
+                cwd: resolve(options.cwd),
+                pid: process.pid,
+            })}\n`);
+        }),
     }));
 }
 /**
@@ -178,6 +276,93 @@ export async function rollbackTwinCollapse(projectRoot, id, options) {
     const handle = await openDualScopeDb('project', projectRoot);
     return rollbackTwinCollapseRecovery(getDualScopeNativeDb(handle), id);
 }
+/** Audit log of snapshot releases, under the project's `.cleo/audit/`. */
+export const TWIN_COLLAPSE_RELEASE_AUDIT_FILE = 'twin-collapse-release.jsonl';
+/**
+ * Release a pre-collapse snapshot (T12767):
+ * `cleo doctor twin-collapse --release-snapshot <id> [--dry-run] --confirm`.
+ *
+ * Allowed only after a verified recovery or a no-recovery-needed check (see
+ * `planSnapshotRelease`): the recovery plan against the snapshot must find
+ * nothing left to recover. A release clears the markers' reference to the
+ * snapshot and its sidecar pin, and appends a row to
+ * `.cleo/audit/twin-collapse-release.jsonl`. The snapshot file is never
+ * touched; it rotates normally afterwards. A dry run reports the bytes
+ * reclaimed once it rotates and writes nothing.
+ *
+ * @param projectRoot - Project directory.
+ * @param id - The snapshot: backup id (`migration-<timestamp>`), file name or path.
+ * @param options - `cwd`, `confirmOwnerStore`, `dryRun`, `confirm`.
+ * @returns The plan and, for a release, what was released.
+ * @throws {CleoError} `E_TWIN_COLLAPSE_RELEASE` (not confirmed, or not
+ *   releasable) and the owner-store guard's errors; nothing is written.
+ * @task T12767
+ */
+export async function releaseProjectTwinCollapseSnapshot(projectRoot, id, options) {
+    const dryRun = options.dryRun === true;
+    const dbPath = resolveDualScopeDbPath('project', projectRoot);
+    if (!existsSync(dbPath))
+        throw new Error(`no project store at ${dbPath}`);
+    // This store's own snapshot only (T12772); a moved store's by file name (T12788).
+    const withSnapshot = (live, fn) => {
+        const recorded = planSnapshotRelease(live, id, null).snapshot;
+        if (recorded === null)
+            return fn(null, {});
+        const { path } = resolveStoreSnapshot(recorded, dbPath, E_TWIN_COLLAPSE_RELEASE);
+        if (!existsSync(path))
+            return fn(null, { snapshotPath: path });
+        const snap = openCleoDbSnapshot(path, { readOnly: true, applyPragmas: false });
+        try {
+            return fn(snap.db, { snapshotPath: path });
+        }
+        finally {
+            snap.close();
+        }
+    };
+    if (dryRun) {
+        const live = openCleoDbSnapshot(dbPath, { readOnly: true });
+        try {
+            const plan = withSnapshot(live.db, (snap, at) => planSnapshotRelease(live.db, id, snap, at));
+            return { dbPath, dryRun, plan, release: null, auditFile: null };
+        }
+        finally {
+            live.close();
+        }
+    }
+    if (options.confirm !== true)
+        throw new CleoError(ExitCode.VALIDATION_ERROR, `${E_TWIN_COLLAPSE_RELEASE}: releasing ${id} needs the owner's decision (--confirm); nothing was changed`, {
+            fix: `cleo doctor twin-collapse --release-snapshot ${id} --dry-run  # show the plan, ask the owner, then add --confirm`,
+            details: { field: 'confirm', expected: true, actual: false },
+        });
+    assertOwnerStoreRewriteConfirmed('doctor twin-collapse --release-snapshot', dbPath, options);
+    const handle = await openDualScopeDb('project', projectRoot);
+    const live = getDualScopeNativeDb(handle);
+    const auditFile = join(dirname(dbPath), 'audit', TWIN_COLLAPSE_RELEASE_AUDIT_FILE);
+    return withSnapshot(live, (snap, at) => {
+        let plan = planSnapshotRelease(live, id, snap, at);
+        if (plan.basis === null)
+            throw releaseRefused(id, plan);
+        const audit = (row) => {
+            mkdirSync(dirname(auditFile), { recursive: true });
+            appendFileSync(auditFile, `${JSON.stringify({
+                timestamp: row.releasedAt,
+                operation: 'doctor twin-collapse --release-snapshot',
+                snapshot: row.snapshot,
+                movedFrom: row.movedFrom,
+                basis: row.basis,
+                bytes: row.bytes,
+                markers: row.markers,
+                receipts: row.receipts,
+                confirmedBy: 'owner (--confirm)',
+                cwd: resolve(options.cwd),
+                pid: process.pid,
+            })}\n`);
+        };
+        const release = releaseTwinCollapseSnapshot(live, id, snap, audit, at);
+        plan = { ...plan, basis: release.basis };
+        return { dbPath, dryRun, plan, release, auditFile };
+    });
+}
 /**
  * The `twin_collapse` check of the default `cleo doctor` report: `error` for a
  * failed collapse or one whose snapshot cannot be written, `warning` for a
@@ -199,7 +384,16 @@ export function twinCollapseDoctorCheck(projectRoot) {
             message: `twin collapse state unreadable: ${error instanceof Error ? error.message : String(error)}`,
         };
     }
-    const details = { dbPath: report.dbPath, pairs: report.pairs, preflight: report.preflight };
+    // T12770: rotation keeps every migration backup while a marker is unreadable.
+    const unreadableMarkers = report.storeExists
+        ? readMarkerSnapshots(join(dirname(report.dbPath), 'backups', 'sqlite')).unreadable
+        : [];
+    const details = {
+        dbPath: report.dbPath,
+        pairs: report.pairs,
+        preflight: report.preflight,
+        unreadableMarkers,
+    };
     const failed = report.pairs.filter((p) => p.state === 'failed');
     if (failed.length > 0 || report.preflight?.ok === false) {
         const first = failed[0]?.failure;
@@ -230,7 +424,8 @@ export function twinCollapseDoctorCheck(projectRoot) {
         conflicted.length > 0 ||
         unguarded.length > 0 ||
         unpinned.length > 0 ||
-        missing.length > 0) {
+        missing.length > 0 ||
+        unreadableMarkers.length > 0) {
         return {
             check: 'twin_collapse',
             status: 'warning',
@@ -250,6 +445,9 @@ export function twinCollapseDoctorCheck(projectRoot) {
                 unpinned.length > 0
                     ? `the pre-collapse snapshot of ${unpinned.map((p) => `${p.table} (${p.snapshotPath})`).join(', ')} is not pinned yet; the next open pins it so rotation never deletes it`
                     : '',
+                unreadableMarkers.length > 0
+                    ? `the twin-collapse marker ${unreadableMarkers.join(', ')} cannot be read, so backup rotation keeps every migration backup in .cleo/backups/sqlite until it is repaired`
+                    : '',
                 missing.length > 0
                     ? `the pre-collapse snapshot of ${missing.map((p) => `${p.table} (${p.snapshotPath})`).join(', ')} is missing: the store before the collapse can no longer be recovered from it`
                     : '',

package/dist/doctor/twin-collapse.js.map

@@ -1 +1 @@
-{"version":3,"file":"twin-collapse.js","sourceRoot":"","sources":["../../src/doctor/twin-collapse.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"twin-collapse.js","sourceRoot":"","sources":["../../src/doctor/twin-collapse.ts"],"names":[],"mappings":"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"}

package/dist/error-catalog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error-catalog.d.ts","sourceRoot":"","sources":["../src/error-catalog.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,yDAAyD;IACzD,IAAI,EAAE,MAAM,CAAC;IACb,oDAAoD;IACpD,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,sCAAsC;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,kEAAkE;IAClE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,0CAA0C;IAC1C,UAAU,EAAE,MAAM,CAAC;IACnB,iCAAiC;IACjC,WAAW,EAAE,OAAO,CAAC;IACrB,+CAA+C;IAC/C,QAAQ,EAAE,MAAM,CAAC;CAClB;AAeD;;GAEG;AACH,eAAO,MAAM,aAAa,EAAE,WAAW,CAAC,MAAM,EAAE,eAAe,CAonC9D,CAAC;AAEF;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAE5E;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAK1F;AAED;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,eAAe,EAAE,CAE1D"}
+{"version":3,"file":"error-catalog.d.ts","sourceRoot":"","sources":["../src/error-catalog.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,yDAAyD;IACzD,IAAI,EAAE,MAAM,CAAC;IACb,oDAAoD;IACpD,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,sCAAsC;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,kEAAkE;IAClE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,0CAA0C;IAC1C,UAAU,EAAE,MAAM,CAAC;IACnB,iCAAiC;IACjC,WAAW,EAAE,OAAO,CAAC;IACrB,+CAA+C;IAC/C,QAAQ,EAAE,MAAM,CAAC;CAClB;AAeD;;GAEG;AACH,eAAO,MAAM,aAAa,EAAE,WAAW,CAAC,MAAM,EAAE,eAAe,CAioC9D,CAAC;AAEF;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAE5E;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAK1F;AAED;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,eAAe,EAAE,CAE1D"}

package/dist/error-catalog.js

@@ -120,6 +120,10 @@ export const ERROR_CATALOG = new Map([
         ExitCode.SESSION_UNBOUND,
         def(ExitCode.SESSION_UNBOUND, 'SESSION_UNBOUND', 'CONTRACT', 'No session is bound to this caller', 428, true, 'E_SESSION_UNBOUND', "Bind a session: run 'cleo session start --scope global --name \"<name>\"', 'cleo session resume <id>', or set CLEO_SESSION_ID=<id>."),
     ],
+    [
+        ExitCode.TASK_RENAMED,
+        def(ExitCode.TASK_RENAMED, 'TASK_RENAMED', 'CONFLICT', 'Task was re-numbered by sync', 409, true, 'E_TASK_RENAMED', "The task you addressed now has another id (a display-id collision re-numbered it). Re-read it with 'cleo show <new id>' and retry against that id."),
+    ],
     [
         ExitCode.WORKTREE_LOCKED,
         def(ExitCode.WORKTREE_LOCKED, 'WORKTREE_LOCKED', 'CONFLICT', 'Task worktree is locked by a live holder', 409, true, 'E_WORKTREE_LOCKED', "Another spawn holds this task's worktree. Attach with 'cleo orchestrate spawn <id> --resume', or wait until the holder exits or its heartbeat goes stale."),