floq 1.7.0 → 1.9.0

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/db/projectDelete.d.ts

@@ -0,0 +1,20 @@
+import type { Task, Comment } from './schema.js';
+/**
+ * How to handle child tasks when deleting a project.
+ * - `cascade`: delete the project together with all its child tasks (and their comments)
+ * - `keep`: delete only the project, moving its child tasks back to Inbox (unlinked)
+ */
+export type ProjectDeleteMode = 'cascade' | 'keep';
+export interface ProjectDeleteResult {
+    /** Child tasks that were deleted (only populated for `cascade`). */
+    deletedTasks: Task[];
+    /** Child tasks moved to Inbox, in their original state (only populated for `keep`). */
+    movedTasks: Task[];
+    /** Comments that were deleted (project's own comments, plus child comments in `cascade`). */
+    deletedComments: Comment[];
+}
+/**
+ * Delete a project and handle its child tasks according to `mode`.
+ * Returns the prior state so the operation can be undone.
+ */
+export declare function deleteProject(project: Task, mode: ProjectDeleteMode): Promise<ProjectDeleteResult>;

package/dist/db/projectDelete.js

@@ -0,0 +1,49 @@
+import { eq } from 'drizzle-orm';
+import { getDb, schema } from './index.js';
+/**
+ * Delete a project and handle its child tasks according to `mode`.
+ * Returns the prior state so the operation can be undone.
+ */
+export async function deleteProject(project, mode) {
+    const db = getDb();
+    const children = await db
+        .select()
+        .from(schema.tasks)
+        .where(eq(schema.tasks.parentId, project.id));
+    const deletedTasks = [];
+    const movedTasks = [];
+    let deletedComments = [];
+    // Always remove the project's own comments.
+    const projectComments = await db
+        .select()
+        .from(schema.comments)
+        .where(eq(schema.comments.taskId, project.id));
+    deletedComments = deletedComments.concat(projectComments);
+    await db.delete(schema.comments).where(eq(schema.comments.taskId, project.id));
+    if (mode === 'cascade') {
+        for (const child of children) {
+            const childComments = await db
+                .select()
+                .from(schema.comments)
+                .where(eq(schema.comments.taskId, child.id));
+            deletedComments = deletedComments.concat(childComments);
+            await db.delete(schema.comments).where(eq(schema.comments.taskId, child.id));
+            await db.delete(schema.tasks).where(eq(schema.tasks.id, child.id));
+            deletedTasks.push(child);
+        }
+    }
+    else {
+        // keep: unlink children and move them back to Inbox.
+        const now = new Date();
+        for (const child of children) {
+            movedTasks.push(child);
+            await db
+                .update(schema.tasks)
+                .set({ parentId: null, status: 'inbox', updatedAt: now })
+                .where(eq(schema.tasks.id, child.id));
+        }
+    }
+    // Finally remove the project itself.
+    await db.delete(schema.tasks).where(eq(schema.tasks.id, project.id));
+    return { deletedTasks, movedTasks, deletedComments };
+}

package/dist/i18n/en.d.ts

@@ -51,6 +51,12 @@ export declare const en: {
             notFound: string;
             multipleMatch: string;
             completed: string;
+            deleted: string;
+            deletedWithTasks: string;
+            tasksMovedToInbox: string;
+            deletePrompt: string;
+            deleteChildrenPrompt: string;
+            deleteCancelled: string;
             noProjects: string;
             description: string;
             statusLabel: string;
@@ -247,6 +253,11 @@ export declare const en: {
         deleteConfirm: string;
         deleted: string;
         deleteCancelled: string;
+        deleteProjectConfirm: string;
+        deleteProjectChildren: string;
+        deletedProject: string;
+        deletedProjectWithTasks: string;
+        projectTasksToInbox: string;
         undone: string;
         redone: string;
         nothingToUndo: string;
@@ -675,6 +686,11 @@ export type TuiTranslations = {
     deleteConfirm: string;
     deleted: string;
     deleteCancelled: string;
+    deleteProjectConfirm?: string;
+    deleteProjectChildren?: string;
+    deletedProject?: string;
+    deletedProjectWithTasks?: string;
+    projectTasksToInbox?: string;
     undone: string;
     redone: string;
     nothingToUndo: string;

package/dist/i18n/en.js

@@ -55,6 +55,12 @@ export const en = {
             notFound: 'Project not found: {id}',
             multipleMatch: 'Multiple projects match "{id}". Please be more specific.',
             completed: 'Completed project: "{name}"',
+            deleted: 'Deleted project: "{name}"',
+            deletedWithTasks: 'Deleted project "{name}" and {count} task(s)',
+            tasksMovedToInbox: 'Moved {count} task(s) to Inbox',
+            deletePrompt: 'Delete project "{name}"?',
+            deleteChildrenPrompt: 'Project "{name}" has {count} task(s). a=delete all  k=keep tasks (→Inbox)  n=cancel',
+            deleteCancelled: 'Cancelled.',
             noProjects: 'No projects',
             description: 'Description: {description}',
             statusLabel: 'Status: {status}',
@@ -260,6 +266,11 @@ export const en = {
         deleteConfirm: 'Delete "{title}"? (y/n)',
         deleted: 'Deleted: "{title}"',
         deleteCancelled: 'Delete cancelled',
+        deleteProjectConfirm: 'Delete project "{title}"? (y/n)',
+        deleteProjectChildren: 'Project "{title}" has {count} task(s). t=delete all  i=keep tasks (→Inbox)  n=cancel',
+        deletedProject: 'Deleted project: "{title}"',
+        deletedProjectWithTasks: 'Deleted project "{title}" and {count} task(s)',
+        projectTasksToInbox: 'Deleted project "{title}", moved {count} task(s) to Inbox',
         // Undo/Redo
         undone: 'Undone: {action}',
         redone: 'Redone: {action}',

package/dist/i18n/ja.js

@@ -55,6 +55,12 @@ export const ja = {
             notFound: 'プロジェクトが見つかりません: {id}',
             multipleMatch: '「{id}」に一致するプロジェクトが複数あります。より具体的に指定してください。',
             completed: 'プロジェクトを完了しました: 「{name}」',
+            deleted: 'プロジェクトを削除しました: 「{name}」',
+            deletedWithTasks: 'プロジェクト「{name}」とタスク{count}件を削除しました',
+            tasksMovedToInbox: 'タスク{count}件をInboxへ移動しました',
+            deletePrompt: 'プロジェクト「{name}」を削除しますか？',
+            deleteChildrenPrompt: 'プロジェクト「{name}」にはタスクが{count}件あります。 a=すべて削除  k=タスクを残す(→Inbox)  n=キャンセル',
+            deleteCancelled: 'キャンセルしました。',
             noProjects: 'プロジェクトなし',
             description: '説明: {description}',
             statusLabel: 'ステータス: {status}',
@@ -260,6 +266,11 @@ export const ja = {
         deleteConfirm: '「{title}」を削除しますか？ (y/n)',
         deleted: '削除しました: 「{title}」',
         deleteCancelled: '削除をキャンセルしました',
+        deleteProjectConfirm: 'プロジェクト「{title}」を削除しますか？ (y/n)',
+        deleteProjectChildren: 'プロジェクト「{title}」にはタスクが{count}件あります。 t=すべて削除  i=タスクを残す(→Inbox)  n=キャンセル',
+        deletedProject: 'プロジェクトを削除しました: 「{title}」',
+        deletedProjectWithTasks: 'プロジェクト「{title}」とタスク{count}件を削除しました',
+        projectTasksToInbox: 'プロジェクト「{title}」を削除し、タスク{count}件をInboxへ移動しました',
         // Undo/Redo
         undone: '元に戻しました: {action}',
         redone: 'やり直しました: {action}',

package/dist/ui/App.js

@@ -30,7 +30,7 @@ import { KanbanMario } from './components/KanbanMario.js';
 import { GtdDQ } from './components/GtdDQ.js';
 import { GtdMario } from './components/GtdMario.js';
 import { VERSION } from '../version.js';
-import { HistoryProvider, useHistory, CreateTaskCommand, DeleteTaskCommand, MoveTaskCommand, LinkTaskCommand, ConvertToProjectCommand, CreateCommentCommand, DeleteCommentCommand, SetContextCommand, SetFocusCommand, SetEffortCommand, } from './history/index.js';
+import { HistoryProvider, useHistory, CreateTaskCommand, DeleteTaskCommand, DeleteProjectCommand, MoveTaskCommand, LinkTaskCommand, ConvertToProjectCommand, CreateCommentCommand, DeleteCommentCommand, SetContextCommand, SetFocusCommand, SetEffortCommand, } from './history/index.js';
 const TABS = ['inbox', 'next', 'waiting', 'someday', 'projects', 'done'];
 export function App() {
     const [themeName, setThemeNameState] = useState(getThemeName);
@@ -102,6 +102,8 @@ function AppContent({ onOpenSettings }) {
     const [selectedCommentIndex, setSelectedCommentIndex] = useState(0);
     const [taskToWaiting, setTaskToWaiting] = useState(null);
     const [taskToDelete, setTaskToDelete] = useState(null);
+    const [projectToDelete, setProjectToDelete] = useState(null);
+    const [projectChildCount, setProjectChildCount] = useState(0);
     const [projectProgress, setProjectProgress] = useState({});
     // Search state
     const [searchQuery, setSearchQuery] = useState('');
@@ -517,6 +519,19 @@ function AppContent({ onOpenSettings }) {
         setMessage(fmt(i18n.tui.deleted || 'Deleted: "{title}"', { title: task.title }));
         await loadTasks();
     }, [i18n.tui.deleted, loadTasks, history]);
+    const deleteProjectAction = useCallback(async (project, mode, childCount) => {
+        const message = mode === 'cascade'
+            ? (childCount > 0
+                ? fmt(i18n.tui.deletedProjectWithTasks || 'Deleted project "{title}" and {count} task(s)', { title: project.title, count: childCount })
+                : fmt(i18n.tui.deletedProject || 'Deleted project: "{title}"', { title: project.title }))
+            : (childCount > 0
+                ? fmt(i18n.tui.projectTasksToInbox || 'Deleted project "{title}", moved {count} task(s) to Inbox', { title: project.title, count: childCount })
+                : fmt(i18n.tui.deletedProject || 'Deleted project: "{title}"', { title: project.title }));
+        const command = new DeleteProjectCommand({ project, mode, description: message });
+        await history.execute(command);
+        setMessage(message);
+        await loadTasks();
+    }, [i18n.tui.deletedProject, i18n.tui.deletedProjectWithTasks, i18n.tui.projectTasksToInbox, loadTasks, history]);
     const getTabLabel = (tab) => {
         switch (tab) {
             case 'inbox':
@@ -576,6 +591,51 @@ function AppContent({ onOpenSettings }) {
             // Ignore other keys in confirm mode
             return;
         }
+        // Handle confirm-delete-project mode
+        if (mode === 'confirm-delete-project' && projectToDelete) {
+            const cancel = () => {
+                setMessage(i18n.tui.deleteCancelled || 'Delete cancelled');
+                setProjectToDelete(null);
+                setMode('normal');
+            };
+            const runDelete = (deleteMode) => {
+                const project = projectToDelete;
+                const count = projectChildCount;
+                deleteProjectAction(project, deleteMode, count).then(() => {
+                    if (selectedTaskIndex >= currentTasks.length - 1) {
+                        setSelectedTaskIndex(Math.max(0, selectedTaskIndex - 1));
+                    }
+                });
+                setProjectToDelete(null);
+                setMode('normal');
+            };
+            if (projectChildCount > 0) {
+                if (input === 't' || input === 'T') {
+                    runDelete('cascade');
+                    return;
+                }
+                if (input === 'i' || input === 'I') {
+                    runDelete('keep');
+                    return;
+                }
+                if (input === 'n' || input === 'N' || key.escape) {
+                    cancel();
+                    return;
+                }
+            }
+            else {
+                if (input === 'y' || input === 'Y') {
+                    runDelete('cascade');
+                    return;
+                }
+                if (input === 'n' || input === 'N' || key.escape) {
+                    cancel();
+                    return;
+                }
+            }
+            // Ignore other keys in confirm mode
+            return;
+        }
         // Handle add mode
         if (mode === 'add' || mode === 'add-to-project' || mode === 'add-comment' || mode === 'move-to-waiting') {
             if (key.escape) {
@@ -1077,6 +1137,20 @@ function AppContent({ onOpenSettings }) {
             });
             return;
         }
+        // Delete project (D key on projects tab - with confirmation)
+        if (input === 'D' && currentTasks.length > 0 && currentTab === 'projects') {
+            const project = currentTasks[selectedTaskIndex];
+            const db = getDb();
+            db.select()
+                .from(schema.tasks)
+                .where(eq(schema.tasks.parentId, project.id))
+                .then((children) => {
+                setProjectChildCount(children.length);
+                setProjectToDelete(project);
+                setMode('confirm-delete-project');
+            });
+            return;
+        }
         // Delete task (D key - with confirmation)
         if (input === 'D' && currentTasks.length > 0 && currentTab !== 'projects') {
             const task = currentTasks[selectedTaskIndex];
@@ -1224,7 +1298,9 @@ function AppContent({ onOpenSettings }) {
                             const isActive = (ctx === 'clear' && !currentContext) ||
                                 (ctx !== 'clear' && ctx !== 'new' && currentContext === ctx);
                             return (_jsxs(Text, { color: index === contextSelectIndex ? theme.colors.textSelected : theme.colors.text, bold: index === contextSelectIndex, children: [index === contextSelectIndex ? theme.style.selectedPrefix : theme.style.unselectedPrefix, label, isActive && ' *'] }, ctx));
-                        }) }), _jsx(Text, { color: theme.colors.textMuted, children: i18n.tui.context?.setContextHelp || 'j/k: select, Enter: confirm, Esc: cancel' })] })), mode === 'set-effort' && (_jsxs(Box, { flexDirection: "column", borderStyle: theme.borders.modal, borderColor: theme.colors.borderActive, paddingX: 2, paddingY: 1, children: [_jsx(Text, { bold: true, color: theme.colors.accent, children: i18n.tui.effort?.set || 'Set effort' }), _jsx(Text, { color: theme.colors.textMuted, children: i18n.tui.effort?.setHelp || 'j/k: select, Enter: confirm, Esc: cancel' }), _jsx(Box, { flexDirection: "column", marginTop: 1, children: EFFORT_OPTIONS.map((option, index) => (_jsxs(Text, { color: index === effortSelectIndex ? theme.colors.textSelected : theme.colors.text, bold: index === effortSelectIndex, children: [index === effortSelectIndex ? theme.style.selectedPrefix : theme.style.unselectedPrefix, option.label] }, option.label))) })] })), mode === 'add-context' && (_jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: theme.colors.secondary, bold: true, children: i18n.tui.context?.newContext || 'New context: ' }), _jsx(TextInput, { value: inputValue, onChange: setInputValue, onSubmit: handleInputSubmit, placeholder: i18n.tui.context?.newContextPlaceholder || 'Enter context name...' }), _jsxs(Text, { color: theme.colors.textMuted, children: [" ", i18n.tui.inputHelp] })] })), mode === 'search' && (_jsx(SearchBar, { value: searchQuery, onChange: handleSearchChange, onSubmit: handleInputSubmit })), mode === 'confirm-delete' && taskToDelete && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.colors.accent, bold: true, children: fmt(i18n.tui.deleteConfirm || 'Delete "{title}"? (y/n)', { title: taskToDelete.title }) }) })), message && mode === 'normal' && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.colors.textHighlight, children: message }) })), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [(mode === 'task-detail' || mode === 'add-comment') ? (theme.style.showFunctionKeys ? (_jsx(FunctionKeyBar, { keys: [
+                        }) }), _jsx(Text, { color: theme.colors.textMuted, children: i18n.tui.context?.setContextHelp || 'j/k: select, Enter: confirm, Esc: cancel' })] })), mode === 'set-effort' && (_jsxs(Box, { flexDirection: "column", borderStyle: theme.borders.modal, borderColor: theme.colors.borderActive, paddingX: 2, paddingY: 1, children: [_jsx(Text, { bold: true, color: theme.colors.accent, children: i18n.tui.effort?.set || 'Set effort' }), _jsx(Text, { color: theme.colors.textMuted, children: i18n.tui.effort?.setHelp || 'j/k: select, Enter: confirm, Esc: cancel' }), _jsx(Box, { flexDirection: "column", marginTop: 1, children: EFFORT_OPTIONS.map((option, index) => (_jsxs(Text, { color: index === effortSelectIndex ? theme.colors.textSelected : theme.colors.text, bold: index === effortSelectIndex, children: [index === effortSelectIndex ? theme.style.selectedPrefix : theme.style.unselectedPrefix, option.label] }, option.label))) })] })), mode === 'add-context' && (_jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: theme.colors.secondary, bold: true, children: i18n.tui.context?.newContext || 'New context: ' }), _jsx(TextInput, { value: inputValue, onChange: setInputValue, onSubmit: handleInputSubmit, placeholder: i18n.tui.context?.newContextPlaceholder || 'Enter context name...' }), _jsxs(Text, { color: theme.colors.textMuted, children: [" ", i18n.tui.inputHelp] })] })), mode === 'search' && (_jsx(SearchBar, { value: searchQuery, onChange: handleSearchChange, onSubmit: handleInputSubmit })), mode === 'confirm-delete' && taskToDelete && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.colors.accent, bold: true, children: fmt(i18n.tui.deleteConfirm || 'Delete "{title}"? (y/n)', { title: taskToDelete.title }) }) })), mode === 'confirm-delete-project' && projectToDelete && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.colors.accent, bold: true, children: projectChildCount > 0
+                        ? fmt(i18n.tui.deleteProjectChildren || 'Project "{title}" has {count} task(s). t=delete all  i=keep tasks (→Inbox)  n=cancel', { title: projectToDelete.title, count: projectChildCount })
+                        : fmt(i18n.tui.deleteProjectConfirm || 'Delete project "{title}"? (y/n)', { title: projectToDelete.title }) }) })), message && mode === 'normal' && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.colors.textHighlight, children: message }) })), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [(mode === 'task-detail' || mode === 'add-comment') ? (theme.style.showFunctionKeys ? (_jsx(FunctionKeyBar, { keys: [
                             { key: 'i', label: i18n.tui.keyBar.comment },
                             { key: 'd', label: i18n.tui.keyBar.delete },
                             { key: 'P', label: i18n.tui.keyBar.project },

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月']