session-steward 0.9.0 → 0.10.0

package/lib/cli.mjs

@@ -8,6 +8,12 @@ import process, {
 } from "node:process";
 
 import { getProvider } from "./providers/index.mjs";
+import {
+  acquireSessionMutationLock,
+  executePreparedSessionCleanup,
+  prepareSessionCleanup,
+  resolveSessionCleanupScope,
+} from "./session-cleanup.mjs";
 import {
   SESSION_EVENT_KIND,
   SESSION_EVENT_REASON,
@@ -19,7 +25,7 @@ function providerOptions(providerId, home) {
 }
 
 const PAGE_SIZE = 20;
-const ALLOWED_INACTIVE_DAYS = new Set([30, 60, 90]);
+const MAX_INACTIVE_DAYS = 3_650;
 const ALLOWED_ARCHIVE_STATUSES = new Set(["all", "active", "archived"]);
 const ALLOWED_CLEANUP_MODES = new Set(["standard", "thorough"]);
 const HELP_TEXT = `
@@ -28,7 +34,7 @@ Commands
   search                        Clear the active search filter
   workspace <path>              Show one exact workspace
   workspace                     Clear the workspace filter
-  inactive <30|60|90>           Show sessions last active that many days ago
+  inactive <days>               Show sessions last active that many days ago
   inactive                      Clear the inactivity filter
   archive <all|active|archived> Filter sessions by archive status
   archive                       Clear the archive filter
@@ -73,7 +79,7 @@ Options
   --backups                      Print retained recovery backups
   --search <text>                Search names, workspaces, and session IDs
   --workspace <path>             Show one exact workspace
-  --inactive-days <30|60|90>     Show sessions last active at least this long ago
+  --inactive-days <days>          Show sessions last active at least this long ago
   --archive-status <status>      Show all, active, or archived sessions
   --sort <updated|created|name|cwd|size>
                                  Choose the session order
@@ -576,8 +582,8 @@ function validateInactiveDays(value) {
 
   const days = Number(value);
 
-  if (!ALLOWED_INACTIVE_DAYS.has(days)) {
-    throw new Error("Inactive days must be 30, 60, or 90.");
+  if (!Number.isSafeInteger(days) || days < 1 || days > MAX_INACTIVE_DAYS) {
+    throw new Error(`Inactive days must be a whole number between 1 and ${MAX_INACTIVE_DAYS}.`);
   }
 
   return days;
@@ -594,7 +600,7 @@ function validateArchiveStatus(value) {
 }
 
 function validateCleanupMode(value) {
-  const cleanupMode = value || "standard";
+  const cleanupMode = value || "thorough";
 
   if (!ALLOWED_CLEANUP_MODES.has(cleanupMode)) {
     throw new Error("Cleanup must be standard or thorough.");
@@ -888,38 +894,47 @@ async function runInteractive(state) {
             continue;
           }
 
-          const restoreResult = await state.provider.restoreSessionDeletionBackup({
-            backupDirectory: backup.backupDirectory,
-            ...providerOptions(state.provider.id, state.providerHome),
-            onProgress: ({ message }) => {
-              if (message) output.write(`${message}...\n`);
-            },
+          const options = providerOptions(state.provider.id, state.providerHome);
+          const releaseMutationLock = await acquireSessionMutationLock({
+            options,
+            provider: state.provider,
           });
-          const cleanupDirectories = [
-            restoreResult.safetyBackupDirectory,
-            backup.backupDirectory,
-          ].filter(Boolean);
-          const retainedDirectories = [];
-
-          for (const backupDirectory of cleanupDirectories) {
-            try {
-              await state.provider.deleteSessionDeletionBackup({
-                backupDirectory,
-                ...providerOptions(state.provider.id, state.providerHome),
-              });
-            } catch {
-              retainedDirectories.push(backupDirectory);
+          try {
+            const restoreResult = await state.provider.restoreSessionDeletionBackup({
+              backupDirectory: backup.backupDirectory,
+              ...options,
+              onProgress: ({ message }) => {
+                if (message) output.write(`${message}...\n`);
+              },
+            });
+            const cleanupDirectories = [
+              restoreResult.safetyBackupDirectory,
+              backup.backupDirectory,
+            ].filter(Boolean);
+            const retainedDirectories = [];
+
+            for (const backupDirectory of cleanupDirectories) {
+              try {
+                await state.provider.deleteSessionDeletionBackup({
+                  backupDirectory,
+                  ...options,
+                });
+              } catch {
+                retainedDirectories.push(backupDirectory);
+              }
             }
-          }
 
-          state.provider.invalidateSessionCache?.(providerOptions(state.provider.id, state.providerHome));
-          const restoredCount = restoreResult.restoredFileCount ?? restoreResult.restoredEntryCount ?? 0;
-          output.write(`Restored and verified ${restoredCount} session data files.\n`);
-          if (retainedDirectories.length > 0) {
-            output.write(`Restore completed, but recovery files remain at ${retainedDirectories.join(", ")}.\n`);
+            state.provider.invalidateSessionCache?.(options);
+            const restoredCount = restoreResult.restoredFileCount ?? restoreResult.restoredEntryCount ?? 0;
+            output.write(`Restored and verified ${restoredCount} session data files.\n`);
+            if (retainedDirectories.length > 0) {
+              output.write(`Restore completed, but recovery files remain at ${retainedDirectories.join(", ")}.\n`);
+            }
+            state.page = 1;
+            state.forceRefresh = true;
+          } finally {
+            await releaseMutationLock();
           }
-          state.page = 1;
-          state.forceRefresh = true;
         } catch (error) {
           output.write(`\n${error instanceof Error ? error.message : String(error)}\n`);
         }
@@ -941,11 +956,20 @@ async function runInteractive(state) {
             continue;
           }
 
-          await state.provider.deleteSessionDeletionBackup({
-            backupDirectory: backup.backupDirectory,
-            ...providerOptions(state.provider.id, state.providerHome),
+          const options = providerOptions(state.provider.id, state.providerHome);
+          const releaseMutationLock = await acquireSessionMutationLock({
+            options,
+            provider: state.provider,
           });
-          output.write(`Deleted recovery backup ${backup.id}.\n`);
+          try {
+            await state.provider.deleteSessionDeletionBackup({
+              backupDirectory: backup.backupDirectory,
+              ...options,
+            });
+            output.write(`Deleted recovery backup ${backup.id}.\n`);
+          } finally {
+            await releaseMutationLock();
+          }
         } catch (error) {
           output.write(`\n${error instanceof Error ? error.message : String(error)}\n`);
         }
@@ -1055,25 +1079,24 @@ async function runInteractive(state) {
         try {
           const sessionIds = parseSelectors(command.args, state.result.records);
           if (sessionIds.length === 0) throw new Error("Choose at least one session to delete.");
-          const scope = cleanupScope(state.cleanupMode);
-          if (scope === "deep") {
-            await state.provider.assertDeepCleanupSupported(
-              providerOptions(state.provider.id, state.providerHome),
-            );
-          }
-          const deletionStore = await state.provider.loadDeletionStore({
-            ...providerOptions(state.provider.id, state.providerHome),
-            recordIds: sessionIds,
+          const options = providerOptions(state.provider.id, state.providerHome);
+          const cleanupResolution = await resolveSessionCleanupScope({
+            options,
+            provider: state.provider,
+            scope: cleanupScope(state.cleanupMode),
           });
-          const deletionPlan = await state.provider.planSessionDeletion({
+          const scope = cleanupResolution.scope;
+          if (cleanupResolution.fallback) {
+            output.write("Thorough cleanup is unavailable for this storage layout. Using standard cleanup.\n");
+          }
+          const prepared = await prepareSessionCleanup({
+            options,
+            provider: state.provider,
             recordIds: sessionIds,
-            store: deletionStore,
-          });
-          const preflight = await state.provider.preflightSessionDeletion({
-            plan: deletionPlan,
             scope,
-            store: deletionStore,
           });
+          const deletionPlan = prepared.plan;
+          const preflight = prepared.preflight;
 
           printDeletionPreview(deletionPlan, preflight, scope);
           output.write(
@@ -1094,77 +1117,82 @@ async function runInteractive(state) {
             continue;
           }
 
-          let cancelRequested = false;
-          let canCancel = true;
-          let lastMessage = "";
-          const handleInterrupt = () => {
-            if (canCancel) {
-              cancelRequested = true;
-              output.write("\nCancellation requested. Finishing the current safe step.\n");
-            } else {
-              output.write("\nCleanup is already applying changes and will finish safely.\n");
-            }
-          };
-          process.on("SIGINT", handleInterrupt);
-          let result;
-
-          try {
-            result = await state.provider.executeSessionDeletion({
-              onProgress: ({ canCancel: nextCanCancel, message }) => {
-                canCancel = nextCanCancel;
-                if (message !== lastMessage) {
-                  output.write(`${message}...\n`);
-                  lastMessage = message;
-                }
-              },
-              plan: deletionPlan,
-              scope,
-              shouldCancel: () => cancelRequested,
-              store: deletionStore,
-            });
-          } finally {
-            process.off("SIGINT", handleInterrupt);
-          }
-          const verification = await state.provider.verifySessionDeletion({
-            plan: deletionPlan,
-            scope,
-            store: deletionStore,
+          const releaseMutationLock = await acquireSessionMutationLock({
+            options,
+            provider: state.provider,
           });
+          try {
+            let cancelRequested = false;
+            let canCancel = true;
+            let lastMessage = "";
+            const handleInterrupt = () => {
+              if (canCancel) {
+                cancelRequested = true;
+                output.write("\nCancellation requested. Finishing the current safe step.\n");
+              } else {
+                output.write("\nCleanup is already applying changes and will finish safely.\n");
+              }
+            };
+            process.on("SIGINT", handleInterrupt);
+            let execution;
 
-          if (verification.complete) {
             try {
-              await state.provider.deleteSessionDeletionBackup({
-                backupDirectory: result.backupDirectory,
-                ...providerOptions(state.provider.id, state.providerHome),
+              execution = await executePreparedSessionCleanup({
+                expectedFingerprint: prepared.fingerprint,
+                onProgress: ({ canCancel: nextCanCancel, message }) => {
+                  canCancel = nextCanCancel;
+                  if (message !== lastMessage) {
+                    output.write(`${message}...\n`);
+                    lastMessage = message;
+                  }
+                },
+                options,
+                provider: state.provider,
+                recordIds: prepared.requestedIds,
+                scope: prepared.scope,
+                shouldCancel: () => cancelRequested,
               });
-            } catch {
-              output.write(`Cleanup completed, but its recovery backup remains at ${result.backupDirectory}.\n`);
+            } finally {
+              process.off("SIGINT", handleInterrupt);
+            }
+            const result = execution.deletion;
+            const verification = execution.verification;
+
+            if (verification.complete) {
+              try {
+                await state.provider.deleteSessionDeletionBackup({
+                  backupDirectory: result.backupDirectory,
+                  ...options,
+                });
+              } catch {
+                output.write(`Cleanup completed, but its recovery backup remains at ${result.backupDirectory}.\n`);
+              }
+              output.write(
+                `Deleted and verified ${result.deletedIds.length} sessions and ${result.deletedTranscriptPaths.length} session paths.\n`,
+              );
+            } else {
+              output.write(
+                `Cleanup finished, but some selected artifacts remain. Backup: ${result.backupDirectory}\n`,
+              );
             }
-            output.write(
-              `Deleted and verified ${result.deletedIds.length} sessions and ${result.deletedTranscriptPaths.length} session paths.\n`,
-            );
-          } else {
-            output.write(
-              `Cleanup finished, but some selected artifacts remain. Backup: ${result.backupDirectory}\n`,
-            );
-          }
 
-          if (result.skippedTranscriptPaths.length > 0) {
-            output.write(
-              `Skipped ${result.skippedTranscriptPaths.length} missing transcript paths.\n`,
-            );
-          }
-          if (result.unrecognizedLocationCount > 0) {
-            output.write(
-              `${result.unrecognizedLocationCount} ${result.unrecognizedLocationCount === 1 ? "location" : "locations"} in your Claude folder ${result.unrecognizedLocationCount === 1 ? "was" : "were"} not recognized and ${result.unrecognizedLocationCount === 1 ? "was" : "were"} not examined.\n`,
-            );
-          }
+            if (result.skippedTranscriptPaths.length > 0) {
+              output.write(
+                `Skipped ${result.skippedTranscriptPaths.length} missing transcript paths.\n`,
+              );
+            }
+            if (result.unrecognizedLocationCount > 0) {
+              output.write(
+                `${result.unrecognizedLocationCount} ${result.unrecognizedLocationCount === 1 ? "location" : "locations"} in your Claude folder ${result.unrecognizedLocationCount === 1 ? "was" : "were"} not recognized and ${result.unrecognizedLocationCount === 1 ? "was" : "were"} not examined.\n`,
+              );
+            }
 
-          state.provider.invalidateSessionCache?.(
-            providerOptions(state.provider.id, state.providerHome),
-          );
-          state.page = 1;
-          state.forceRefresh = true;
+            state.provider.invalidateSessionCache?.(options);
+            state.page = 1;
+            state.forceRefresh = true;
+          } finally {
+            await releaseMutationLock();
+          }
         } catch (error) {
           output.write(`\n${error instanceof Error ? error.message : String(error)}\n`);
           await pause(rl);

package/lib/installed-products.mjs

@@ -0,0 +1,44 @@
+import { execFileSync } from "node:child_process";
+import { promises as fs } from "node:fs";
+
+import { getCommandInvocation } from "./platform.mjs";
+
+function readCommandVersion(command, args) {
+  try {
+    const invocation = getCommandInvocation(command, args);
+    return execFileSync(invocation.command, invocation.args, {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"],
+      windowsHide: invocation.windowsHide,
+    }).trim() || null;
+  } catch {
+    return null;
+  }
+}
+
+export async function getInstalledProductVersions() {
+  const versions = {
+    chatgptDesktop: null,
+    claudeCli: readCommandVersion("claude", ["--version"]),
+    claudeDesktop: null,
+    codexCli: readCommandVersion("codex", ["--version"]),
+  };
+
+  if (process.platform !== "darwin") return versions;
+
+  const applications = [
+    ["chatgptDesktop", "/Applications/ChatGPT.app/Contents/Info.plist"],
+    ["claudeDesktop", "/Applications/Claude.app/Contents/Info.plist"],
+  ];
+  for (const [key, infoPath] of applications) {
+    try {
+      await fs.access(infoPath);
+      versions[key] = readCommandVersion(
+        "/usr/libexec/PlistBuddy",
+        ["-c", "Print :CFBundleShortVersionString", infoPath],
+      );
+    } catch {
+    }
+  }
+  return versions;
+}