mixdog 1.3.1 → 1.3.3

package/src/runtime/shared/worktrees/contract.mjs

@@ -265,13 +265,19 @@ export function nextRevision(workspace) {
  * @property {string} repoCommonDir
  * @property {string} projectPath
  * @property {string} path Absolute worktree folder (see managedWorktreePath).
- * @property {string} branch Full branch name, e.g. "mixdog/fix-login".
+ * @property {string|null} branch Full branch name, e.g. "mixdog/fix-login"; null only for a snapshot.
  * @property {string|null} baseCommit
  * @property {number} createdAt Epoch milliseconds.
- * @property {string|null} ownerSessionId Lead session that retains it; null once released.
+ * @property {string|null} ownerSessionId Lead session that retains it; null once released (and for a snapshot).
  * @property {WorktreeEntryState} state
+ * @property {'snapshot'} [kind] A read-only detached checkout of `baseCommit`
+ *   (WORKTREE_SNAPSHOT_KIND): no branch, bound to no session, removed with
+ *   the turn that made it.
  */
 
+/** `kind` of a managed read-only snapshot: a detached checkout no session works in. */
+export const WORKTREE_SNAPSHOT_KIND = 'snapshot';
+
 /**
  * @param {unknown} input
  * @returns {WorktreeEntry}
@@ -284,16 +290,18 @@ export function normalizeWorktreeEntry(input) {
   const id = text(value.id, 'worktree.id');
   const idError = worktreeNameError(id);
   if (idError) throw new TypeError(`worktree.id is invalid: ${idError}`);
+  const snapshot = value.kind === WORKTREE_SNAPSHOT_KIND;
   return {
     id,
     repoCommonDir: text(value.repoCommonDir, 'worktree.repoCommonDir'),
     projectPath: text(value.projectPath, 'worktree.projectPath'),
     path: text(value.path, 'worktree.path'),
-    branch: text(value.branch, 'worktree.branch'),
+    branch: snapshot ? nullableText(value.branch, 'worktree.branch') : text(value.branch, 'worktree.branch'),
     baseCommit: nullableCommit(value.baseCommit, 'worktree.baseCommit'),
     createdAt: value.createdAt,
     ownerSessionId: nullableText(value.ownerSessionId, 'worktree.ownerSessionId'),
     state: oneOf(value.state, WORKTREE_ENTRY_STATES, 'worktree.state'),
+    ...(snapshot ? { kind: WORKTREE_SNAPSHOT_KIND } : {}),
   };
 }
 

package/src/runtime/shared/worktrees/maintenance.mjs

@@ -72,14 +72,21 @@ export async function listWorktreesWithRetention({
  * The manual prune (an explicit request, so independent of autoCleanup):
  * the startup reconcile plus removal of clean, merged worktrees that no
  * stored or live session retains. Dirty or unmerged ones are reported kept.
- * @param {{ liveSessionIds?: string[], listSessionIds?: () => Promise<string[]>, manager?: object }} [options]
+ * `repoCommonDir` limits the prune to that repository's worktrees.
+ * @param {{ liveSessionIds?: string[], listSessionIds?: () => Promise<string[]>, manager?: object, repoCommonDir?: string|null }} [options]
  */
-export async function pruneWorktrees({ liveSessionIds = [], listSessionIds = storedSessionIds, manager = null } = {}) {
+export async function pruneWorktrees({
+  liveSessionIds = [],
+  listSessionIds = storedSessionIds,
+  manager = null,
+  repoCommonDir = null,
+} = {}) {
   const backend = manager || (await loadManager());
   return backend.reconcileManagedWorktrees({
     liveSessionIds,
     retainedSessionIds: await listSessionIds(),
     removeOrphans: true,
+    ...(repoCommonDir ? { repoCommonDir } : {}),
   });
 }
 
@@ -93,6 +100,8 @@ export async function pruneWorktrees({ liveSessionIds = [], listSessionIds = sto
 export async function cleanupDeletedSessionWorktree(sessionId, { manager = null, autoCleanup } = {}) {
   const backend = manager || (await loadManager());
   await backend.forgetSharedWorktreeSession?.(sessionId);
+  // Its read-only snapshots go whatever autoCleanup says (they never outlive their holder).
+  await backend.removeSessionSnapshots?.(sessionId);
   const entry = await backend.getSessionWorktree(sessionId);
   if (!entry) return null;
   const enabled = autoCleanup ?? (await backend.currentWorktreeSettings()).autoCleanup;