pi-session-cleanup 1.1.0 → 1.1.2

package/src/session-delete.ts

@@ -1,17 +1,77 @@
-import { spawnSync } from "node:child_process";
+import { spawn } from "node:child_process";
 import { existsSync } from "node:fs";
 import { unlink } from "node:fs/promises";
 
 import type { DeleteSessionResult } from "./types.js";
 
-function buildTrashErrorHint(result: ReturnType<typeof spawnSync>): string | null {
+const TRASH_PROVIDER_TIMEOUT_MS = 5_000;
+const TRASH_PROVIDER_MAX_STDERR_BYTES = 64 * 1024;
+
+interface TrashProcessResult {
+  status: number | null;
+  stderr?: string;
+  error?: Error;
+}
+
+type TrashProcessRunner = (
+  command: string,
+  args: readonly string[],
+  options: { timeout: number; maxStderrBytes: number },
+) => Promise<TrashProcessResult>;
+
+interface TrashProvider {
+  name: string;
+  command: string;
+  getArgs: (sessionPath: string) => string[];
+}
+
+export interface DeleteSessionFileOptions {
+  spawn?: TrashProcessRunner;
+  existsSync?: (path: string) => boolean;
+  unlink?: (path: string) => Promise<void>;
+}
+
+function argsWithDashSafety(prefix: string[], sessionPath: string, suffix: string[] = []): string[] {
+  const pathArgs = sessionPath.startsWith("-") ? ["--", sessionPath] : [sessionPath];
+  return [...prefix, ...pathArgs, ...suffix];
+}
+
+const TRASH_PROVIDERS: readonly TrashProvider[] = [
+  {
+    name: "trash",
+    command: "trash",
+    getArgs: (sessionPath) => argsWithDashSafety([], sessionPath),
+  },
+  {
+    name: "trash-put",
+    command: "trash-put",
+    getArgs: (sessionPath) => argsWithDashSafety([], sessionPath),
+  },
+  {
+    name: "gio trash",
+    command: "gio",
+    getArgs: (sessionPath) => argsWithDashSafety(["trash"], sessionPath),
+  },
+  {
+    name: "kioclient5 move",
+    command: "kioclient5",
+    getArgs: (sessionPath) => argsWithDashSafety(["move"], sessionPath, ["trash:/"]),
+  },
+  {
+    name: "kioclient move",
+    command: "kioclient",
+    getArgs: (sessionPath) => argsWithDashSafety(["move"], sessionPath, ["trash:/"]),
+  },
+];
+
+function buildTrashErrorHint(providerName: string, result: TrashProcessResult): string | null {
   const details: string[] = [];
 
   if (result.error) {
     details.push(result.error.message);
   }
 
-  const stderr = result.stderr?.toString().trim();
+  const stderr = result.stderr?.trim();
   if (stderr) {
     details.push(stderr.split("\n")[0] ?? stderr);
   }
@@ -20,26 +80,120 @@ function buildTrashErrorHint(result: ReturnType<typeof spawnSync>): string | nul
     return null;
   }
 
-  return `trash: ${details.join(" · ").slice(0, 200)}`;
+  return `${providerName}: ${details.join(" · ").slice(0, 200)}`;
+}
+
+function runTrashProcess(
+  command: string,
+  args: readonly string[],
+  options: { timeout: number; maxStderrBytes: number },
+): Promise<TrashProcessResult> {
+  return new Promise((resolve) => {
+    let child: ReturnType<typeof spawn>;
+    try {
+      child = spawn(command, [...args], {
+        stdio: ["ignore", "ignore", "pipe"],
+        windowsHide: true,
+      });
+    } catch (error) {
+      resolve({
+        status: null,
+        error: error instanceof Error ? error : new Error(String(error)),
+      });
+      return;
+    }
+
+    const stderrChunks: Buffer[] = [];
+    let stderrBytes = 0;
+    let processError: Error | undefined;
+    let settled = false;
+
+    const finish = (result: TrashProcessResult): void => {
+      if (settled) {
+        return;
+      }
+
+      settled = true;
+      clearTimeout(timeout);
+      resolve(result);
+    };
+
+    const failAndKill = (error: Error): void => {
+      if (!processError) {
+        processError = error;
+      }
+      child.kill();
+    };
+
+    const timeout = setTimeout(() => {
+      failAndKill(new Error(`Trash provider timed out after ${options.timeout}ms.`));
+    }, options.timeout);
+    timeout.unref?.();
+
+    child.stderr?.on("data", (chunk: unknown) => {
+      const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(String(chunk));
+      stderrBytes += buffer.length;
+      if (stderrBytes > options.maxStderrBytes) {
+        failAndKill(new Error(`Trash provider stderr exceeded ${options.maxStderrBytes} bytes.`));
+        return;
+      }
+
+      stderrChunks.push(buffer);
+    });
+
+    child.on("error", (error: Error) => {
+      processError = error;
+      finish({
+        status: null,
+        stderr: Buffer.concat(stderrChunks).toString("utf8"),
+        error: processError,
+      });
+    });
+
+    child.on("close", (status: number | null) => {
+      finish({
+        status,
+        stderr: Buffer.concat(stderrChunks).toString("utf8"),
+        error: processError,
+      });
+    });
+  });
 }
 
 /**
  * Mirrors Pi's built-in behavior: try moving to trash first, then fallback to unlink.
  */
-export async function deleteSessionFile(sessionPath: string): Promise<DeleteSessionResult> {
-  const trashArgs = sessionPath.startsWith("-") ? ["--", sessionPath] : [sessionPath];
-  const trashResult = spawnSync("trash", trashArgs, { encoding: "utf-8" });
+export async function deleteSessionFile(
+  sessionPath: string,
+  options: DeleteSessionFileOptions = {},
+): Promise<DeleteSessionResult> {
+  const runProcess = options.spawn ?? runTrashProcess;
+  const pathExists = options.existsSync ?? existsSync;
+  const unlinkFile = options.unlink ?? unlink;
+  const trashHints: string[] = [];
+
+  for (const provider of TRASH_PROVIDERS) {
+    const result = await runProcess(provider.command, provider.getArgs(sessionPath), {
+      timeout: TRASH_PROVIDER_TIMEOUT_MS,
+      maxStderrBytes: TRASH_PROVIDER_MAX_STDERR_BYTES,
+    });
+
+    if (result.status === 0 || !pathExists(sessionPath)) {
+      return { ok: true, method: "trash" };
+    }
 
-  if (trashResult.status === 0 || !existsSync(sessionPath)) {
-    return { ok: true, method: "trash" };
+    const hint = buildTrashErrorHint(provider.name, result);
+    if (hint) {
+      trashHints.push(hint);
+    }
   }
 
   try {
-    await unlink(sessionPath);
+    await unlinkFile(sessionPath);
     return { ok: true, method: "unlink" };
   } catch (error) {
     const unlinkError = error instanceof Error ? error.message : String(error);
-    const trashHint = buildTrashErrorHint(trashResult);
+    const trashHint = trashHints.length > 0 ? trashHints.join("; ") : null;
 
     return {
       ok: false,

package/src/session-entry.ts

@@ -1,23 +1,23 @@
-import type { SessionManager } from "@mariozechner/pi-coding-agent";
-
-export interface ActiveAgentSessionEntryData {
-  name: string | null;
-}
-
-type SessionManagerWithCustomEntry = SessionManager & {
-  appendCustomEntry?: (customType: string, data?: unknown) => string;
-};
-
-export function appendActiveAgentSessionEntry(
-  sessionManager: SessionManager,
-  agentName: string | null,
-): void {
-  const writableSessionManager = sessionManager as SessionManagerWithCustomEntry;
-  if (typeof writableSessionManager.appendCustomEntry !== "function") {
-    throw new Error("The current Pi build does not expose sessionManager.appendCustomEntry().");
-  }
-
-  writableSessionManager.appendCustomEntry("active_agent", {
-    name: agentName,
-  } satisfies ActiveAgentSessionEntryData);
-}
+import type { SessionManager } from "@earendil-works/pi-coding-agent";
+
+export interface ActiveAgentSessionEntryData {
+  name: string | null;
+}
+
+type SessionManagerWithCustomEntry = SessionManager & {
+  appendCustomEntry?: (customType: string, data?: unknown) => string;
+};
+
+export function appendActiveAgentSessionEntry(
+  sessionManager: SessionManager,
+  agentName: string | null,
+): void {
+  const writableSessionManager = sessionManager as SessionManagerWithCustomEntry;
+  if (typeof writableSessionManager.appendCustomEntry !== "function") {
+    throw new Error("The current Pi build does not expose sessionManager.appendCustomEntry().");
+  }
+
+  writableSessionManager.appendCustomEntry("active_agent", {
+    name: agentName,
+  } satisfies ActiveAgentSessionEntryData);
+}

package/src/session-format.ts

@@ -1,98 +1,98 @@
-import { homedir } from "node:os";
-
-import type { SessionInfo } from "@mariozechner/pi-coding-agent";
-
-const LABEL_MAX_TEXT = 56;
-
-type SessionDisplayInfo = SessionInfo & {
-  responsibleAgentName?: string | null;
-};
-
-function compactWhitespace(value: string): string {
-  return value.replace(/\s+/g, " ").trim();
-}
-
-function clipText(value: string, max = LABEL_MAX_TEXT): string {
-  if (value.length <= max) {
-    return value;
-  }
-
-  return `${value.slice(0, Math.max(1, max - 1))}…`;
-}
-
-export function shortenPath(path: string): string {
-  const home = homedir();
-  if (path.startsWith(home)) {
-    return `~${path.slice(home.length)}`;
-  }
-
-  return path;
-}
-
-export function formatSessionAge(date: Date, now = Date.now()): string {
-  const ageMs = Math.max(0, now - date.getTime());
-  const minutes = Math.floor(ageMs / 60000);
-
-  if (minutes < 1) {
-    return "now";
-  }
-
-  if (minutes < 60) {
-    return `${minutes}m`;
-  }
-
-  const hours = Math.floor(minutes / 60);
-  if (hours < 24) {
-    return `${hours}h`;
-  }
-
-  const days = Math.floor(hours / 24);
-  if (days < 7) {
-    return `${days}d`;
-  }
-
-  if (days < 30) {
-    return `${Math.floor(days / 7)}w`;
-  }
-
-  if (days < 365) {
-    return `${Math.floor(days / 30)}mo`;
-  }
-
-  return `${Math.floor(days / 365)}y`;
-}
-
-export function getSessionTitle(session: SessionInfo): string {
-  const preferred = compactWhitespace(session.name ?? "");
-  if (preferred) {
-    return clipText(preferred);
-  }
-
-  const preview = compactWhitespace(session.firstMessage ?? "");
-  if (preview) {
-    return clipText(preview);
-  }
-
-  return "(no preview)";
-}
-
-export function getResponsibleAgentDisplayName(session: SessionDisplayInfo): string {
-  const normalizedAgentName = compactWhitespace(session.responsibleAgentName ?? "");
-  return normalizedAgentName || "unknown";
-}
-
-export function buildSessionSelectionLabel(
-  session: SessionDisplayInfo,
-  index: number,
-  selected: boolean,
-): string {
-  const marker = selected ? "[x]" : "[ ]";
-  const title = getSessionTitle(session);
-  const agent = `@${getResponsibleAgentDisplayName(session)}`;
-  const age = formatSessionAge(session.modified);
-  const shortId = session.id.slice(0, 8);
-  const cwd = shortenPath(session.cwd || "(unknown cwd)");
-  const position = String(index + 1).padStart(3, "0");
-
-  return `${position} ${marker} ${title} · ${agent} · ${age} · ${shortId} · ${cwd}`;
-}
+import { homedir } from "node:os";
+
+import type { SessionInfo } from "@earendil-works/pi-coding-agent";
+
+const LABEL_MAX_TEXT = 56;
+
+type SessionDisplayInfo = SessionInfo & {
+  responsibleAgentName?: string | null;
+};
+
+function compactWhitespace(value: string): string {
+  return value.replace(/\s+/g, " ").trim();
+}
+
+function clipText(value: string, max = LABEL_MAX_TEXT): string {
+  if (value.length <= max) {
+    return value;
+  }
+
+  return `${value.slice(0, Math.max(1, max - 1))}…`;
+}
+
+export function shortenPath(path: string): string {
+  const home = homedir();
+  if (path.startsWith(home)) {
+    return `~${path.slice(home.length)}`;
+  }
+
+  return path;
+}
+
+export function formatSessionAge(date: Date, now = Date.now()): string {
+  const ageMs = Math.max(0, now - date.getTime());
+  const minutes = Math.floor(ageMs / 60000);
+
+  if (minutes < 1) {
+    return "now";
+  }
+
+  if (minutes < 60) {
+    return `${minutes}m`;
+  }
+
+  const hours = Math.floor(minutes / 60);
+  if (hours < 24) {
+    return `${hours}h`;
+  }
+
+  const days = Math.floor(hours / 24);
+  if (days < 7) {
+    return `${days}d`;
+  }
+
+  if (days < 30) {
+    return `${Math.floor(days / 7)}w`;
+  }
+
+  if (days < 365) {
+    return `${Math.floor(days / 30)}mo`;
+  }
+
+  return `${Math.floor(days / 365)}y`;
+}
+
+export function getSessionTitle(session: SessionInfo): string {
+  const preferred = compactWhitespace(session.name ?? "");
+  if (preferred) {
+    return clipText(preferred);
+  }
+
+  const preview = compactWhitespace(session.firstMessage ?? "");
+  if (preview) {
+    return clipText(preview);
+  }
+
+  return "(no preview)";
+}
+
+export function getResponsibleAgentDisplayName(session: SessionDisplayInfo): string {
+  const normalizedAgentName = compactWhitespace(session.responsibleAgentName ?? "");
+  return normalizedAgentName || "unknown";
+}
+
+export function buildSessionSelectionLabel(
+  session: SessionDisplayInfo,
+  index: number,
+  selected: boolean,
+): string {
+  const marker = selected ? "[x]" : "[ ]";
+  const title = getSessionTitle(session);
+  const agent = `@${getResponsibleAgentDisplayName(session)}`;
+  const age = formatSessionAge(session.modified);
+  const shortId = session.id.slice(0, 8);
+  const cwd = shortenPath(session.cwd || "(unknown cwd)");
+  const position = String(index + 1).padStart(3, "0");
+
+  return `${position} ${marker} ${title} · ${agent} · ${age} · ${shortId} · ${cwd}`;
+}