agenr 0.9.0 → 0.9.2

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## 0.9.2 (2026-02-26)
+
+### Fixed
+- fix(consolidate): fragmented clustering produced duplicate canonical entries instead of a single winner (#249)
+  - Phase 1 now over-fetches neighbors (3x) when type-filtered to preserve same-type neighborhood coverage
+  - Added a new Phase 3 post-merge dedup pass to merge near-duplicate canonical entries created in the same run
+  - Phase 3 disables idempotency and only processes clusters that include entries created during the current run
+
+## 0.9.1 (2026-02-26)
+
+### Changed
+- Renamed `agenr daemon` CLI command to `agenr watcher` - "watcher" better describes what it does
+- `agenr daemon` still works as a hidden compatibility command
+- Updated user-facing command output to say "watcher" instead of "daemon"
+
+### Internal
+- Renamed `src/commands/daemon.ts` to `src/commands/watcher.ts`
+- Renamed daemon command interfaces and exports from `Daemon*`/`runDaemon*` to `Watcher*`/`runWatcher*`
+
 ## 0.9.0 (2026-02-25)
 
 ### Features

package/dist/cli-main.js

@@ -1040,7 +1040,7 @@ async function runResetCommand(options, deps) {
     return { exitCode: 0 };
   }
   resolvedDeps.stdoutLine(
-    "WARNING: If the agenr watcher daemon is running, stop it before proceeding. Reset will not abort if the daemon is running."
+    "WARNING: If the agenr watcher is running, stop it before proceeding. Reset will not abort if the watcher is running."
   );
   let backupPath;
   try {
@@ -1690,7 +1690,7 @@ async function runDbCheckCommand(options, deps) {
   }
 }
 
-// src/commands/daemon.ts
+// src/commands/watcher.ts
 import { execFile, spawn } from "child_process";
 import fs9 from "fs/promises";
 import os6 from "os";
@@ -2024,7 +2024,7 @@ function getDefaultPlatformDir(platform, homeDir = os5.homedir()) {
   throw new Error(`No default directory for platform: ${platform}`);
 }
 
-// src/commands/daemon.ts
+// src/commands/watcher.ts
 var LAUNCH_LABEL = "com.agenr.watch";
 var DEFAULT_INTERVAL_SECONDS = 120;
 var DEFAULT_STATUS_LOG_LINES = 20;
@@ -2131,7 +2131,7 @@ function resolveDeps2(deps) {
 }
 function ensureSupportedPlatform(platform) {
   if (platform !== "darwin") {
-    throw new Error("Daemon commands are currently supported on macOS only.");
+    throw new Error("Watcher commands are currently supported on macOS only.");
   }
 }
 async function runLaunchctl(deps, args, strict) {
@@ -2266,7 +2266,7 @@ function printLines(lines) {
 `);
   }
 }
-async function runDaemonInstallCommand(options, deps) {
+async function runWatcherInstallCommand(options, deps) {
   const resolvedDeps = resolveDeps2(deps);
   ensureSupportedPlatform(resolvedDeps.platformFn());
   const intervalSeconds = parsePositiveInt(options.interval, DEFAULT_INTERVAL_SECONDS, "--interval");
@@ -2278,7 +2278,7 @@ async function runDaemonInstallCommand(options, deps) {
   const { launchAgentsDir, plistPath, logDir, logPath } = getPaths(homeDir);
   const plistExists = await fileExists(resolvedDeps.statFn, plistPath);
   if (plistExists && options.force !== true) {
-    throw new Error(`Daemon plist already exists: ${plistPath}. Re-run with --force to overwrite.`);
+    throw new Error(`Watcher plist already exists: ${plistPath}. Re-run with --force to overwrite.`);
   }
   await resolvedDeps.mkdirFn(launchAgentsDir, { recursive: true });
   await resolvedDeps.mkdirFn(logDir, { recursive: true });
@@ -2307,7 +2307,7 @@ async function runDaemonInstallCommand(options, deps) {
   await resolvedDeps.writeFileFn(plistPath, plist, "utf8");
   await runLaunchctl(resolvedDeps, ["bootout", `gui/${uid}/${LAUNCH_LABEL}`], false);
   await runLaunchctl(resolvedDeps, ["bootstrap", `gui/${uid}`, plistPath], true);
-  clack2.log.success(`Installed daemon plist: ${plistPath}`);
+  clack2.log.success(`Installed watcher plist: ${plistPath}`);
   clack2.log.info(`Log file: ${logPath}`);
   return { exitCode: 0 };
 }
@@ -2327,7 +2327,7 @@ async function requireInstalledPlist(deps, homeDir, message) {
   }
   return plistPath;
 }
-async function runDaemonStartCommand(_options = {}, deps) {
+async function runWatcherStartCommand(_options = {}, deps) {
   const resolvedDeps = resolveDeps2(deps);
   ensureSupportedPlatform(resolvedDeps.platformFn());
   const homeDir = resolvedDeps.homedirFn();
@@ -2338,21 +2338,21 @@ async function runDaemonStartCommand(_options = {}, deps) {
   const plistPath = await requireInstalledPlist(
     resolvedDeps,
     homeDir,
-    "Daemon not installed. Run `agenr daemon install` first."
+    "Watcher not installed. Run `agenr watcher install` first."
   );
   const state = await getLaunchctlState(resolvedDeps, uid);
   if (state.loaded && state.running) {
-    clack2.log.info("Daemon is already running.");
+    clack2.log.info("Watcher is already running.");
     return { exitCode: 0 };
   }
   if (state.loaded && !state.running) {
     await runLaunchctl(resolvedDeps, ["bootout", `gui/${uid}/${LAUNCH_LABEL}`], false);
   }
   await runLaunchctl(resolvedDeps, ["bootstrap", `gui/${uid}`, plistPath], true);
-  clack2.log.success("Daemon started.");
+  clack2.log.success("Watcher started.");
   return { exitCode: 0 };
 }
-async function runDaemonStopCommand(_options = {}, deps) {
+async function runWatcherStopCommand(_options = {}, deps) {
   const resolvedDeps = resolveDeps2(deps);
   ensureSupportedPlatform(resolvedDeps.platformFn());
   const homeDir = resolvedDeps.homedirFn();
@@ -2363,18 +2363,18 @@ async function runDaemonStopCommand(_options = {}, deps) {
   await requireInstalledPlist(
     resolvedDeps,
     homeDir,
-    "Daemon not installed. Run `agenr daemon install` first."
+    "Watcher not installed. Run `agenr watcher install` first."
   );
   const state = await getLaunchctlState(resolvedDeps, uid);
   if (!state.loaded) {
-    clack2.log.info("Daemon is not loaded.");
+    clack2.log.info("Watcher is not loaded.");
     return { exitCode: 0 };
   }
   await runLaunchctl(resolvedDeps, ["bootout", `gui/${uid}/${LAUNCH_LABEL}`], true);
-  clack2.log.success("Daemon stopped.");
+  clack2.log.success("Watcher stopped.");
   return { exitCode: 0 };
 }
-async function runDaemonRestartCommand(_options = {}, deps) {
+async function runWatcherRestartCommand(_options = {}, deps) {
   const resolvedDeps = resolveDeps2(deps);
   ensureSupportedPlatform(resolvedDeps.platformFn());
   const homeDir = resolvedDeps.homedirFn();
@@ -2382,7 +2382,7 @@ async function runDaemonRestartCommand(_options = {}, deps) {
   if (uid < 0) {
     throw new Error("Unable to resolve current user ID for launchctl.");
   }
-  const plistPath = await requireInstalledPlist(resolvedDeps, homeDir, "Daemon not installed.");
+  const plistPath = await requireInstalledPlist(resolvedDeps, homeDir, "Watcher not installed.");
   await runLaunchctl(resolvedDeps, ["bootout", `gui/${uid}/${LAUNCH_LABEL}`], false);
   const maxWaitMs = 1e4;
   const pollMs = 500;
@@ -2394,13 +2394,13 @@ async function runDaemonRestartCommand(_options = {}, deps) {
   }
   const finalState = await getLaunchctlState(resolvedDeps, uid);
   if (finalState.loaded) {
-    clack2.log.warn("Daemon did not unload within 10s - attempting bootstrap anyway.");
+    clack2.log.warn("Watcher did not unload within 10s - attempting bootstrap anyway.");
   }
   await runLaunchctl(resolvedDeps, ["bootstrap", `gui/${uid}`, plistPath], true);
-  clack2.log.success("Daemon restarted.");
+  clack2.log.success("Watcher restarted.");
   return { exitCode: 0 };
 }
-async function runDaemonUninstallCommand(options, deps) {
+async function runWatcherUninstallCommand(options, deps) {
   const resolvedDeps = resolveDeps2(deps);
   ensureSupportedPlatform(resolvedDeps.platformFn());
   const homeDir = resolvedDeps.homedirFn();
@@ -2411,11 +2411,11 @@ async function runDaemonUninstallCommand(options, deps) {
   const { plistPath } = getPaths(homeDir);
   const exists = await fileExists(resolvedDeps.statFn, plistPath);
   if (!exists) {
-    clack2.log.info(`Daemon plist not found: ${plistPath}`);
+    clack2.log.info(`Watcher plist not found: ${plistPath}`);
     return { exitCode: 0 };
   }
   if (options.yes !== true) {
-    const confirmed = await resolvedDeps.confirmFn("Remove agenr watch daemon?");
+    const confirmed = await resolvedDeps.confirmFn("Remove agenr watcher?");
     if (!confirmed) {
       clack2.log.warn("Uninstall cancelled.");
       return { exitCode: 1 };
@@ -2423,10 +2423,10 @@ async function runDaemonUninstallCommand(options, deps) {
   }
   await runLaunchctl(resolvedDeps, ["bootout", `gui/${uid}/${LAUNCH_LABEL}`], false);
   await resolvedDeps.rmFn(plistPath, { force: true });
-  clack2.log.success("Daemon uninstalled.");
+  clack2.log.success("Watcher uninstalled.");
   return { exitCode: 0 };
 }
-async function runDaemonStatusCommand(options, deps) {
+async function runWatcherStatusCommand(options, deps) {
   const resolvedDeps = resolveDeps2(deps);
   ensureSupportedPlatform(resolvedDeps.platformFn());
   const homeDir = resolvedDeps.homedirFn();
@@ -2454,8 +2454,8 @@ async function runDaemonStatusCommand(options, deps) {
   const lineCount = parsePositiveInt(options.lines, DEFAULT_STATUS_LOG_LINES, "--lines");
   const logTail = await readLastLines(resolvedDeps.readFileFn, logPath, lineCount);
   const nowMs = resolvedDeps.nowFn();
-  const daemonLines = [
-    "-- Daemon --",
+  const serviceLines = [
+    "-- Service --",
     `Loaded: ${loaded ? "yes" : "no"}`,
     `Running: ${running ? "yes" : "no"}`,
     `Current file: ${currentFile ?? "(none)"}`,
@@ -2471,7 +2471,7 @@ async function runDaemonStatusCommand(options, deps) {
     `Sessions watched: ${health.sessionsWatched}`,
     `Entries stored: ${health.entriesStored}`
   ] : ["-- Watcher --", "Heartbeat: no data"];
-  resolvedDeps.noteFn([...daemonLines, "", ...watcherLines].join("\n"), "Status");
+  resolvedDeps.noteFn([...serviceLines, "", ...watcherLines].join("\n"), "Status");
   if (logTail.length > 0) {
     clack2.log.info(`Last ${logTail.length} log lines:`);
     printLines(logTail);
@@ -2500,14 +2500,14 @@ async function followLog(deps, logPath, lines) {
     });
   });
 }
-async function runDaemonLogsCommand(options, deps) {
+async function runWatcherLogsCommand(options, deps) {
   const resolvedDeps = resolveDeps2(deps);
   ensureSupportedPlatform(resolvedDeps.platformFn());
   const homeDir = resolvedDeps.homedirFn();
   const { logPath } = getPaths(homeDir);
   const logExists = await fileExists(resolvedDeps.statFn, logPath);
   if (!logExists) {
-    throw new Error(`Daemon log file not found: ${logPath}`);
+    throw new Error(`Watcher log file not found: ${logPath}`);
   }
   const lineCount = parsePositiveInt(options.lines, DEFAULT_LOG_LINES, "--lines");
   const follow = options.follow === true || options.lines === void 0;
@@ -6400,7 +6400,8 @@ async function buildClusters(db, options = {}) {
     unionFind.add(entry.id);
   }
   for (const entry of candidates) {
-    const neighbors = await findSimilar(db, entry.embedding, neighborLimit);
+    const fetchLimit = typeFilter ? neighborLimit * 3 : neighborLimit;
+    const neighbors = await findSimilar(db, entry.embedding, fetchLimit);
     for (const neighbor of neighbors) {
       const candidate = entryById.get(neighbor.entry.id);
       if (!candidate || candidate.id === entry.id) {
@@ -7006,17 +7007,19 @@ function checkpointToProcessedMaps(checkpoint) {
   }
   return {
     phase1,
-    phase2: new Set(checkpoint.processed.phase2 ?? [])
+    phase2: new Set(checkpoint.processed.phase2 ?? []),
+    phase3: new Set(checkpoint.processed.phase3 ?? [])
   };
 }
-function processedMapsToCheckpoint(phase1, phase2) {
+function processedMapsToCheckpoint(phase1, phase2, phase3) {
   const serializedPhase1 = {};
   for (const [type, fingerprints] of phase1.entries()) {
     serializedPhase1[type] = [...fingerprints];
   }
   return {
     phase1: serializedPhase1,
-    phase2: [...phase2]
+    phase2: [...phase2],
+    phase3: [...phase3]
   };
 }
 function createEmptyPlan(types) {
@@ -7044,8 +7047,10 @@ function createDefaultCheckpoint(dbPathSignature, optionsSignature, types) {
     optionsSignature,
     processed: {
       phase1: {},
-      phase2: []
+      phase2: [],
+      phase3: []
     },
+    createdEntryIds: [],
     plan: createEmptyPlan(types)
   };
 }
@@ -7119,12 +7124,15 @@ async function processPhaseClusters(params, deps) {
       stats.clustersMerged += 1;
       stats.entriesConsolidatedFrom += item.cluster.entries.length;
       stats.canonicalEntriesCreated += 1;
+      if (outcome.mergedEntryId) {
+        params.context.createdEntryIds.add(outcome.mergedEntryId);
+      }
     }
     params.checkpoint.phase = params.phase;
     params.checkpoint.projectIndex = params.projectIndex;
     params.checkpoint.typeIndex = params.typeIndex;
     params.checkpoint.clusterIndex = item.index + 1;
-    params.checkpoint.processed = processedMapsToCheckpoint(params.context.processedPhase1, params.context.processedPhase2);
+    params.checkpoint.processed = processedMapsToCheckpoint(params.context.processedPhase1, params.context.processedPhase2, params.context.processedPhase3);
     await saveCheckpoint(params.checkpoint);
     if (isShutdownRequested()) {
       params.context.batchReached = true;
@@ -7229,6 +7237,8 @@ async function runConsolidationOrchestrator(db, dbPath, llmClient, embeddingApiK
     checkpoint,
     processedPhase1: processedMaps.phase1,
     processedPhase2: processedMaps.phase2,
+    processedPhase3: processedMaps.phase3,
+    createdEntryIds: new Set(checkpoint.createdEntryIds ?? []),
     minCluster,
     phase1Threshold,
     phase2Threshold,
@@ -7493,23 +7503,85 @@ async function runConsolidationOrchestrator(db, dbPath, llmClient, embeddingApiK
         }
       }
     }
+    if (!context.batchReached && context.batchLimit && context.processedClustersInRun >= context.batchLimit) {
+      context.batchReached = true;
+    }
+    if (!context.batchReached && context.createdEntryIds.size >= 2) {
+      onLog(`Phase 3: Post-merge dedup (${context.createdEntryIds.size} new entries)...`);
+      for (let projectIndex = 0; projectIndex < phase1PlanByProject.length; projectIndex += 1) {
+        if (isShutdownRequested()) {
+          context.batchReached = true;
+          break;
+        }
+        if (context.batchReached) {
+          break;
+        }
+        const projectPlan = phase1PlanByProject[projectIndex];
+        const project = projectPlan.project;
+        const projectLabel = project ?? "(untagged)";
+        const dedupClusters = await resolvedDeps.buildClustersFn(db, {
+          simThreshold: phase1Threshold,
+          minCluster: 2,
+          maxClusterSize: phase1MaxClusterSize,
+          platform,
+          project,
+          idempotencyDays: 0,
+          verbose: options.verbose,
+          onLog: options.verbose ? onLog : void 0
+        });
+        const relevantClusters = dedupClusters.filter(
+          (cluster) => cluster.entries.some((entry) => context.createdEntryIds.has(entry.id))
+        );
+        if (relevantClusters.length === 0) {
+          continue;
+        }
+        onLog(`Phase 3: Found ${relevantClusters.length} dedup clusters for project=${projectLabel}`);
+        const phase3Stats = await processPhaseClusters(
+          {
+            db,
+            clusters: relevantClusters,
+            phase: 3,
+            projectIndex,
+            type: "post-merge-dedup",
+            typeIndex: 0,
+            llmClient,
+            embeddingApiKey,
+            options,
+            checkpoint: context.checkpoint,
+            processedSet: context.processedPhase3,
+            context
+          },
+          resolvedDeps
+        );
+        if (context.report.phase3) {
+          updateAggregateStats(context.report.phase3, phase3Stats);
+        } else {
+          context.report.phase3 = phase3Stats;
+        }
+        if (context.batchReached) {
+          break;
+        }
+      }
+    }
     context.report.phase1.types = phase1Types.map((type) => phase1StatsByType.get(type)).filter((item) => Boolean(item));
   }
   await runFinalization(db, dryRun, onWarn, resolvedDeps);
   context.report.entriesAfter = (await Promise.all(projectGroups.map((project) => resolvedDeps.countActiveEntriesFn(db, platform, project)))).reduce((sum, count) => sum + count, 0);
   context.report.progress.partial = context.batchReached;
-  context.report.progress.processedClusters = context.report.phase1.totals.clustersProcessed + (context.report.phase2?.clustersProcessed ?? 0);
+  const estimatedPhasesProcessed = context.report.phase1.totals.clustersProcessed + (context.report.phase2?.clustersProcessed ?? 0);
+  context.report.progress.processedClusters = estimatedPhasesProcessed + (context.report.phase3?.clustersProcessed ?? 0);
   context.report.progress.remainingClusters = Math.max(
-    context.report.estimate.totalClusters - context.report.phase1.totals.skippedByResume - (context.report.phase2?.skippedByResume ?? 0) - context.report.progress.processedClusters,
+    context.report.estimate.totalClusters - context.report.phase1.totals.skippedByResume - (context.report.phase2?.skippedByResume ?? 0) - estimatedPhasesProcessed,
     0
   );
-  context.report.summary.totalLlmCalls = context.report.phase1.totals.llmCalls + (context.report.phase2?.llmCalls ?? 0);
-  context.report.summary.totalFlagged = context.report.phase1.totals.mergesFlagged + (context.report.phase2?.mergesFlagged ?? 0);
-  context.report.summary.totalCanonicalEntriesCreated = context.report.phase1.totals.canonicalEntriesCreated + (context.report.phase2?.canonicalEntriesCreated ?? 0);
-  context.report.summary.totalEntriesConsolidatedFrom = context.report.phase1.totals.entriesConsolidatedFrom + (context.report.phase2?.entriesConsolidatedFrom ?? 0);
+  context.report.summary.totalLlmCalls = context.report.phase1.totals.llmCalls + (context.report.phase2?.llmCalls ?? 0) + (context.report.phase3?.llmCalls ?? 0);
+  context.report.summary.totalFlagged = context.report.phase1.totals.mergesFlagged + (context.report.phase2?.mergesFlagged ?? 0) + (context.report.phase3?.mergesFlagged ?? 0);
+  context.report.summary.totalCanonicalEntriesCreated = context.report.phase1.totals.canonicalEntriesCreated + (context.report.phase2?.canonicalEntriesCreated ?? 0) + (context.report.phase3?.canonicalEntriesCreated ?? 0);
+  context.report.summary.totalEntriesConsolidatedFrom = context.report.phase1.totals.entriesConsolidatedFrom + (context.report.phase2?.entriesConsolidatedFrom ?? 0) + (context.report.phase3?.entriesConsolidatedFrom ?? 0);
   if (context.batchReached) {
-    context.checkpoint.phase = context.report.phase2 ? 2 : 1;
-    context.checkpoint.processed = processedMapsToCheckpoint(context.processedPhase1, context.processedPhase2);
+    context.checkpoint.phase = context.report.phase3 ? 3 : context.report.phase2 ? 2 : 1;
+    context.checkpoint.processed = processedMapsToCheckpoint(context.processedPhase1, context.processedPhase2, context.processedPhase3);
+    context.checkpoint.createdEntryIds = [...context.createdEntryIds];
     await saveCheckpoint(context.checkpoint);
   } else {
     await clearCheckpoint();
@@ -7777,6 +7849,15 @@ function renderTextReport(stats, dryRun) {
       `|  +- LLM calls: ${formatNumber(stats.phase2.llmCalls)}`
     );
   }
+  if (stats.phase3) {
+    lines.push(
+      "|",
+      "|  Phase 3: Post-Merge Dedup",
+      `|  +- Clusters processed: ${formatNumber(stats.phase3.clustersProcessed)} / ${formatNumber(stats.phase3.clustersFound)}`,
+      `|  +- Clusters merged: ${formatNumber(stats.phase3.clustersMerged)}`,
+      `|  +- LLM calls: ${formatNumber(stats.phase3.llmCalls)}`
+    );
+  }
   lines.push(
     "|",
     "|  Summary",
@@ -17044,8 +17125,8 @@ var initWizardRuntime = {
   scanSessionFiles,
   runIngestCommand,
   runConsolidateCommand,
-  runDaemonInstallCommand,
-  runDaemonStopCommand,
+  runWatcherInstallCommand,
+  runWatcherStopCommand,
   runDbResetCommand
 };
 async function runInitWizard(options) {
@@ -17496,7 +17577,7 @@ but requires clearing your existing knowledge database first.`
       if (process.platform === "darwin") {
         spinner4.start("Stopping watcher...");
         try {
-          await initWizardRuntime.runDaemonStopCommand({});
+          await initWizardRuntime.runWatcherStopCommand({});
         } catch {
         }
         spinner4.stop("Watcher stopped");
@@ -17633,27 +17714,27 @@ Estimated cost with ${model}:
     }
     if (setupWatcher) {
       const spinner4 = clack7.spinner();
-      spinner4.start("Installing watcher daemon...");
+      spinner4.start("Installing watcher...");
       try {
-        const daemonResult = await initWizardRuntime.runDaemonInstallCommand({
+        const watcherResult = await initWizardRuntime.runWatcherInstallCommand({
           force: true,
           interval: 120,
           dir: selectedPlatform.sessionsDir,
           platform: selectedPlatform.id
         });
-        if (daemonResult.exitCode === 0) {
-          spinner4.stop("Watcher daemon installed and running (120s interval)");
+        if (watcherResult.exitCode === 0) {
+          spinner4.stop("Watcher installed and running (120s interval)");
           watcherStatus = "Running (120s interval)";
         } else {
           spinner4.stop(
-            `Daemon install failed. Run manually:
+            `Watcher install failed. Run manually:
   agenr watch --dir ${selectedPlatform.sessionsDir} --platform ${selectedPlatform.id}`
           );
           watcherStatus = "Failed";
         }
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
-        spinner4.stop(`Daemon install failed: ${message}`);
+        spinner4.stop(`Watcher install failed: ${message}`);
         watcherStatus = "Failed";
       }
     } else {
@@ -21448,35 +21529,40 @@ function createProgram() {
   program.command("mcp").description("Start MCP server for cross-tool AI memory").option("--db <path>", "Database path override").option("--verbose", "Log requests to stderr", false).action(async (opts) => {
     await runMcpCommand(opts);
   });
-  const daemonCommand = program.command("daemon").description("Manage the agenr watch daemon");
-  daemonCommand.command("install").description("Install and start the watch daemon (macOS launchd)").option("--force", "Overwrite existing launchd plist", false).option("--interval <seconds>", "Watch interval for daemon mode", parseIntOption, 120).option("--dir <path>", "Sessions directory to watch (overrides auto-detection)").option("--platform <name>", "Platform name (openclaw, claude-code, codex, plaud)").option("--node-path <path>", "Node binary path override for launchd").option("--context <path>", "Regenerate context file after each cycle").action(async (opts) => {
-    const result = await runDaemonInstallCommand(opts);
-    process.exitCode = result.exitCode;
-  });
-  daemonCommand.command("start").description("Start the watch daemon if installed").action(async () => {
-    const result = await runDaemonStartCommand({});
-    process.exitCode = result.exitCode;
-  });
-  daemonCommand.command("stop").description("Stop the watch daemon without uninstalling").action(async () => {
-    const result = await runDaemonStopCommand({});
-    process.exitCode = result.exitCode;
-  });
-  daemonCommand.command("restart").description("Restart the watch daemon").action(async () => {
-    const result = await runDaemonRestartCommand({});
-    process.exitCode = result.exitCode;
-  });
-  daemonCommand.command("uninstall").description("Stop and remove the watch daemon").option("--yes", "Skip confirmation prompt", false).action(async (opts) => {
-    const result = await runDaemonUninstallCommand(opts);
-    process.exitCode = result.exitCode;
-  });
-  daemonCommand.command("status").description("Show daemon status and recent logs").option("--lines <n>", "Number of log lines to include", parseIntOption, 20).action(async (opts) => {
-    const result = await runDaemonStatusCommand(opts);
-    process.exitCode = result.exitCode;
-  });
-  daemonCommand.command("logs").description("Show or follow daemon logs").option("--lines <n>", "Number of log lines", parseIntOption, 100).option("--follow", "Follow logs continuously", false).action(async (opts) => {
-    const result = await runDaemonLogsCommand(opts);
-    process.exitCode = result.exitCode;
-  });
+  const registerWatcherSubcommands = (command) => {
+    command.command("install").description("Install and start the watcher (macOS launchd)").option("--force", "Overwrite existing launchd plist", false).option("--interval <seconds>", "Watch interval for watcher mode", parseIntOption, 120).option("--dir <path>", "Sessions directory to watch (overrides auto-detection)").option("--platform <name>", "Platform name (openclaw, claude-code, codex, plaud)").option("--node-path <path>", "Node binary path override for launchd").option("--context <path>", "Regenerate context file after each cycle").action(async (opts) => {
+      const result = await runWatcherInstallCommand(opts);
+      process.exitCode = result.exitCode;
+    });
+    command.command("start").description("Start the watcher if installed").action(async () => {
+      const result = await runWatcherStartCommand({});
+      process.exitCode = result.exitCode;
+    });
+    command.command("stop").description("Stop the watcher without uninstalling").action(async () => {
+      const result = await runWatcherStopCommand({});
+      process.exitCode = result.exitCode;
+    });
+    command.command("restart").description("Restart the watcher").action(async () => {
+      const result = await runWatcherRestartCommand({});
+      process.exitCode = result.exitCode;
+    });
+    command.command("uninstall").description("Stop and remove the watcher").option("--yes", "Skip confirmation prompt", false).action(async (opts) => {
+      const result = await runWatcherUninstallCommand(opts);
+      process.exitCode = result.exitCode;
+    });
+    command.command("status").description("Show watcher status and recent logs").option("--lines <n>", "Number of log lines to include", parseIntOption, 20).action(async (opts) => {
+      const result = await runWatcherStatusCommand(opts);
+      process.exitCode = result.exitCode;
+    });
+    command.command("logs").description("Show or follow watcher logs").option("--lines <n>", "Number of log lines", parseIntOption, 100).option("--follow", "Follow logs continuously", false).action(async (opts) => {
+      const result = await runWatcherLogsCommand(opts);
+      process.exitCode = result.exitCode;
+    });
+  };
+  const watcherCommand = program.command("watcher").description("Manage the agenr watcher");
+  registerWatcherSubcommands(watcherCommand);
+  const daemonAliasCommand = program.command("daemon", { hidden: true }).description("Alias for watcher (deprecated)");
+  registerWatcherSubcommands(daemonAliasCommand);
   const dbCommand = program.command("db").description("Manage the local knowledge database");
   dbCommand.command("stats").description("Show database statistics").option("--db <path>", "Database path override").option("--platform <name>", "Filter stats by platform").option("--project <name>", "Filter by project (repeatable)", (val, prev) => [...prev, val], []).option("--exclude-project <name>", "Exclude entries from project (repeatable)", (val, prev) => [...prev, val], []).action(async (opts) => {
     await runDbStatsCommand({ db: opts.db, platform: opts.platform, project: opts.project, excludeProject: opts.excludeProject });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agenr",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "openclaw": {
     "extensions": [
       "dist/openclaw-plugin/index.js"
@@ -11,6 +11,13 @@
   "bin": {
     "agenr": "dist/cli.js"
   },
+  "scripts": {
+    "build": "tsup src/cli.ts src/cli-main.ts src/openclaw-plugin/index.ts --format esm --dts",
+    "dev": "tsup src/cli.ts src/cli-main.ts --format esm --watch",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "typecheck": "tsc --noEmit"
+  },
   "dependencies": {
     "@clack/prompts": "^1.0.1",
     "@libsql/client": "^0.17.0",
@@ -54,11 +61,9 @@
     "README.md"
   ],
   "author": "agenr-ai",
-  "scripts": {
-    "build": "tsup src/cli.ts src/cli-main.ts src/openclaw-plugin/index.ts --format esm --dts",
-    "dev": "tsup src/cli.ts src/cli-main.ts --format esm --watch",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "typecheck": "tsc --noEmit"
+  "pnpm": {
+    "overrides": {
+      "fast-xml-parser": "^5.3.6"
+    }
   }
-}
+}