floq 1.4.0 → 1.5.0

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/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/ui/App.js

@@ -407,6 +407,7 @@ function AppContent({ onOpenSettings }) {
             toStatus: 'done',
             fromWaitingFor: task.waitingFor,
             toWaitingFor: null,
+            fromCompletedAt: task.completedAt,
             description: fmt(i18n.tui.completed, { title: task.title }),
         });
         await history.execute(command);
@@ -420,6 +421,7 @@ function AppContent({ onOpenSettings }) {
             toStatus: status,
             fromWaitingFor: task.waitingFor,
             toWaitingFor: null,
+            fromCompletedAt: task.completedAt,
             description: fmt(i18n.tui.movedTo, { title: task.title, status: i18n.status[status] }),
         });
         await history.execute(command);
@@ -433,6 +435,7 @@ function AppContent({ onOpenSettings }) {
             toStatus: 'waiting',
             fromWaitingFor: task.waitingFor,
             toWaitingFor: waitingFor.trim(),
+            fromCompletedAt: task.completedAt,
             description: fmt(i18n.tui.movedToWaiting, { title: task.title, person: waitingFor.trim() }),
         });
         await history.execute(command);
@@ -1109,7 +1112,7 @@ function AppContent({ onOpenSettings }) {
             return;
         }
         // Move to inbox
-        if (input === 'i' && currentTasks.length > 0 && currentTab !== 'inbox' && currentTab !== 'projects' && currentTab !== 'done') {
+        if (input === 'i' && currentTasks.length > 0 && currentTab !== 'inbox' && currentTab !== 'projects') {
             const task = currentTasks[selectedTaskIndex];
             moveTaskToStatus(task, 'inbox').then(() => {
                 if (selectedTaskIndex >= currentTasks.length - 1) {
@@ -1188,17 +1191,17 @@ function AppContent({ onOpenSettings }) {
                     const count = tasks[tab].length;
                     const label = `${index + 1}:${getTabLabel(tab)}(${count})`;
                     return (_jsx(Box, { marginRight: 1, children: _jsx(Text, { color: isActive ? theme.colors.textSelected : theme.colors.textMuted, bold: isActive, inverse: isActive && theme.style.tabActiveInverse, children: formatTabLabel(` ${label} `, isActive) }) }, tab));
-                }) }), mode === 'project-detail' && selectedProject && (_jsxs(_Fragment, { children: [_jsxs(Box, { marginBottom: 1, children: [_jsxs(Text, { color: theme.colors.accent, bold: true, children: [theme.name === 'modern' ? '📁 ' : '>> ', selectedProject.title] }), _jsxs(Text, { color: theme.colors.textMuted, children: [" (Esc/b: ", i18n.tui.back || 'back', ")"] })] }), _jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.projectTasks || 'Tasks', " (", projectTasks.length, ")"] }) })] })), (mode === 'task-detail' || mode === 'add-comment') && selectedTask && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { marginBottom: 1, children: [_jsxs(Text, { color: theme.colors.accent, bold: true, children: [theme.name === 'modern' ? '📋 ' : '>> ', i18n.tui.taskDetailTitle || 'Task Details'] }), _jsxs(Text, { color: theme.colors.textMuted, children: [" (Esc/b: ", i18n.tui.back || 'back', ", ", i18n.tui.commentHint || 'i: add comment', ")"] })] }), _jsxs(Box, { flexDirection: "column", borderStyle: theme.borders.list, borderColor: theme.colors.border, paddingX: 1, paddingY: 1, marginBottom: 1, children: [_jsx(Text, { color: theme.colors.text, bold: true, children: selectedTask.title }), selectedTask.description && (_jsx(Text, { color: theme.colors.textMuted, children: selectedTask.description })), _jsxs(Box, { marginTop: 1, children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.taskDetailStatus, ": "] }), _jsxs(Text, { color: theme.colors.accent, children: [i18n.status[selectedTask.status], selectedTask.waitingFor && ` (${selectedTask.waitingFor})`] })] }), _jsxs(Box, { children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.context?.label || 'Context', ": "] }), _jsx(Text, { color: theme.colors.accent, children: selectedTask.context ? `@${selectedTask.context}` : (i18n.tui.context?.none || 'No context') })] }), _jsxs(Box, { children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.effort?.label || 'Effort', ": "] }), _jsx(Text, { color: theme.colors.accent, children: selectedTask.effort ? (i18n.tui.effort?.[selectedTask.effort] || selectedTask.effort) : '-' })] }), _jsxs(Box, { children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.focus?.label || 'Focus', ": "] }), _jsx(Text, { color: theme.colors.accent, children: selectedTask.isFocused ? '★' : '-' })] })] }), _jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.comments || 'Comments', " (", taskComments.length, ")"] }) }), _jsx(Box, { flexDirection: "column", borderStyle: theme.borders.list, borderColor: theme.colors.border, paddingX: 1, paddingY: 1, minHeight: 5, children: taskComments.length === 0 ? (_jsx(Text, { color: theme.colors.textMuted, italic: true, children: i18n.tui.noComments || 'No comments yet' })) : (taskComments.map((comment, index) => {
+                }) }), mode === 'project-detail' && selectedProject && (_jsxs(_Fragment, { children: [_jsxs(Box, { marginBottom: 1, children: [_jsxs(Text, { color: theme.colors.accent, bold: true, children: [theme.name === 'modern' ? '📁 ' : '>> ', selectedProject.title] }), _jsxs(Text, { color: theme.colors.textMuted, children: [" (Esc/b: ", i18n.tui.back || 'back', ")"] })] }), _jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.projectTasks || 'Tasks', " (", projectTasks.length, ")"] }) })] })), (mode === 'task-detail' || mode === 'add-comment') && selectedTask && (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { marginBottom: 1, children: [_jsxs(Text, { color: theme.colors.accent, bold: true, children: [theme.name === 'modern' ? '📋 ' : '>> ', i18n.tui.taskDetailTitle || 'Task Details'] }), _jsxs(Text, { color: theme.colors.textMuted, children: [" (Esc/b: ", i18n.tui.back || 'back', ", ", i18n.tui.commentHint || 'i: add comment', ")"] })] }), _jsxs(Box, { flexDirection: "column", borderStyle: theme.borders.list, borderColor: theme.colors.border, paddingX: 1, paddingY: 1, marginBottom: 1, children: [_jsx(Text, { color: theme.colors.text, bold: true, children: selectedTask.title }), selectedTask.description && (_jsx(Text, { color: theme.colors.textMuted, children: selectedTask.description })), _jsxs(Box, { marginTop: 1, children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.taskDetailStatus, ": "] }), _jsxs(Text, { color: theme.colors.accent, children: [i18n.status[selectedTask.status], selectedTask.waitingFor && ` (${selectedTask.waitingFor})`] })] }), _jsxs(Box, { children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.context?.label || 'Context', ": "] }), _jsx(Text, { color: theme.colors.accent, children: selectedTask.context ? `@${selectedTask.context}` : (i18n.tui.context?.none || 'No context') })] }), _jsxs(Box, { children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.effort?.label || 'Effort', ": "] }), _jsx(Text, { color: theme.colors.accent, children: selectedTask.effort ? (i18n.tui.effort?.[selectedTask.effort] || selectedTask.effort) : '-' })] }), _jsxs(Box, { children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.focus?.label || 'Focus', ": "] }), _jsx(Text, { color: theme.colors.accent, children: selectedTask.isFocused ? '★' : '-' })] }), selectedTask.status === 'done' && (_jsxs(Box, { children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.taskDetailCompletedAt || 'Completed', ": "] }), _jsx(Text, { color: theme.colors.accent, children: (selectedTask.completedAt ?? selectedTask.updatedAt).toLocaleString() })] }))] }), _jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.comments || 'Comments', " (", taskComments.length, ")"] }) }), _jsx(Box, { flexDirection: "column", borderStyle: theme.borders.list, borderColor: theme.colors.border, paddingX: 1, paddingY: 1, minHeight: 5, children: taskComments.length === 0 ? (_jsx(Text, { color: theme.colors.textMuted, italic: true, children: i18n.tui.noComments || 'No comments yet' })) : (taskComments.map((comment, index) => {
                             const isSelected = index === selectedCommentIndex && mode === 'task-detail';
                             return (_jsxs(Box, { flexDirection: "row", marginBottom: 1, children: [_jsx(Text, { color: isSelected ? theme.colors.textSelected : theme.colors.textMuted, children: isSelected ? theme.style.selectedPrefix : theme.style.unselectedPrefix }), _jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: theme.colors.textMuted, children: ["[", comment.createdAt.toLocaleString(), "]"] }), _jsx(Text, { color: isSelected ? theme.colors.textSelected : theme.colors.text, bold: isSelected, children: comment.content })] })] }, comment.id));
                         })) }), mode === 'add-comment' && (_jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: theme.colors.secondary, bold: true, children: i18n.tui.addComment || 'New comment: ' }), _jsx(TextInput, { value: inputValue, onChange: setInputValue, onSubmit: handleInputSubmit, placeholder: "" }), _jsxs(Text, { color: theme.colors.textMuted, children: [" ", i18n.tui.inputHelp] })] }))] })), mode === 'search' && searchQuery && (_jsx(SearchResults, { results: searchResults, selectedIndex: searchResultIndex, query: searchQuery })), mode !== 'task-detail' && mode !== 'add-comment' && mode !== 'search' && (theme.uiStyle === 'titled-box' ? (_jsx(TitledBox, { title: mode === 'project-detail' && selectedProject ? selectedProject.title : getTabLabel(currentTab), borderColor: theme.colors.border, minHeight: 10, children: currentTasks.length === 0 ? (_jsx(Text, { color: theme.colors.textMuted, italic: true, children: i18n.tui.noTasks })) : (currentTasks.map((task, index) => {
                     const parentProject = getParentProject(task.parentId);
                     const progress = currentTab === 'projects' ? projectProgress[task.id] : undefined;
-                    return (_jsx(TaskItem, { task: task, isSelected: index === selectedTaskIndex, projectName: parentProject?.title, progress: progress }, task.id));
+                    return (_jsx(TaskItem, { task: task, isSelected: index === selectedTaskIndex, projectName: parentProject?.title, progress: progress, showStatus: mode === 'project-detail' }, task.id));
                 })) })) : (_jsx(Box, { flexDirection: "column", borderStyle: theme.borders.list, borderColor: theme.colors.border, paddingX: 1, paddingY: 1, minHeight: 10, children: currentTasks.length === 0 ? (_jsx(Text, { color: theme.colors.textMuted, italic: true, children: i18n.tui.noTasks })) : (currentTasks.map((task, index) => {
                     const parentProject = getParentProject(task.parentId);
                     const progress = currentTab === 'projects' ? projectProgress[task.id] : undefined;
-                    return (_jsx(TaskItem, { task: task, isSelected: index === selectedTaskIndex, projectName: parentProject?.title, progress: progress }, task.id));
+                    return (_jsx(TaskItem, { task: task, isSelected: index === selectedTaskIndex, projectName: parentProject?.title, progress: progress, showStatus: mode === 'project-detail' }, task.id));
                 })) }))), (mode === 'add' || mode === 'add-to-project') && (_jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: theme.colors.secondary, bold: true, children: mode === 'add-to-project' && selectedProject
                             ? `${i18n.tui.newTask}[${selectedProject.title}] `
                             : i18n.tui.newTask }), _jsx(TextInput, { value: inputValue, onChange: setInputValue, onSubmit: handleInputSubmit, placeholder: i18n.tui.placeholder }), _jsxs(Text, { color: theme.colors.textMuted, children: [" ", i18n.tui.inputHelp] })] })), mode === 'move-to-waiting' && taskToWaiting && (_jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: theme.colors.secondary, bold: true, children: i18n.tui.waitingFor }), _jsx(TextInput, { value: inputValue, onChange: setInputValue, onSubmit: handleInputSubmit, placeholder: "" }), _jsxs(Text, { color: theme.colors.textMuted, children: [" ", i18n.tui.inputHelp] })] })), mode === 'select-project' && taskToLink && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.selectProject || 'Select project for', ": ", taskToLink.title] }), _jsx(Box, { flexDirection: "column", marginTop: 1, borderStyle: theme.borders.list, borderColor: theme.colors.borderActive, paddingX: 1, children: tasks.projects.map((project, index) => (_jsxs(Text, { color: index === projectSelectIndex ? theme.colors.textSelected : theme.colors.text, bold: index === projectSelectIndex, children: [index === projectSelectIndex ? theme.style.selectedPrefix : theme.style.unselectedPrefix, project.title] }, project.id))) }), _jsx(Text, { color: theme.colors.textMuted, children: i18n.tui.selectProjectHelp || 'j/k: select, Enter: confirm, Esc: cancel' })] })), mode === 'context-filter' && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: theme.colors.secondary, bold: true, children: i18n.tui.context?.filter || 'Filter by context' }), _jsx(Box, { flexDirection: "column", marginTop: 1, borderStyle: theme.borders.list, borderColor: theme.colors.borderActive, paddingX: 1, children: ['all', 'none', ...availableContexts].map((ctx, index) => {

package/dist/ui/components/GtdDQ.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import React, { useState, useEffect, useCallback } from 'react';
 import { Box, Text, useInput, useApp, useStdout } from 'ink';
 import TextInput from 'ink-text-input';
@@ -14,6 +14,7 @@ import { SearchResults } from './SearchResults.js';
 import { HelpModal } from './HelpModal.js';
 import { InsightsModal } from './InsightsModal.js';
 import { CalendarModal } from './CalendarModal.js';
+import { StatusBadge } from './StatusBadge.js';
 import { Clock } from './Clock.js';
 import { CalendarEvents } from './CalendarEvents.js';
 import { PomodoroBattleUI, BattleMessage, getBattleMessage, BATTLE_COMMANDS } from './PomodoroBattleUI.js';
@@ -346,6 +347,7 @@ export function GtdDQ({ onOpenSettings }) {
             toStatus: 'done',
             fromWaitingFor: task.waitingFor,
             toWaitingFor: null,
+            fromCompletedAt: task.completedAt,
             description: fmt(i18n.tui.completed, { title: task.title }),
         });
         await history.execute(command);
@@ -359,6 +361,7 @@ export function GtdDQ({ onOpenSettings }) {
             toStatus: status,
             fromWaitingFor: task.waitingFor,
             toWaitingFor: null,
+            fromCompletedAt: task.completedAt,
             description: fmt(i18n.tui.movedTo, { title: task.title, status: i18n.status[status] }),
         });
         await history.execute(command);
@@ -372,6 +375,7 @@ export function GtdDQ({ onOpenSettings }) {
             toStatus: 'waiting',
             fromWaitingFor: task.waitingFor,
             toWaitingFor: waitingFor.trim(),
+            fromCompletedAt: task.completedAt,
             description: fmt(i18n.tui.movedToWaiting, { title: task.title, person: waitingFor.trim() }),
         });
         await history.execute(command);
@@ -645,10 +649,20 @@ export function GtdDQ({ onOpenSettings }) {
         // Handle task-detail mode
         if (mode === 'task-detail') {
             if (key.escape || input === 'b' || input === 'h' || key.leftArrow) {
+                // If came from project-detail, go back to project-detail
+                if (selectedProject) {
+                    setMode('project-detail');
+                    const taskIndex = projectTasks.findIndex(t => t.id === selectedTask?.id);
+                    if (taskIndex >= 0) {
+                        setSelectedTaskIndex(taskIndex);
+                    }
+                }
+                else {
+                    setMode('normal');
+                }
                 setSelectedTask(null);
                 setTaskComments([]);
                 setSelectedCommentIndex(0);
-                setMode('normal');
                 return;
             }
             // Navigate comments
@@ -868,6 +882,14 @@ export function GtdDQ({ onOpenSettings }) {
                 });
                 return;
             }
+            // Enter to view task details within project
+            if (key.return && projectTasks.length > 0) {
+                const task = projectTasks[selectedTaskIndex];
+                setSelectedTask(task);
+                loadTaskComments(task.id);
+                setMode('task-detail');
+                return;
+            }
             return;
         }
         if (message)
@@ -1006,7 +1028,7 @@ export function GtdDQ({ onOpenSettings }) {
                     return;
                 }
                 // Move to inbox
-                if (input === 'i' && currentTab !== 'inbox' && currentTab !== 'projects' && currentTab !== 'done') {
+                if (input === 'i' && currentTab !== 'inbox' && currentTab !== 'projects') {
                     moveTaskToStatus(task, 'inbox').then(() => {
                         if (selectedTaskIndex >= currentTasks.length - 1) {
                             setSelectedTaskIndex(Math.max(0, selectedTaskIndex - 1));
@@ -1157,7 +1179,7 @@ export function GtdDQ({ onOpenSettings }) {
                         }) })] })) : mode === 'set-context' && currentTasks.length > 0 ? (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.context?.setContext || 'Set context for', ": ", currentTasks[selectedTaskIndex]?.title] }), _jsx(Box, { flexDirection: "column", marginTop: 1, children: ['clear', ...availableContexts, 'new'].map((ctx, index) => {
                             const label = ctx === 'clear' ? (i18n.tui.context?.none || 'Clear context') : ctx === 'new' ? (i18n.tui.context?.addNew || 'New context...') : `@${ctx}`;
                             return (_jsxs(Text, { color: index === contextSelectIndex ? theme.colors.textSelected : theme.colors.text, bold: index === contextSelectIndex, children: [index === contextSelectIndex ? '▶ ' : '  ', label] }, ctx));
-                        }) })] })) : mode === 'set-effort' && getCurrentTask() ? (_jsx(Box, { flexDirection: "column", children: _jsx(TitledBoxInline, { title: i18n.tui.effort?.set || 'Set Effort', width: Math.min(40, terminalWidth - 4), minHeight: EFFORT_OPTIONS.length, isActive: true, children: EFFORT_OPTIONS.map((option, index) => (_jsxs(Text, { color: index === effortSelectIndex ? theme.colors.textSelected : theme.colors.text, bold: index === effortSelectIndex, children: [index === effortSelectIndex ? '▶ ' : '  ', option.label] }, option.label))) }) })) : mode === 'select-project' && taskToLink ? (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.selectProject || 'Select project', ": ", taskToLink.title] }), _jsx(Box, { flexDirection: "column", marginTop: 1, children: tasks.projects.map((project, index) => (_jsxs(Text, { color: index === projectSelectIndex ? theme.colors.textSelected : theme.colors.text, bold: index === projectSelectIndex, children: [index === projectSelectIndex ? '▶ ' : '  ', project.title] }, project.id))) })] })) : mode === 'confirm-delete' && taskToDelete ? (_jsx(Box, { flexDirection: "column", children: _jsx(Text, { color: theme.colors.accent, bold: true, children: fmt(i18n.tui.deleteConfirm || 'Delete "{title}"? (y/n)', { title: taskToDelete.title }) }) })) : (mode === 'task-detail' || mode === 'add-comment') && selectedTask ? (_jsxs(Box, { flexDirection: "column", children: [_jsxs(TitledBoxInline, { title: i18n.tui.taskDetailTitle || 'Task Details', width: terminalWidth - 4, minHeight: 4, isActive: true, children: [_jsx(Text, { color: theme.colors.text, bold: true, children: selectedTask.title }), selectedTask.description && (_jsx(Text, { color: theme.colors.textMuted, children: selectedTask.description })), _jsxs(Box, { children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.taskDetailStatus || 'Status', ": "] }), _jsxs(Text, { color: theme.colors.accent, children: [i18n.status[selectedTask.status], selectedTask.waitingFor && ` (${selectedTask.waitingFor})`] })] }), _jsxs(Box, { children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.context?.label || 'Context', ": "] }), _jsx(Text, { color: theme.colors.accent, children: selectedTask.context ? `@${selectedTask.context}` : (i18n.tui.context?.none || 'No context') })] }), _jsxs(Box, { children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.effort?.label || 'Effort', ": "] }), _jsx(Text, { color: theme.colors.accent, children: selectedTask.effort ? (i18n.tui.effort?.[selectedTask.effort] || selectedTask.effort) : '-' })] }), _jsxs(Box, { children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.focus?.label || 'Focus', ": "] }), _jsx(Text, { color: theme.colors.accent, children: selectedTask.isFocused ? '★' : '-' })] })] }), _jsx(Box, { marginTop: 1, children: _jsx(TitledBoxInline, { title: `${i18n.tui.comments || 'Comments'} (${taskComments.length})`, width: terminalWidth - 4, minHeight: 5, isActive: mode === 'task-detail', children: taskComments.length === 0 ? (_jsx(Text, { color: theme.colors.textMuted, italic: true, children: i18n.tui.noComments || 'No comments yet' })) : (taskComments.map((comment, index) => {
+                        }) })] })) : mode === 'set-effort' && getCurrentTask() ? (_jsx(Box, { flexDirection: "column", children: _jsx(TitledBoxInline, { title: i18n.tui.effort?.set || 'Set Effort', width: Math.min(40, terminalWidth - 4), minHeight: EFFORT_OPTIONS.length, isActive: true, children: EFFORT_OPTIONS.map((option, index) => (_jsxs(Text, { color: index === effortSelectIndex ? theme.colors.textSelected : theme.colors.text, bold: index === effortSelectIndex, children: [index === effortSelectIndex ? '▶ ' : '  ', option.label] }, option.label))) }) })) : mode === 'select-project' && taskToLink ? (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.selectProject || 'Select project', ": ", taskToLink.title] }), _jsx(Box, { flexDirection: "column", marginTop: 1, children: tasks.projects.map((project, index) => (_jsxs(Text, { color: index === projectSelectIndex ? theme.colors.textSelected : theme.colors.text, bold: index === projectSelectIndex, children: [index === projectSelectIndex ? '▶ ' : '  ', project.title] }, project.id))) })] })) : mode === 'confirm-delete' && taskToDelete ? (_jsx(Box, { flexDirection: "column", children: _jsx(Text, { color: theme.colors.accent, bold: true, children: fmt(i18n.tui.deleteConfirm || 'Delete "{title}"? (y/n)', { title: taskToDelete.title }) }) })) : (mode === 'task-detail' || mode === 'add-comment') && selectedTask ? (_jsxs(Box, { flexDirection: "column", children: [_jsxs(TitledBoxInline, { title: i18n.tui.taskDetailTitle || 'Task Details', width: terminalWidth - 4, minHeight: 4, isActive: true, children: [_jsx(Text, { color: theme.colors.text, bold: true, children: selectedTask.title }), selectedTask.description && (_jsx(Text, { color: theme.colors.textMuted, children: selectedTask.description })), _jsxs(Box, { children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.taskDetailStatus || 'Status', ": "] }), _jsxs(Text, { color: theme.colors.accent, children: [i18n.status[selectedTask.status], selectedTask.waitingFor && ` (${selectedTask.waitingFor})`] })] }), _jsxs(Box, { children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.context?.label || 'Context', ": "] }), _jsx(Text, { color: theme.colors.accent, children: selectedTask.context ? `@${selectedTask.context}` : (i18n.tui.context?.none || 'No context') })] }), _jsxs(Box, { children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.effort?.label || 'Effort', ": "] }), _jsx(Text, { color: theme.colors.accent, children: selectedTask.effort ? (i18n.tui.effort?.[selectedTask.effort] || selectedTask.effort) : '-' })] }), _jsxs(Box, { children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.focus?.label || 'Focus', ": "] }), _jsx(Text, { color: theme.colors.accent, children: selectedTask.isFocused ? '★' : '-' })] }), selectedTask.status === 'done' && (_jsxs(Box, { children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.taskDetailCompletedAt || 'Completed', ": "] }), _jsx(Text, { color: theme.colors.accent, children: (selectedTask.completedAt ?? selectedTask.updatedAt).toLocaleString() })] }))] }), _jsx(Box, { marginTop: 1, children: _jsx(TitledBoxInline, { title: `${i18n.tui.comments || 'Comments'} (${taskComments.length})`, width: terminalWidth - 4, minHeight: 5, isActive: mode === 'task-detail', children: taskComments.length === 0 ? (_jsx(Text, { color: theme.colors.textMuted, italic: true, children: i18n.tui.noComments || 'No comments yet' })) : (taskComments.map((comment, index) => {
                                 const isSelected = index === selectedCommentIndex && mode === 'task-detail';
                                 return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Text, { color: theme.colors.textMuted, children: [isSelected ? '▶ ' : '  ', "[", comment.createdAt.toLocaleString(), "]"] }), _jsxs(Text, { color: isSelected ? theme.colors.textSelected : theme.colors.text, bold: isSelected, children: ['  ', comment.content] })] }, comment.id));
                             })) }) })] })) : (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { marginRight: 2, children: _jsx(TitledBoxInline, { title: mode === 'project-detail' && selectedProject ? selectedProject.title : 'GTD', width: leftPaneWidth, minHeight: 8, isActive: paneFocus === 'tabs' && mode !== 'project-detail', children: mode === 'project-detail' ? (_jsx(Text, { color: theme.colors.textMuted, children: "\u2190 Esc/b: back" })) : (TABS.map((tab, index) => {
@@ -1180,7 +1202,7 @@ export function GtdDQ({ onOpenSettings }) {
                                 ].join('');
                                 const availableWidth = rightPaneWidth - 6 - getDisplayWidth(prefix) - getDisplayWidth(focusPrefix) - getDisplayWidth(effortBadge) - getDisplayWidth(suffix);
                                 const displayTitle = truncateString(task.title, availableWidth);
-                                return (_jsxs(Text, { color: isSelected ? theme.colors.textSelected : theme.colors.text, bold: isSelected, children: [prefix, focusPrefix, effortBadge, displayTitle, task.waitingFor && _jsxs(Text, { color: theme.colors.muted, children: [" (", task.waitingFor, ")"] }), task.context && _jsxs(Text, { color: theme.colors.muted, children: [" @", task.context] }), parentProject && _jsxs(Text, { color: theme.colors.muted, children: [" [", parentProject.title, "]"] }), progress && _jsxs(Text, { color: theme.colors.muted, children: [" [", progress.completed, "/", progress.total, "]"] })] }, task.id));
+                                return (_jsxs(Text, { color: isSelected ? theme.colors.textSelected : theme.colors.text, bold: isSelected, children: [prefix, mode === 'project-detail' && _jsxs(_Fragment, { children: [_jsx(StatusBadge, { status: task.status }), " "] }), focusPrefix, effortBadge, displayTitle, task.waitingFor && _jsxs(Text, { color: theme.colors.muted, children: [" (", task.waitingFor, ")"] }), task.context && _jsxs(Text, { color: theme.colors.muted, children: [" @", task.context] }), parentProject && _jsxs(Text, { color: theme.colors.muted, children: [" [", parentProject.title, "]"] }), progress && _jsxs(Text, { color: theme.colors.muted, children: [" [", progress.completed, "/", progress.total, "]"] })] }, task.id));
                             })) }) })] })), (mode === 'add' || mode === 'add-to-project') && (_jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: theme.colors.secondary, bold: true, children: mode === 'add-to-project' && selectedProject
                             ? `${i18n.tui.newTask}[${selectedProject.title}] `
                             : i18n.tui.newTask }), _jsx(TextInput, { value: inputValue, onChange: setInputValue, onSubmit: handleInputSubmit, placeholder: i18n.tui.placeholder })] })), mode === 'move-to-waiting' && taskToWaiting && (_jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: theme.colors.secondary, bold: true, children: i18n.tui.waitingFor }), _jsx(TextInput, { value: inputValue, onChange: setInputValue, onSubmit: handleInputSubmit, placeholder: "" })] })), mode === 'add-context' && (_jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: theme.colors.secondary, bold: true, children: "New context: " }), _jsx(TextInput, { value: inputValue, onChange: setInputValue, onSubmit: handleInputSubmit, placeholder: "Enter context name..." })] })), mode === 'add-comment' && selectedTask && (_jsxs(Box, { marginTop: 1, children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.addComment || 'Add comment', ": "] }), _jsx(TextInput, { value: inputValue, onChange: setInputValue, onSubmit: handleInputSubmit, placeholder: "Enter comment..." })] })), mode === 'search' && (_jsx(SearchBar, { value: searchQuery, onChange: handleSearchChange, onSubmit: handleInputSubmit })), mode === 'search' && searchQuery && (_jsx(SearchResults, { results: searchResults, selectedIndex: searchResultIndex, query: searchQuery })), message && mode === 'normal' && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.colors.textHighlight, children: message }) })), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: theme.colors.accent, children: "\u2328\uFE0F " }), _jsx(Text, { color: theme.colors.textMuted, children: mode === 'task-detail'