floq 1.4.1 → 1.6.0

package/README.ja.md

@@ -1,5 +1,9 @@
 # Floq
 
+[![npm version](https://img.shields.io/npm/v/floq.svg)](https://www.npmjs.com/package/floq)
+[![npm downloads](https://img.shields.io/npm/dm/floq.svg)](https://www.npmjs.com/package/floq)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+
 [English](./README.md)
 
 MS-DOSスタイルのテーマを備えたターミナルベースのGTD（Getting Things Done）タスクマネージャー。

package/README.md

@@ -1,5 +1,9 @@
 # Floq
 
+[![npm version](https://img.shields.io/npm/v/floq.svg)](https://www.npmjs.com/package/floq)
+[![npm downloads](https://img.shields.io/npm/dm/floq.svg)](https://www.npmjs.com/package/floq)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+
 [日本語](./README.ja.md)
 
 A terminal-based GTD (Getting Things Done) task manager with MS-DOS style themes.

package/dist/cli.js

@@ -196,6 +196,24 @@ configCmd
         await showDateFormatCommand();
     }
 });
+configCmd
+    .command('insights-weeks [weeks]')
+    .description('Set number of weeks for insights (default: 2)')
+    .action(async (weeks) => {
+    const { getInsightsWeeks, setInsightsWeeks } = await import('./config.js');
+    if (weeks !== undefined) {
+        const n = parseInt(weeks, 10);
+        if (isNaN(n) || n < 1) {
+            console.error('Weeks must be a positive integer');
+            process.exit(1);
+        }
+        setInsightsWeeks(n);
+        console.log(`Insights weeks set to ${n}`);
+    }
+    else {
+        console.log(`Insights weeks: ${getInsightsWeeks()}`);
+    }
+});
 configCmd
     .command('pomodoro')
     .description('Configure pomodoro settings')
@@ -216,9 +234,13 @@ configCmd
 program
     .command('insights')
     .description('Show task completion insights and statistics')
-    .option('-w, --weeks <n>', 'Number of weeks to analyze (default: 2)', '2')
+    .option('-w, --weeks <n>', 'Number of weeks to analyze (uses config default)')
     .action(async (options) => {
-    const weeks = Math.max(1, parseInt(options.weeks ?? '2', 10) || 2);
+    const { getInsightsWeeks } = await import('./config.js');
+    const defaultWeeks = getInsightsWeeks();
+    const weeks = options.weeks
+        ? Math.max(1, parseInt(options.weeks, 10) || defaultWeeks)
+        : defaultWeeks;
     await showInsights(weeks);
 });
 // Sync command
@@ -358,4 +380,12 @@ calendarCmd
     .action(async () => {
     await selectCalendar();
 });
+// MCP server command
+program
+    .command('mcp')
+    .description('Start MCP server for LLM integration')
+    .action(async () => {
+    const { startMcpServer } = await import('./mcp/server.js');
+    await startMcpServer();
+});
 export { program };

package/dist/commands/config.js

@@ -3,7 +3,7 @@ import React from 'react';
 import { createInterface } from 'readline';
 import { unlinkSync, existsSync, readdirSync } from 'fs';
 import { dirname, basename, join } from 'path';
-import { loadConfig, saveConfig, getDbPath, getViewMode, setViewMode, isTursoEnabled, getTursoConfig, setTursoConfig, setTursoEnabled, getSplashDuration, setSplashDuration, getDateFormat, setDateFormat, getCalendarConfig, isCalendarEnabled } from '../config.js';
+import { loadConfig, saveConfig, getDbPath, getViewMode, setViewMode, isTursoEnabled, getTursoConfig, setTursoConfig, setTursoEnabled, getSplashDuration, setSplashDuration, getDateFormat, setDateFormat, getCalendarConfig, isCalendarEnabled, getInsightsWeeks } from '../config.js';
 import { CONFIG_FILE } from '../paths.js';
 import { ThemeSelector } from '../ui/ThemeSelector.js';
 import { ModeSelector } from '../ui/ModeSelector.js';
@@ -25,6 +25,7 @@ export async function showConfig() {
     console.log(`View Mode: ${config.viewMode || 'gtd'}`);
     console.log(`Date Format: ${dateFormat}`);
     console.log(`Splash: ${splashDuration === 0 ? 'disabled' : splashDuration === -1 ? 'wait for key' : `${splashDuration}ms`}`);
+    console.log(`Insights Weeks: ${getInsightsWeeks()}`);
     console.log(`Turso: ${isTursoEnabled() ? 'enabled' : 'disabled'}`);
     if (config.db_path) {
         console.log(`  (custom: ${config.db_path})`);

package/dist/commands/done.js

@@ -28,6 +28,7 @@ export async function markDone(taskId) {
     await db.update(schema.tasks)
         .set({
         status: 'done',
+        completedAt: new Date(),
         updatedAt: new Date(),
     })
         .where(eq(schema.tasks.id, task.id));

package/dist/commands/insights.js

@@ -1,4 +1,4 @@
-import { eq, and, gte } from 'drizzle-orm';
+import { eq, and } from 'drizzle-orm';
 import { getDb, schema } from '../db/index.js';
 import { t, fmt } from '../i18n/index.js';
 function getWeekStart(date) {
@@ -53,8 +53,8 @@ function groupByWeek(tasks, weeks) {
         const weekEnd = new Date(weekStart);
         weekEnd.setDate(weekEnd.getDate() + 7);
         const weekTasks = tasks.filter(task => {
-            const updated = task.updatedAt;
-            return updated >= weekStart && updated < weekEnd;
+            const completionDate = task.completedAt ?? task.updatedAt;
+            return completionDate >= weekStart && completionDate < weekEnd;
         });
         result.push({
             weekStart,
@@ -69,7 +69,7 @@ function groupByDayOfWeek(tasks) {
     for (let i = 0; i < 7; i++)
         days.set(i, 0);
     for (const task of tasks) {
-        const day = task.updatedAt.getDay();
+        const day = (task.completedAt ?? task.updatedAt).getDay();
         days.set(day, (days.get(day) || 0) + 1);
     }
     return days;
@@ -95,9 +95,9 @@ function calculateAverageCompletionDays(tasks) {
     let validCount = 0;
     for (const task of tasks) {
         const created = task.createdAt.getTime();
-        const updated = task.updatedAt.getTime();
-        if (updated > created) {
-            totalMs += updated - created;
+        const completed = (task.completedAt ?? task.updatedAt).getTime();
+        if (completed > created) {
+            totalMs += completed - created;
             validCount++;
         }
     }
@@ -138,11 +138,14 @@ export async function showInsights(weeks) {
     startDate.setDate(startDate.getDate() - (weeks - 1) * 7);
     const endDate = new Date(now);
     endDate.setHours(23, 59, 59, 999);
-    // Query all completed tasks in the period
-    const completedTasks = await db
+    // Query completed tasks (use completedAt with updatedAt fallback)
+    const completedTasks = (await db
         .select()
         .from(schema.tasks)
-        .where(and(eq(schema.tasks.status, 'done'), gte(schema.tasks.updatedAt, startDate), eq(schema.tasks.isProject, false)));
+        .where(and(eq(schema.tasks.status, 'done'), eq(schema.tasks.isProject, false)))).filter(task => {
+        const completionDate = task.completedAt ?? task.updatedAt;
+        return completionDate >= startDate;
+    });
     // Header
     console.log();
     console.log(l.title);

package/dist/commands/move.js

@@ -4,7 +4,7 @@ import { t, fmt } from '../i18n/index.js';
 export async function moveTask(taskId, targetStatus, waitingFor) {
     const db = getDb();
     const i18n = t();
-    const validStatuses = ['inbox', 'next', 'waiting', 'someday'];
+    const validStatuses = ['inbox', 'next', 'waiting', 'someday', 'done'];
     if (!validStatuses.includes(targetStatus)) {
         console.error(fmt(i18n.commands.move.invalidStatus, { status: targetStatus }));
         console.error(fmt(i18n.commands.move.validStatuses, { statuses: validStatuses.join(', ') }));
@@ -35,6 +35,7 @@ export async function moveTask(taskId, targetStatus, waitingFor) {
         .set({
         status: targetStatus,
         waitingFor: targetStatus === 'waiting' ? waitingFor : null,
+        completedAt: targetStatus === 'done' ? new Date() : null,
         updatedAt: new Date(),
     })
         .where(eq(schema.tasks.id, task.id));

package/dist/config.d.ts

@@ -43,6 +43,7 @@ export interface Config {
     pomodoroFocusMode?: boolean;
     dateFormat?: DateFormat;
     calendar?: CalendarConfig;
+    insightsWeeks?: number;
 }
 export declare function loadConfig(): Config;
 export declare function saveConfig(updates: Partial<Config>): void;
@@ -80,3 +81,5 @@ 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 getInsightsWeeks(): number;
+export declare function setInsightsWeeks(weeks: number): void;

package/dist/config.js

@@ -244,3 +244,14 @@ export function getCalendarType() {
         return undefined;
     return calendar.type || (calendar.url ? 'ical' : undefined);
 }
+const DEFAULT_INSIGHTS_WEEKS = 2;
+export function getInsightsWeeks() {
+    const weeks = loadConfig().insightsWeeks;
+    if (weeks === undefined || weeks < 1) {
+        return DEFAULT_INSIGHTS_WEEKS;
+    }
+    return weeks;
+}
+export function setInsightsWeeks(weeks) {
+    saveConfig({ insightsWeeks: Math.max(1, weeks) });
+}

package/dist/db/index.js

@@ -26,6 +26,7 @@ async function initializeRemoteSchema(tursoUrl, authToken) {
         const hasContext = tableInfo.some(col => col.name === 'context');
         const hasIsFocused = tableInfo.some(col => col.name === 'is_focused');
         const hasEffort = tableInfo.some(col => col.name === 'effort');
+        const hasCompletedAt = tableInfo.some(col => col.name === 'completed_at');
         if (!tableExists) {
             // Fresh install: create new schema on remote
             await remoteClient.execute(`
@@ -41,6 +42,7 @@ async function initializeRemoteSchema(tursoUrl, authToken) {
           is_focused INTEGER NOT NULL DEFAULT 0,
           effort TEXT,
           due_date INTEGER,
+          completed_at INTEGER,
           created_at INTEGER NOT NULL,
           updated_at INTEGER NOT NULL
         )
@@ -63,6 +65,11 @@ async function initializeRemoteSchema(tursoUrl, authToken) {
         if (tableExists && !hasEffort) {
             await remoteClient.execute("ALTER TABLE tasks ADD COLUMN effort TEXT");
         }
+        // Migration: add completed_at column if missing
+        if (tableExists && !hasCompletedAt) {
+            await remoteClient.execute("ALTER TABLE tasks ADD COLUMN completed_at INTEGER");
+            await remoteClient.execute("UPDATE tasks SET completed_at = updated_at WHERE status = 'done'");
+        }
         // Create comments table
         await remoteClient.execute(`
       CREATE TABLE IF NOT EXISTS comments (
@@ -86,6 +93,17 @@ async function initializeRemoteSchema(tursoUrl, authToken) {
         updated_at INTEGER NOT NULL
       )
     `);
+        // Create operation_history table for crash-safe undo
+        await remoteClient.execute(`
+      CREATE TABLE IF NOT EXISTS operation_history (
+        id TEXT PRIMARY KEY,
+        command_type TEXT NOT NULL,
+        command_data TEXT NOT NULL,
+        executed_at INTEGER NOT NULL,
+        is_undone INTEGER NOT NULL DEFAULT 0
+      )
+    `);
+        await remoteClient.execute("CREATE INDEX IF NOT EXISTS idx_operation_history_executed_at ON operation_history(executed_at)");
     }
     finally {
         remoteClient.close();
@@ -102,6 +120,7 @@ async function initializeLocalSchema() {
     const hasContext = tableInfo.some(col => col.name === 'context');
     const hasIsFocused = tableInfo.some(col => col.name === 'is_focused');
     const hasEffort = tableInfo.some(col => col.name === 'effort');
+    const hasCompletedAt = tableInfo.some(col => col.name === 'completed_at');
     const tableExists = tableInfo.length > 0;
     if (tableExists && hasProjectId && !hasIsProject) {
         // Migration: old schema -> new schema
@@ -136,6 +155,7 @@ async function initializeLocalSchema() {
         is_focused INTEGER NOT NULL DEFAULT 0,
         effort TEXT,
         due_date INTEGER,
+        completed_at INTEGER,
         created_at INTEGER NOT NULL,
         updated_at INTEGER NOT NULL
       )
@@ -158,6 +178,11 @@ async function initializeLocalSchema() {
     if (tableExists && !hasEffort) {
         await client.execute("ALTER TABLE tasks ADD COLUMN effort TEXT");
     }
+    // Migration: add completed_at column if missing
+    if (tableExists && !hasCompletedAt) {
+        await client.execute("ALTER TABLE tasks ADD COLUMN completed_at INTEGER");
+        await client.execute("UPDATE tasks SET completed_at = updated_at WHERE status = 'done'");
+    }
     // Create comments table
     await client.execute(`
     CREATE TABLE IF NOT EXISTS comments (
@@ -181,6 +206,17 @@ async function initializeLocalSchema() {
       updated_at INTEGER NOT NULL
     )
   `);
+    // Create operation_history table for crash-safe undo
+    await client.execute(`
+    CREATE TABLE IF NOT EXISTS operation_history (
+      id TEXT PRIMARY KEY,
+      command_type TEXT NOT NULL,
+      command_data TEXT NOT NULL,
+      executed_at INTEGER NOT NULL,
+      is_undone INTEGER NOT NULL DEFAULT 0
+    )
+  `);
+    await client.execute("CREATE INDEX IF NOT EXISTS idx_operation_history_executed_at ON operation_history(executed_at)");
 }
 // DB 初期化
 export async function initDb() {

package/dist/db/schema.d.ts

@@ -205,6 +205,23 @@ export declare const tasks: import("drizzle-orm/sqlite-core").SQLiteTableWithCol
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
+        completedAt: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+            name: "completed_at";
+            tableName: "tasks";
+            dataType: "date";
+            columnType: "SQLiteTimestamp";
+            data: Date;
+            driverParam: number;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
         createdAt: import("drizzle-orm/sqlite-core").SQLiteColumn<{
             name: "created_at";
             tableName: "tasks";
@@ -482,3 +499,102 @@ export declare const pomodoroSessions: import("drizzle-orm/sqlite-core").SQLiteT
 }>;
 export type PomodoroSession = typeof pomodoroSessions.$inferSelect;
 export type NewPomodoroSession = typeof pomodoroSessions.$inferInsert;
+export declare const operationHistory: import("drizzle-orm/sqlite-core").SQLiteTableWithColumns<{
+    name: "operation_history";
+    schema: undefined;
+    columns: {
+        id: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+            name: "id";
+            tableName: "operation_history";
+            dataType: "string";
+            columnType: "SQLiteText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: true;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            length: number | undefined;
+        }>;
+        commandType: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+            name: "command_type";
+            tableName: "operation_history";
+            dataType: "string";
+            columnType: "SQLiteText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            length: number | undefined;
+        }>;
+        commandData: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+            name: "command_data";
+            tableName: "operation_history";
+            dataType: "string";
+            columnType: "SQLiteText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            length: number | undefined;
+        }>;
+        executedAt: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+            name: "executed_at";
+            tableName: "operation_history";
+            dataType: "date";
+            columnType: "SQLiteTimestamp";
+            data: Date;
+            driverParam: number;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        isUndone: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+            name: "is_undone";
+            tableName: "operation_history";
+            dataType: "boolean";
+            columnType: "SQLiteBoolean";
+            data: boolean;
+            driverParam: number;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+    };
+    dialect: "sqlite";
+}>;
+export type OperationHistory = typeof operationHistory.$inferSelect;

package/dist/db/schema.js

@@ -11,6 +11,7 @@ export const tasks = sqliteTable('tasks', {
     isFocused: integer('is_focused', { mode: 'boolean' }).notNull().default(false),
     effort: text('effort'),
     dueDate: integer('due_date', { mode: 'timestamp' }),
+    completedAt: integer('completed_at', { mode: 'timestamp' }),
     createdAt: integer('created_at', { mode: 'timestamp' }).notNull(),
     updatedAt: integer('updated_at', { mode: 'timestamp' }).notNull(),
 });
@@ -32,3 +33,10 @@ export const pomodoroSessions = sqliteTable('pomodoro_sessions', {
     completedCount: integer('completed_count').notNull().default(0),
     updatedAt: integer('updated_at', { mode: 'timestamp' }).notNull(),
 });
+export const operationHistory = sqliteTable('operation_history', {
+    id: text('id').primaryKey(),
+    commandType: text('command_type').notNull(),
+    commandData: text('command_data').notNull(), // JSON serialized
+    executedAt: integer('executed_at', { mode: 'timestamp' }).notNull(),
+    isUndone: integer('is_undone', { mode: 'boolean' }).notNull().default(false),
+});

package/dist/i18n/en.d.ts

@@ -243,6 +243,7 @@ export declare const en: {
         taskDetailTitle: string;
         taskDetailFooter: string;
         taskDetailStatus: string;
+        taskDetailCompletedAt: string;
         deleteConfirm: string;
         deleted: string;
         deleteCancelled: string;
@@ -670,6 +671,7 @@ export type TuiTranslations = {
     taskDetailTitle: string;
     taskDetailFooter: string;
     taskDetailStatus: string;
+    taskDetailCompletedAt?: string;
     deleteConfirm: string;
     deleted: string;
     deleteCancelled: string;

package/dist/i18n/en.js

@@ -256,6 +256,7 @@ export const en = {
         taskDetailTitle: 'Task Details',
         taskDetailFooter: 'j/k=select i=comment d=delete P=link b/Esc=back',
         taskDetailStatus: 'Status',
+        taskDetailCompletedAt: 'Completed',
         deleteConfirm: 'Delete "{title}"? (y/n)',
         deleted: 'Deleted: "{title}"',
         deleteCancelled: 'Delete cancelled',

package/dist/i18n/ja.js

@@ -256,6 +256,7 @@ export const ja = {
         taskDetailTitle: 'タスク詳細',
         taskDetailFooter: 'j/k=選択 i=コメント d=削除 P=紐づけ b/Esc=戻る',
         taskDetailStatus: 'ステータス',
+        taskDetailCompletedAt: '完了日',
         deleteConfirm: '「{title}」を削除しますか？ (y/n)',
         deleted: '削除しました: 「{title}」',
         deleteCancelled: '削除をキャンセルしました',

package/dist/index.js

@@ -10,6 +10,7 @@ async function main() {
     const isConfigCommand = args[0] === 'config';
     const isSyncCommand = args[0] === 'sync';
     const isSetupCommand = args[0] === 'setup';
+    const isMcpCommand = args[0] === 'mcp';
     // 初回起動時（引数なし + config未作成）はウィザードを起動
     if (isTuiMode && isFirstRun()) {
         await runSetupWizard();
@@ -19,7 +20,7 @@ async function main() {
         return;
     }
     // config/syncコマンド以外でTursoモードの場合は接続先を表示
-    if (!isTuiMode && !isConfigCommand && !isSyncCommand && !isSetupCommand && isTursoEnabled()) {
+    if (!isTuiMode && !isConfigCommand && !isSyncCommand && !isSetupCommand && !isMcpCommand && isTursoEnabled()) {
         const turso = getTursoConfig();
         if (turso) {
             const host = new URL(turso.url).host;

package/dist/mcp/server.d.ts

@@ -0,0 +1 @@
+export declare function startMcpServer(): Promise<void>;