floq 0.0.1 → 0.1.0

package/dist/config.js

@@ -39,6 +39,16 @@ export function saveConfig(updates) {
         // Ignore errors
     }
 }
+export function getTursoConfig() {
+    return loadConfig().turso;
+}
+export function setTursoConfig(config) {
+    saveConfig({ turso: config });
+}
+export function isTursoEnabled() {
+    const turso = getTursoConfig();
+    return turso !== undefined && turso.url !== '' && turso.authToken !== '';
+}
 export function getDbPath() {
     const config = loadConfig();
     if (config.db_path) {
@@ -48,6 +58,10 @@ export function getDbPath() {
         }
         return join(DATA_DIR, config.db_path);
     }
+    // Turso モードでは別のDBファイルを使用（embedded replica 用）
+    if (isTursoEnabled()) {
+        return join(DATA_DIR, 'gtd-turso.db');
+    }
     return join(DATA_DIR, 'gtd.db');
 }
 export function getLocale() {

package/dist/db/index.d.ts

@@ -1,6 +1,7 @@
-import Database from 'better-sqlite3';
+import { drizzle } from 'drizzle-orm/libsql';
 import * as schema from './schema.js';
-export declare function getDb(): import("drizzle-orm/better-sqlite3").BetterSQLite3Database<typeof schema> & {
-    $client: Database.Database;
-};
+export type DbInstance = ReturnType<typeof drizzle<typeof schema>>;
+export declare function initDb(): Promise<void>;
+export declare function getDb(): DbInstance;
+export declare function syncDb(): Promise<void>;
 export { schema };

package/dist/db/index.js

@@ -1,45 +1,83 @@
-import Database from 'better-sqlite3';
-import { drizzle } from 'drizzle-orm/better-sqlite3';
+import { drizzle } from 'drizzle-orm/libsql';
+import { createClient } from '@libsql/client';
 import { mkdirSync, existsSync } from 'fs';
 import { dirname } from 'path';
 import * as schema from './schema.js';
-import { getDbPath } from '../config.js';
+import { getDbPath, isTursoEnabled, getTursoConfig } from '../config.js';
 function ensureDbDir(dbPath) {
     const dbDir = dirname(dbPath);
     if (!existsSync(dbDir)) {
         mkdirSync(dbDir, { recursive: true });
     }
 }
-function initializeSchema(sqlite) {
-    // Check if we need to migrate from old schema
-    const tableInfo = sqlite.prepare("PRAGMA table_info(tasks)").all();
+let client = null;
+let dbInstance = null;
+// リモート DB のスキーマを初期化
+async function initializeRemoteSchema(tursoUrl, authToken) {
+    // リモート専用クライアントでスキーマを作成
+    const remoteClient = createClient({
+        url: tursoUrl,
+        authToken: authToken,
+    });
+    try {
+        const tableInfoResult = await remoteClient.execute("PRAGMA table_info(tasks)");
+        const tableInfo = tableInfoResult.rows;
+        const tableExists = tableInfo.length > 0;
+        if (!tableExists) {
+            // Fresh install: create new schema on remote
+            await remoteClient.execute(`
+        CREATE TABLE IF NOT EXISTS tasks (
+          id TEXT PRIMARY KEY,
+          title TEXT NOT NULL,
+          description TEXT,
+          status TEXT NOT NULL DEFAULT 'inbox' CHECK(status IN ('inbox', 'next', 'waiting', 'someday', 'done')),
+          is_project INTEGER NOT NULL DEFAULT 0,
+          parent_id TEXT,
+          waiting_for TEXT,
+          due_date INTEGER,
+          created_at INTEGER NOT NULL,
+          updated_at INTEGER NOT NULL
+        )
+      `);
+            await remoteClient.execute("CREATE INDEX IF NOT EXISTS idx_tasks_status ON tasks(status)");
+            await remoteClient.execute("CREATE INDEX IF NOT EXISTS idx_tasks_parent_id ON tasks(parent_id)");
+            await remoteClient.execute("CREATE INDEX IF NOT EXISTS idx_tasks_is_project ON tasks(is_project)");
+        }
+    }
+    finally {
+        remoteClient.close();
+    }
+}
+// ローカル DB のスキーマを初期化（ローカルモード用）
+async function initializeLocalSchema() {
+    if (!client)
+        return;
+    const tableInfoResult = await client.execute("PRAGMA table_info(tasks)");
+    const tableInfo = tableInfoResult.rows;
     const hasProjectId = tableInfo.some(col => col.name === 'project_id');
     const hasIsProject = tableInfo.some(col => col.name === 'is_project');
     const tableExists = tableInfo.length > 0;
     if (tableExists && hasProjectId && !hasIsProject) {
         // Migration: old schema -> new schema
-        // Add new columns
-        sqlite.prepare("ALTER TABLE tasks ADD COLUMN is_project INTEGER NOT NULL DEFAULT 0").run();
-        sqlite.prepare("ALTER TABLE tasks ADD COLUMN parent_id TEXT").run();
-        // Migrate: convert projects to tasks with is_project=1
-        const projects = sqlite.prepare("SELECT * FROM projects").all();
-        const insertStmt = sqlite.prepare(`
-      INSERT INTO tasks (id, title, description, status, is_project, parent_id, waiting_for, due_date, created_at, updated_at)
-      VALUES (?, ?, ?, ?, 1, NULL, NULL, NULL, ?, ?)
-    `);
+        await client.execute("ALTER TABLE tasks ADD COLUMN is_project INTEGER NOT NULL DEFAULT 0");
+        await client.execute("ALTER TABLE tasks ADD COLUMN parent_id TEXT");
+        const projectsResult = await client.execute("SELECT * FROM projects");
+        const projects = projectsResult.rows;
         for (const p of projects) {
             const newStatus = p.status === 'active' ? 'next' : (p.status === 'completed' ? 'done' : p.status);
-            insertStmt.run(p.id, p.name, p.description, newStatus, p.created_at, p.updated_at);
+            await client.execute({
+                sql: `INSERT INTO tasks (id, title, description, status, is_project, parent_id, waiting_for, due_date, created_at, updated_at)
+              VALUES (?, ?, ?, ?, 1, NULL, NULL, NULL, ?, ?)`,
+                args: [p.id, p.name, p.description, newStatus, p.created_at, p.updated_at]
+            });
         }
-        // Update parent_id from old project_id
-        sqlite.prepare("UPDATE tasks SET parent_id = project_id WHERE project_id IS NOT NULL").run();
-        // Create new indexes
-        sqlite.prepare("CREATE INDEX IF NOT EXISTS idx_tasks_parent_id ON tasks(parent_id)").run();
-        sqlite.prepare("CREATE INDEX IF NOT EXISTS idx_tasks_is_project ON tasks(is_project)").run();
+        await client.execute("UPDATE tasks SET parent_id = project_id WHERE project_id IS NOT NULL");
+        await client.execute("CREATE INDEX IF NOT EXISTS idx_tasks_parent_id ON tasks(parent_id)");
+        await client.execute("CREATE INDEX IF NOT EXISTS idx_tasks_is_project ON tasks(is_project)");
     }
     else if (!tableExists) {
         // Fresh install: create new schema
-        sqlite.prepare(`
+        await client.execute(`
       CREATE TABLE IF NOT EXISTS tasks (
         id TEXT PRIMARY KEY,
         title TEXT NOT NULL,
@@ -52,21 +90,58 @@ function initializeSchema(sqlite) {
         created_at INTEGER NOT NULL,
         updated_at INTEGER NOT NULL
       )
-    `).run();
-        sqlite.prepare("CREATE INDEX IF NOT EXISTS idx_tasks_status ON tasks(status)").run();
-        sqlite.prepare("CREATE INDEX IF NOT EXISTS idx_tasks_parent_id ON tasks(parent_id)").run();
-        sqlite.prepare("CREATE INDEX IF NOT EXISTS idx_tasks_is_project ON tasks(is_project)").run();
+    `);
+        await client.execute("CREATE INDEX IF NOT EXISTS idx_tasks_status ON tasks(status)");
+        await client.execute("CREATE INDEX IF NOT EXISTS idx_tasks_parent_id ON tasks(parent_id)");
+        await client.execute("CREATE INDEX IF NOT EXISTS idx_tasks_is_project ON tasks(is_project)");
     }
 }
-let dbInstance = null;
+// DB 初期化
+export async function initDb() {
+    if (dbInstance)
+        return;
+    const dbPath = getDbPath();
+    ensureDbDir(dbPath);
+    if (isTursoEnabled()) {
+        // Turso embedded replica モード
+        const turso = getTursoConfig();
+        // 1. まずリモートにスキーマを作成
+        await initializeRemoteSchema(turso.url, turso.authToken);
+        // 2. embedded replica クライアントを作成
+        client = createClient({
+            url: `file:${dbPath}`,
+            syncUrl: turso.url,
+            authToken: turso.authToken,
+            syncInterval: 60, // 60秒ごとに自動同期
+        });
+        // 3. 初回同期（リモートからローカルにデータをプル）
+        await client.sync();
+    }
+    else {
+        // ローカルモード（libsql でローカルファイルのみ）
+        client = createClient({
+            url: `file:${dbPath}`,
+        });
+        // ローカルモードではスキーマをローカルに作成
+        await initializeLocalSchema();
+    }
+    dbInstance = drizzle(client, { schema });
+}
+// DB インスタンス取得
 export function getDb() {
     if (!dbInstance) {
-        const dbPath = getDbPath();
-        ensureDbDir(dbPath);
-        const sqlite = new Database(dbPath);
-        initializeSchema(sqlite);
-        dbInstance = drizzle(sqlite, { schema });
+        throw new Error('Database not initialized. Call initDb() first.');
     }
     return dbInstance;
 }
+// 手動同期（Turso モード時のみ有効）
+export async function syncDb() {
+    if (!client) {
+        throw new Error('Database not initialized');
+    }
+    if (!isTursoEnabled()) {
+        throw new Error('Turso sync is not enabled');
+    }
+    await client.sync();
+}
 export { schema };

package/dist/i18n/en.d.ts

@@ -74,6 +74,16 @@ export declare const en: {
         selectProject: string;
         selectProjectHelp: string;
         back: string;
+        keyBar: {
+            add: string;
+            done: string;
+            next: string;
+            someday: string;
+            inbox: string;
+            project: string;
+            help: string;
+            quit: string;
+        };
         help: {
             title: string;
             navigation: string;
@@ -122,6 +132,16 @@ export type HelpTranslations = {
     quit: string;
     closeHint: string;
 };
+export type KeyBarTranslations = {
+    add: string;
+    done: string;
+    next: string;
+    someday: string;
+    inbox: string;
+    project: string;
+    help: string;
+    quit: string;
+};
 export type TuiTranslations = {
     title: string;
     helpHint: string;
@@ -144,6 +164,7 @@ export type TuiTranslations = {
     selectProject: string;
     selectProjectHelp: string;
     back: string;
+    keyBar: KeyBarTranslations;
     help: HelpTranslations;
 };
 export type Translations = {

package/dist/i18n/en.js

@@ -80,6 +80,17 @@ export const en = {
         selectProject: 'Select project for',
         selectProjectHelp: 'j/k: select, Enter: confirm, Esc: cancel',
         back: 'back',
+        // Action key bar labels
+        keyBar: {
+            add: 'Add',
+            done: 'Done',
+            next: 'Next',
+            someday: 'Someday',
+            inbox: 'Inbox',
+            project: 'Project',
+            help: 'Help',
+            quit: 'Quit',
+        },
         // Help modal
         help: {
             title: 'Keyboard Shortcuts',

package/dist/i18n/ja.js

@@ -80,6 +80,17 @@ export const ja = {
         selectProject: 'プロジェクトを選択',
         selectProjectHelp: 'j/k: 選択, Enter: 確定, Esc: キャンセル',
         back: '戻る',
+        // Action key bar labels
+        keyBar: {
+            add: '追加',
+            done: '完了',
+            next: '次へ',
+            someday: 'いつか',
+            inbox: 'Inbox',
+            project: 'プロジェクト',
+            help: 'ヘルプ',
+            quit: '終了',
+        },
         // Help modal
         help: {
             title: 'キーボードショートカット',

package/dist/index.js

@@ -1,3 +1,25 @@
 #!/usr/bin/env node
 import { program } from './cli.js';
-program.parse();
+import { initDb } from './db/index.js';
+import { isTursoEnabled, getTursoConfig } from './config.js';
+async function main() {
+    // 起動時にモードを表示（TUI以外のコマンド時）
+    const args = process.argv.slice(2);
+    const isTuiMode = args.length === 0;
+    const isConfigCommand = args[0] === 'config';
+    const isSyncCommand = args[0] === 'sync';
+    // config/syncコマンド以外でTursoモードの場合は接続先を表示
+    if (!isTuiMode && !isConfigCommand && !isSyncCommand && isTursoEnabled()) {
+        const turso = getTursoConfig();
+        if (turso) {
+            const host = new URL(turso.url).host;
+            console.log(`🔄 Turso sync: ${host}`);
+        }
+    }
+    // configコマンドはDB不要なのでスキップ
+    if (!isConfigCommand) {
+        await initDb();
+    }
+    program.parse();
+}
+main().catch(console.error);