floq 1.7.0 → 1.9.0

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

@@ -5,4 +5,10 @@ export declare function addProject(name: string, options: AddProjectOptions): Pr
 export declare function listProjectsCommand(): Promise<void>;
 export declare function showProject(projectId: string): Promise<void>;
 export declare function completeProject(projectId: string): Promise<void>;
+interface DeleteProjectOptions {
+    withTasks?: boolean;
+    keepTasks?: boolean;
+    force?: boolean;
+}
+export declare function deleteProjectCommand(projectId: string, options: DeleteProjectOptions): Promise<void>;
 export {};

package/dist/commands/project.js

@@ -1,6 +1,8 @@
 import { v4 as uuidv4 } from 'uuid';
+import { createInterface } from 'readline';
 import { eq, like, and } from 'drizzle-orm';
 import { getDb, schema } from '../db/index.js';
+import { deleteProject } from '../db/projectDelete.js';
 import { t, fmt } from '../i18n/index.js';
 export async function addProject(name, options) {
     const db = getDb();
@@ -150,3 +152,96 @@ export async function completeProject(projectId) {
         .where(eq(schema.tasks.id, project.id));
     console.log(fmt(i18n.commands.project.completed, { name: project.title }));
 }
+function ask(rl, question) {
+    return new Promise((resolve) => {
+        rl.question(question, (answer) => {
+            resolve(answer.trim().toLowerCase());
+        });
+    });
+}
+export async function deleteProjectCommand(projectId, options) {
+    const db = getDb();
+    const i18n = t();
+    // Find project by ID prefix, then by exact name.
+    let projects = await db
+        .select()
+        .from(schema.tasks)
+        .where(and(eq(schema.tasks.isProject, true), like(schema.tasks.id, `${projectId}%`)));
+    if (projects.length === 0) {
+        projects = await db
+            .select()
+            .from(schema.tasks)
+            .where(and(eq(schema.tasks.isProject, true), eq(schema.tasks.title, projectId)));
+    }
+    if (projects.length === 0) {
+        console.error(fmt(i18n.commands.project.notFound, { id: projectId }));
+        process.exit(1);
+    }
+    if (projects.length > 1) {
+        console.error(fmt(i18n.commands.project.multipleMatch, { id: projectId }));
+        for (const p of projects) {
+            console.error(`  [${p.id.slice(0, 8)}] ${p.title}`);
+        }
+        process.exit(1);
+    }
+    const project = projects[0];
+    const children = await db
+        .select()
+        .from(schema.tasks)
+        .where(eq(schema.tasks.parentId, project.id));
+    const childCount = children.length;
+    // Decide how to handle child tasks. When neither flag is given and the
+    // project has tasks, the choice is resolved interactively below.
+    let mode = options.withTasks ? 'cascade' :
+        options.keepTasks ? 'keep' :
+            childCount === 0 ? 'cascade' :
+                null;
+    if (!options.force) {
+        // A single prompt keeps this reliable for piped/non-TTY input.
+        const rl = createInterface({ input: process.stdin, output: process.stdout });
+        try {
+            if (mode !== null) {
+                const answer = await ask(rl, `${fmt(i18n.commands.project.deletePrompt, { name: project.title })} (y/N): `);
+                if (answer !== 'y' && answer !== 'yes') {
+                    console.log(i18n.commands.project.deleteCancelled);
+                    return;
+                }
+            }
+            else {
+                const answer = await ask(rl, `${fmt(i18n.commands.project.deleteChildrenPrompt, { name: project.title, count: childCount })}: `);
+                if (answer === 'a' || answer === 'all') {
+                    mode = 'cascade';
+                }
+                else if (answer === 'k' || answer === 'keep') {
+                    mode = 'keep';
+                }
+                else {
+                    console.log(i18n.commands.project.deleteCancelled);
+                    return;
+                }
+            }
+        }
+        finally {
+            rl.close();
+        }
+    }
+    else if (mode === null) {
+        // Forced with no explicit choice: keep tasks to avoid silent data loss.
+        mode = 'keep';
+    }
+    await deleteProject(project, mode);
+    if (mode === 'cascade') {
+        if (childCount > 0) {
+            console.log(fmt(i18n.commands.project.deletedWithTasks, { name: project.title, count: childCount }));
+        }
+        else {
+            console.log(fmt(i18n.commands.project.deleted, { name: project.title }));
+        }
+    }
+    else {
+        console.log(fmt(i18n.commands.project.deleted, { name: project.title }));
+        if (childCount > 0) {
+            console.log(fmt(i18n.commands.project.tasksMovedToInbox, { count: childCount }));
+        }
+    }
+}

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>;