floq 1.8.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

@@ -12,7 +12,8 @@ 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
@@ -316,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')
@@ -346,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
@@ -390,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>;

package/dist/commands/calendar.js

@@ -1,11 +1,38 @@
-import { getCalendarConfig, setCalendarConfig, setCalendarEnabled, getGoogleOAuthClient, setGoogleOAuthClient, setCalendarOAuthConfig, getCalendarOAuthConfig, getCalendarType, } from '../config.js';
+import { getCalendarConfig, setCalendarConfig, getCalendarSources, addCalendarSource, removeCalendarSource, updateCalendarSource, setCalendarEnabled, getGoogleOAuthClient, setGoogleOAuthClient, getCalendarOAuthTokens, setCalendarOAuthTokens, } from '../config.js';
 import { fetchCalendarEvents, getTodayEvents, clearCalendarCache, formatEventTime } from '../calendar/index.js';
 import { getLocale } from '../config.js';
-import { startOAuthFlow, pollForTokens, clearOAuthTokens } from '../calendar/oauth.js';
+import { startOAuthFlow, pollForTokens, clearOAuthTokens, getValidAccessToken } from '../calendar/oauth.js';
 import { listCalendars } from '../calendar/google-api.js';
 import * as readline from 'readline';
 /**
- * Add or update calendar URL (iCal mode)
+ * Resolve a calendar source by id, 1-based index, or name
+ */
+function resolveSource(idOrIndex) {
+    const sources = getCalendarSources();
+    // Exact id match
+    const byId = sources.find(s => s.id === idOrIndex);
+    if (byId)
+        return byId;
+    // 1-based index
+    const index = parseInt(idOrIndex, 10);
+    if (!isNaN(index) && index >= 1 && index <= sources.length) {
+        return sources[index - 1];
+    }
+    // Name match
+    return sources.find(s => s.name === idOrIndex);
+}
+function printSourceList(sources) {
+    sources.forEach((source, index) => {
+        const status = source.enabled !== false ? 'enabled' : 'disabled';
+        const detail = source.type === 'ical'
+            ? (source.url && source.url.length > 50 ? source.url.substring(0, 50) + '...' : source.url)
+            : source.calendarId;
+        console.log(`  ${index + 1}. [${source.id}] ${source.name} (${source.type}, ${status})`);
+        console.log(`       ${detail}`);
+    });
+}
+/**
+ * Add a new iCal calendar (multiple calendars can be registered)
  */
 export async function addCalendar(url, options) {
     // Validate URL
@@ -13,50 +40,112 @@ export async function addCalendar(url, options) {
         console.error('Error: Invalid URL. Must start with https://, webcal://, or http://');
         process.exit(1);
     }
-    setCalendarConfig({
-        url,
-        name: options.name,
+    const existing = getCalendarSources().find(s => s.url === url);
+    if (existing) {
+        console.error(`Error: This URL is already registered as "${existing.name}" [${existing.id}].`);
+        process.exit(1);
+    }
+    // Default name from URL hostname when not provided
+    let name = options.name;
+    if (!name) {
+        try {
+            name = new URL(url.replace('webcal://', 'https://')).hostname;
+        }
+        catch {
+            name = `Calendar ${getCalendarSources().length + 1}`;
+        }
+    }
+    const source = addCalendarSource({
+        name,
         type: 'ical',
+        url,
         enabled: true,
     });
     console.log('Calendar added successfully!');
+    console.log(`  ID: ${source.id}`);
+    console.log(`  Name: ${source.name}`);
     console.log(`  URL: ${url}`);
-    if (options.name) {
-        console.log(`  Name: ${options.name}`);
-    }
     // Try to fetch events to validate the URL
     console.log('\nFetching events...');
     try {
         const events = await fetchCalendarEvents(url);
         console.log(`Found ${events.length} events.`);
     }
-    catch (error) {
+    catch {
         console.log('Warning: Could not fetch events. Please check the URL.');
     }
+    if (getCalendarConfig()?.enabled === false) {
+        console.log('Note: calendar display is currently disabled. Run "floq calendar enable" to show events.');
+    }
 }
 /**
- * Remove calendar configuration
+ * List registered calendars
  */
-export async function removeCalendar() {
-    const config = getCalendarConfig();
-    if (!config) {
-        console.log('No calendar configured.');
+export async function listCalendarSourcesCommand() {
+    const sources = getCalendarSources();
+    if (sources.length === 0) {
+        console.log('No calendars registered.');
+        console.log('Use "floq calendar add <url>" or "floq calendar select" to add one.');
+        return;
+    }
+    console.log(`Registered calendars (${sources.length})`);
+    console.log('-'.repeat(40));
+    printSourceList(sources);
+}
+/**
+ * Remove a calendar (by id/index/name), or all calendar configuration with --all
+ */
+export async function removeCalendar(idOrIndex, options = {}) {
+    const sources = getCalendarSources();
+    if (options.all) {
+        if (sources.length === 0 && !getCalendarConfig()) {
+            console.log('No calendar configured.');
+            return;
+        }
+        setCalendarConfig(undefined);
+        clearCalendarCache();
+        console.log('All calendar configuration removed.');
         return;
     }
-    setCalendarConfig(undefined);
+    if (sources.length === 0) {
+        console.log('No calendars registered.');
+        return;
+    }
+    let target;
+    if (idOrIndex) {
+        target = resolveSource(idOrIndex);
+        if (!target) {
+            console.error(`Error: Calendar "${idOrIndex}" not found.`);
+            console.log('');
+            printSourceList(sources);
+            process.exit(1);
+        }
+    }
+    else if (sources.length === 1) {
+        target = sources[0];
+    }
+    else {
+        console.log('Multiple calendars are registered. Specify which one to remove:');
+        console.log('');
+        printSourceList(sources);
+        console.log('');
+        console.log('Usage: floq calendar remove <id|number|name>');
+        console.log('       floq calendar remove --all   (remove everything)');
+        return;
+    }
+    removeCalendarSource(target.id);
     clearCalendarCache();
-    console.log('Calendar removed.');
+    console.log(`Calendar "${target.name}" [${target.id}] removed.`);
 }
 /**
  * Show calendar configuration and today's events
  */
 export async function showCalendar() {
-    const config = getCalendarConfig();
+    const sources = getCalendarSources();
     const locale = getLocale();
-    const calendarType = getCalendarType();
     console.log('Calendar Configuration');
     console.log('-'.repeat(40));
-    if (!config || (!config.url && !config.oauth)) {
+    if (sources.length === 0) {
         console.log('No calendar configured.');
         console.log('');
         console.log('Option 1: iCal URL (no authentication required)');
@@ -68,18 +157,9 @@ export async function showCalendar() {
         console.log('  floq calendar select');
         return;
     }
-    console.log(`Type: ${calendarType || 'unknown'}`);
-    if (calendarType === 'oauth' && config.oauth) {
-        console.log(`Calendar: ${config.oauth.calendarName}`);
-        console.log(`Calendar ID: ${config.oauth.calendarId}`);
-    }
-    else if (config.url) {
-        console.log(`URL: ${config.url}`);
-        if (config.name) {
-            console.log(`Name: ${config.name}`);
-        }
-    }
-    console.log(`Status: ${config.enabled !== false ? 'enabled' : 'disabled'}`);
+    printSourceList(sources);
+    console.log('');
+    console.log(`Display: ${getCalendarConfig()?.enabled !== false ? 'enabled' : 'disabled'}`);
     console.log('');
     console.log("Today's Events");
     console.log('-'.repeat(40));
@@ -90,11 +170,13 @@ export async function showCalendar() {
         console.log(locale === 'ja' ? '今日の予定はありません' : 'No events today');
         return;
     }
+    const showCalendarName = sources.length > 1;
     for (const event of todayEvents) {
         const timeStr = event.allDay
             ? (locale === 'ja' ? '終日' : 'All day')
             : `${formatEventTime(event.start)} - ${formatEventTime(event.end)}`;
-        console.log(`  ${timeStr}  ${event.title}`);
+        const calLabel = showCalendarName && event.calendarName ? ` [${event.calendarName}]` : '';
+        console.log(`  ${timeStr}  ${event.title}${calLabel}`);
         if (event.location) {
             console.log(`    📍 ${event.location}`);
         }
@@ -104,16 +186,16 @@ export async function showCalendar() {
  * Sync/refresh calendar cache
  */
 export async function syncCalendar() {
-    const config = getCalendarConfig();
-    if (!config) {
+    const sources = getCalendarSources();
+    if (sources.length === 0) {
         console.log('No calendar configured.');
         return;
     }
-    console.log('Syncing calendar...');
+    console.log('Syncing calendars...');
     clearCalendarCache();
     try {
         const events = await fetchCalendarEvents();
-        console.log(`Synced ${events.length} events.`);
+        console.log(`Synced ${events.length} events from ${sources.filter(s => s.enabled !== false).length} calendar(s).`);
         const todayEvents = getTodayEvents();
         console.log(`${todayEvents.length} events today.`);
     }
@@ -123,29 +205,43 @@ export async function syncCalendar() {
     }
 }
 /**
- * Enable calendar display
+ * Toggle calendar display (overall, or a specific calendar by id)
  */
-export async function enableCalendar() {
-    const config = getCalendarConfig();
-    if (!config) {
+async function setCalendarDisplay(enabled, idOrIndex) {
+    const sources = getCalendarSources();
+    const label = enabled ? 'enabled' : 'disabled';
+    if (sources.length === 0) {
         console.log('No calendar configured.');
-        console.log('Use "floq calendar add <url>" to add a calendar first.');
+        if (enabled) {
+            console.log('Use "floq calendar add <url>" to add a calendar first.');
+        }
         return;
     }
-    setCalendarEnabled(true);
-    console.log('Calendar display enabled.');
-}
-/**
- * Disable calendar display
- */
-export async function disableCalendar() {
-    const config = getCalendarConfig();
-    if (!config) {
-        console.log('No calendar configured.');
+    if (idOrIndex) {
+        const target = resolveSource(idOrIndex);
+        if (!target) {
+            console.error(`Error: Calendar "${idOrIndex}" not found.`);
+            process.exit(1);
+        }
+        updateCalendarSource(target.id, { enabled });
+        // Enabling a specific calendar implies the user wants events shown —
+        // also lift a global disable so the change is actually visible
+        if (enabled && getCalendarConfig()?.enabled === false) {
+            setCalendarEnabled(true);
+            console.log('Calendar display was disabled — re-enabled.');
+        }
+        clearCalendarCache();
+        console.log(`Calendar "${target.name}" ${label}.`);
         return;
     }
-    setCalendarEnabled(false);
-    console.log('Calendar display disabled.');
+    setCalendarEnabled(enabled);
+    console.log(`Calendar display ${label}.`);
+}
+export async function enableCalendar(idOrIndex) {
+    await setCalendarDisplay(true, idOrIndex);
+}
+export async function disableCalendar(idOrIndex) {
+    await setCalendarDisplay(false, idOrIndex);
 }
 /**
  * Configure OAuth client credentials
@@ -156,7 +252,7 @@ export async function configOAuthClient(clientId, clientSecret) {
     console.log('');
     console.log('Next steps:');
     console.log('  1. Run "floq calendar login" to authenticate');
-    console.log('  2. Run "floq calendar select" to choose a calendar');
+    console.log('  2. Run "floq calendar select" to choose calendars');
 }
 /**
  * Start OAuth login flow
@@ -206,21 +302,11 @@ export async function loginCalendar() {
         console.log('');
         console.log('Waiting for authorization...');
         const tokens = await pollForTokens(deviceCode, interval);
-        // Save tokens temporarily (calendar selection happens next)
-        const config = getCalendarConfig() || {};
-        setCalendarConfig({
-            ...config,
-            type: 'oauth',
-            oauth: {
-                tokens,
-                calendarId: '',
-                calendarName: '',
-            },
-        });
+        setCalendarOAuthTokens(tokens);
         console.log('');
         console.log('Login successful!');
         console.log('');
-        console.log('Now run "floq calendar select" to choose a calendar.');
+        console.log('Now run "floq calendar select" to choose calendars.');
     }
     catch (error) {
         console.error('Login failed:', error instanceof Error ? error.message : error);
@@ -231,24 +317,27 @@ export async function loginCalendar() {
  * Logout from OAuth (clear tokens)
  */
 export async function logoutCalendar() {
-    const oauthConfig = getCalendarOAuthConfig();
-    if (!oauthConfig) {
+    const tokens = getCalendarOAuthTokens();
+    if (!tokens) {
         console.log('Not logged in.');
         return;
     }
     clearOAuthTokens();
     console.log('Logged out successfully.');
+    const oauthSources = getCalendarSources().filter(s => s.type === 'oauth');
+    if (oauthSources.length > 0) {
+        console.log(`Note: ${oauthSources.length} Google calendar(s) remain registered but need login to fetch events.`);
+    }
 }
 /**
- * Select a calendar from the user's calendars
+ * Select Google calendars to register (multiple selections supported)
  */
 export async function selectCalendar() {
-    const oauthConfig = getCalendarOAuthConfig();
-    if (!oauthConfig) {
+    const tokens = getCalendarOAuthTokens();
+    if (!tokens) {
         console.log('Not logged in. Run "floq calendar login" first.');
         return;
     }
-    const { getValidAccessToken } = await import('../calendar/oauth.js');
     const accessToken = await getValidAccessToken();
     if (!accessToken) {
         console.log('Failed to get access token. Try logging in again.');
@@ -262,38 +351,58 @@ export async function selectCalendar() {
             console.log('No calendars found.');
             return;
         }
+        const registeredIds = new Set(getCalendarSources()
+            .filter(s => s.type === 'oauth')
+            .map(s => s.calendarId));
         console.log('Available calendars:');
         console.log('');
         calendars.forEach((cal, index) => {
             const primary = cal.primary ? ' (primary)' : '';
-            console.log(`  ${index + 1}. ${cal.summary}${primary}`);
+            const registered = registeredIds.has(cal.id) ? ' [registered]' : '';
+            console.log(`  ${index + 1}. ${cal.summary}${primary}${registered}`);
         });
         console.log('');
-        // Interactive selection
+        // Interactive selection (comma-separated numbers for multiple calendars)
         const rl = readline.createInterface({
             input: process.stdin,
             output: process.stdout,
         });
         const answer = await new Promise((resolve) => {
-            rl.question('Select calendar (number): ', resolve);
+            rl.question('Select calendars (numbers, comma-separated): ', resolve);
         });
         rl.close();
-        const selection = parseInt(answer, 10);
-        if (isNaN(selection) || selection < 1 || selection > calendars.length) {
+        const selections = answer
+            .split(',')
+            .map(s => parseInt(s.trim(), 10))
+            .filter(n => !isNaN(n) && n >= 1 && n <= calendars.length);
+        if (selections.length === 0) {
             console.log('Invalid selection.');
             return;
         }
-        const selectedCalendar = calendars[selection - 1];
-        // Update config with selected calendar
-        setCalendarOAuthConfig({
-            tokens: oauthConfig.tokens,
-            calendarId: selectedCalendar.id,
-            calendarName: selectedCalendar.summary,
-        });
         console.log('');
-        console.log(`Calendar "${selectedCalendar.summary}" selected!`);
+        for (const selection of [...new Set(selections)]) {
+            const selectedCalendar = calendars[selection - 1];
+            if (registeredIds.has(selectedCalendar.id)) {
+                console.log(`Calendar "${selectedCalendar.summary}" is already registered. Skipped.`);
+                continue;
+            }
+            const source = addCalendarSource({
+                name: selectedCalendar.summary,
+                type: 'oauth',
+                calendarId: selectedCalendar.id,
+                enabled: true,
+            });
+            registeredIds.add(selectedCalendar.id);
+            console.log(`Calendar "${selectedCalendar.summary}" added! [${source.id}]`);
+        }
+        clearCalendarCache();
         console.log('');
-        console.log('Calendar integration is now active. Run "floq calendar show" to see events.');
+        if (getCalendarConfig()?.enabled === false) {
+            console.log('Note: calendar display is currently disabled. Run "floq calendar enable" to show events.');
+        }
+        else {
+            console.log('Calendar integration is now active. Run "floq schedule" to see events.');
+        }
     }
     catch (error) {
         console.error('Failed to list calendars:', error instanceof Error ? error.message : error);

package/dist/commands/config.js

@@ -35,19 +35,11 @@ export async function showConfig() {
     }
     // Calendar configuration
     const calendarConfig = getCalendarConfig();
-    console.log(`Calendar: ${isCalendarEnabled() ? 'enabled' : calendarConfig ? 'disabled' : 'not configured'}`);
-    if (calendarConfig) {
-        const calendarType = calendarConfig.type || (calendarConfig.url ? 'ical' : 'unknown');
-        console.log(`  Type: ${calendarType}`);
-        if (calendarConfig.name) {
-            console.log(`  Name: ${calendarConfig.name}`);
-        }
-        if (calendarConfig.url) {
-            console.log(`  URL: ${calendarConfig.url.substring(0, 50)}...`);
-        }
-        if (calendarConfig.oauth) {
-            console.log(`  Calendar: ${calendarConfig.oauth.calendarName}`);
-        }
+    const calendarSources = calendarConfig?.calendars || [];
+    console.log(`Calendar: ${isCalendarEnabled() ? 'enabled' : calendarSources.length > 0 ? 'disabled' : 'not configured'}`);
+    for (const source of calendarSources) {
+        const status = source.enabled !== false ? '' : ' (disabled)';
+        console.log(`  - ${source.name} [${source.type}]${status}`);
     }
 }
 export async function setLanguage(locale) {

package/dist/commands/schedule.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Show schedule from all registered calendars
+ */
+export declare function showSchedule(period?: string, options?: {
+    days?: string;
+}): Promise<void>;

package/dist/commands/schedule.js

@@ -0,0 +1,109 @@
+import { getCalendarSources, getLocale } from '../config.js';
+import { fetchCalendarEvents, getEventsForDate, formatEventTime, isEventOngoing } from '../calendar/index.js';
+const WEEKDAYS_EN = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
+const WEEKDAYS_JA = ['日', '月', '火', '水', '木', '金', '土'];
+function resolveRange(period, daysOption) {
+    const today = new Date();
+    const startOfToday = new Date(today.getFullYear(), today.getMonth(), today.getDate());
+    if (daysOption) {
+        const days = parseInt(daysOption, 10);
+        if (isNaN(days) || days < 1) {
+            console.error('Error: --days must be a positive integer');
+            process.exit(1);
+        }
+        return { start: startOfToday, days };
+    }
+    switch (period) {
+        case undefined:
+        case 'today':
+            return { start: startOfToday, days: 1 };
+        case 'tomorrow': {
+            const tomorrow = new Date(startOfToday);
+            tomorrow.setDate(tomorrow.getDate() + 1);
+            return { start: tomorrow, days: 1 };
+        }
+        case 'week':
+            return { start: startOfToday, days: 7 };
+        default:
+            console.error(`Error: Unknown period "${period}". Use: today, tomorrow, week`);
+            process.exit(1);
+    }
+}
+function formatDateHeader(date, locale) {
+    const today = new Date();
+    const startOfToday = new Date(today.getFullYear(), today.getMonth(), today.getDate());
+    const diff = Math.round((date.getTime() - startOfToday.getTime()) / (1000 * 60 * 60 * 24));
+    const weekdays = locale === 'ja' ? WEEKDAYS_JA : WEEKDAYS_EN;
+    const dateStr = locale === 'ja'
+        ? `${date.getMonth() + 1}/${date.getDate()}(${weekdays[date.getDay()]})`
+        : `${weekdays[date.getDay()]}, ${date.toLocaleString('en', { month: 'short' })} ${date.getDate()}`;
+    if (diff === 0)
+        return `${dateStr} ${locale === 'ja' ? '今日' : '(Today)'}`;
+    if (diff === 1)
+        return `${dateStr} ${locale === 'ja' ? '明日' : '(Tomorrow)'}`;
+    return dateStr;
+}
+/**
+ * Show schedule from all registered calendars
+ */
+export async function showSchedule(period, options = {}) {
+    const sources = getCalendarSources();
+    const locale = getLocale();
+    if (sources.length === 0) {
+        console.log(locale === 'ja' ? 'カレンダーが設定されていません。' : 'No calendar configured.');
+        console.log('');
+        console.log('  floq calendar add <url> [-n name]   (iCal URL)');
+        console.log('  floq calendar login && floq calendar select   (Google OAuth)');
+        return;
+    }
+    const range = resolveRange(period, options.days);
+    await fetchCalendarEvents();
+    const showCalendarName = sources.filter(s => s.enabled !== false).length > 1;
+    const now = new Date();
+    const startOfToday = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+    const baseOffset = Math.round((range.start.getTime() - startOfToday.getTime()) / (1000 * 60 * 60 * 24));
+    // Events are only fetched through the end of next month — warn if the range extends past it
+    const fetchWindowEnd = new Date(now.getFullYear(), now.getMonth() + 2, 0, 23, 59, 59);
+    const rangeEnd = new Date(range.start);
+    rangeEnd.setDate(rangeEnd.getDate() + range.days - 1);
+    if (rangeEnd > fetchWindowEnd) {
+        console.log(locale === 'ja'
+            ? `注意: 来月末より先の予定は表示されません`
+            : 'Note: events beyond the end of next month are not shown');
+        console.log('');
+    }
+    let totalShown = 0;
+    for (let i = 0; i < range.days; i++) {
+        const dayStart = new Date(range.start);
+        dayStart.setDate(dayStart.getDate() + i);
+        const dayEvents = getEventsForDate(baseOffset + i);
+        // For multi-day views, skip empty days
+        if (dayEvents.length === 0 && range.days > 1) {
+            continue;
+        }
+        if (totalShown > 0 || i > 0) {
+            console.log('');
+        }
+        console.log(formatDateHeader(dayStart, locale));
+        console.log('-'.repeat(40));
+        if (dayEvents.length === 0) {
+            console.log(locale === 'ja' ? '  予定はありません' : '  No events');
+            continue;
+        }
+        for (const event of dayEvents) {
+            const timeStr = event.allDay
+                ? (locale === 'ja' ? '終日       ' : 'All day    ')
+                : `${formatEventTime(event.start)}-${formatEventTime(event.end)}`;
+            const ongoing = isEventOngoing(event) ? ' ◀' : '';
+            const calLabel = showCalendarName && event.calendarName ? ` [${event.calendarName}]` : '';
+            console.log(`  ${timeStr}  ${event.title}${calLabel}${ongoing}`);
+            if (event.location) {
+                console.log(`             📍 ${event.location}`);
+            }
+            totalShown++;
+        }
+    }
+    if (range.days > 1 && totalShown === 0) {
+        console.log(locale === 'ja' ? '期間内に予定はありません' : 'No events in this period');
+    }
+}

package/dist/config.d.ts

@@ -21,12 +21,22 @@ export interface CalendarOAuthConfig {
     calendarId: string;
     calendarName: string;
 }
+export interface CalendarSource {
+    id: string;
+    name: string;
+    type: 'ical' | 'oauth';
+    url?: string;
+    calendarId?: string;
+    enabled?: boolean;
+}
 export interface CalendarConfig {
+    enabled?: boolean;
+    calendars?: CalendarSource[];
+    googleOAuth?: GoogleOAuthClient;
+    oauthTokens?: CalendarOAuthTokens;
     url?: string;
     name?: string;
-    enabled?: boolean;
     type?: 'ical' | 'oauth';
-    googleOAuth?: GoogleOAuthClient;
     oauth?: CalendarOAuthConfig;
 }
 export type DateFormat = 'auto' | 'ddd, MMM D' | 'MM/DD(ddd)' | 'YYYY-MM-DD' | 'MM-DD' | 'DD/MM' | 'none';
@@ -74,12 +84,16 @@ export declare function getDateFormat(): DateFormat;
 export declare function setDateFormat(format: DateFormat): void;
 export declare function getCalendarConfig(): CalendarConfig | undefined;
 export declare function setCalendarConfig(config: CalendarConfig | undefined): void;
+export declare function getCalendarSources(): CalendarSource[];
+export declare function addCalendarSource(source: Omit<CalendarSource, 'id'>): CalendarSource;
+export declare function removeCalendarSource(id: string): boolean;
+export declare function updateCalendarSource(id: string, updates: Partial<Omit<CalendarSource, 'id'>>): boolean;
+export declare function isCalendarSourceUsable(source: CalendarSource, config?: CalendarConfig): boolean;
 export declare function isCalendarEnabled(): boolean;
 export declare function setCalendarEnabled(enabled: boolean): void;
 export declare function getGoogleOAuthClient(): GoogleOAuthClient | undefined;
 export declare function setGoogleOAuthClient(client: GoogleOAuthClient): void;
-export declare function getCalendarOAuthConfig(): CalendarOAuthConfig | undefined;
-export declare function setCalendarOAuthConfig(oauth: CalendarOAuthConfig | undefined): void;
-export declare function getCalendarType(): 'ical' | 'oauth' | undefined;
+export declare function getCalendarOAuthTokens(): CalendarOAuthTokens | undefined;
+export declare function setCalendarOAuthTokens(tokens: CalendarOAuthTokens | undefined): void;
 export declare function getInsightsWeeks(): number;
 export declare function setInsightsWeeks(weeks: number): void;

package/dist/config.js

@@ -1,5 +1,6 @@
 import { existsSync, readFileSync, writeFileSync, mkdirSync, renameSync } from 'fs';
 import { dirname, join, isAbsolute } from 'path';
+import { randomUUID } from 'crypto';
 import { CONFIG_FILE, DATA_DIR } from './paths.js';
 // Migrate legacy DB file names (including related metadata files)
 function migrateDbFiles() {
@@ -183,25 +184,109 @@ export function getDateFormat() {
 export function setDateFormat(format) {
     saveConfig({ dateFormat: format });
 }
+function generateCalendarId() {
+    return randomUUID().slice(0, 8);
+}
+// Migrate legacy single-calendar config to the multi-calendar format
+function migrateCalendarConfig(calendar) {
+    const hasLegacyFields = calendar.url !== undefined ||
+        calendar.name !== undefined ||
+        calendar.type !== undefined ||
+        calendar.oauth !== undefined;
+    if (!hasLegacyFields)
+        return null;
+    const calendars = [...(calendar.calendars || [])];
+    let oauthTokens = calendar.oauthTokens;
+    if (calendar.url && !calendars.some(c => c.url === calendar.url)) {
+        calendars.push({
+            id: generateCalendarId(),
+            name: calendar.name || 'Calendar',
+            type: 'ical',
+            url: calendar.url,
+        });
+    }
+    if (calendar.oauth) {
+        oauthTokens = oauthTokens || calendar.oauth.tokens;
+        if (calendar.oauth.calendarId && !calendars.some(c => c.calendarId === calendar.oauth?.calendarId)) {
+            calendars.push({
+                id: generateCalendarId(),
+                name: calendar.oauth.calendarName || 'Google Calendar',
+                type: 'oauth',
+                calendarId: calendar.oauth.calendarId,
+            });
+        }
+    }
+    return {
+        enabled: calendar.enabled,
+        calendars,
+        googleOAuth: calendar.googleOAuth,
+        oauthTokens,
+    };
+}
 export function getCalendarConfig() {
-    return loadConfig().calendar;
+    const calendar = loadConfig().calendar;
+    if (!calendar)
+        return undefined;
+    const migrated = migrateCalendarConfig(calendar);
+    if (migrated) {
+        saveConfig({ calendar: migrated });
+        return migrated;
+    }
+    return calendar;
 }
 export function setCalendarConfig(config) {
     saveConfig({ calendar: config });
 }
+export function getCalendarSources() {
+    return getCalendarConfig()?.calendars || [];
+}
+export function addCalendarSource(source) {
+    const calendar = getCalendarConfig() || {};
+    const newSource = { id: generateCalendarId(), ...source };
+    setCalendarConfig({
+        ...calendar,
+        calendars: [...(calendar.calendars || []), newSource],
+        enabled: calendar.enabled === false ? calendar.enabled : true,
+    });
+    return newSource;
+}
+export function removeCalendarSource(id) {
+    const calendar = getCalendarConfig();
+    if (!calendar)
+        return false;
+    const calendars = calendar.calendars || [];
+    const newCalendars = calendars.filter(c => c.id !== id);
+    if (newCalendars.length === calendars.length)
+        return false;
+    setCalendarConfig({ ...calendar, calendars: newCalendars });
+    return true;
+}
+export function updateCalendarSource(id, updates) {
+    const calendar = getCalendarConfig();
+    if (!calendar)
+        return false;
+    const calendars = calendar.calendars || [];
+    const index = calendars.findIndex(c => c.id === id);
+    if (index === -1)
+        return false;
+    const newCalendars = [...calendars];
+    newCalendars[index] = { ...newCalendars[index], ...updates };
+    setCalendarConfig({ ...calendar, calendars: newCalendars });
+    return true;
+}
+// True when a calendar source has everything it needs to fetch events
+export function isCalendarSourceUsable(source, config) {
+    const calendar = config ?? getCalendarConfig();
+    if (source.type === 'ical') {
+        return !!source.url;
+    }
+    return !!source.calendarId && !!calendar?.oauthTokens;
+}
 export function isCalendarEnabled() {
     const calendar = getCalendarConfig();
     if (!calendar || calendar.enabled === false)
         return false;
-    // OAuth mode
-    if (calendar.type === 'oauth' && calendar.oauth) {
-        return true;
-    }
-    // iCal mode
-    if (calendar.url && calendar.url !== '') {
-        return true;
-    }
-    return false;
+    return (calendar.calendars || []).some(c => c.enabled !== false && isCalendarSourceUsable(c, calendar));
 }
 export function setCalendarEnabled(enabled) {
     const calendar = getCalendarConfig();
@@ -224,26 +309,19 @@ export function setGoogleOAuthClient(client) {
     const calendar = getCalendarConfig() || {};
     setCalendarConfig({ ...calendar, googleOAuth: client });
 }
-export function getCalendarOAuthConfig() {
-    return getCalendarConfig()?.oauth;
+export function getCalendarOAuthTokens() {
+    return getCalendarConfig()?.oauthTokens;
 }
-export function setCalendarOAuthConfig(oauth) {
+export function setCalendarOAuthTokens(tokens) {
     const calendar = getCalendarConfig() || {};
-    if (oauth) {
-        setCalendarConfig({ ...calendar, type: 'oauth', oauth, enabled: true });
+    if (tokens) {
+        setCalendarConfig({ ...calendar, oauthTokens: tokens });
     }
     else {
-        // Clear OAuth config
-        const { oauth: _removed, ...rest } = calendar;
+        const { oauthTokens: _removed, ...rest } = calendar;
         setCalendarConfig(rest);
     }
 }
-export function getCalendarType() {
-    const calendar = getCalendarConfig();
-    if (!calendar)
-        return undefined;
-    return calendar.type || (calendar.url ? 'ical' : undefined);
-}
 const DEFAULT_INSIGHTS_WEEKS = 2;
 export function getInsightsWeeks() {
     const weeks = loadConfig().insightsWeeks;

package/dist/ui/components/CalendarModal.js

@@ -3,7 +3,7 @@ import { useState, useEffect, useMemo } from 'react';
 import { Box, Text, useInput } from 'ink';
 import { t } from '../../i18n/index.js';
 import { useTheme } from '../theme/index.js';
-import { isCalendarEnabled, getCalendarConfig, getCalendarType } from '../../config.js';
+import { isCalendarEnabled, getCalendarSources } from '../../config.js';
 import { getCalendarEvents, getEventsForDate, formatEventTime, isEventOngoing, } from '../../calendar/index.js';
 const WEEKDAYS_EN = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
 const WEEKDAYS_JA = ['日', '月', '火', '水', '木', '金', '土'];
@@ -19,8 +19,7 @@ export function CalendarModal({ onClose }) {
     const [viewMonth, setViewMonth] = useState(new Date());
     const [mode, setMode] = useState('calendar');
     const calendarEnabled = isCalendarEnabled();
-    const config = getCalendarConfig();
-    const calendarType = getCalendarType();
+    const calendarSources = getCalendarSources().filter(s => s.enabled !== false);
     const isJapanese = i18n.tui.calendar?.yesterday === '昨日';
     const weekdays = isJapanese ? WEEKDAYS_JA : WEEKDAYS_EN;
     // Load all events on mount
@@ -211,10 +210,12 @@ export function CalendarModal({ onClose }) {
         }
     });
     const formatTitle = (title) => theme.style.headerUppercase ? title.toUpperCase() : title;
-    // Get calendar name for header
-    const calendarName = calendarType === 'oauth' && config?.oauth
-        ? config.oauth.calendarName
-        : config?.name || 'Calendar';
+    // Get calendar name for header (single calendar shows its name, multiple show a count)
+    const calendarName = calendarSources.length === 1
+        ? calendarSources[0].name
+        : calendarSources.length > 1
+            ? `Calendar (${calendarSources.length})`
+            : 'Calendar';
     // Format month header
     const monthNames = isJapanese
         ? ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "floq",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "Floq - Getting Things Done Task Manager with MS-DOS style themes",
   "type": "module",
   "main": "dist/index.js",