@agenticmail/enterprise 0.5.169 → 0.5.170

package/src/engine/agent-autonomy.ts

@@ -25,16 +25,13 @@ export interface AutonomySettings {
   /** Auto clock-in/out based on work schedule */
   clockEnabled: boolean;
 
-  /** Daily catchup email to manager */
+  /**
+   * Daily/Weekly catchup: times are read from config.dailyCatchUp (Manager & Catch-Up tab).
+   * These booleans just enable/disable the behavior.
+   */
   dailyCatchupEnabled: boolean;
-  dailyCatchupHour: number;       // 0-23, default 9
-  dailyCatchupMinute: number;     // 0-59, default 0
-
-  /** Weekly catchup email (broader summary + goals) */
   weeklyCatchupEnabled: boolean;
   weeklyCatchupDay: number;       // 0=Sun..6=Sat, default 1 (Monday)
-  weeklyCatchupHour: number;      // default 9
-  weeklyCatchupMinute: number;    // default 0
 
   /** Goal progress check */
   goalCheckEnabled: boolean;
@@ -59,12 +56,8 @@ export const DEFAULT_AUTONOMY_SETTINGS: AutonomySettings = {
   enabled: true,
   clockEnabled: true,
   dailyCatchupEnabled: true,
-  dailyCatchupHour: 9,
-  dailyCatchupMinute: 0,
   weeklyCatchupEnabled: true,
   weeklyCatchupDay: 1,
-  weeklyCatchupHour: 9,
-  weeklyCatchupMinute: 0,
   goalCheckEnabled: true,
   goalCheckHours: [14, 17],
   knowledgeContribEnabled: true,
@@ -177,7 +170,7 @@ export class AgentAutonomyManager {
 
     const features = [];
     if (this.settings.clockEnabled) features.push('clock');
-    if (this.settings.dailyCatchupEnabled) features.push('daily-catchup@' + this.settings.dailyCatchupHour + ':' + String(this.settings.dailyCatchupMinute).padStart(2, '0'));
+    if (this.settings.dailyCatchupEnabled) features.push('daily-catchup(time from Manager tab)');
     if (this.settings.weeklyCatchupEnabled) features.push('weekly-catchup@' + ['Sun','Mon','Tue','Wed','Thu','Fri','Sat'][this.settings.weeklyCatchupDay]);
     if (this.settings.goalCheckEnabled) features.push('goals@' + this.settings.goalCheckHours.join(','));
     if (this.settings.knowledgeContribEnabled) features.push('knowledge@' + ['Sun','Mon','Tue','Wed','Thu','Fri','Sat'][this.settings.knowledgeContribDay]);
@@ -284,24 +277,44 @@ export class AgentAutonomyManager {
   private async checkCatchupSchedule(): Promise<void> {
     if (!this.config.managerEmail || !this.config.runtime) return;
 
+    // Read catchup time from config.dailyCatchUp (set in Manager & Catch-Up tab)
+    let catchUpHour = 9;
+    let catchUpMinute = 0;
+    let catchUpTz = this.config.timezone || 'UTC';
+    try {
+      const rows = await this.config.engineDb.query<any>(
+        `SELECT config FROM managed_agents WHERE id = $1`, [this.config.agentId]
+      );
+      if (rows?.[0]?.config) {
+        const cfg = typeof rows[0].config === 'string' ? JSON.parse(rows[0].config) : rows[0].config;
+        if (cfg.dailyCatchUp?.time) {
+          const parts = cfg.dailyCatchUp.time.split(':');
+          catchUpHour = parseInt(parts[0]) || 9;
+          catchUpMinute = parseInt(parts[1]) || 0;
+        }
+        if (cfg.dailyCatchUp?.timezone) catchUpTz = cfg.dailyCatchUp.timezone;
+        // If dailyCatchUp is explicitly disabled in Manager tab, respect that
+        if (cfg.dailyCatchUp && cfg.dailyCatchUp.enabled === false) return;
+      }
+    } catch {}
+
     const now = new Date();
-    const tz = this.config.timezone || 'UTC';
-    const localTime = new Date(now.toLocaleString('en-US', { timeZone: tz }));
+    const localTime = new Date(now.toLocaleString('en-US', { timeZone: catchUpTz }));
     const hour = localTime.getHours();
     const minute = localTime.getMinutes();
     const dayOfWeek = localTime.getDay();
     const dateStr = localTime.toISOString().split('T')[0];
 
-    // Weekly catchup: configurable day + time
+    // Weekly catchup: configurable day, same time as daily
     const isWeeklyCatchupTime = this.settings.weeklyCatchupEnabled
       && dayOfWeek === this.settings.weeklyCatchupDay
-      && hour === this.settings.weeklyCatchupHour
-      && minute >= this.settings.weeklyCatchupMinute && minute < this.settings.weeklyCatchupMinute + 15;
+      && hour === catchUpHour
+      && minute >= catchUpMinute && minute < catchUpMinute + 15;
 
-    // Daily catchup: configurable time (skip if weekly already covers it)
+    // Daily catchup: uses time from Manager & Catch-Up tab
     const isDailyCatchupTime = this.settings.dailyCatchupEnabled
-      && hour === this.settings.dailyCatchupHour
-      && minute >= this.settings.dailyCatchupMinute && minute < this.settings.dailyCatchupMinute + 15;
+      && hour === catchUpHour
+      && minute >= catchUpMinute && minute < catchUpMinute + 15;
 
     if (!isDailyCatchupTime && !isWeeklyCatchupTime) return;