@sooink/ai-session-tidy 0.1.2 → 0.1.4

package/dist/index.js

@@ -67,19 +67,29 @@ async function getDirectorySize(dirPath) {
   }
 }
 
-// src/scanners/claude-code.ts
-import { readdir as readdir2, readFile, stat as stat2, access } from "fs/promises";
-import { join as join3 } from "path";
-import { createReadStream } from "fs";
-import { createInterface } from "readline";
-
 // src/utils/paths.ts
+import { existsSync } from "fs";
 import { homedir } from "os";
 import { join as join2 } from "path";
 function decodePath(encoded) {
   if (encoded === "") return "";
   if (!encoded.startsWith("-")) return encoded;
-  return encoded.replace(/-/g, "/");
+  const parts = encoded.slice(1).split("-");
+  return reconstructPath(parts, "");
+}
+function reconstructPath(parts, currentPath) {
+  if (parts.length === 0) return currentPath;
+  for (let len = parts.length; len >= 1; len--) {
+    const segment = parts.slice(0, len).join("-");
+    const testPath = currentPath + "/" + segment;
+    if (existsSync(testPath)) {
+      const result = reconstructPath(parts.slice(len), testPath);
+      if (existsSync(result) || parts.slice(len).length === 0) {
+        return result;
+      }
+    }
+  }
+  return currentPath + "/" + parts.join("/");
 }
 function getConfigDir(appName) {
   switch (process.platform) {
@@ -109,6 +119,9 @@ function getClaudeTodosDir() {
 function getClaudeFileHistoryDir() {
   return join2(homedir(), ".claude", "file-history");
 }
+function getClaudeTasksDir() {
+  return join2(homedir(), ".claude", "tasks");
+}
 function tildify(path) {
   const home = homedir();
   if (path.startsWith(home)) {
@@ -118,6 +131,10 @@ function tildify(path) {
 }
 
 // src/scanners/claude-code.ts
+import { readdir as readdir2, readFile, stat as stat2, access } from "fs/promises";
+import { join as join3 } from "path";
+import { createReadStream } from "fs";
+import { createInterface } from "readline";
 var ClaudeCodeScanner = class {
   name = "claude-code";
   projectsDir;
@@ -125,6 +142,7 @@ var ClaudeCodeScanner = class {
   sessionEnvDir;
   todosDir;
   fileHistoryDir;
+  tasksDir;
   constructor(projectsDirOrOptions) {
     if (typeof projectsDirOrOptions === "string") {
       this.projectsDir = projectsDirOrOptions;
@@ -132,18 +150,21 @@ var ClaudeCodeScanner = class {
       this.sessionEnvDir = null;
       this.todosDir = null;
       this.fileHistoryDir = null;
+      this.tasksDir = null;
     } else if (projectsDirOrOptions) {
       this.projectsDir = projectsDirOrOptions.projectsDir ?? getClaudeProjectsDir();
       this.configPath = projectsDirOrOptions.configPath === void 0 ? getClaudeConfigPath() : projectsDirOrOptions.configPath;
       this.sessionEnvDir = projectsDirOrOptions.sessionEnvDir === void 0 ? getClaudeSessionEnvDir() : projectsDirOrOptions.sessionEnvDir;
       this.todosDir = projectsDirOrOptions.todosDir === void 0 ? getClaudeTodosDir() : projectsDirOrOptions.todosDir;
       this.fileHistoryDir = projectsDirOrOptions.fileHistoryDir === void 0 ? getClaudeFileHistoryDir() : projectsDirOrOptions.fileHistoryDir;
+      this.tasksDir = projectsDirOrOptions.tasksDir === void 0 ? getClaudeTasksDir() : projectsDirOrOptions.tasksDir;
     } else {
       this.projectsDir = getClaudeProjectsDir();
       this.configPath = getClaudeConfigPath();
       this.sessionEnvDir = getClaudeSessionEnvDir();
       this.todosDir = getClaudeTodosDir();
       this.fileHistoryDir = getClaudeFileHistoryDir();
+      this.tasksDir = getClaudeTasksDir();
     }
   }
   async isAvailable() {
@@ -190,6 +211,8 @@ var ClaudeCodeScanner = class {
     sessions.push(...todosSessions);
     const fileHistorySessions = await this.scanFileHistoryDir(validSessionIds);
     sessions.push(...fileHistorySessions);
+    const tasksSessions = await this.scanTasksDir(validSessionIds);
+    sessions.push(...tasksSessions);
     const totalSize = sessions.reduce((sum, s) => sum + s.size, 0);
     return {
       toolName: this.name,
@@ -359,6 +382,40 @@ var ClaudeCodeScanner = class {
     }
     return orphanedHistories;
   }
+  /**
+   * Detect orphaned folders from ~/.claude/tasks
+   * Folder name is the session UUID, contains .lock file
+   */
+  async scanTasksDir(validSessionIds) {
+    if (!this.tasksDir) {
+      return [];
+    }
+    const orphanedTasks = [];
+    try {
+      await access(this.tasksDir);
+      const entries = await readdir2(this.tasksDir, { withFileTypes: true });
+      for (const entry of entries) {
+        if (!entry.isDirectory()) continue;
+        const sessionId = entry.name;
+        if (!validSessionIds.has(sessionId)) {
+          const taskPath = join3(this.tasksDir, entry.name);
+          const size = await getDirectorySize(taskPath);
+          const taskStat = await stat2(taskPath);
+          orphanedTasks.push({
+            toolName: this.name,
+            sessionPath: taskPath,
+            projectPath: sessionId,
+            // Session UUID
+            size,
+            lastModified: taskStat.mtime,
+            type: "tasks"
+          });
+        }
+      }
+    } catch {
+    }
+    return orphanedTasks;
+  }
   /**
    * Extract project path (cwd) from JSONL file
    */
@@ -602,6 +659,7 @@ function outputTable(results, verbose) {
   const sessionEnvEntries = allSessions.filter((s) => s.type === "session-env");
   const todosEntries = allSessions.filter((s) => s.type === "todos");
   const fileHistoryEntries = allSessions.filter((s) => s.type === "file-history");
+  const tasksEntries = allSessions.filter((s) => s.type === "tasks");
   const totalSize = results.reduce((sum, r) => sum + r.totalSize, 0);
   if (allSessions.length === 0) {
     logger.success("No orphaned sessions found.");
@@ -624,6 +682,9 @@ function outputTable(results, verbose) {
   if (fileHistoryEntries.length > 0) {
     parts.push(`${fileHistoryEntries.length} file-history folder(s)`);
   }
+  if (tasksEntries.length > 0) {
+    parts.push(`${tasksEntries.length} tasks folder(s)`);
+  }
   logger.warn(`Found ${parts.join(" + ")} (${formatSize(totalSize)})`);
   console.log();
   const summaryTable = new Table({
@@ -634,6 +695,7 @@ function outputTable(results, verbose) {
       chalk2.cyan("Env"),
       chalk2.cyan("Todos"),
       chalk2.cyan("History"),
+      chalk2.cyan("Tasks"),
       chalk2.cyan("Size"),
       chalk2.cyan("Scan Time")
     ],
@@ -646,6 +708,7 @@ function outputTable(results, verbose) {
       const envs = result.sessions.filter((s) => s.type === "session-env").length;
       const todos = result.sessions.filter((s) => s.type === "todos").length;
       const histories = result.sessions.filter((s) => s.type === "file-history").length;
+      const tasks = result.sessions.filter((s) => s.type === "tasks").length;
       summaryTable.push([
         result.toolName,
         folders > 0 ? String(folders) : "-",
@@ -653,6 +716,7 @@ function outputTable(results, verbose) {
         envs > 0 ? String(envs) : "-",
         todos > 0 ? String(todos) : "-",
         histories > 0 ? String(histories) : "-",
+        tasks > 0 ? String(tasks) : "-",
         formatSize(result.totalSize),
         `${result.scanDuration.toFixed(0)}ms`
       ]);
@@ -669,7 +733,7 @@ function outputTable(results, verbose) {
         console.log(
           `  ${chalk2.cyan(`[${session.toolName}]`)} ${chalk2.white(projectName)} ${chalk2.dim(`(${formatSize(session.size)})`)}`
         );
-        console.log(`    ${chalk2.dim("\u2192")} ${session.projectPath}`);
+        console.log(`    ${chalk2.dim("\u2192")} ${tildify(session.projectPath)}`);
         console.log(`    ${chalk2.dim("Modified:")} ${session.lastModified.toLocaleDateString()}`);
         console.log();
       }
@@ -683,7 +747,7 @@ function outputTable(results, verbose) {
         console.log(
           `  ${chalk2.yellow("[config]")} ${chalk2.white(projectName)}`
         );
-        console.log(`    ${chalk2.dim("\u2192")} ${entry.projectPath}`);
+        console.log(`    ${chalk2.dim("\u2192")} ${tildify(entry.projectPath)}`);
         if (entry.configStats?.lastCost) {
           const cost = `$${entry.configStats.lastCost.toFixed(2)}`;
           const inTokens = formatTokens(entry.configStats.lastTotalInputTokens);
@@ -693,6 +757,58 @@ function outputTable(results, verbose) {
         console.log();
       }
     }
+    if (sessionEnvEntries.length > 0) {
+      console.log();
+      console.log(chalk2.bold("Empty Session Env Folders:"));
+      console.log();
+      for (const entry of sessionEnvEntries) {
+        const folderName = entry.sessionPath.split("/").pop() || entry.sessionPath;
+        console.log(
+          `  ${chalk2.green("[session-env]")} ${chalk2.white(folderName)} ${chalk2.dim("(empty)")}`
+        );
+        console.log(`    ${chalk2.dim("\u2192")} ${tildify(entry.sessionPath)}`);
+        console.log();
+      }
+    }
+    if (todosEntries.length > 0) {
+      console.log();
+      console.log(chalk2.bold("Orphaned Todos:"));
+      console.log();
+      for (const entry of todosEntries) {
+        const fileName = entry.sessionPath.split("/").pop() || entry.sessionPath;
+        console.log(
+          `  ${chalk2.magenta("[todos]")} ${chalk2.white(fileName)} ${chalk2.dim(`(${formatSize(entry.size)})`)}`
+        );
+        console.log(`    ${chalk2.dim("\u2192")} ${tildify(entry.sessionPath)}`);
+        console.log();
+      }
+    }
+    if (fileHistoryEntries.length > 0) {
+      console.log();
+      console.log(chalk2.bold("Orphaned File History:"));
+      console.log();
+      for (const entry of fileHistoryEntries) {
+        const folderName = entry.sessionPath.split("/").pop() || entry.sessionPath;
+        console.log(
+          `  ${chalk2.blue("[file-history]")} ${chalk2.white(folderName)} ${chalk2.dim(`(${formatSize(entry.size)})`)}`
+        );
+        console.log(`    ${chalk2.dim("\u2192")} ${tildify(entry.sessionPath)}`);
+        console.log();
+      }
+    }
+    if (tasksEntries.length > 0) {
+      console.log();
+      console.log(chalk2.bold("Orphaned Tasks:"));
+      console.log();
+      for (const entry of tasksEntries) {
+        const folderName = entry.sessionPath.split("/").pop() || entry.sessionPath;
+        console.log(
+          `  ${chalk2.cyan("[tasks]")} ${chalk2.white(folderName)} ${chalk2.dim(`(${formatSize(entry.size)})`)}`
+        );
+        console.log(`    ${chalk2.dim("\u2192")} ${tildify(entry.sessionPath)}`);
+        console.log();
+      }
+    }
   }
   console.log();
   console.log(
@@ -709,7 +825,7 @@ import inquirer from "inquirer";
 
 // src/core/cleaner.ts
 import { readFile as readFile3, writeFile, mkdir, copyFile } from "fs/promises";
-import { existsSync } from "fs";
+import { existsSync as existsSync2 } from "fs";
 import { join as join5 } from "path";
 import { homedir as homedir2 } from "os";
 
@@ -751,7 +867,8 @@ var Cleaner = class {
         session: 0,
         sessionEnv: 0,
         todos: 0,
-        fileHistory: 0
+        fileHistory: 0,
+        tasks: 0
       },
       skippedCount: 0,
       alreadyGoneCount: 0,
@@ -782,6 +899,9 @@ var Cleaner = class {
             case "file-history":
               result.deletedByType.fileHistory++;
               break;
+            case "tasks":
+              result.deletedByType.tasks++;
+              break;
             default:
               result.deletedByType.session++;
           }
@@ -821,7 +941,7 @@ var Cleaner = class {
     const configPath = entries[0].sessionPath;
     const projectPathsToRemove = new Set(entries.map((e) => e.projectPath));
     const backupDir = getBackupDir();
-    if (!existsSync(backupDir)) {
+    if (!existsSync2(backupDir)) {
       await mkdir(backupDir, { recursive: true });
     }
     const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
@@ -852,10 +972,29 @@ function formatSessionChoice(session) {
   const isConfig = session.type === "config";
   const toolTag = isConfig ? chalk3.yellow("[config]") : chalk3.cyan(`[${session.toolName}]`);
   const name = chalk3.white(projectName);
-  const size = isConfig ? "" : chalk3.dim(`(${formatSize(session.size)})`);
-  const path = chalk3.dim(`\u2192 ${session.projectPath}`);
-  return `${toolTag} ${name} ${size}
-    ${path}`;
+  const size = isConfig ? "" : ` ${chalk3.dim(`(${formatSize(session.size)})`)}`;
+  const path = chalk3.dim(`\u2192 ${tildify(session.projectPath)}`);
+  return `${toolTag} ${name}${size}
+      ${path}`;
+}
+function formatGroupChoice(group) {
+  const labels = {
+    "session-env": "empty session-env folder",
+    "todos": "orphaned todos file",
+    "file-history": "orphaned file-history folder",
+    "tasks": "orphaned tasks folder"
+  };
+  const colors = {
+    "session-env": chalk3.green,
+    "todos": chalk3.magenta,
+    "file-history": chalk3.blue,
+    "tasks": chalk3.cyan
+  };
+  const label = labels[group.type] || group.type;
+  const count = group.sessions.length;
+  const plural = count > 1 ? "s" : "";
+  const color = colors[group.type] || chalk3.white;
+  return `${color(`[${group.type}]`)} ${chalk3.white(`${count} ${label}${plural}`)} ${chalk3.dim(`(${formatSize(group.totalSize)})`)}`;
 }
 var cleanCommand = new Command2("clean").description("Remove orphaned session data").option("-f, --force", "Skip confirmation prompt").option("-n, --dry-run", "Show what would be deleted without deleting").option("-i, --interactive", "Select sessions to delete interactively").option("--no-trash", "Permanently delete instead of moving to trash").option("-v, --verbose", "Enable verbose output").action(async (options) => {
   const spinner = ora2("Scanning for orphaned sessions...").start();
@@ -885,14 +1024,39 @@ var cleanCommand = new Command2("clean").description("Remove orphaned session da
     const fileHistoryEntries = allSessions.filter(
       (s) => s.type === "file-history"
     );
-    const autoCleanEntries = [
-      ...sessionEnvEntries,
-      ...todosEntries,
-      ...fileHistoryEntries
-    ];
-    const selectableSessions = allSessions.filter(
-      (s) => s.type !== "session-env" && s.type !== "todos" && s.type !== "file-history"
+    const tasksEntries = allSessions.filter((s) => s.type === "tasks");
+    const individualSessions = allSessions.filter(
+      (s) => s.type !== "session-env" && s.type !== "todos" && s.type !== "file-history" && s.type !== "tasks"
     );
+    const groupChoices = [];
+    if (sessionEnvEntries.length > 0) {
+      groupChoices.push({
+        type: "session-env",
+        sessions: sessionEnvEntries,
+        totalSize: sessionEnvEntries.reduce((sum, s) => sum + s.size, 0)
+      });
+    }
+    if (todosEntries.length > 0) {
+      groupChoices.push({
+        type: "todos",
+        sessions: todosEntries,
+        totalSize: todosEntries.reduce((sum, s) => sum + s.size, 0)
+      });
+    }
+    if (fileHistoryEntries.length > 0) {
+      groupChoices.push({
+        type: "file-history",
+        sessions: fileHistoryEntries,
+        totalSize: fileHistoryEntries.reduce((sum, s) => sum + s.size, 0)
+      });
+    }
+    if (tasksEntries.length > 0) {
+      groupChoices.push({
+        type: "tasks",
+        sessions: tasksEntries,
+        totalSize: tasksEntries.reduce((sum, s) => sum + s.size, 0)
+      });
+    }
     console.log();
     const parts = [];
     if (folderSessions.length > 0) {
@@ -910,62 +1074,89 @@ var cleanCommand = new Command2("clean").description("Remove orphaned session da
     if (fileHistoryEntries.length > 0) {
       parts.push(`${fileHistoryEntries.length} file-history folder(s)`);
     }
+    if (tasksEntries.length > 0) {
+      parts.push(`${tasksEntries.length} tasks folder(s)`);
+    }
     logger.warn(`Found ${parts.join(" + ")} (${formatSize(totalSize)})`);
     if (options.verbose && !options.interactive) {
       console.log();
-      for (const session of selectableSessions) {
+      for (const session of individualSessions) {
         console.log(
-          chalk3.dim(`  ${session.toolName}: ${session.projectPath}`)
+          chalk3.dim(`  ${session.toolName}: ${tildify(session.projectPath)}`)
         );
       }
     }
     let sessionsToClean = allSessions;
     if (options.interactive) {
-      if (selectableSessions.length === 0) {
-        if (autoCleanEntries.length > 0) {
-          sessionsToClean = autoCleanEntries;
-          logger.info(
-            `Only ${autoCleanEntries.length} auto-cleanup target(s) found`
-          );
-        } else {
-          logger.info("No selectable sessions found.");
-          return;
+      if (!process.stdout.isTTY) {
+        logger.error("Interactive mode requires a TTY. Omit -i or use -f to skip confirmation.");
+        return;
+      }
+      const choices = [];
+      for (const session of individualSessions) {
+        choices.push({
+          name: formatSessionChoice(session),
+          value: { type: "individual", session },
+          checked: false
+        });
+      }
+      for (const group of groupChoices) {
+        choices.push({
+          name: formatGroupChoice(group),
+          value: { type: "group", group },
+          checked: false
+        });
+      }
+      if (choices.length === 0) {
+        logger.info("No selectable sessions found.");
+        return;
+      }
+      console.log();
+      const { selected } = await inquirer.prompt([
+        {
+          type: "checkbox",
+          name: "selected",
+          message: "Select items to delete:",
+          choices,
+          pageSize: 15,
+          loop: false
         }
-      } else {
-        console.log();
-        const { selected } = await inquirer.prompt([
-          {
-            type: "checkbox",
-            name: "selected",
-            message: "Select sessions to delete:",
-            choices: selectableSessions.map((session) => ({
-              name: formatSessionChoice(session),
-              value: session,
-              checked: false
-            })),
-            pageSize: 15,
-            loop: false
-          }
-        ]);
-        if (selected.length === 0) {
-          logger.info("No sessions selected. Cancelled.");
-          return;
+      ]);
+      if (selected.length === 0) {
+        logger.info("No items selected. Cancelled.");
+        return;
+      }
+      if (process.stdout.isTTY) {
+        const linesToClear = selected.length + 1;
+        for (let i = 0; i < linesToClear; i++) {
+          process.stdout.write("\x1B[1A\x1B[2K");
         }
-        sessionsToClean = [...selected, ...autoCleanEntries];
-        const selectedSize = selected.reduce((sum, s) => sum + s.size, 0);
-        console.log();
-        if (selected.length > 0) {
-          logger.info(
-            `Selected: ${selected.length} session(s) (${formatSize(selectedSize)})`
-          );
+      }
+      console.log(chalk3.green("\u2714") + " " + chalk3.bold("Selected items:"));
+      for (const item of selected) {
+        if (item.type === "individual") {
+          const s = item.session;
+          const tag = s.type === "config" ? chalk3.yellow("[config]") : chalk3.cyan(`[${s.toolName}]`);
+          const size = s.type === "config" ? "" : ` ${chalk3.dim(`(${formatSize(s.size)})`)}`;
+          console.log(`  ${tag} ${basename(s.projectPath)}${size}`);
+          console.log(`      ${chalk3.dim(`\u2192 ${tildify(s.projectPath)}`)}`);
+        } else {
+          console.log(`  ${formatGroupChoice(item.group)}`);
         }
-        if (autoCleanEntries.length > 0) {
-          const autoSize = autoCleanEntries.reduce((sum, s) => sum + s.size, 0);
-          logger.info(
-            `+ ${autoCleanEntries.length} auto-cleanup target(s) (${formatSize(autoSize)})`
-          );
+      }
+      sessionsToClean = [];
+      for (const item of selected) {
+        if (item.type === "individual") {
+          sessionsToClean.push(item.session);
+        } else {
+          sessionsToClean.push(...item.group.sessions);
         }
       }
+      const selectedSize = sessionsToClean.reduce((sum, s) => sum + s.size, 0);
+      console.log();
+      logger.info(
+        `Selected: ${sessionsToClean.length} item(s) (${formatSize(selectedSize)})`
+      );
     }
     const cleanSize = sessionsToClean.reduce((sum, s) => sum + s.size, 0);
     if (options.dryRun) {
@@ -985,9 +1176,12 @@ var cleanCommand = new Command2("clean").description("Remove orphaned session da
       const dryRunHistories = sessionsToClean.filter(
         (s) => s.type === "file-history"
       );
+      const dryRunTasks = sessionsToClean.filter(
+        (s) => s.type === "tasks"
+      );
       for (const session of dryRunFolders) {
         console.log(
-          `  ${chalk3.red("Would delete:")} ${session.sessionPath} (${formatSize(session.size)})`
+          `  ${chalk3.red("Would delete:")} ${tildify(session.sessionPath)} (${formatSize(session.size)})`
         );
       }
       if (dryRunConfigs.length > 0) {
@@ -996,29 +1190,40 @@ var cleanCommand = new Command2("clean").description("Remove orphaned session da
           `  ${chalk3.yellow("Would remove from ~/.claude.json:")}`
         );
         for (const config of dryRunConfigs) {
-          console.log(`    - ${config.projectPath}`);
+          console.log(`    - ${tildify(config.projectPath)}`);
         }
       }
-      const autoCleanParts = [];
       if (dryRunEnvs.length > 0) {
-        autoCleanParts.push(`${dryRunEnvs.length} session-env`);
+        console.log();
+        console.log(
+          `  ${chalk3.green("Would delete:")} ${dryRunEnvs.length} session-env folder(s)`
+        );
       }
       if (dryRunTodos.length > 0) {
-        autoCleanParts.push(`${dryRunTodos.length} todos`);
+        console.log();
+        console.log(
+          `  ${chalk3.magenta("Would delete:")} ${dryRunTodos.length} todos file(s) (${formatSize(dryRunTodos.reduce((sum, s) => sum + s.size, 0))})`
+        );
       }
       if (dryRunHistories.length > 0) {
-        autoCleanParts.push(`${dryRunHistories.length} file-history`);
+        console.log();
+        console.log(
+          `  ${chalk3.blue("Would delete:")} ${dryRunHistories.length} file-history folder(s) (${formatSize(dryRunHistories.reduce((sum, s) => sum + s.size, 0))})`
+        );
       }
-      if (autoCleanParts.length > 0) {
-        const autoSize = dryRunEnvs.reduce((sum, s) => sum + s.size, 0) + dryRunTodos.reduce((sum, s) => sum + s.size, 0) + dryRunHistories.reduce((sum, s) => sum + s.size, 0);
+      if (dryRunTasks.length > 0) {
         console.log();
         console.log(
-          `  ${chalk3.dim(`Would auto-delete: ${autoCleanParts.join(" + ")} (${formatSize(autoSize)})`)}`
+          `  ${chalk3.cyan("Would delete:")} ${dryRunTasks.length} tasks folder(s) (${formatSize(dryRunTasks.reduce((sum, s) => sum + s.size, 0))})`
         );
       }
       return;
     }
     if (!options.force) {
+      if (!process.stdout.isTTY) {
+        logger.error("Confirmation requires a TTY. Use -f to skip confirmation.");
+        return;
+      }
       console.log();
       const action = options.noTrash ? "permanently delete" : "move to trash";
       const { confirmed } = await inquirer.prompt([
@@ -1058,6 +1263,9 @@ var cleanCommand = new Command2("clean").description("Remove orphaned session da
       if (deletedByType.fileHistory > 0) {
         parts2.push(`${deletedByType.fileHistory} file-history`);
       }
+      if (deletedByType.tasks > 0) {
+        parts2.push(`${deletedByType.tasks} tasks`);
+      }
       const summary = parts2.length > 0 ? parts2.join(" + ") : `${cleanResult.deletedCount} item(s)`;
       logger.success(
         `${action}: ${summary} (${formatSize(cleanResult.totalSizeDeleted)})`
@@ -1080,7 +1288,7 @@ var cleanCommand = new Command2("clean").description("Remove orphaned session da
       logger.error(`Failed to delete ${cleanResult.errors.length} item(s)`);
       if (options.verbose) {
         for (const err of cleanResult.errors) {
-          console.log(chalk3.red(`  ${err.sessionPath}: ${err.error.message}`));
+          console.log(chalk3.red(`  ${tildify(err.sessionPath)}: ${err.error.message}`));
         }
       }
     }
@@ -1096,12 +1304,12 @@ var cleanCommand = new Command2("clean").description("Remove orphaned session da
 // src/commands/watch.ts
 import { Command as Command3 } from "commander";
 import chalk4 from "chalk";
-import { existsSync as existsSync4 } from "fs";
+import { existsSync as existsSync5 } from "fs";
 import { homedir as homedir5 } from "os";
 import { join as join8, resolve as resolve2 } from "path";
 
 // src/utils/config.ts
-import { existsSync as existsSync2, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { existsSync as existsSync3, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { homedir as homedir3 } from "os";
 import { dirname as dirname2, join as join6, resolve } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
@@ -1116,7 +1324,7 @@ function getAppVersion() {
   ];
   for (const packagePath of paths) {
     try {
-      if (existsSync2(packagePath)) {
+      if (existsSync3(packagePath)) {
         const content = readFileSync(packagePath, "utf-8");
         const pkg = JSON.parse(content);
         return pkg.version;
@@ -1132,7 +1340,7 @@ function getConfigPath() {
 }
 function loadConfig() {
   const configPath = getConfigPath();
-  if (!existsSync2(configPath)) {
+  if (!existsSync3(configPath)) {
     return {};
   }
   try {
@@ -1145,7 +1353,7 @@ function loadConfig() {
 function saveConfig(config) {
   const configPath = getConfigPath();
   const configDir = dirname2(configPath);
-  if (!existsSync2(configDir)) {
+  if (!existsSync3(configDir)) {
     mkdirSync(configDir, { recursive: true });
   }
   const { version: _removed, ...cleanConfig } = config;
@@ -1241,17 +1449,17 @@ var IGNORED_SYSTEM_PATTERNS = [
   // All hidden folders (starting with .)
   /(^|[/\\])\../,
   // macOS user folders (not project directories)
-  /\/Library\//,
-  /\/Applications\//,
-  /\/Music\//,
-  /\/Movies\//,
-  /\/Pictures\//,
-  /\/Downloads\//,
-  /\/Documents\//,
-  /\/Desktop\//,
-  /\/Public\//,
+  /\/Library(\/|$)/,
+  /\/Applications(\/|$)/,
+  /\/Music(\/|$)/,
+  /\/Movies(\/|$)/,
+  /\/Pictures(\/|$)/,
+  /\/Downloads(\/|$)/,
+  /\/Documents(\/|$)/,
+  /\/Desktop(\/|$)/,
+  /\/Public(\/|$)/,
   // Development folders
-  /node_modules/
+  /node_modules(\/|$)/
 ];
 
 // src/core/watcher.ts
@@ -1384,37 +1592,67 @@ var Watcher = class {
 import { homedir as homedir4 } from "os";
 import { join as join7, dirname as dirname3 } from "path";
 import { readFile as readFile4, writeFile as writeFile2, unlink, mkdir as mkdir2 } from "fs/promises";
-import { existsSync as existsSync3 } from "fs";
+import { existsSync as existsSync4 } from "fs";
 import { execSync } from "child_process";
 var SERVICE_LABEL = "sooink.ai-session-tidy.watcher";
 var PLIST_FILENAME = `${SERVICE_LABEL}.plist`;
+var BIN_NAME = "ai-session-tidy";
+var BUNDLE_IDENTIFIER = "io.github.sooink.ai-session-tidy";
 function getPlistPath() {
   return join7(homedir4(), "Library", "LaunchAgents", PLIST_FILENAME);
 }
+function getBinPath() {
+  try {
+    const binPath = execSync(`which ${BIN_NAME}`, {
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+    if (binPath && existsSync4(binPath)) {
+      return binPath;
+    }
+  } catch {
+  }
+  return null;
+}
 function getNodePath() {
   return process.execPath;
 }
 function getScriptPath() {
   const scriptPath = process.argv[1];
-  if (scriptPath && existsSync3(scriptPath)) {
+  if (scriptPath && existsSync4(scriptPath)) {
     return scriptPath;
   }
   throw new Error("Could not determine script path");
 }
+function getProgramArgs(args) {
+  const binPath = getBinPath();
+  if (binPath) {
+    return [binPath, ...args];
+  }
+  return [getNodePath(), getScriptPath(), ...args];
+}
 function generatePlist(options) {
-  const allArgs = [options.nodePath, options.scriptPath, ...options.args];
-  const argsXml = allArgs.map((arg) => `    <string>${arg}</string>`).join("\n");
+  const argsXml = options.programArgs.map((arg) => `    <string>${arg}</string>`).join("\n");
   const home = homedir4();
+  const nodeBinDir = dirname3(process.execPath);
+  const systemPath = process.env["PATH"] ?? "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin";
+  const envPath = systemPath.includes(nodeBinDir) ? systemPath : `${nodeBinDir}:${systemPath}`;
   return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
   <key>Label</key>
   <string>${options.label}</string>
+  <key>AssociatedBundleIdentifiers</key>
+  <array>
+    <string>${BUNDLE_IDENTIFIER}</string>
+  </array>
   <key>EnvironmentVariables</key>
   <dict>
     <key>HOME</key>
     <string>${home}</string>
+    <key>PATH</key>
+    <string>${envPath}</string>
   </dict>
   <key>ProgramArguments</key>
   <array>
@@ -1444,11 +1682,11 @@ var ServiceManager = class {
       throw new Error("Service management is only supported on macOS");
     }
     const launchAgentsDir = dirname3(this.plistPath);
-    if (!existsSync3(launchAgentsDir)) {
+    if (!existsSync4(launchAgentsDir)) {
       await mkdir2(launchAgentsDir, { recursive: true });
     }
     const logDir = join7(homedir4(), ".ai-session-tidy");
-    if (!existsSync3(logDir)) {
+    if (!existsSync4(logDir)) {
       await mkdir2(logDir, { recursive: true });
     }
     const stdoutPath = join7(logDir, "watcher.log");
@@ -1457,14 +1695,12 @@ var ServiceManager = class {
     await writeFile2(stderrPath, "", "utf-8");
     const plistContent = generatePlist({
       label: SERVICE_LABEL,
-      nodePath: getNodePath(),
-      scriptPath: getScriptPath(),
-      args: ["watch", "run"]
+      programArgs: getProgramArgs(["watch", "run"])
     });
     await writeFile2(this.plistPath, plistContent, "utf-8");
   }
   async uninstall() {
-    if (existsSync3(this.plistPath)) {
+    if (existsSync4(this.plistPath)) {
       await unlink(this.plistPath);
     }
   }
@@ -1472,9 +1708,18 @@ var ServiceManager = class {
     if (!this.isSupported()) {
       throw new Error("Service management is only supported on macOS");
     }
-    if (!existsSync3(this.plistPath)) {
+    if (!existsSync4(this.plistPath)) {
       throw new Error('Service not installed. Run "watch start" to install and start.');
     }
+    const logDir = join7(homedir4(), ".ai-session-tidy");
+    const stdoutPath = join7(logDir, "watcher.log");
+    const stderrPath = join7(logDir, "watcher.error.log");
+    if (existsSync4(stdoutPath)) {
+      await writeFile2(stdoutPath, "", "utf-8");
+    }
+    if (existsSync4(stderrPath)) {
+      await writeFile2(stderrPath, "", "utf-8");
+    }
     try {
       execSync(`launchctl load "${this.plistPath}"`, { stdio: "pipe" });
     } catch (error) {
@@ -1488,7 +1733,7 @@ var ServiceManager = class {
     if (!this.isSupported()) {
       throw new Error("Service management is only supported on macOS");
     }
-    if (!existsSync3(this.plistPath)) {
+    if (!existsSync4(this.plistPath)) {
       return;
     }
     try {
@@ -1505,7 +1750,7 @@ var ServiceManager = class {
     if (!this.isSupported()) {
       return info;
     }
-    if (!existsSync3(this.plistPath)) {
+    if (!existsSync4(this.plistPath)) {
       return info;
     }
     try {
@@ -1538,7 +1783,7 @@ var ServiceManager = class {
     let stdout = "";
     let stderr = "";
     try {
-      if (existsSync3(stdoutPath)) {
+      if (existsSync4(stdoutPath)) {
         const content = await readFile4(stdoutPath, "utf-8");
         const logLines = content.split("\n");
         stdout = logLines.slice(-lines).join("\n");
@@ -1546,7 +1791,7 @@ var ServiceManager = class {
     } catch {
     }
     try {
-      if (existsSync3(stderrPath)) {
+      if (existsSync4(stderrPath)) {
         const content = await readFile4(stderrPath, "utf-8");
         const logLines = content.split("\n");
         stderr = logLines.slice(-lines).join("\n");
@@ -1638,7 +1883,7 @@ var statusCommand = new Command3("status").description("Show watcher service sta
     if (status.pid) {
       console.log(`PID:    ${status.pid}`);
     }
-    console.log(`Plist:  ${status.plistPath}`);
+    console.log(`Plist:  ${tildify(status.plistPath)}`);
     console.log();
     if (options.logs) {
       const lines = parseInt(options.logs, 10) || 20;
@@ -1701,14 +1946,14 @@ async function runWatcher(options) {
       logger.info(`Using default watch paths.`);
     }
   }
-  const validPaths = watchPaths.filter((p) => existsSync4(p));
+  const validPaths = watchPaths.filter((p) => existsSync5(p));
   if (validPaths.length === 0) {
     logger.error("No valid watch paths found. Use -p to specify paths.");
     return;
   }
   if (validPaths.length < watchPaths.length) {
-    const invalidPaths = watchPaths.filter((p) => !existsSync4(p));
-    logger.warn(`Skipping non-existent paths: ${invalidPaths.join(", ")}`);
+    const invalidPaths = watchPaths.filter((p) => !existsSync5(p));
+    logger.warn(`Skipping non-existent paths: ${invalidPaths.map(tildify).join(", ")}`);
   }
   const allScanners = createAllScanners();
   const availableScanners = await getAvailableScanners(allScanners);
@@ -1720,7 +1965,7 @@ async function runWatcher(options) {
   logger.info(
     `Watching for project deletions (${availableScanners.map((s) => s.name).join(", ")})`
   );
-  logger.info(`Watch paths: ${validPaths.join(", ")}`);
+  logger.info(`Watch paths: ${validPaths.map(tildify).join(", ")}`);
   logger.info(`Cleanup delay: ${String(delayMinutes)} minute(s)`);
   logger.info(`Watch depth: ${String(depth)}`);
   if (process.stdout.isTTY) {
@@ -1732,15 +1977,16 @@ async function runWatcher(options) {
     watchPaths: validPaths,
     delayMs,
     depth,
-    ignorePaths: getIgnorePaths(),
+    ignorePaths: getIgnorePaths() ?? [],
     onDelete: async (events) => {
-      if (events.length === 1) {
-        logger.info(`Detected deletion: ${events[0].path}`);
+      const firstEvent = events[0];
+      if (events.length === 1 && firstEvent) {
+        logger.info(`Detected deletion: ${tildify(firstEvent.path)}`);
       } else {
         logger.info(`Detected ${events.length} deletions (debounced)`);
         if (options.verbose) {
           for (const event of events) {
-            logger.debug(`  - ${event.path}`);
+            logger.debug(`  - ${tildify(event.path)}`);
           }
         }
       }
@@ -1772,6 +2018,9 @@ async function runWatcher(options) {
         if (deletedByType.fileHistory > 0) {
           parts.push(`${deletedByType.fileHistory} file-history`);
         }
+        if (deletedByType.tasks > 0) {
+          parts.push(`${deletedByType.tasks} tasks`);
+        }
         const summary = parts.length > 0 ? parts.join(" + ") : `${cleanResult.deletedCount} item(s)`;
         logger.success(
           `${action}: ${summary} (${formatSize(cleanResult.totalSizeDeleted)})`
@@ -1904,7 +2153,7 @@ pathCommand.command("list").description("List watch paths").action(() => {
   }
   console.log();
   for (const p of paths) {
-    console.log(`  ${p}`);
+    console.log(`  ${tildify(p)}`);
   }
 });
 configCommand.addCommand(pathCommand);
@@ -1929,7 +2178,7 @@ ignoreCommand.command("list").description("List ignored paths").action(() => {
   }
   console.log();
   for (const p of paths) {
-    console.log(`  ${p}`);
+    console.log(`  ${tildify(p)}`);
   }
 });
 configCommand.addCommand(ignoreCommand);
@@ -1980,6 +2229,10 @@ configCommand.command("show").description("Show all configuration").action(() =>
 });
 configCommand.command("reset").description("Reset configuration to defaults").option("-f, --force", "Skip confirmation prompt").action(async (options) => {
   if (!options.force) {
+    if (!process.stdout.isTTY) {
+      logger.error("Confirmation requires a TTY. Use -f to skip confirmation.");
+      return;
+    }
     const { confirmed } = await inquirer2.prompt([
       {
         type: "confirm",