@lobehub/lobehub 2.0.0-next.258 → 2.0.0-next.259

package/packages/database/src/schemas/agentCronJob.ts

@@ -43,7 +43,7 @@ export const agentCronJobs = pgTable(
 
     // Core configuration
     enabled: boolean('enabled').default(true),
-    cronPattern: text('cron_pattern').notNull(), // e.g., "0 */30 * * *"
+    cronPattern: text('cron_pattern').notNull(), // e.g., "*/30 * * * *" (every 30 minutes)
     timezone: text('timezone').default('UTC'),
 
     // Content fields
@@ -82,27 +82,61 @@ export const cronPatternSchema = z
     'Invalid cron pattern',
   );
 
-// Minimum 30 minutes validation
+// Minimum 30 minutes validation (using standard cron format)
 export const minimumIntervalSchema = z.string().refine((pattern) => {
-  // For simplicity, we'll validate common patterns
-  // More complex validation can be added later
-  const thirtyMinPatterns = [
-    '0 */30 * * *', // Every 30 minutes
-    '0 0 * * *', // Every hour
-    '0 0 */2 * *', // Every 2 hours
-    '0 0 */6 * *', // Every 6 hours
-    '0 0 0 * *', // Daily
-    '0 0 0 * * 1', // Weekly
-    '0 0 0 1 *', // Monthly
+  // Standard cron format: minute hour day month weekday
+  const allowedPatterns = [
+    '*/30 * * * *', // Every 30 minutes
+    '0 * * * *', // Every hour
+    '0 */2 * * *', // Every 2 hours
+    '0 */3 * * *', // Every 3 hours
+    '0 */4 * * *', // Every 4 hours
+    '0 */6 * * *', // Every 6 hours
+    '0 */8 * * *', // Every 8 hours
+    '0 */12 * * *', // Every 12 hours
+    '0 0 * * *', // Daily at midnight
+    '0 0 * * 0', // Weekly on Sunday
+    '0 0 1 * *', // Monthly on 1st
   ];
 
-  // Check if it matches allowed patterns or follows 30+ minute intervals
-  return (
-    thirtyMinPatterns.includes(pattern) ||
-    pattern.includes('*/30') ||
-    pattern.includes('*/60') ||
-    /0 \d+ \* \* \*/.test(pattern)
-  ); // Hours pattern
+  // Check if it matches allowed patterns
+  if (allowedPatterns.includes(pattern)) {
+    return true;
+  }
+
+  // Parse pattern to validate minimum 30-minute interval
+  const parts = pattern.split(' ');
+  if (parts.length !== 5) {
+    return false;
+  }
+
+  const [minute, hour] = parts;
+
+  // Allow minute intervals >= 30 (e.g., */30, */45, */60)
+  if (minute.startsWith('*/')) {
+    const interval = parseInt(minute.slice(2));
+    if (!isNaN(interval) && interval >= 30) {
+      return true;
+    }
+  }
+
+  // Allow hourly patterns: 0 */N * * * where N >= 1
+  if (minute === '0' && hour.startsWith('*/')) {
+    const interval = parseInt(hour.slice(2));
+    if (!isNaN(interval) && interval >= 1) {
+      return true;
+    }
+  }
+
+  // Allow specific hour patterns: 0 N * * * (runs once per day)
+  if (minute === '0' && /^\d+$/.test(hour)) {
+    const h = parseInt(hour);
+    if (!isNaN(h) && h >= 0 && h <= 23) {
+      return true;
+    }
+  }
+
+  return false;
 }, 'Minimum execution interval is 30 minutes');
 
 export const executionConditionsSchema = z

package/packages/file-loaders/package.json

@@ -25,7 +25,6 @@
     "test:coverage": "vitest --coverage --silent='passed-only'"
   },
   "dependencies": {
-    "@napi-rs/canvas": "^0.1.70",
     "@xmldom/xmldom": "^0.9.8",
     "concat-stream": "^2.0.0",
     "debug": "^4.4.3",
@@ -37,6 +36,7 @@
     "yauzl": "^3.2.0"
   },
   "devDependencies": {
+    "@napi-rs/canvas": "^0.1.70",
     "@types/concat-stream": "^2.0.3",
     "@types/yauzl": "^2.10.3",
     "typescript": "^5.9.3"

package/scripts/electronWorkflow/buildNextApp.mts

@@ -20,6 +20,31 @@ const foldersToSymlink = [
 
 const foldersToCopy = ['src', 'scripts'];
 
+// Assets to remove from desktop build output (not needed for Electron app)
+const assetsToRemove = [
+  // Icons & favicons
+  'apple-touch-icon.png',
+  'favicon.ico',
+  'favicon-32x32.ico',
+  'favicon-16x16.png',
+  'favicon-32x32.png',
+
+  // SEO & sitemap
+  'sitemap.xml',
+  'sitemap-index.xml',
+  'sitemap',
+  'robots.txt',
+
+  // Incompatible pages
+  'not-compatible.html',
+  'not-compatible',
+
+  // Large media assets
+  'videos',
+  'screenshots',
+  'og',
+];
+
 const filesToCopy = [
   'package.json',
   'tsconfig.json',
@@ -85,10 +110,13 @@ const build = async () => {
 
   console.log('🏗  Running next build in shadow workspace...');
   try {
-    execSync('next build --webpack', {
+    execSync('next build', {
       cwd: TEMP_DIR,
       env: {
         ...process.env,
+        // Pass PROJECT_ROOT to next.config.ts for outputFileTracingRoot
+        // This fixes Turbopack symlink resolution when building in shadow workspace
+        ELECTRON_BUILD_PROJECT_ROOT: PROJECT_ROOT,
         NODE_OPTIONS: process.env.NODE_OPTIONS || '--max-old-space-size=8192',
       },
       stdio: 'inherit',
@@ -106,6 +134,16 @@ const build = async () => {
     if (fs.existsSync(sourceOutDir)) {
       console.log('📦 Moving "out" directory...');
       await fs.move(sourceOutDir, targetOutDir);
+
+      // Remove unnecessary assets from desktop build
+      console.log('🗑️  Removing unnecessary assets...');
+      for (const asset of assetsToRemove) {
+        const assetPath = path.join(targetOutDir, asset);
+        if (fs.existsSync(assetPath)) {
+          await fs.remove(assetPath);
+          console.log(`   Removed: ${asset}`);
+        }
+      }
     } else {
       console.warn("⚠️ 'out' directory not found. Using '.next' instead (fallback)?");
       const sourceNextDir = path.join(TEMP_DIR, '.next');

package/scripts/electronWorkflow/modifiers/nextConfig.mts

@@ -144,6 +144,32 @@ export const modifyNextConfig = async (TEMP_DIR: string) => {
         }
       }
 
+      // 6. Inject outputFileTracingRoot to fix symlink resolution for Turbopack
+      // When building in shadow workspace (TEMP_DIR), symlinks (e.g., node_modules) point to PROJECT_ROOT
+      // Turbopack's root defaults to TEMP_DIR, causing strip_prefix to fail for paths outside TEMP_DIR
+      // Setting outputFileTracingRoot to PROJECT_ROOT allows Turbopack to correctly resolve these symlinks
+      // We use ELECTRON_BUILD_PROJECT_ROOT env var which is set by buildNextApp.mts
+      const outputFileTracingRootPair = nextConfigDecl.find({
+        rule: {
+          pattern: 'outputFileTracingRoot: $A',
+        },
+      });
+      if (!outputFileTracingRootPair) {
+        const objectNode = nextConfigDecl.find({
+          rule: { kind: 'object' },
+        });
+        if (objectNode) {
+          const range = objectNode.range();
+          // Insert outputFileTracingRoot that reads from env var at build time
+          // Falls back to current directory if not in electron build context
+          edits.push({
+            end: range.start.index + 1,
+            start: range.start.index + 1,
+            text: "\n  outputFileTracingRoot: process.env.ELECTRON_BUILD_PROJECT_ROOT || process.cwd(),",
+          });
+        }
+      }
+
       // Remove withPWA wrapper
       const withPWA = root.find({
         rule: {

package/src/app/[variants]/(main)/chat/cron/[cronId]/index.tsx

@@ -85,13 +85,15 @@ const AutoSaveHintSlot = memo(() => {
   return <AutoSaveHint lastUpdatedTime={lastUpdatedTime} saveStatus={status} />;
 });
 
+// Standard cron format: minute hour day month weekday
 const CRON_PATTERNS = [
-  { label: 'agentCronJobs.interval.30min', value: '0 */30 * * *' },
-  { label: 'agentCronJobs.interval.1hour', value: '0 0 * * *' },
+  { label: 'agentCronJobs.interval.30min', value: '*/30 * * * *' },
+  { label: 'agentCronJobs.interval.1hour', value: '0 * * * *' },
+  { label: 'agentCronJobs.interval.2hours', value: '0 */2 * * *' },
   { label: 'agentCronJobs.interval.6hours', value: '0 */6 * * *' },
   { label: 'agentCronJobs.interval.12hours', value: '0 */12 * * *' },
-  { label: 'agentCronJobs.interval.daily', value: '0 0 0 * *' },
-  { label: 'agentCronJobs.interval.weekly', value: '0 0 0 * 0' },
+  { label: 'agentCronJobs.interval.daily', value: '0 0 * * *' },
+  { label: 'agentCronJobs.interval.weekly', value: '0 0 * * 0' },
 ];
 
 const WEEKDAY_OPTIONS = [
@@ -115,13 +117,15 @@ const WEEKDAY_LABELS: Record<number, string> = {
 };
 
 const getIntervalText = (cronPattern: string) => {
+  // Standard cron format mapping
   const intervalMap: Record<string, string> = {
+    '*/30 * * * *': 'agentCronJobs.interval.30min',
+    '0 * * * *': 'agentCronJobs.interval.1hour',
     '0 */12 * * *': 'agentCronJobs.interval.12hours',
-    '0 */30 * * *': 'agentCronJobs.interval.30min',
+    '0 */2 * * *': 'agentCronJobs.interval.2hours',
     '0 */6 * * *': 'agentCronJobs.interval.6hours',
-    '0 0 * * *': 'agentCronJobs.interval.1hour',
-    '0 0 0 * *': 'agentCronJobs.interval.daily',
-    '0 0 0 * 0': 'agentCronJobs.interval.weekly',
+    '0 0 * * *': 'agentCronJobs.interval.daily',
+    '0 0 * * 0': 'agentCronJobs.interval.weekly',
   };
 
   return intervalMap[cronPattern] || cronPattern;

package/src/app/[variants]/(main)/chat/profile/features/AgentCronJobs/CronJobForm.tsx

@@ -26,13 +26,15 @@ interface CronJobFormProps {
   onSubmit: (data: CronJobFormData) => void;
 }
 
+// Standard cron format: minute hour day month weekday
 const CRON_PATTERNS = [
-  { label: 'agentCronJobs.interval.30min', value: '0 */30 * * *' },
-  { label: 'agentCronJobs.interval.1hour', value: '0 0 * * *' },
-  { label: 'agentCronJobs.interval.6hours', value: '0 */6 * * *' },
-  { label: 'agentCronJobs.interval.12hours', value: '0 */12 * * *' },
-  { label: 'agentCronJobs.interval.daily', value: '0 0 0 * *' },
-  { label: 'agentCronJobs.interval.weekly', value: '0 0 0 * 0' },
+  { label: 'agentCronJobs.interval.30min', value: '*/30 * * * *' }, // Every 30 minutes
+  { label: 'agentCronJobs.interval.1hour', value: '0 * * * *' }, // Every hour
+  { label: 'agentCronJobs.interval.2hours', value: '0 */2 * * *' }, // Every 2 hours
+  { label: 'agentCronJobs.interval.6hours', value: '0 */6 * * *' }, // Every 6 hours
+  { label: 'agentCronJobs.interval.12hours', value: '0 */12 * * *' }, // Every 12 hours
+  { label: 'agentCronJobs.interval.daily', value: '0 0 * * *' }, // Daily at midnight
+  { label: 'agentCronJobs.interval.weekly', value: '0 0 * * 0' }, // Weekly on Sunday
 ];
 
 const WEEKDAY_OPTIONS = [
@@ -120,7 +122,7 @@ const CronJobForm = memo<CronJobFormProps>(({ editingJob, formRef, onSubmit }) =
     <Form
       form={form}
       initialValues={{
-        cronPattern: '0 */30 * * *', // Default to 30 minutes
+        cronPattern: '*/30 * * * *', // Default to every 30 minutes
         weekdays: [],
       }}
       layout="vertical"

package/apps/desktop/src/main/utils/fullDiskAccess.ts

@@ -1,121 +0,0 @@
-/**
- * Full Disk Access utilities for macOS
- * Based on https://github.com/inket/FullDiskAccess
- */
-import { shell } from 'electron';
-import { macOS } from 'electron-is';
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-
-import { createLogger } from './logger';
-
-const logger = createLogger('utils:fullDiskAccess');
-
-/**
- * Get the macOS major version number
- * Returns 0 if not macOS or unable to determine
- *
- * Darwin version to macOS version mapping:
- * - Darwin 23.x = macOS 14 (Sonoma)
- * - Darwin 22.x = macOS 13 (Ventura)
- * - Darwin 21.x = macOS 12 (Monterey)
- * - Darwin 20.x = macOS 11 (Big Sur)
- * - Darwin 19.x = macOS 10.15 (Catalina)
- * - Darwin 18.x = macOS 10.14 (Mojave)
- */
-export function getMacOSMajorVersion(): number {
-  if (!macOS()) return 0;
-  try {
-    const release = os.release(); // e.g., "23.0.0" for macOS 14 (Sonoma)
-    const darwinMajor = Number.parseInt(release.split('.')[0], 10);
-    if (darwinMajor >= 20) {
-      return darwinMajor - 9; // Darwin 20 = macOS 11, Darwin 21 = macOS 12, etc.
-    }
-    // For older versions, return 10 (covers Mojave and Catalina)
-    return 10;
-  } catch {
-    return 0;
-  }
-}
-
-/**
- * Check if Full Disk Access is granted by attempting to read a protected directory.
- *
- * On macOS 12+ (Monterey, Ventura, Sonoma, Sequoia): checks ~/Library/Containers/com.apple.stocks
- * On macOS 10.14-11 (Mojave, Catalina, Big Sur): checks ~/Library/Safari
- *
- * Reading these directories will also register the app in TCC database,
- * making it appear in System Settings > Privacy & Security > Full Disk Access
- */
-export function checkFullDiskAccess(): boolean {
-  if (!macOS()) return true;
-
-  const homeDir = os.homedir();
-  const macOSVersion = getMacOSMajorVersion();
-
-  // Determine which protected directory to check based on macOS version
-  let checkPath: string;
-  if (macOSVersion >= 12) {
-    // macOS 12+ (Monterey, Ventura, Sonoma, Sequoia)
-    checkPath = path.join(homeDir, 'Library', 'Containers', 'com.apple.stocks');
-  } else {
-    // macOS 10.14-11 (Mojave, Catalina, Big Sur)
-    checkPath = path.join(homeDir, 'Library', 'Safari');
-  }
-
-  try {
-    fs.readdirSync(checkPath);
-    logger.info(`[FullDiskAccess] Access granted (able to read ${checkPath})`);
-    return true;
-  } catch {
-    logger.info(`[FullDiskAccess] Access not granted (unable to read ${checkPath})`);
-    return false;
-  }
-}
-
-/**
- * Open Full Disk Access settings page in System Settings
- *
- * NOTE: Full Disk Access cannot be requested programmatically.
- * User must manually add the app in System Settings.
- * There is NO entitlement for Full Disk Access - it's purely TCC controlled.
- */
-export async function openFullDiskAccessSettings(): Promise<void> {
-  if (!macOS()) {
-    logger.info('[FullDiskAccess] Not macOS, skipping');
-    return;
-  }
-
-  logger.info('[FullDiskAccess] Opening Full Disk Access settings...');
-
-  // On macOS 13+ (Ventura), System Preferences is replaced by System Settings,
-  // and deep links may differ. We try multiple known schemes for compatibility.
-  const candidates = [
-    // macOS 13+ (Ventura and later) - System Settings
-    'x-apple.systempreferences:com.apple.settings.PrivacySecurity.extension?Privacy_AllFiles',
-    // macOS 13+ alternative format
-    'x-apple.systempreferences:com.apple.preference.security?Privacy_AllFiles',
-  ];
-
-  for (const url of candidates) {
-    try {
-      logger.info(`[FullDiskAccess] Trying URL: ${url}`);
-      await shell.openExternal(url);
-      logger.info(`[FullDiskAccess] Successfully opened via ${url}`);
-      return;
-    } catch (error) {
-      logger.warn(`[FullDiskAccess] Failed with URL ${url}:`, error);
-    }
-  }
-
-  // Fallback: open Privacy & Security pane
-  try {
-    const fallbackUrl = 'x-apple.systempreferences:com.apple.preference.security?Privacy';
-    logger.info(`[FullDiskAccess] Trying fallback URL: ${fallbackUrl}`);
-    await shell.openExternal(fallbackUrl);
-    logger.info('[FullDiskAccess] Opened Privacy & Security settings as fallback');
-  } catch (error) {
-    logger.error('[FullDiskAccess] Failed to open any Privacy settings:', error);
-  }
-}