mercury-agent 0.4.7 → 0.4.8

package/src/core/task-scheduler.ts

@@ -1,139 +1,139 @@
-import { CronExpressionParser } from "cron-parser";
-import { logger } from "../logger.js";
-import type { Db } from "../storage/db.js";
-
-type TaskHandler = (task: {
-  id: number;
-  spaceId: string;
-  prompt: string;
-  createdBy: string;
-  silent: boolean;
-}) => Promise<void>;
-
-export class TaskScheduler {
-  private timer: NodeJS.Timeout | null = null;
-  private handler: TaskHandler | null = null;
-
-  constructor(
-    private readonly db: Db,
-    private readonly pollIntervalMs = 5_000,
-  ) {}
-
-  start(handler: TaskHandler) {
-    if (this.timer) return;
-    this.handler = handler;
-    this.recalculateNextRuns();
-
-    const tick = async () => {
-      try {
-        const due = this.db.getDueTasks(Date.now());
-        for (const task of due) {
-          // For cron tasks, update next run before execution
-          // For at-tasks, we'll delete after execution
-          if (task.cron) {
-            const next = this.computeNextRun(
-              task.cron,
-              task.timezone ?? undefined,
-            );
-            this.db.updateTaskNextRun(task.id, next);
-          }
-
-          try {
-            await handler({
-              id: task.id,
-              spaceId: task.spaceId,
-              prompt: task.prompt,
-              createdBy: task.createdBy,
-              silent: task.silent === 1,
-            });
-          } catch (error) {
-            logger.error("Scheduler task handler failed", {
-              taskId: task.id,
-              spaceId: task.spaceId,
-              error: error instanceof Error ? error.message : String(error),
-            });
-          }
-
-          // For at-tasks, delete after execution (regardless of success/failure)
-          if (task.at) {
-            this.db.deleteTaskById(task.id);
-            logger.info("One-shot task completed and deleted", {
-              taskId: task.id,
-              spaceId: task.spaceId,
-            });
-          }
-        }
-      } catch (error) {
-        logger.error(
-          "Scheduler error",
-          error instanceof Error ? error : undefined,
-        );
-      } finally {
-        this.timer = setTimeout(tick, this.pollIntervalMs);
-      }
-    };
-
-    this.timer = setTimeout(tick, this.pollIntervalMs);
-  }
-
-  stop() {
-    if (!this.timer) return;
-    clearTimeout(this.timer);
-    this.timer = null;
-  }
-
-  computeNextRun(cron: string, timezone?: string, from = new Date()): number {
-    try {
-      const interval = CronExpressionParser.parse(cron, {
-        currentDate: from,
-        tz: timezone ?? "UTC",
-      });
-      return interval.next().getTime();
-    } catch {
-      // Timezone rejected by cron-parser — fall back to UTC
-      const interval = CronExpressionParser.parse(cron, { currentDate: from });
-      return interval.next().getTime();
-    }
-  }
-
-  private recalculateNextRuns(): void {
-    const tasks = this.db.listTasks();
-    let updated = 0;
-    for (const task of tasks) {
-      if (!task.active || !task.cron) continue;
-      let correct: number;
-      try {
-        correct = this.computeNextRun(task.cron, task.timezone ?? undefined);
-      } catch (err) {
-        logger.warn("Skipping task with invalid cron expression", {
-          taskId: task.id,
-          cron: task.cron,
-          error: err instanceof Error ? err.message : String(err),
-        });
-        continue;
-      }
-      if (correct !== task.nextRunAt) {
-        this.db.updateTaskNextRun(task.id, correct);
-        updated++;
-      }
-    }
-    if (updated > 0) {
-      logger.info(`Recalculated next_run_at for ${updated} cron task(s)`);
-    }
-  }
-
-  async triggerTask(taskId: number): Promise<boolean> {
-    if (!this.handler) return false;
-    const task = this.db.getTask(taskId);
-    if (!task?.active) return false;
-
-    await this.handler({
-      id: task.id,
-      spaceId: task.spaceId,
-      prompt: task.prompt,
-      createdBy: task.createdBy,
-      silent: task.silent === 1,
-    });
-    return true;
-  }
-}
+import { CronExpressionParser } from "cron-parser";
+import { logger } from "../logger.js";
+import type { Db } from "../storage/db.js";
+
+type TaskHandler = (task: {
+  id: number;
+  spaceId: string;
+  prompt: string;
+  createdBy: string;
+  silent: boolean;
+}) => Promise<void>;
+
+export class TaskScheduler {
+  private timer: NodeJS.Timeout | null = null;
+  private handler: TaskHandler | null = null;
+
+  constructor(
+    private readonly db: Db,
+    private readonly pollIntervalMs = 5_000,
+  ) {}
+
+  start(handler: TaskHandler) {
+    if (this.timer) return;
+    this.handler = handler;
+    this.recalculateNextRuns();
+
+    const tick = async () => {
+      try {
+        const due = this.db.getDueTasks(Date.now());
+        for (const task of due) {
+          // For cron tasks, update next run before execution
+          // For at-tasks, we'll delete after execution
+          if (task.cron) {
+            const next = this.computeNextRun(
+              task.cron,
+              task.timezone ?? undefined,
+            );
+            this.db.updateTaskNextRun(task.id, next);
+          }
+
+          try {
+            await handler({
+              id: task.id,
+              spaceId: task.spaceId,
+              prompt: task.prompt,
+              createdBy: task.createdBy,
+              silent: task.silent === 1,
+            });
+          } catch (error) {
+            logger.error("Scheduler task handler failed", {
+              taskId: task.id,
+              spaceId: task.spaceId,
+              error: error instanceof Error ? error.message : String(error),
+            });
+          }
+
+          // For at-tasks, delete after execution (regardless of success/failure)
+          if (task.at) {
+            this.db.deleteTaskById(task.id);
+            logger.info("One-shot task completed and deleted", {
+              taskId: task.id,
+              spaceId: task.spaceId,
+            });
+          }
+        }
+      } catch (error) {
+        logger.error(
+          "Scheduler error",
+          error instanceof Error ? error : undefined,
+        );
+      } finally {
+        this.timer = setTimeout(tick, this.pollIntervalMs);
+      }
+    };
+
+    this.timer = setTimeout(tick, this.pollIntervalMs);
+  }
+
+  stop() {
+    if (!this.timer) return;
+    clearTimeout(this.timer);
+    this.timer = null;
+  }
+
+  computeNextRun(cron: string, timezone?: string, from = new Date()): number {
+    try {
+      const interval = CronExpressionParser.parse(cron, {
+        currentDate: from,
+        tz: timezone ?? "UTC",
+      });
+      return interval.next().getTime();
+    } catch {
+      // Timezone rejected by cron-parser — fall back to UTC
+      const interval = CronExpressionParser.parse(cron, { currentDate: from });
+      return interval.next().getTime();
+    }
+  }
+
+  private recalculateNextRuns(): void {
+    const tasks = this.db.listTasks();
+    let updated = 0;
+    for (const task of tasks) {
+      if (!task.active || !task.cron) continue;
+      let correct: number;
+      try {
+        correct = this.computeNextRun(task.cron, task.timezone ?? undefined);
+      } catch (err) {
+        logger.warn("Skipping task with invalid cron expression", {
+          taskId: task.id,
+          cron: task.cron,
+          error: err instanceof Error ? err.message : String(err),
+        });
+        continue;
+      }
+      if (correct !== task.nextRunAt) {
+        this.db.updateTaskNextRun(task.id, correct);
+        updated++;
+      }
+    }
+    if (updated > 0) {
+      logger.info(`Recalculated next_run_at for ${updated} cron task(s)`);
+    }
+  }
+
+  async triggerTask(taskId: number): Promise<boolean> {
+    if (!this.handler) return false;
+    const task = this.db.getTask(taskId);
+    if (!task?.active) return false;
+
+    await this.handler({
+      id: task.id,
+      spaceId: task.spaceId,
+      prompt: task.prompt,
+      createdBy: task.createdBy,
+      silent: task.silent === 1,
+    });
+    return true;
+  }
+}

package/src/extensions/catalog.ts

@@ -1,117 +1,117 @@
-/**
- * Bundled extension catalog for dashboard install. Sources live under
- * `examples/extensions/<sourceDir>/` in the mercury-agent package (or repo).
- */
-export type ExtensionCatalogCategory =
-  | "browsing"
-  | "automation"
-  | "knowledge"
-  | "voice"
-  | "code"
-  | "other";
-
-export interface ExtensionCatalogEntry {
-  /** Installed directory name under `.mercury/extensions/` */
-  name: string;
-  label: string;
-  description: string;
-  category: ExtensionCatalogCategory;
-  /** Subdirectory of `examples/extensions/` to copy from */
-  sourceDir: string;
-  requiredEnvVars?: string[];
-  requiresRestart: boolean;
-}
-
-export const EXTENSION_CATALOG: ExtensionCatalogEntry[] = [
-  {
-    name: "web-browser",
-    label: "Web browsing & automation",
-    description:
-      "Web search (Brave) and interactive browser (pinchtab) for sites like Gmail, banks, and forms.",
-    category: "automation",
-    sourceDir: "pinchtab",
-    requiredEnvVars: ["MERCURY_BRAVE_API_KEY"],
-    requiresRestart: true,
-  },
-  {
-    name: "napkin",
-    label: "Knowledge vault",
-    description:
-      "Obsidian-style vault, napkin CLI, and optional KB distillation job.",
-    category: "knowledge",
-    sourceDir: "napkin",
-    requiresRestart: true,
-  },
-  {
-    name: "charts",
-    label: "Charts",
-    description: "Minimal charts CLI extension example.",
-    category: "other",
-    sourceDir: "charts",
-    requiresRestart: true,
-  },
-  {
-    name: "pdf",
-    label: "PDF tools",
-    description: "PDF form filling and scripts (see extension skill).",
-    category: "other",
-    sourceDir: "pdf",
-    requiresRestart: true,
-  },
-  {
-    name: "gws",
-    label: "Google Workspace",
-    description: "Google Workspace integration (see extension skill).",
-    category: "other",
-    sourceDir: "gws",
-    requiresRestart: true,
-  },
-  {
-    name: "voice-transcribe",
-    label: "Voice transcription",
-    description:
-      "Transcribe voice with local Python (Transformers or Faster-Whisper) or Hugging Face Inference API.",
-    category: "voice",
-    sourceDir: "voice-transcribe",
-    requiresRestart: true,
-  },
-  {
-    name: "voice-synth",
-    label: "Voice synthesis (TTS)",
-    description:
-      "Google or Azure cloud TTS for English/Hebrew; mrctl tts synthesize and optional auto voice per space. Set Azure key+region and/or Google credentials path on the host.",
-    category: "voice",
-    sourceDir: "voice-synth",
-    requiresRestart: true,
-  },
-  {
-    name: "tradestation",
-    label: "TradeStation",
-    description:
-      "TradeStation API v3 (accounts, balances, positions, bars, host-gated orders via mrctl) with OAuth refresh; admin-only by default.",
-    category: "other",
-    sourceDir: "tradestation",
-    requiredEnvVars: [
-      "MERCURY_TS_CLIENT_ID",
-      "MERCURY_TS_CLIENT_SECRET",
-      "MERCURY_TRADESTATION_REFRESH_TOKEN",
-    ],
-    requiresRestart: true,
-  },
-  {
-    name: "yahoo-mail",
-    label: "Yahoo Mail",
-    description:
-      "Read, search, and send Yahoo Mail via IMAP/SMTP with an app-specific password.",
-    category: "other",
-    sourceDir: "yahoo-mail",
-    requiredEnvVars: ["MERCURY_YAHOO_EMAIL", "MERCURY_YAHOO_APP_PASSWORD"],
-    requiresRestart: true,
-  },
-];
-
-export function getCatalogEntryByName(
-  name: string,
-): ExtensionCatalogEntry | undefined {
-  return EXTENSION_CATALOG.find((e) => e.name === name);
-}
+/**
+ * Bundled extension catalog for dashboard install. Sources live under
+ * `examples/extensions/<sourceDir>/` in the mercury-agent package (or repo).
+ */
+export type ExtensionCatalogCategory =
+  | "browsing"
+  | "automation"
+  | "knowledge"
+  | "voice"
+  | "code"
+  | "other";
+
+export interface ExtensionCatalogEntry {
+  /** Installed directory name under `.mercury/extensions/` */
+  name: string;
+  label: string;
+  description: string;
+  category: ExtensionCatalogCategory;
+  /** Subdirectory of `examples/extensions/` to copy from */
+  sourceDir: string;
+  requiredEnvVars?: string[];
+  requiresRestart: boolean;
+}
+
+export const EXTENSION_CATALOG: ExtensionCatalogEntry[] = [
+  {
+    name: "web-browser",
+    label: "Web browsing & automation",
+    description:
+      "Web search (Brave) and interactive browser (pinchtab) for sites like Gmail, banks, and forms.",
+    category: "automation",
+    sourceDir: "pinchtab",
+    requiredEnvVars: ["MERCURY_BRAVE_API_KEY"],
+    requiresRestart: true,
+  },
+  {
+    name: "napkin",
+    label: "Knowledge vault",
+    description:
+      "Obsidian-style vault, napkin CLI, and optional KB distillation job.",
+    category: "knowledge",
+    sourceDir: "napkin",
+    requiresRestart: true,
+  },
+  {
+    name: "charts",
+    label: "Charts",
+    description: "Minimal charts CLI extension example.",
+    category: "other",
+    sourceDir: "charts",
+    requiresRestart: true,
+  },
+  {
+    name: "pdf",
+    label: "PDF tools",
+    description: "PDF form filling and scripts (see extension skill).",
+    category: "other",
+    sourceDir: "pdf",
+    requiresRestart: true,
+  },
+  {
+    name: "gws",
+    label: "Google Workspace",
+    description: "Google Workspace integration (see extension skill).",
+    category: "other",
+    sourceDir: "gws",
+    requiresRestart: true,
+  },
+  {
+    name: "voice-transcribe",
+    label: "Voice transcription",
+    description:
+      "Transcribe voice with local Python (Transformers or Faster-Whisper) or Hugging Face Inference API.",
+    category: "voice",
+    sourceDir: "voice-transcribe",
+    requiresRestart: true,
+  },
+  {
+    name: "voice-synth",
+    label: "Voice synthesis (TTS)",
+    description:
+      "Google or Azure cloud TTS for English/Hebrew; mrctl tts synthesize and optional auto voice per space. Set Azure key+region and/or Google credentials path on the host.",
+    category: "voice",
+    sourceDir: "voice-synth",
+    requiresRestart: true,
+  },
+  {
+    name: "tradestation",
+    label: "TradeStation",
+    description:
+      "TradeStation API v3 (accounts, balances, positions, bars, host-gated orders via mrctl) with OAuth refresh; admin-only by default.",
+    category: "other",
+    sourceDir: "tradestation",
+    requiredEnvVars: [
+      "MERCURY_TS_CLIENT_ID",
+      "MERCURY_TS_CLIENT_SECRET",
+      "MERCURY_TRADESTATION_REFRESH_TOKEN",
+    ],
+    requiresRestart: true,
+  },
+  {
+    name: "yahoo-mail",
+    label: "Yahoo Mail",
+    description:
+      "Read, search, and send Yahoo Mail via IMAP/SMTP with an app-specific password.",
+    category: "other",
+    sourceDir: "yahoo-mail",
+    requiredEnvVars: ["MERCURY_YAHOO_EMAIL", "MERCURY_YAHOO_APP_PASSWORD"],
+    requiresRestart: true,
+  },
+];
+
+export function getCatalogEntryByName(
+  name: string,
+): ExtensionCatalogEntry | undefined {
+  return EXTENSION_CATALOG.find((e) => e.name === name);
+}