floq 1.7.0 → 1.9.0

package/README.ja.md

@@ -274,7 +274,7 @@ floq config turso --disable
 
 ## Googleカレンダー連携
 
-FloqはGoogleカレンダーの予定をTUIに表示できます。2つの方法があります:
+FloqはGoogleカレンダーの予定をTUIに表示できます。複数のカレンダーを登録でき（iCalとOAuthの混在も可能）、有効なカレンダーすべての予定がマージして表示されます。2つの方法があります:
 
 ### 方法1: iCal URL（シンプル、認証不要）
 
@@ -284,7 +284,9 @@ GoogleカレンダーのシークレットiCal URLを使用して、OAuth設定
 # GoogleカレンダーからiCal URLを取得:
 # 設定 > (カレンダー名) > カレンダーの統合 > "iCal形式の非公開URL"
 
-floq calendar add "https://calendar.google.com/calendar/ical/..." -n "マイカレンダー"
+floq calendar add "https://calendar.google.com/calendar/ical/..." -n "仕事"
+floq calendar add "https://calendar.google.com/calendar/ical/..." -n "プライベート"
+floq calendar list
 floq calendar show
 ```
 
@@ -326,10 +328,10 @@ floq calendar login
 # → ブラウザが開いて認証画面へ
 # → 表示されたコードを入力
 
-# カレンダーを選択
+# 登録するカレンダーを選択（複数選択可）
 floq calendar select
 # → カレンダー一覧が表示される
-# → 番号を入力して選択
+# → 番号をカンマ区切りで入力（例: 1,3）
 
 # 設定と今日の予定を表示
 floq calendar show
@@ -345,20 +347,33 @@ floq calendar logout
 
 ```bash
 # iCalモード
-floq calendar add <url> [-n name]   # iCal URLを追加
-floq calendar remove                 # カレンダーを削除
+floq calendar add <url> [-n name]   # iCalカレンダーを追加（複数登録可）
 
 # OAuthモード
 floq calendar config --client-id <id> --client-secret <secret>
 floq calendar login                  # Google OAuthログイン
 floq calendar logout                 # OAuthトークンをクリア
-floq calendar select                 # カレンダー選択（対話式）
+floq calendar select                 # Googleカレンダーを登録（対話式・複数可）
 
 # 共通コマンド
+floq calendar list                   # 登録済みカレンダー一覧
+floq calendar remove <id|番号|名前>  # カレンダーを削除
+floq calendar remove --all           # カレンダー設定をすべて削除
 floq calendar show                   # 設定と今日の予定を表示
 floq calendar sync                   # キャッシュを更新
-floq calendar enable                 # 表示を有効化
-floq calendar disable                # 表示を無効化
+floq calendar enable [id]            # 表示を有効化（全体または個別）
+floq calendar disable [id]           # 表示を無効化（全体または個別）
+```
+
+### スケジュールコマンド
+
+登録したすべてのカレンダーの予定をまとめて確認できます:
+
+```bash
+floq schedule              # 今日の予定
+floq schedule tomorrow     # 明日の予定
+floq schedule week         # 今後7日間
+floq schedule --days 3     # 今後N日間
 ```
 
 ## テーマ

package/README.md

@@ -274,7 +274,7 @@ floq config turso --disable
 
 ## Google Calendar Integration
 
-Floq can display your Google Calendar events in the TUI. Two methods are available:
+Floq can display your Google Calendar events in the TUI. Multiple calendars can be registered (iCal and OAuth sources can be mixed), and events from all enabled calendars are merged. Two methods are available:
 
 ### Option 1: iCal URL (Simple, No Authentication)
 
@@ -284,7 +284,9 @@ Use Google Calendar's secret iCal URL for read-only access without OAuth setup.
 # Get your iCal URL from Google Calendar:
 # Settings > (Your Calendar) > Integrate calendar > "Secret address in iCal format"
 
-floq calendar add "https://calendar.google.com/calendar/ical/..." -n "My Calendar"
+floq calendar add "https://calendar.google.com/calendar/ical/..." -n "Work"
+floq calendar add "https://calendar.google.com/calendar/ical/..." -n "Personal"
+floq calendar list
 floq calendar show
 ```
 
@@ -326,10 +328,10 @@ floq calendar login
 # → Opens browser for authentication
 # → Enter the displayed code when prompted
 
-# Select a calendar
+# Select calendars to register (multiple selections supported)
 floq calendar select
 # → Shows list of your calendars
-# → Enter the number to select
+# → Enter numbers, comma-separated (e.g. 1,3)
 
 # View configuration and today's events
 floq calendar show
@@ -345,20 +347,33 @@ floq calendar logout
 
 ```bash
 # iCal mode
-floq calendar add <url> [-n name]   # Add iCal URL
-floq calendar remove                 # Remove calendar
+floq calendar add <url> [-n name]   # Add an iCal calendar (repeatable)
 
 # OAuth mode
 floq calendar config --client-id <id> --client-secret <secret>
 floq calendar login                  # Google OAuth login
 floq calendar logout                 # Clear OAuth tokens
-floq calendar select                 # Select calendar (interactive)
+floq calendar select                 # Register Google calendars (interactive, multiple)
 
 # Common commands
+floq calendar list                   # List registered calendars
+floq calendar remove <id|num|name>   # Remove a calendar
+floq calendar remove --all           # Remove all calendar configuration
 floq calendar show                   # Show config and today's events
 floq calendar sync                   # Refresh cache
-floq calendar enable                 # Enable display
-floq calendar disable                # Disable display
+floq calendar enable [id]            # Enable display (all, or one calendar)
+floq calendar disable [id]           # Disable display (all, or one calendar)
+```
+
+### Schedule Command
+
+View merged events from all registered calendars:
+
+```bash
+floq schedule              # Today's events
+floq schedule tomorrow     # Tomorrow's events
+floq schedule week         # Next 7 days
+floq schedule --days 3     # Next N days
 ```
 
 ## Themes

package/dist/calendar/index.d.ts

@@ -5,9 +5,12 @@ export interface CalendarEvent {
     end: Date;
     allDay: boolean;
     location?: string;
+    calendarName?: string;
+    sourceId?: string;
 }
 /**
- * Fetch calendar events from the configured source (iCal URL or OAuth)
+ * Fetch and merge calendar events from all enabled calendar sources.
+ * When a URL is passed explicitly, fetch only that iCal URL (validation use; cache is not updated).
  */
 export declare function fetchCalendarEvents(url?: string): Promise<CalendarEvent[]>;
 /**

package/dist/calendar/index.js

@@ -1,5 +1,5 @@
 import ICAL from 'ical.js';
-import { getCalendarConfig, isCalendarEnabled, getCalendarType, getCalendarOAuthConfig } from '../config.js';
+import { getCalendarConfig, isCalendarEnabled, isCalendarSourceUsable } from '../config.js';
 import { getValidAccessToken } from './oauth.js';
 import { listEvents as listGoogleEvents } from './google-api.js';
 const CACHE_TTL_MS = 5 * 60 * 1000; // 5 minutes
@@ -90,29 +90,6 @@ function normalizeUrl(url) {
     }
     return url;
 }
-/**
- * Fetch calendar events via OAuth (Google Calendar API)
- */
-async function fetchEventsViaOAuth() {
-    const oauthConfig = getCalendarOAuthConfig();
-    if (!oauthConfig) {
-        return [];
-    }
-    const accessToken = await getValidAccessToken();
-    if (!accessToken) {
-        return [];
-    }
-    const now = new Date();
-    const startOfMonth = new Date(now.getFullYear(), now.getMonth(), 1);
-    const endOfNextMonth = new Date(now.getFullYear(), now.getMonth() + 2, 0); // Last day of next month
-    try {
-        return await listGoogleEvents(accessToken, oauthConfig.calendarId, startOfMonth, endOfNextMonth);
-    }
-    catch (error) {
-        console.error('Failed to fetch Google Calendar events:', error);
-        return [];
-    }
-}
 /**
  * Fetch calendar events via iCal URL
  */
@@ -130,28 +107,59 @@ async function fetchEventsViaIcal(url) {
     return parseICalData(icalData);
 }
 /**
- * Fetch calendar events from the configured source (iCal URL or OAuth)
+ * Fetch events for a single calendar source
+ */
+async function fetchEventsForSource(source, accessToken) {
+    let events;
+    if (source.type === 'oauth') {
+        if (!accessToken || !source.calendarId) {
+            return [];
+        }
+        const now = new Date();
+        const startOfMonth = new Date(now.getFullYear(), now.getMonth(), 1);
+        const endOfNextMonth = new Date(now.getFullYear(), now.getMonth() + 2, 0); // Last day of next month
+        events = await listGoogleEvents(accessToken, source.calendarId, startOfMonth, endOfNextMonth);
+    }
+    else {
+        if (!source.url) {
+            return [];
+        }
+        events = await fetchEventsViaIcal(source.url);
+    }
+    return events.map(event => ({
+        ...event,
+        calendarName: source.name,
+        sourceId: source.id,
+    }));
+}
+/**
+ * Fetch and merge calendar events from all enabled calendar sources.
+ * When a URL is passed explicitly, fetch only that iCal URL (validation use; cache is not updated).
  */
 export async function fetchCalendarEvents(url) {
+    if (url) {
+        return fetchEventsViaIcal(url);
+    }
     try {
-        let events;
-        const calendarType = getCalendarType();
-        if (url) {
-            // Explicit URL provided, use iCal mode
-            events = await fetchEventsViaIcal(url);
-        }
-        else if (calendarType === 'oauth') {
-            // OAuth mode
-            events = await fetchEventsViaOAuth();
+        const config = getCalendarConfig();
+        const sources = (config?.calendars || []).filter(s => s.enabled !== false && isCalendarSourceUsable(s, config));
+        if (sources.length === 0) {
+            return [];
         }
-        else {
-            // iCal mode
-            const targetUrl = getCalendarConfig()?.url;
-            if (!targetUrl) {
-                return [];
+        // Resolve the access token once if any oauth source is present
+        const needsOAuth = sources.some(s => s.type === 'oauth');
+        const accessToken = needsOAuth ? await getValidAccessToken() : null;
+        const results = await Promise.allSettled(sources.map(source => fetchEventsForSource(source, accessToken)));
+        const events = [];
+        results.forEach((result, index) => {
+            if (result.status === 'fulfilled') {
+                events.push(...result.value);
             }
-            events = await fetchEventsViaIcal(targetUrl);
-        }
+            else {
+                console.error(`Failed to fetch calendar "${sources[index].name}":`, result.reason);
+            }
+        });
+        events.sort((a, b) => a.start.getTime() - b.start.getTime());
         // Update cache
         eventsCache = {
             events,

package/dist/calendar/oauth.js

@@ -1,4 +1,4 @@
-import { getGoogleOAuthClient, getCalendarOAuthConfig, setCalendarOAuthConfig, } from '../config.js';
+import { getGoogleOAuthClient, getCalendarOAuthTokens, setCalendarOAuthTokens, } from '../config.js';
 const GOOGLE_OAUTH_DEVICE_CODE_URL = 'https://oauth2.googleapis.com/device/code';
 const GOOGLE_OAUTH_TOKEN_URL = 'https://oauth2.googleapis.com/token';
 const CALENDAR_SCOPE = 'https://www.googleapis.com/auth/calendar.readonly';
@@ -125,19 +125,15 @@ export function isTokenExpired(tokens) {
  * Get a valid access token, refreshing if necessary
  */
 export async function getValidAccessToken() {
-    const oauthConfig = getCalendarOAuthConfig();
-    if (!oauthConfig) {
+    let tokens = getCalendarOAuthTokens();
+    if (!tokens) {
         return null;
     }
-    let tokens = oauthConfig.tokens;
     if (isTokenExpired(tokens)) {
         try {
             tokens = await refreshAccessToken(tokens.refreshToken);
             // Update stored tokens
-            setCalendarOAuthConfig({
-                ...oauthConfig,
-                tokens,
-            });
+            setCalendarOAuthTokens(tokens);
         }
         catch (error) {
             console.error('Failed to refresh access token:', error);
@@ -150,5 +146,5 @@ export async function getValidAccessToken() {
  * Clear OAuth tokens (logout)
  */
 export function clearOAuthTokens() {
-    setCalendarOAuthConfig(undefined);
+    setCalendarOAuthTokens(undefined);
 }

package/dist/cli.js

@@ -6,13 +6,14 @@ import { addTask } from './commands/add.js';
 import { listTasks, listProjects } from './commands/list.js';
 import { moveTask } from './commands/move.js';
 import { markDone } from './commands/done.js';
-import { addProject, listProjectsCommand, showProject, completeProject, } from './commands/project.js';
+import { addProject, listProjectsCommand, showProject, completeProject, deleteProjectCommand, } from './commands/project.js';
 import { showConfig, setLanguage, setDbPath, resetDbPath, setTheme, selectTheme, setViewModeCommand, selectMode, setTurso, disableTurso, enableTurso, clearTurso, showTursoQr, syncCommand, resetDatabase, setSplashCommand, showSplash, showDateFormatCommand, setDateFormatCommand } from './commands/config.js';
 import { addComment, listComments } from './commands/comment.js';
 import { listContexts, addContextCommand, removeContextCommand } from './commands/context.js';
 import { showInsights } from './commands/insights.js';
 import { runSetupWizard } from './commands/setup.js';
-import { addCalendar, removeCalendar, showCalendar, syncCalendar, enableCalendar, disableCalendar, configOAuthClient, loginCalendar, logoutCalendar, selectCalendar } from './commands/calendar.js';
+import { addCalendar, removeCalendar, showCalendar, syncCalendar, enableCalendar, disableCalendar, configOAuthClient, loginCalendar, logoutCalendar, selectCalendar, listCalendarSourcesCommand } from './commands/calendar.js';
+import { showSchedule } from './commands/schedule.js';
 import { VERSION } from './version.js';
 const program = new Command();
 program
@@ -96,6 +97,16 @@ projectCmd
     .action(async (id) => {
     await completeProject(id);
 });
+projectCmd
+    .command('delete <id>')
+    .alias('rm')
+    .description('Delete a project (prompts how to handle its tasks)')
+    .option('--with-tasks', 'Delete the project together with all its tasks')
+    .option('--keep-tasks', 'Delete the project but move its tasks to Inbox')
+    .option('-f, --force', 'Skip confirmation prompts')
+    .action(async (id, options) => {
+    await deleteProjectCommand(id, options);
+});
 // Config commands
 const configCmd = program
     .command('config')
@@ -306,22 +317,39 @@ program
     .action(async () => {
     await runSetupWizard();
 });
+// Schedule command
+program
+    .command('schedule [period]')
+    .description('Show schedule from registered calendars (today, tomorrow, week)')
+    .option('-d, --days <n>', 'Number of days to show')
+    .action(async (period, options) => {
+    await showSchedule(period, options);
+});
 // Calendar commands
 const calendarCmd = program
     .command('calendar')
     .description('Google Calendar (iCal) integration');
 calendarCmd
     .command('add <url>')
-    .description('Add or update calendar URL')
+    .description('Add a calendar by iCal URL (multiple calendars supported)')
     .option('-n, --name <name>', 'Display name for the calendar')
     .action(async (url, options) => {
     await addCalendar(url, options);
 });
 calendarCmd
-    .command('remove')
-    .description('Remove calendar configuration')
+    .command('list')
+    .alias('ls')
+    .description('List registered calendars')
     .action(async () => {
-    await removeCalendar();
+    await listCalendarSourcesCommand();
+});
+calendarCmd
+    .command('remove [id]')
+    .alias('rm')
+    .description('Remove a calendar by id/number/name')
+    .option('--all', 'Remove all calendar configuration')
+    .action(async (id, options) => {
+    await removeCalendar(id, options);
 });
 calendarCmd
     .command('show')
@@ -336,16 +364,16 @@ calendarCmd
     await syncCalendar();
 });
 calendarCmd
-    .command('enable')
-    .description('Enable calendar display')
-    .action(async () => {
-    await enableCalendar();
+    .command('enable [id]')
+    .description('Enable calendar display (all, or a specific calendar by id)')
+    .action(async (id) => {
+    await enableCalendar(id);
 });
 calendarCmd
-    .command('disable')
-    .description('Disable calendar display')
-    .action(async () => {
-    await disableCalendar();
+    .command('disable [id]')
+    .description('Disable calendar display (all, or a specific calendar by id)')
+    .action(async (id) => {
+    await disableCalendar(id);
 });
 // OAuth commands
 calendarCmd
@@ -380,7 +408,7 @@ calendarCmd
 });
 calendarCmd
     .command('select')
-    .description('Select a calendar to display')
+    .description('Select Google calendars to register (multiple supported)')
     .action(async () => {
     await selectCalendar();
 });

package/dist/commands/calendar.d.ts

@@ -1,13 +1,19 @@
 /**
- * Add or update calendar URL (iCal mode)
+ * Add a new iCal calendar (multiple calendars can be registered)
  */
 export declare function addCalendar(url: string, options: {
     name?: string;
 }): Promise<void>;
 /**
- * Remove calendar configuration
+ * List registered calendars
  */
-export declare function removeCalendar(): Promise<void>;
+export declare function listCalendarSourcesCommand(): Promise<void>;
+/**
+ * Remove a calendar (by id/index/name), or all calendar configuration with --all
+ */
+export declare function removeCalendar(idOrIndex?: string, options?: {
+    all?: boolean;
+}): Promise<void>;
 /**
  * Show calendar configuration and today's events
  */
@@ -16,14 +22,8 @@ export declare function showCalendar(): Promise<void>;
  * Sync/refresh calendar cache
  */
 export declare function syncCalendar(): Promise<void>;
-/**
- * Enable calendar display
- */
-export declare function enableCalendar(): Promise<void>;
-/**
- * Disable calendar display
- */
-export declare function disableCalendar(): Promise<void>;
+export declare function enableCalendar(idOrIndex?: string): Promise<void>;
+export declare function disableCalendar(idOrIndex?: string): Promise<void>;
 /**
  * Configure OAuth client credentials
  */
@@ -37,6 +37,6 @@ export declare function loginCalendar(): Promise<void>;
  */
 export declare function logoutCalendar(): Promise<void>;
 /**
- * Select a calendar from the user's calendars
+ * Select Google calendars to register (multiple selections supported)
  */
 export declare function selectCalendar(): Promise<void>;