floq 0.4.0 → 0.5.0

package/README.ja.md

@@ -7,10 +7,10 @@ MS-DOSスタイルのテーマを備えたターミナルベースのGTD（Getti
 ## 特徴
 
 - **TUIインターフェース**: Ink（CLI用React）で構築されたインタラクティブなターミナルUI
-- **GTDワークフロー**: Inbox、Next Actions、Waiting For、Someday/Maybe、Done
+- **GTDワークフロー**: Inbox、Next Actions、Waiting For、Someday/Maybe、Done（過去7日間表示）
 - **カンバンモード**: 3カラムのカンバンボード表示（TODO、Doing、Done）
 - **プロジェクト**: タスクをプロジェクトに整理（進捗バー表示付き）
-- **コンテキスト**: タスクにコンテキスト（@work、@homeなど）を設定してフィルタリング
+- **コンテキスト**: タスクにコンテキスト（@work、@homeなど）を設定してフィルタリング。タスク追加時は現在のフィルターを自動継承
 - **タスク検索**: `/` キーで全タスクを素早く検索
 - **コメント**: タスクにメモやコメントを追加
 - **クラウド同期**: [Turso](https://turso.tech/)のembedded replicasによるオプションの同期機能

package/README.md

@@ -7,10 +7,10 @@ A terminal-based GTD (Getting Things Done) task manager with MS-DOS style themes
 ## Features
 
 - **TUI Interface**: Interactive terminal UI built with Ink (React for CLI)
-- **GTD Workflow**: Inbox, Next Actions, Waiting For, Someday/Maybe, Done
+- **GTD Workflow**: Inbox, Next Actions, Waiting For, Someday/Maybe, Done (shows last 7 days)
 - **Kanban Mode**: 3-column kanban board view (TODO, Doing, Done)
 - **Projects**: Organize tasks into projects with progress tracking
-- **Contexts**: Tag tasks with contexts (@work, @home, etc.) and filter by context
+- **Contexts**: Tag tasks with contexts (@work, @home, etc.) and filter by context. New tasks inherit the active context filter
 - **Task Search**: Quick search across all tasks with `/`
 - **Comments**: Add notes and comments to tasks
 - **Cloud Sync**: Optional sync with [Turso](https://turso.tech/) using embedded replicas

package/dist/commands/list.js

@@ -1,4 +1,4 @@
-import { eq } from 'drizzle-orm';
+import { eq, and, gte } from 'drizzle-orm';
 import { getDb, schema } from '../db/index.js';
 import { t, fmt } from '../i18n/index.js';
 export async function listTasks(status) {
@@ -11,10 +11,22 @@ export async function listTasks(status) {
             console.error(fmt(i18n.commands.list.validStatuses, { statuses: validStatuses.join(', ') }));
             process.exit(1);
         }
-        const tasks = await db
-            .select()
-            .from(schema.tasks)
-            .where(eq(schema.tasks.status, status));
+        // For done status, only show tasks from the last week by default
+        let tasks;
+        if (status === 'done') {
+            const oneWeekAgo = new Date();
+            oneWeekAgo.setDate(oneWeekAgo.getDate() - 7);
+            tasks = await db
+                .select()
+                .from(schema.tasks)
+                .where(and(eq(schema.tasks.status, 'done'), gte(schema.tasks.updatedAt, oneWeekAgo)));
+        }
+        else {
+            tasks = await db
+                .select()
+                .from(schema.tasks)
+                .where(eq(schema.tasks.status, status));
+        }
         console.log(`\n${i18n.status[status]} (${tasks.length})`);
         console.log('─'.repeat(40));
         if (tasks.length === 0) {

package/dist/ui/App.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { useState, useEffect, useCallback } from 'react';
 import { Box, Text, useInput, useApp } from 'ink';
 import TextInput from 'ink-text-input';
-import { eq, and } from 'drizzle-orm';
+import { eq, and, gte } from 'drizzle-orm';
 import { v4 as uuidv4 } from 'uuid';
 import { TaskItem } from './components/TaskItem.js';
 import { HelpModal } from './components/HelpModal.js';
@@ -105,10 +105,21 @@ function AppContent({ onOpenSettings }) {
         // Load all tasks (including project children) by status
         const statusList = ['inbox', 'next', 'waiting', 'someday', 'done'];
         for (const status of statusList) {
+            // For done tasks, only show those completed in the last week
+            const oneWeekAgo = new Date();
+            oneWeekAgo.setDate(oneWeekAgo.getDate() - 7);
+            const conditions = [
+                eq(schema.tasks.status, status),
+                eq(schema.tasks.isProject, false),
+            ];
+            // Filter done tasks to last week only
+            if (status === 'done') {
+                conditions.push(gte(schema.tasks.updatedAt, oneWeekAgo));
+            }
             let allTasks = await db
                 .select()
                 .from(schema.tasks)
-                .where(and(eq(schema.tasks.status, status), eq(schema.tasks.isProject, false)));
+                .where(and(...conditions));
             // Apply context filter
             if (contextFilter !== null) {
                 if (contextFilter === '') {
@@ -205,7 +216,7 @@ function AppContent({ onOpenSettings }) {
             setMode('normal');
         }
     }, [tasks]);
-    const addTask = useCallback(async (title, parentId) => {
+    const addTask = useCallback(async (title, parentId, context) => {
         if (!title.trim())
             return;
         const now = new Date();
@@ -216,6 +227,7 @@ function AppContent({ onOpenSettings }) {
                 title: title.trim(),
                 status: parentId ? 'next' : 'inbox',
                 parentId: parentId || null,
+                context: context || null,
                 createdAt: now,
                 updatedAt: now,
             },
@@ -298,12 +310,13 @@ function AppContent({ onOpenSettings }) {
                 setMode('task-detail');
             }
             else if (mode === 'add-to-project' && selectedProject) {
-                await addTask(value, selectedProject.id);
+                await addTask(value, selectedProject.id, contextFilter && contextFilter !== '' ? contextFilter : null);
                 await loadProjectTasks(selectedProject.id);
                 setMode('project-detail');
             }
             else {
-                await addTask(value);
+                // Pass contextFilter when adding a task, so it inherits the current filter context
+                await addTask(value, undefined, contextFilter && contextFilter !== '' ? contextFilter : null);
                 setMode('normal');
             }
         }

package/dist/ui/components/KanbanBoard.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { useState, useEffect, useCallback } from 'react';
 import { Box, Text, useInput, useApp } from 'ink';
 import TextInput from 'ink-text-input';
-import { eq, and, inArray } from 'drizzle-orm';
+import { eq, and, inArray, gte } from 'drizzle-orm';
 import { v4 as uuidv4 } from 'uuid';
 import { KanbanColumn } from './KanbanColumn.js';
 import { HelpModal } from './HelpModal.js';
@@ -72,11 +72,13 @@ export function KanbanBoard({ onSwitchToGtd, onOpenSettings }) {
             .select()
             .from(schema.tasks)
             .where(and(inArray(schema.tasks.status, ['next', 'waiting']), eq(schema.tasks.isProject, false)));
-        // Done: done (non-project tasks)
+        // Done: done (non-project tasks) - only show last week
+        const oneWeekAgo = new Date();
+        oneWeekAgo.setDate(oneWeekAgo.getDate() - 7);
         let doneTasks = await db
             .select()
             .from(schema.tasks)
-            .where(and(eq(schema.tasks.status, 'done'), eq(schema.tasks.isProject, false)));
+            .where(and(eq(schema.tasks.status, 'done'), eq(schema.tasks.isProject, false), gte(schema.tasks.updatedAt, oneWeekAgo)));
         // Load projects for linking
         const projectTasks = await db
             .select()
@@ -189,7 +191,7 @@ export function KanbanBoard({ onSwitchToGtd, onOpenSettings }) {
             setMode('normal');
         }
     }, [tasks]);
-    const addTask = useCallback(async (title) => {
+    const addTask = useCallback(async (title, context) => {
         if (!title.trim())
             return;
         const now = new Date();
@@ -199,6 +201,7 @@ export function KanbanBoard({ onSwitchToGtd, onOpenSettings }) {
                 id: taskId,
                 title: title.trim(),
                 status: 'inbox', // New tasks go to inbox (which maps to TODO)
+                context: context || null,
                 createdAt: now,
                 updatedAt: now,
             },
@@ -249,7 +252,8 @@ export function KanbanBoard({ onSwitchToGtd, onOpenSettings }) {
             return;
         }
         if (value.trim()) {
-            await addTask(value);
+            // Pass contextFilter when adding a task, so it inherits the current filter context
+            await addTask(value, contextFilter && contextFilter !== '' ? contextFilter : null);
         }
         setInputValue('');
         setMode('normal');
@@ -711,7 +715,7 @@ export function KanbanBoard({ onSwitchToGtd, onOpenSettings }) {
                                     : (tursoEnabled ? ' [DB]TURSO' : ' [DB]local') }), contextFilter !== null && (_jsxs(Text, { color: theme.colors.accent, children: [' ', "@", contextFilter === '' ? (i18n.tui.context?.none || 'none') : contextFilter] }))] }), _jsx(Text, { color: theme.colors.textMuted, children: i18n.tui.helpHint })] }), (mode === 'task-detail' || mode === 'add-comment' || mode === 'select-project') && 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') })] }), selectedTask.dueDate && (_jsxs(Text, { color: theme.colors.textMuted, children: ["Due: ", selectedTask.dueDate.toLocaleDateString()] }))] }), _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 === 'select-project' && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.selectProject || 'Select project for', ": ", selectedTask.title] }), _jsx(Box, { flexDirection: "column", marginTop: 1, borderStyle: theme.borders.list, borderColor: theme.colors.borderActive, paddingX: 1, children: 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 === 'search' ? (_jsx(_Fragment, { children: searchQuery && (_jsx(SearchResults, { results: searchResults, selectedIndex: searchResultIndex, query: searchQuery })) })) : 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) => {
+                        })) }), 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 === 'select-project' && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Text, { color: theme.colors.secondary, bold: true, children: [i18n.tui.selectProject || 'Select project for', ": ", selectedTask.title] }), _jsx(Box, { flexDirection: "column", marginTop: 1, borderStyle: theme.borders.list, borderColor: theme.colors.borderActive, paddingX: 1, children: 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 === 'search' ? (_jsx(_Fragment, { children: searchQuery && (_jsx(SearchResults, { results: searchResults, selectedIndex: searchResultIndex, query: searchQuery, viewMode: "kanban" })) })) : 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) => {
                             const label = ctx === 'all'
                                 ? (i18n.tui.context?.all || 'All')
                                 : ctx === 'none'

package/dist/ui/components/SearchResults.d.ts

@@ -4,6 +4,7 @@ interface SearchResultsProps {
     results: Task[];
     selectedIndex: number;
     query: string;
+    viewMode?: 'gtd' | 'kanban';
 }
-export declare function SearchResults({ results, selectedIndex, query }: SearchResultsProps): React.ReactElement;
+export declare function SearchResults({ results, selectedIndex, query, viewMode }: SearchResultsProps): React.ReactElement;
 export {};

package/dist/ui/components/SearchResults.js

@@ -2,7 +2,17 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
 import { Box, Text } from 'ink';
 import { t } from '../../i18n/index.js';
 import { useTheme } from '../theme/index.js';
-export function SearchResults({ results, selectedIndex, query }) {
+// Map GTD status to Kanban column
+function getKanbanColumn(status) {
+    if (status === 'inbox' || status === 'someday') {
+        return 'todo';
+    }
+    if (status === 'next' || status === 'waiting') {
+        return 'doing';
+    }
+    return 'done';
+}
+export function SearchResults({ results, selectedIndex, query, viewMode = 'gtd' }) {
     const i18n = t();
     const theme = useTheme();
     const search = i18n.tui.search;
@@ -12,7 +22,17 @@ export function SearchResults({ results, selectedIndex, query }) {
     return (_jsxs(Box, { flexDirection: "column", borderStyle: theme.borders.list, borderColor: theme.colors.borderActive, paddingX: 1, paddingY: 1, minHeight: 5, children: [_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: theme.colors.secondary, bold: true, children: ["[", search.resultsTitle, "] (", results.length, ")"] }) }), results.length === 0 ? (_jsx(Text, { color: theme.colors.textMuted, italic: true, children: search.noResults })) : (results.slice(0, 10).map((task, index) => {
                 const isSelected = index === selectedIndex;
                 const shortId = task.id.slice(0, 8);
-                const displayLabel = task.isProject ? i18n.tui.keyBar.project : i18n.status[task.status];
+                let displayLabel;
+                if (task.isProject) {
+                    displayLabel = i18n.tui.keyBar.project;
+                }
+                else if (viewMode === 'kanban') {
+                    const kanbanColumn = getKanbanColumn(task.status);
+                    displayLabel = i18n.kanban[kanbanColumn];
+                }
+                else {
+                    displayLabel = i18n.status[task.status];
+                }
                 return (_jsx(Box, { children: _jsxs(Text, { color: isSelected ? theme.colors.textSelected : theme.colors.text, bold: isSelected, children: [isSelected ? theme.style.selectedPrefix : theme.style.unselectedPrefix, "[", shortId, "] ", task.title, _jsxs(Text, { color: theme.colors.textMuted, children: [" (", displayLabel, ")"] }), task.waitingFor && (_jsxs(Text, { color: theme.colors.statusWaiting, children: [" - ", task.waitingFor] }))] }) }, task.id));
             })), results.length > 10 && (_jsxs(Text, { color: theme.colors.textMuted, italic: true, children: ["... and ", results.length - 10, " more"] }))] }));
 }

package/package.json

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