pi-session-cleanup 1.1.0 → 1.1.2

package/src/session-quit-shutdown.ts

@@ -1,40 +1,40 @@
-import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
-
-import { deleteSessionFile } from "./session-delete.js";
-
-let pendingSessionFileForQuitDeletion: string | undefined;
-
-export function scheduleSessionDeletionForQuit(sessionFile: string | undefined): void {
-  pendingSessionFileForQuitDeletion = sessionFile;
-}
-
-export function clearScheduledSessionDeletionForQuit(): void {
-  pendingSessionFileForQuitDeletion = undefined;
-}
-
-export async function flushScheduledSessionDeletionForQuit(
-  ctx: ExtensionContext,
-): Promise<void> {
-  const sessionFile = pendingSessionFileForQuitDeletion;
-  pendingSessionFileForQuitDeletion = undefined;
-
-  if (!sessionFile) {
-    return;
-  }
-
-  try {
-    const deleteResult = await deleteSessionFile(sessionFile);
-    if (!deleteResult.ok) {
-      ctx.ui.notify(
-        `Failed to delete the current session during shutdown: ${deleteResult.error}`,
-        "warning",
-      );
-    }
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    ctx.ui.notify(
-      `Failed to delete the current session during shutdown: ${message}`,
-      "warning",
-    );
-  }
-}
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+
+import { deleteSessionFile } from "./session-delete.js";
+
+let pendingSessionFileForQuitDeletion: string | undefined;
+
+export function scheduleSessionDeletionForQuit(sessionFile: string | undefined): void {
+  pendingSessionFileForQuitDeletion = sessionFile;
+}
+
+export function clearScheduledSessionDeletionForQuit(): void {
+  pendingSessionFileForQuitDeletion = undefined;
+}
+
+export async function flushScheduledSessionDeletionForQuit(
+  ctx: ExtensionContext,
+): Promise<void> {
+  const sessionFile = pendingSessionFileForQuitDeletion;
+  pendingSessionFileForQuitDeletion = undefined;
+
+  if (!sessionFile) {
+    return;
+  }
+
+  try {
+    const deleteResult = await deleteSessionFile(sessionFile);
+    if (!deleteResult.ok) {
+      ctx.ui.notify(
+        `Failed to delete the current session during shutdown: ${deleteResult.error}`,
+        "warning",
+      );
+    }
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    ctx.ui.notify(
+      `Failed to delete the current session during shutdown: ${message}`,
+      "warning",
+    );
+  }
+}

package/src/session-selection.ts

@@ -1,167 +1,167 @@
-import type { ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
-
-import { buildSessionSelectionLabel } from "./session-format.js";
-import { showSessionCleanupPicker } from "./tui/session-cleanup-picker.js";
-import type { SessionCleanupSession, SessionSelectionResult } from "./types.js";
-
-interface ConfirmAction {
-  kind: "confirm";
-}
-
-interface ToggleAllAction {
-  kind: "toggle-all";
-}
-
-interface RefreshAction {
-  kind: "refresh";
-}
-
-interface CancelAction {
-  kind: "cancel";
-}
-
-interface ToggleSessionAction {
-  kind: "toggle-session";
-  sessionPath: string;
-}
-
-type SelectionAction =
-  | ConfirmAction
-  | ToggleAllAction
-  | RefreshAction
-  | CancelAction
-  | ToggleSessionAction;
-
-function buildMenu(
-  sessions: readonly SessionCleanupSession[],
-  selectedPaths: ReadonlySet<string>,
-): {
-  labels: string[];
-  actionsByLabel: Map<string, SelectionAction>;
-} {
-  const labels: string[] = [];
-  const actionsByLabel = new Map<string, SelectionAction>();
-
-  const confirmLabel = `✅ Delete selected (${selectedPaths.size})`;
-  labels.push(confirmLabel);
-  actionsByLabel.set(confirmLabel, { kind: "confirm" });
-
-  const toggleAllLabel =
-    selectedPaths.size === sessions.length
-      ? "☐ Clear all selections"
-      : "☑ Select all sessions";
-  labels.push(toggleAllLabel);
-  actionsByLabel.set(toggleAllLabel, { kind: "toggle-all" });
-
-  const refreshLabel = "↻ Refresh session list";
-  labels.push(refreshLabel);
-  actionsByLabel.set(refreshLabel, { kind: "refresh" });
-
-  const cancelLabel = "✖ Cancel";
-  labels.push(cancelLabel);
-  actionsByLabel.set(cancelLabel, { kind: "cancel" });
-
-  sessions.forEach((session, index) => {
-    const label = buildSessionSelectionLabel(
-      session,
-      index,
-      selectedPaths.has(session.path),
-    );
-    labels.push(label);
-    actionsByLabel.set(label, {
-      kind: "toggle-session",
-      sessionPath: session.path,
-    });
-  });
-
-  return { labels, actionsByLabel };
-}
-
-async function selectSessionsWithLegacyMenu(
-  ctx: ExtensionCommandContext,
-  sessions: readonly SessionCleanupSession[],
-): Promise<SessionSelectionResult> {
-  const selectedPaths = new Set<string>();
-
-  while (true) {
-    const menu = buildMenu(sessions, selectedPaths);
-    const selectedLabel = await ctx.ui.select(
-      "Select sessions to delete (toggle multiple, then confirm)",
-      menu.labels,
-    );
-
-    if (!selectedLabel) {
-      return {
-        cancelled: true,
-        refreshRequested: false,
-        selectedPaths,
-      };
-    }
-
-    const action = menu.actionsByLabel.get(selectedLabel);
-    if (!action) {
-      ctx.ui.notify("Unknown selection action. Please try again.", "warning");
-      continue;
-    }
-
-    switch (action.kind) {
-      case "confirm": {
-        return {
-          cancelled: false,
-          refreshRequested: false,
-          selectedPaths,
-        };
-      }
-      case "toggle-all": {
-        if (selectedPaths.size === sessions.length) {
-          selectedPaths.clear();
-        } else {
-          sessions.forEach((session) => selectedPaths.add(session.path));
-        }
-        break;
-      }
-      case "refresh": {
-        return {
-          cancelled: false,
-          refreshRequested: true,
-          selectedPaths,
-        };
-      }
-      case "cancel": {
-        return {
-          cancelled: true,
-          refreshRequested: false,
-          selectedPaths,
-        };
-      }
-      case "toggle-session": {
-        if (selectedPaths.has(action.sessionPath)) {
-          selectedPaths.delete(action.sessionPath);
-        } else {
-          selectedPaths.add(action.sessionPath);
-        }
-        break;
-      }
-      default: {
-        const unreachable: never = action;
-        throw new Error(`Unhandled selection action: ${String(unreachable)}`);
-      }
-    }
-  }
-}
-
-export async function selectSessionsForCleanup(
-  ctx: ExtensionCommandContext,
-  sessions: readonly SessionCleanupSession[],
-): Promise<SessionSelectionResult> {
-  try {
-    return await showSessionCleanupPicker(ctx, sessions);
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    ctx.ui.notify(
-      `Interactive picker failed (${message}). Falling back to basic selector.`,
-      "warning",
-    );
-    return selectSessionsWithLegacyMenu(ctx, sessions);
-  }
-}
+import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
+
+import { buildSessionSelectionLabel } from "./session-format.js";
+import { showSessionCleanupPicker } from "./tui/session-cleanup-picker.js";
+import type { SessionCleanupSession, SessionSelectionResult } from "./types.js";
+
+interface ConfirmAction {
+  kind: "confirm";
+}
+
+interface ToggleAllAction {
+  kind: "toggle-all";
+}
+
+interface RefreshAction {
+  kind: "refresh";
+}
+
+interface CancelAction {
+  kind: "cancel";
+}
+
+interface ToggleSessionAction {
+  kind: "toggle-session";
+  sessionPath: string;
+}
+
+type SelectionAction =
+  | ConfirmAction
+  | ToggleAllAction
+  | RefreshAction
+  | CancelAction
+  | ToggleSessionAction;
+
+function buildMenu(
+  sessions: readonly SessionCleanupSession[],
+  selectedPaths: ReadonlySet<string>,
+): {
+  labels: string[];
+  actionsByLabel: Map<string, SelectionAction>;
+} {
+  const labels: string[] = [];
+  const actionsByLabel = new Map<string, SelectionAction>();
+
+  const confirmLabel = `✅ Delete selected (${selectedPaths.size})`;
+  labels.push(confirmLabel);
+  actionsByLabel.set(confirmLabel, { kind: "confirm" });
+
+  const toggleAllLabel =
+    selectedPaths.size === sessions.length
+      ? "☐ Clear all selections"
+      : "☑ Select all sessions";
+  labels.push(toggleAllLabel);
+  actionsByLabel.set(toggleAllLabel, { kind: "toggle-all" });
+
+  const refreshLabel = "↻ Refresh session list";
+  labels.push(refreshLabel);
+  actionsByLabel.set(refreshLabel, { kind: "refresh" });
+
+  const cancelLabel = "✖ Cancel";
+  labels.push(cancelLabel);
+  actionsByLabel.set(cancelLabel, { kind: "cancel" });
+
+  sessions.forEach((session, index) => {
+    const label = buildSessionSelectionLabel(
+      session,
+      index,
+      selectedPaths.has(session.path),
+    );
+    labels.push(label);
+    actionsByLabel.set(label, {
+      kind: "toggle-session",
+      sessionPath: session.path,
+    });
+  });
+
+  return { labels, actionsByLabel };
+}
+
+async function selectSessionsWithLegacyMenu(
+  ctx: ExtensionCommandContext,
+  sessions: readonly SessionCleanupSession[],
+): Promise<SessionSelectionResult> {
+  const selectedPaths = new Set<string>();
+
+  while (true) {
+    const menu = buildMenu(sessions, selectedPaths);
+    const selectedLabel = await ctx.ui.select(
+      "Select sessions to delete (toggle multiple, then confirm)",
+      menu.labels,
+    );
+
+    if (!selectedLabel) {
+      return {
+        cancelled: true,
+        refreshRequested: false,
+        selectedPaths,
+      };
+    }
+
+    const action = menu.actionsByLabel.get(selectedLabel);
+    if (!action) {
+      ctx.ui.notify("Unknown selection action. Please try again.", "warning");
+      continue;
+    }
+
+    switch (action.kind) {
+      case "confirm": {
+        return {
+          cancelled: false,
+          refreshRequested: false,
+          selectedPaths,
+        };
+      }
+      case "toggle-all": {
+        if (selectedPaths.size === sessions.length) {
+          selectedPaths.clear();
+        } else {
+          sessions.forEach((session) => selectedPaths.add(session.path));
+        }
+        break;
+      }
+      case "refresh": {
+        return {
+          cancelled: false,
+          refreshRequested: true,
+          selectedPaths,
+        };
+      }
+      case "cancel": {
+        return {
+          cancelled: true,
+          refreshRequested: false,
+          selectedPaths,
+        };
+      }
+      case "toggle-session": {
+        if (selectedPaths.has(action.sessionPath)) {
+          selectedPaths.delete(action.sessionPath);
+        } else {
+          selectedPaths.add(action.sessionPath);
+        }
+        break;
+      }
+      default: {
+        const unreachable: never = action;
+        throw new Error(`Unhandled selection action: ${String(unreachable)}`);
+      }
+    }
+  }
+}
+
+export async function selectSessionsForCleanup(
+  ctx: ExtensionCommandContext,
+  sessions: readonly SessionCleanupSession[],
+): Promise<SessionSelectionResult> {
+  try {
+    return await showSessionCleanupPicker(ctx, sessions);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    ctx.ui.notify(
+      `Interactive picker failed (${message}). Falling back to basic selector.`,
+      "warning",
+    );
+    return selectSessionsWithLegacyMenu(ctx, sessions);
+  }
+}

package/src/session-sort.ts

@@ -1,137 +1,137 @@
-import { basename } from "node:path";
-
-import type { SessionInfo } from "@mariozechner/pi-coding-agent";
-
-function toTimestamp(value: unknown): number | null {
-  if (value instanceof Date) {
-    const timestamp = value.getTime();
-    return Number.isFinite(timestamp) ? timestamp : null;
-  }
-
-  if (typeof value === "number") {
-    return Number.isFinite(value) ? value : null;
-  }
-
-  if (typeof value !== "string") {
-    return null;
-  }
-
-  const parsed = Date.parse(value);
-  if (!Number.isFinite(parsed)) {
-    return null;
-  }
-
-  return parsed;
-}
-
-function parseEpochCandidate(token: string): number | null {
-  if (!/^\d{10,17}$/.test(token)) {
-    return null;
-  }
-
-  const numeric = Number(token);
-  if (!Number.isFinite(numeric) || numeric <= 0) {
-    return null;
-  }
-
-  if (token.length <= 10) {
-    return numeric * 1000;
-  }
-
-  return numeric;
-}
-
-function parseCalendarCandidate(path: string): number | null {
-  const match = path.match(
-    /(\d{4})[-_]?([01]\d)[-_]?([0-3]\d)(?:[tT _-]?([0-2]\d)[:_\-]?([0-5]\d)?[:_\-]?([0-5]\d)?)?/, 
-  );
-
-  if (!match) {
-    return null;
-  }
-
-  const year = Number(match[1]);
-  const month = Number(match[2]);
-  const day = Number(match[3]);
-  const hour = Number(match[4] ?? "0");
-  const minute = Number(match[5] ?? "0");
-  const second = Number(match[6] ?? "0");
-
-  if (
-    !Number.isFinite(year) ||
-    !Number.isFinite(month) ||
-    !Number.isFinite(day) ||
-    !Number.isFinite(hour) ||
-    !Number.isFinite(minute) ||
-    !Number.isFinite(second)
-  ) {
-    return null;
-  }
-
-  const utcTimestamp = Date.UTC(year, month - 1, day, hour, minute, second);
-  return Number.isFinite(utcTimestamp) ? utcTimestamp : null;
-}
-
-function timestampFromPath(sessionPath: string): number {
-  const fileName = basename(sessionPath);
-  const epochCandidates = fileName.match(/\d{10,17}/g) ?? [];
-
-  let bestEpoch = 0;
-  for (const candidate of epochCandidates) {
-    const parsed = parseEpochCandidate(candidate);
-    if (parsed && parsed > bestEpoch) {
-      bestEpoch = parsed;
-    }
-  }
-
-  if (bestEpoch > 0) {
-    return bestEpoch;
-  }
-
-  const calendarTimestamp = parseCalendarCandidate(fileName);
-  if (calendarTimestamp) {
-    return calendarTimestamp;
-  }
-
-  return 0;
-}
-
-function compareDescending(left: number, right: number): number {
-  if (left === right) {
-    return 0;
-  }
-
-  return right - left;
-}
-
-export function sortSessionsNewestFirst(
-  sessions: readonly SessionInfo[],
-): SessionInfo[] {
-  return [...sessions].sort((left, right) => {
-    const modifiedOrder = compareDescending(
-      toTimestamp(left.modified) ?? 0,
-      toTimestamp(right.modified) ?? 0,
-    );
-    if (modifiedOrder !== 0) {
-      return modifiedOrder;
-    }
-
-    const createdOrder = compareDescending(
-      toTimestamp(left.created) ?? 0,
-      toTimestamp(right.created) ?? 0,
-    );
-    if (createdOrder !== 0) {
-      return createdOrder;
-    }
-
-    const pathOrder = compareDescending(
-      timestampFromPath(left.path),
-      timestampFromPath(right.path),
-    );
-    if (pathOrder !== 0) {
-      return pathOrder;
-    }
-
-    return right.path.localeCompare(left.path);
-  });
-}
+import { basename } from "node:path";
+
+import type { SessionInfo } from "@earendil-works/pi-coding-agent";
+
+function toTimestamp(value: unknown): number | null {
+  if (value instanceof Date) {
+    const timestamp = value.getTime();
+    return Number.isFinite(timestamp) ? timestamp : null;
+  }
+
+  if (typeof value === "number") {
+    return Number.isFinite(value) ? value : null;
+  }
+
+  if (typeof value !== "string") {
+    return null;
+  }
+
+  const parsed = Date.parse(value);
+  if (!Number.isFinite(parsed)) {
+    return null;
+  }
+
+  return parsed;
+}
+
+function parseEpochCandidate(token: string): number | null {
+  if (!/^\d{10,17}$/.test(token)) {
+    return null;
+  }
+
+  const numeric = Number(token);
+  if (!Number.isFinite(numeric) || numeric <= 0) {
+    return null;
+  }
+
+  if (token.length <= 10) {
+    return numeric * 1000;
+  }
+
+  return numeric;
+}
+
+function parseCalendarCandidate(path: string): number | null {
+  const match = path.match(
+    /(\d{4})[-_]?([01]\d)[-_]?([0-3]\d)(?:[tT _-]?([0-2]\d)[:_\-]?([0-5]\d)?[:_\-]?([0-5]\d)?)?/, 
+  );
+
+  if (!match) {
+    return null;
+  }
+
+  const year = Number(match[1]);
+  const month = Number(match[2]);
+  const day = Number(match[3]);
+  const hour = Number(match[4] ?? "0");
+  const minute = Number(match[5] ?? "0");
+  const second = Number(match[6] ?? "0");
+
+  if (
+    !Number.isFinite(year) ||
+    !Number.isFinite(month) ||
+    !Number.isFinite(day) ||
+    !Number.isFinite(hour) ||
+    !Number.isFinite(minute) ||
+    !Number.isFinite(second)
+  ) {
+    return null;
+  }
+
+  const utcTimestamp = Date.UTC(year, month - 1, day, hour, minute, second);
+  return Number.isFinite(utcTimestamp) ? utcTimestamp : null;
+}
+
+function timestampFromPath(sessionPath: string): number {
+  const fileName = basename(sessionPath);
+  const epochCandidates = fileName.match(/\d{10,17}/g) ?? [];
+
+  let bestEpoch = 0;
+  for (const candidate of epochCandidates) {
+    const parsed = parseEpochCandidate(candidate);
+    if (parsed && parsed > bestEpoch) {
+      bestEpoch = parsed;
+    }
+  }
+
+  if (bestEpoch > 0) {
+    return bestEpoch;
+  }
+
+  const calendarTimestamp = parseCalendarCandidate(fileName);
+  if (calendarTimestamp) {
+    return calendarTimestamp;
+  }
+
+  return 0;
+}
+
+function compareDescending(left: number, right: number): number {
+  if (left === right) {
+    return 0;
+  }
+
+  return right - left;
+}
+
+export function sortSessionsNewestFirst(
+  sessions: readonly SessionInfo[],
+): SessionInfo[] {
+  return [...sessions].sort((left, right) => {
+    const modifiedOrder = compareDescending(
+      toTimestamp(left.modified) ?? 0,
+      toTimestamp(right.modified) ?? 0,
+    );
+    if (modifiedOrder !== 0) {
+      return modifiedOrder;
+    }
+
+    const createdOrder = compareDescending(
+      toTimestamp(left.created) ?? 0,
+      toTimestamp(right.created) ?? 0,
+    );
+    if (createdOrder !== 0) {
+      return createdOrder;
+    }
+
+    const pathOrder = compareDescending(
+      timestampFromPath(left.path),
+      timestampFromPath(right.path),
+    );
+    if (pathOrder !== 0) {
+      return pathOrder;
+    }
+
+    return right.path.localeCompare(left.path);
+  });
+}