@intentic/machine 1.317.0 → 1.319.0

package/dist/sync/project-transfer.js

@@ -0,0 +1,278 @@
+import { existsSync } from "node:fs";
+import { mkdir, mkdtemp, readdir, rm, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { errorMessage } from "@intentic/base/errors";
+import { claimPidFile, livePidRecord, releasePidFile } from "@intentic/local-agent";
+import { pairingRemoteDir, projectDirection } from "./config.js";
+import { capped, classify, ignoreExpressions, ignoreMatcher, selectChanges, } from "./project-files.js";
+import { assertFolder, hashFile, installFile, listingRecordPath, localFile, localTarget, readListingRecord, realDurability, removeFile, walkLocal, writeListingRecord, } from "./project-local.js";
+import { backUp, createPointDir, listPoints, pruneRestorePoints, readManifest, restoreDir, restoreEntry, sealPoint, writeManifest, } from "./restore-points.js";
+import { ignoresFor } from "./ssh.js";
+const STALE = { current: false, conflicts: new Map() };
+const flushedStanding = async (context) => {
+    const flushed = await context.session.flush();
+    const after = await context.session.inspect();
+    return { current: flushed && after.state === "running", conflicts: after.conflicts };
+};
+const mutagenDigestHere = async (root, path) => {
+    try {
+        return await hashFile(await localTarget(root, path), "sha1");
+    }
+    catch {
+        return undefined;
+    }
+};
+const unchangedHere = async (root, conflicts, local) => {
+    const verdicts = new Map();
+    for (const [path, reported] of conflicts) {
+        const here = local.get(path);
+        if (here === undefined || here === "other") {
+            continue;
+        }
+        const unmoved = reported.agreed !== undefined && reported.agreed === reported.here;
+        verdicts.set(path, unmoved && (await mutagenDigestHere(root, path)) === reported.here);
+    }
+    return verdicts;
+};
+const listSides = async (context, standing, record) => {
+    const { pairing, stateDir } = context;
+    const patterns = ignoresFor(pairing);
+    const remoteDir = pairingRemoteDir(pairing);
+    const remote = await context.sandbox.list(ignoreExpressions(patterns));
+    const recordPath = listingRecordPath(stateDir, pairing.sandboxId);
+    const held = await readListingRecord(recordPath, pairing.localDir, remoteDir);
+    const wantsHash = (path, size) => {
+        const there = remote.get(path);
+        return held.agreed.has(path) || (there !== undefined && there !== "other" && there.size === size);
+    };
+    const local = await walkLocal({ root: pairing.localDir, ignored: ignoreMatcher(patterns), cached: held.files, wantsHash });
+    const evidence = { current: standing.current, unchangedHere: await unchangedHere(pairing.localDir, standing.conflicts, local.listing) };
+    const classified = classify(local.listing, remote, held.agreed, evidence);
+    if (record) {
+        await writeListingRecord(recordPath, pairing.localDir, remoteDir, { files: local.hashes, agreed: classified.agreed });
+    }
+    return { remote, changes: classified.changes };
+};
+const recordAgreement = async (context, applied) => {
+    const { pairing, stateDir } = context;
+    const recordPath = listingRecordPath(stateDir, pairing.sandboxId);
+    const record = await readListingRecord(recordPath, pairing.localDir, pairingRemoteDir(pairing));
+    const agreed = new Map(record.agreed);
+    for (const { path, hash } of applied) {
+        if (hash === null) {
+            agreed.delete(path);
+        }
+        else {
+            agreed.set(path, hash);
+        }
+    }
+    await writeListingRecord(recordPath, pairing.localDir, pairingRemoteDir(pairing), { files: record.files, agreed });
+};
+const lockPath = (context) => join(restoreDir(context.stateDir, context.pairing.sandboxId), ".operation.pid");
+const pausedPath = (context) => join(restoreDir(context.stateDir, context.pairing.sandboxId), ".paused");
+const liftAbandonedPause = async (context, locked) => {
+    if (!existsSync(pausedPath(context)) || (!locked && (await livePidRecord(lockPath(context))) !== undefined)) {
+        return;
+    }
+    await context.session.resume();
+    await rm(pausedPath(context), { force: true });
+};
+const holdStill = async (context, flush) => {
+    if ((await context.session.inspect()).state !== "running") {
+        return { standing: STALE, release: undefined };
+    }
+    const standing = flush ? await flushedStanding(context) : STALE;
+    await writeFile(pausedPath(context), `${process.pid}\n`, { mode: 0o600 });
+    try {
+        await context.session.pause();
+    }
+    catch (error) {
+        await rm(pausedPath(context), { force: true });
+        throw error;
+    }
+    const release = async () => {
+        await context.session.resume();
+        await rm(pausedPath(context), { force: true });
+    };
+    return { standing, release };
+};
+const claim = async (context) => {
+    const dir = restoreDir(context.stateDir, context.pairing.sandboxId);
+    await mkdir(dir, { recursive: true, mode: 0o700 });
+    const claimed = await claimPidFile(lockPath(context), dir, { pid: process.pid });
+    return claimed.claimed ? { claimed: true } : { claimed: false, holder: claimed.holder.pid };
+};
+const exclusively = async (context, operation) => {
+    const claimed = await claim(context);
+    if (!claimed.claimed) {
+        throw new Error(`another bring-back or restore for ${context.pairing.localDir} is running (pid ${claimed.holder}); try again once it has finished`);
+    }
+    try {
+        await liftAbandonedPause(context, true);
+        return await operation();
+    }
+    finally {
+        await releasePidFile(lockPath(context), process.pid);
+    }
+};
+const whileHeld = async (context, flush, operation, done) => {
+    const held = await holdStill(context, flush);
+    let result;
+    try {
+        result = await operation(held.standing);
+    }
+    catch (error) {
+        await held.release?.().catch(() => undefined);
+        throw error;
+    }
+    try {
+        await held.release?.();
+    }
+    catch (error) {
+        throw new Error(`${done(result)}, but this folder's file sync could not be resumed (${errorMessage(error)}). The next bring-back, restore or change listing resumes it, and so does \`intentic-machine sync resume --sandbox ${context.pairing.sandboxId}\`.`, { cause: error });
+    }
+    return result;
+};
+const listed = (change) => {
+    const { held, ...entry } = change;
+    return held === undefined ? entry : { ...entry, conflict: true };
+};
+export const projectChanges = async (context) => {
+    const { claimed } = await claim(context);
+    try {
+        await liftAbandonedPause(context, claimed);
+        const running = (await context.session.inspect()).state === "running";
+        const standing = running ? await flushedStanding(context) : STALE;
+        const shown = capped((await listSides(context, standing, claimed)).changes);
+        const result = { ok: true, pairing: context.pairing.sandboxId, direction: projectDirection(context.pairing), changes: shown.changes.map(listed) };
+        return shown.truncated ? { ...result, truncated: true } : result;
+    }
+    finally {
+        if (claimed) {
+            await releasePidFile(lockPath(context), process.pid);
+        }
+    }
+};
+const readiness = (change, there, got) => {
+    if (change.kind === "deleted") {
+        return { change, applied: null };
+    }
+    if (got === undefined || "skipped" in got) {
+        return got ?? { skipped: "the sandbox did not send it" };
+    }
+    if (there === undefined || there === "other" || there.hash !== got.hash || there.size !== got.size) {
+        return { skipped: "it changed in the sandbox after it was listed; bring it back again" };
+    }
+    return { change, fetched: got, applied: got.hash };
+};
+const apply = async (root, ready, entry) => {
+    const current = await localFile(root, ready.change.path);
+    if ((current?.hash ?? null) !== (entry.backedUp ? entry.backup : null)) {
+        throw new Error("it changed here while it was being brought back");
+    }
+    if (ready.fetched === undefined) {
+        await removeFile(root, ready.change.path);
+        return;
+    }
+    const mode = current === undefined ? { executable: ready.fetched.executable } : { exact: current.mode };
+    await installFile(root, ready.change.path, ready.fetched.staged, mode);
+};
+const clearStaging = async (dir) => {
+    for (const name of (await readdir(dir)).filter((entry) => entry.startsWith(".staging-"))) {
+        await rm(join(dir, name), { recursive: true, force: true });
+    }
+};
+const readyChanges = async (context, sides, selected, staging, skipped) => {
+    const writable = selected.filter((change) => {
+        if (change.held !== undefined) {
+            skipped.push({ path: change.path, reason: change.held });
+        }
+        return change.held === undefined;
+    });
+    const fetched = await context.sandbox.fetch(writable.filter((change) => change.kind !== "deleted").map((change) => change.path), staging);
+    const ready = [];
+    for (const change of writable) {
+        const verdict = readiness(change, sides.remote.get(change.path), fetched.get(change.path));
+        if ("skipped" in verdict) {
+            skipped.push({ path: change.path, reason: verdict.skipped });
+        }
+        else {
+            ready.push(verdict);
+        }
+    }
+    return ready;
+};
+const bringBackHeld = async (context, paths, standing, staging) => {
+    const { pairing, stateDir } = context;
+    const durability = context.durability ?? realDurability;
+    const sides = await listSides(context, standing, true);
+    const { selected, unmatched } = selectChanges(sides.changes, paths);
+    const skipped = unmatched.map((path) => ({ path, reason: "the sandbox's copy has no change to bring back there" }));
+    const ready = await readyChanges(context, sides, selected, staging, skipped);
+    const point = await createPointDir(stateDir, pairing.sandboxId, Date.now());
+    const kept = [];
+    for (const item of ready) {
+        try {
+            const request = { path: item.change.path, kind: item.change.kind, applied: item.applied };
+            kept.push({ ready: item, entry: await backUp(stateDir, pairing.sandboxId, point.id, pairing.localDir, request, durability) });
+        }
+        catch (error) {
+            skipped.push({ path: item.change.path, reason: errorMessage(error) });
+        }
+    }
+    const manifest = { id: point.id, createdAt: point.createdAt, dir: pairing.localDir, entries: kept.map(({ entry }) => entry) };
+    await writeManifest(stateDir, pairing.sandboxId, manifest);
+    await sealPoint(stateDir, pairing.sandboxId, point.id, durability);
+    const done = [];
+    for (const { ready: item, entry } of kept) {
+        try {
+            await apply(pairing.localDir, item, entry);
+            done.push({ entry, kind: item.change.kind });
+        }
+        catch (error) {
+            skipped.push({ path: item.change.path, reason: errorMessage(error) });
+        }
+    }
+    await writeManifest(stateDir, pairing.sandboxId, { ...manifest, entries: done.map(({ entry }) => entry) });
+    await recordAgreement(context, done.map(({ entry }) => ({ path: entry.path, hash: entry.applied })));
+    return { ok: true, point: point.id, applied: done.map(({ entry, kind }) => ({ path: entry.path, kind })), skipped };
+};
+export const bringBack = async (context, paths) => await exclusively(context, async () => {
+    const dir = restoreDir(context.stateDir, context.pairing.sandboxId);
+    await clearStaging(dir);
+    const result = await whileHeld(context, true, async (standing) => {
+        const staging = await mkdtemp(join(dir, ".staging-"));
+        try {
+            return await bringBackHeld(context, paths, standing, staging);
+        }
+        finally {
+            await rm(staging, { recursive: true, force: true });
+        }
+    }, (done) => `Brought back ${done.applied.length} file(s), restore point ${done.point}`);
+    await pruneRestorePoints(context.stateDir, context.pairing.sandboxId, Date.now(), result.point);
+    return result;
+});
+export const restorePoints = async (context) => ({
+    ok: true,
+    points: await listPoints(context.stateDir, context.pairing.sandboxId, context.pairing.localDir),
+});
+export const restorePoint = async (context, id) => await exclusively(context, async () => {
+    const { pairing, stateDir } = context;
+    const manifest = await readManifest(stateDir, pairing.sandboxId, id, pairing.localDir);
+    await assertFolder(pairing.localDir);
+    return await whileHeld(context, false, async () => {
+        const skipped = [];
+        let restored = 0;
+        for (const entry of manifest.entries) {
+            try {
+                await restoreEntry(stateDir, pairing.sandboxId, id, pairing.localDir, entry);
+                restored += 1;
+            }
+            catch (error) {
+                skipped.push({ path: entry.path, reason: errorMessage(error) });
+            }
+        }
+        return { ok: true, restored, skipped };
+    }, (done) => `Restored ${done.restored} file(s) from ${id}`);
+});
+//# sourceMappingURL=project-transfer.js.map

package/dist/sync/project-transfer.js.map

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

package/dist/sync/report.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../src/sync/report.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAA6B,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAKvG,OAAO,EAAgD,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AA4E3F,eAAO,MAAM,WAAW,UACb,SAAS,WACP,MAAM,GAAG,SAAS,SACpB,WAAW,cACN,MAAM,QACZ;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,YACnC,MAAM,GAAG,SAAS,KAC7B,YAWD,CAAC;AAGH,eAAO,MAAM,YAAY,YAAmB,MAAM,GAAG,SAAS,KAAG,OAAO,CAAC,YAAY,CAGpF,CAAC;AAIF,eAAO,MAAM,YAAY,WAAY,YAAY,aAAa,MAAM,KAAG,YAIrE,CAAC;AAGH,eAAO,MAAM,aAAa,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAkF,CAAC;AAGpJ,eAAO,MAAM,aAAa,QAAa,OAAO,CAAC,YAAY,CAA8C,CAAC"}
+{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../src/sync/report.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAA6B,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAKvG,OAAO,EAAkE,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAiF7G,eAAO,MAAM,WAAW,UACb,SAAS,WACP,MAAM,GAAG,SAAS,SACpB,WAAW,cACN,MAAM,QACZ;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,YACnC,MAAM,GAAG,SAAS,KAC7B,YAWD,CAAC;AAGH,eAAO,MAAM,YAAY,YAAmB,MAAM,GAAG,SAAS,KAAG,OAAO,CAAC,YAAY,CAGpF,CAAC;AAIF,eAAO,MAAM,YAAY,WAAY,YAAY,aAAa,MAAM,KAAG,YAIrE,CAAC;AAGH,eAAO,MAAM,aAAa,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAkF,CAAC;AAGpJ,eAAO,MAAM,aAAa,QAAa,OAAO,CAAC,YAAY,CAA8C,CAAC"}

package/dist/sync/report.js

@@ -5,7 +5,7 @@ import { runPidPath } from "../config.js";
 import { installedBuild } from "../installed.js";
 import { machineId } from "../machine-id.js";
 import { wslEnvironment } from "../wsl.js";
-import { mirrorHeartbeatPath, readState } from "./config.js";
+import { isProjectPairing, mirrorHeartbeatPath, readState } from "./config.js";
 import { backupSessionName, ensureMutagen, readSessionState, sessionName } from "./mutagen.js";
 const lastTick = async () => {
     const raw = await readFile(mirrorHeartbeatPath, "utf8").catch(() => undefined);
@@ -18,21 +18,23 @@ const agentState = async (installed) => {
 };
 const pairingReport = (mutagen, pairing) => {
     const mirroring = pairing.mirrorOff === true ? "off" : "on";
+    const remote = pairing.remoteDir === undefined ? {} : { remoteDir: pairing.remoteDir };
     if (pairing.mode !== "sync" || mutagen === undefined) {
-        return { sandboxId: pairing.sandboxId, mode: pairing.mode, localDir: pairing.localDir, mirroring };
+        return { sandboxId: pairing.sandboxId, mode: pairing.mode, localDir: pairing.localDir, ...remote, mirroring };
     }
     const session = readSessionState(mutagen, sessionName(pairing.sandboxId));
-    const backup = readSessionState(mutagen, backupSessionName(pairing.sandboxId));
+    const backup = isProjectPairing(pairing) ? undefined : readSessionState(mutagen, backupSessionName(pairing.sandboxId));
     return {
         sandboxId: pairing.sandboxId,
         mode: pairing.mode,
         localDir: pairing.localDir,
+        ...remote,
         mirroring,
         mutagenStatus: session.status,
         conflicts: session.conflicts,
         conflictedPaths: session.conflictedPaths,
         paused: session.paused,
-        backupStatus: backup.status,
+        backupStatus: backup?.status,
     };
 };
 const portRows = (pairing) => [

package/dist/sync/report.js.map

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

package/dist/sync/residue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"residue.d.ts","sourceRoot":"","sources":["../../src/sync/residue.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAqB,KAAK,cAAc,EAAE,MAAM,4BAA4B,CAAC;AA0BpF,eAAO,MAAM,aAAa,aAAc,SAAS,MAAM,EAAE,KAAG,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAcrF,CAAC;AAKF,eAAO,MAAM,kBAAkB,SAAU,MAAM,KAAG,OAK2C,CAAC;AAK9F,eAAO,MAAM,eAAe,SAAU,MAAM,KAAG,OAAmF,CAAC;AAGnI,eAAO,MAAM,aAAa,SAAgB,MAAM,QAAQ,MAAM,WAAW,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,UAAS,MAAM,EAAE,KAAQ,OAAO,CAAC,OAAO,CAuBzI,CAAC;AAGF,eAAO,MAAM,gBAAgB,SAAgB,MAAM,WAAW,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,KAAG,OAAO,CAAC,MAAM,EAAE,CAIzG,CAAC;AAEF,MAAM,WAAW,WAAW;IAExB,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CAC3F;AAWD,eAAO,MAAM,eAAe,SAClB,WAAW,SACV,MAAM,aACF,MAAM,SACV,SAAS,MAAM,EAAE,KACzB,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,SAAS,CAezC,CAAC;AAOF,eAAO,MAAM,cAAc,UAAW,SAAS,MAAM,EAAE,UAAU,WAAW,CAAC,MAAM,CAAC,GAAG,SAAS,KAAG,MAAM,EACF,CAAC;AAUxG,MAAM,WAAW,cAAc;IAE3B,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAEpC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC7B;AAKD,eAAO,MAAM,oBAAoB,SAAgB;IAC7C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,SAAS,cAAc,EAAE,CAAC;IAC9C,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;CACrB,KAAG,OAAO,CAAC,cAAc,CA4BzB,CAAC;AAKF,eAAO,MAAM,mBAAmB,SAAgB;IAC5C,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;CACrB,KAAG,OAAO,CAAC,SAAS,MAAM,EAAE,CA0B5B,CAAC"}
+{"version":3,"file":"residue.d.ts","sourceRoot":"","sources":["../../src/sync/residue.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAqB,KAAK,cAAc,EAAE,MAAM,4BAA4B,CAAC;AA+BpF,eAAO,MAAM,aAAa,aAAc,SAAS,MAAM,EAAE,KAAG,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAcrF,CAAC;AAKF,eAAO,MAAM,kBAAkB,SAAU,MAAM,KAAG,OAK2C,CAAC;AAK9F,eAAO,MAAM,eAAe,SAAU,MAAM,KAAG,OAAmF,CAAC;AAGnI,eAAO,MAAM,aAAa,SAAgB,MAAM,QAAQ,MAAM,WAAW,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,UAAS,MAAM,EAAE,KAAQ,OAAO,CAAC,OAAO,CAuBzI,CAAC;AAGF,eAAO,MAAM,gBAAgB,SAAgB,MAAM,WAAW,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,KAAG,OAAO,CAAC,MAAM,EAAE,CAIzG,CAAC;AAEF,MAAM,WAAW,WAAW;IAExB,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CAC3F;AAWD,eAAO,MAAM,eAAe,SAClB,WAAW,SACV,MAAM,aACF,MAAM,SACV,SAAS,MAAM,EAAE,KACzB,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,SAAS,CAezC,CAAC;AAOF,eAAO,MAAM,cAAc,UAAW,SAAS,MAAM,EAAE,UAAU,WAAW,CAAC,MAAM,CAAC,GAAG,SAAS,KAAG,MAAM,EACF,CAAC;AAUxG,MAAM,WAAW,cAAc;IAE3B,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAEpC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC7B;AAKD,eAAO,MAAM,oBAAoB,SAAgB;IAC7C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,SAAS,cAAc,EAAE,CAAC;IAC9C,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;CACrB,KAAG,OAAO,CAAC,cAAc,CA4BzB,CAAC;AAKF,eAAO,MAAM,mBAAmB,SAAgB;IAC5C,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;CACrB,KAAG,OAAO,CAAC,SAAS,MAAM,EAAE,CA0B5B,CAAC"}

package/dist/sync/residue.js

@@ -3,10 +3,11 @@ import { join, posix } from "node:path";
 import { clearableOnDevice } from "@intentic/sandbox-contract";
 const PLAIN_PATTERN = /^[^/*?[\]!\\]+$/;
 const REPOSITORY = ".git";
+const isPrivateName = (name) => name.startsWith(".env") || name === ".secrets.json" || name === "claude.json";
 export const ignoreMatcher = (patterns) => {
     const anywhere = new Set();
     const atRoot = new Set();
-    for (const pattern of patterns) {
+    for (const pattern of patterns.filter((candidate) => !isPrivateName(candidate.replace(/^\//, "")))) {
         if (PLAIN_PATTERN.test(pattern)) {
             anywhere.add(pattern);
         }

package/dist/sync/residue.js.map

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

package/dist/sync/restore-points.d.ts

@@ -0,0 +1,72 @@
+import { z } from "zod";
+import type { ChangeKind } from "./project-files.js";
+import { type Durability } from "./project-local.js";
+export declare const restoreDir: (stateDir: string, sandboxId: string) => string;
+export declare const pointId: (at: Date) => string;
+export declare const pointTime: (id: string) => number | undefined;
+declare const EntrySchema: z.ZodObject<{
+    path: z.ZodString;
+    kind: z.ZodEnum<{
+        added: "added";
+        deleted: "deleted";
+        modified: "modified";
+    }>;
+    backedUp: z.ZodBoolean;
+    applied: z.ZodNullable<z.ZodString>;
+    backup: z.ZodOptional<z.ZodString>;
+    mode: z.ZodOptional<z.ZodNumber>;
+}, z.core.$strip>;
+declare const ManifestSchema: z.ZodObject<{
+    id: z.ZodString;
+    createdAt: z.ZodString;
+    dir: z.ZodString;
+    entries: z.ZodArray<z.ZodObject<{
+        path: z.ZodString;
+        kind: z.ZodEnum<{
+            added: "added";
+            deleted: "deleted";
+            modified: "modified";
+        }>;
+        backedUp: z.ZodBoolean;
+        applied: z.ZodNullable<z.ZodString>;
+        backup: z.ZodOptional<z.ZodString>;
+        mode: z.ZodOptional<z.ZodNumber>;
+    }, z.core.$strip>>;
+}, z.core.$strip>;
+export type RestoreEntry = z.infer<typeof EntrySchema>;
+export type Manifest = z.infer<typeof ManifestSchema>;
+export interface Skipped {
+    readonly path: string;
+    readonly reason: string;
+}
+export declare const writeManifest: (stateDir: string, sandboxId: string, manifest: Manifest) => Promise<void>;
+export declare const readManifest: (stateDir: string, sandboxId: string, id: string, dir: string) => Promise<Manifest>;
+export interface PointSummary {
+    readonly id: string;
+    readonly createdAt: string;
+    readonly entries: number;
+}
+export declare const listPoints: (stateDir: string, sandboxId: string, dir: string) => Promise<PointSummary[]>;
+export declare const RETAINED_NEWEST = 20;
+export declare const RETAINED_MS: number;
+export type PointHolding = "files" | "nothing" | "unfinished";
+export interface PointOnDisk {
+    readonly id: string;
+    readonly holding: PointHolding;
+}
+export declare const expiredPoints: (points: readonly PointOnDisk[], now: number, keep?: string) => string[];
+export declare const pruneRestorePoints: (stateDir: string, sandboxId: string, now: number, keep?: string) => Promise<void>;
+export declare const createPointDir: (stateDir: string, sandboxId: string, now: number) => Promise<{
+    readonly id: string;
+    readonly createdAt: string;
+}>;
+export interface BackupRequest {
+    readonly path: string;
+    readonly kind: ChangeKind;
+    readonly applied: string | null;
+}
+export declare const backUp: (stateDir: string, sandboxId: string, id: string, root: string, request: BackupRequest, durability: Durability) => Promise<RestoreEntry>;
+export declare const sealPoint: (stateDir: string, sandboxId: string, id: string, durability: Durability) => Promise<void>;
+export declare const restoreEntry: (stateDir: string, sandboxId: string, id: string, root: string, entry: RestoreEntry) => Promise<void>;
+export {};
+//# sourceMappingURL=restore-points.d.ts.map

package/dist/sync/restore-points.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"restore-points.d.ts","sourceRoot":"","sources":["../../src/sync/restore-points.ts"],"names":[],"mappings":"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"}