watashi-db 0.0.13 → 0.0.14

package/dist/database/queries-core.js

@@ -1,4 +1,5 @@
 import { ulid } from "ulid";
+import { DEFAULT_SEARCH_ENTITY_TYPES } from "../types.js";
 import { claimScoreExpression, computeClaimScore } from "../scoring.js";
 // === exp() サポート検出（SQLite数学関数） ===
 /** exp() が使えるかを DB ごとにキャッシュ */
@@ -748,11 +749,11 @@ export function getClaimChecks(db, claimId) {
 export function insertAuditLog(db, params) {
     const id = ulid();
     const now = new Date().toISOString();
-    // 2026-03-03 追加 (V21): client_id でどのデバイスで作られたか追跡
-    const clientIdRow = db.prepare("SELECT value FROM store_meta WHERE key = 'client_id'").get();
+    // 2026-03-03 追加 (V21): device_id でどのデバイスで作られたか追跡
+    const deviceIdRow = db.prepare("SELECT value FROM store_meta WHERE key = 'device_id'").get();
     db.prepare(`
-    INSERT INTO audit_log (id, operation, entity_type, entity_id, summary, details, client_name, client_version, session_id, source_tool, client_id, created_at)
-    VALUES (@id, @operation, @entity_type, @entity_id, @summary, @details, @client_name, @client_version, @session_id, @source_tool, @client_id, @created_at)
+    INSERT INTO audit_log (id, operation, entity_type, entity_id, summary, details, client_name, client_version, session_id, source_tool, device_id, created_at)
+    VALUES (@id, @operation, @entity_type, @entity_id, @summary, @details, @client_name, @client_version, @session_id, @source_tool, @device_id, @created_at)
   `).run({
         id,
         operation: params.operation,
@@ -764,7 +765,7 @@ export function insertAuditLog(db, params) {
         client_version: params.provenance?.client_version ?? null,
         session_id: params.provenance?.session_id ?? null,
         source_tool: params.source_tool ?? null,
-        client_id: clientIdRow?.value ?? null,
+        device_id: deviceIdRow?.value ?? null,
         created_at: now,
     });
 }
@@ -1121,6 +1122,11 @@ export function getTopicSummary(db, tagLimit = 10, decisionLimit = 5, scope) {
         activeMemos = db.prepare(`SELECT COUNT(*) as count FROM user_memos WHERE status = 'active'${scopeFilter}`).get(scopeValues).count;
     }
     catch { /* V16未適用 */ }
+    let activeFiles = 0;
+    try {
+        activeFiles = db.prepare(`SELECT COUNT(*) as count FROM user_files WHERE status = 'active'${scopeFilter}`).get(scopeValues).count;
+    }
+    catch { /* V31未適用 */ }
     // Issue #47: エンティティタイトルから具体的キーワード候補を抽出
     let topicKeywords = [];
     try {
@@ -1148,7 +1154,7 @@ export function getTopicSummary(db, tagLimit = 10, decisionLimit = 5, scope) {
         topicKeywords,
         recentDecisions,
         activeScopes,
-        counts: { activeClaims, activeEpisodes, activeDecisions, activeTheories, activeInsights, activeModels, activeMemos },
+        counts: { activeClaims, activeEpisodes, activeDecisions, activeTheories, activeInsights, activeModels, activeMemos, activeFiles },
     };
 }
 // === V9: Theory CRUD ===
@@ -2551,6 +2557,10 @@ export function updateUserIssue(db, id, updates) {
         setClauses.push("entries = @entries");
         values.entries = updates.entries;
     }
+    if (updates.l1_embedding !== undefined) {
+        setClauses.push("l1_embedding = @l1_embedding");
+        values.l1_embedding = updates.l1_embedding;
+    }
     if (updates.priority !== undefined) {
         setClauses.push("priority = @priority");
         values.priority = updates.priority;
@@ -2649,6 +2659,157 @@ export function getUserIssuesWithL1Embedding(db, scope, limit = 100) {
     }
     return db.prepare("SELECT * FROM user_issues WHERE status = 'open' AND l1_embedding IS NOT NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
+export function insertUserTopic(db, params) {
+    const id = ulid();
+    const now = new Date().toISOString();
+    // device_id を自動取得（store_meta から）
+    let deviceId = params.device_id ?? null;
+    if (!deviceId) {
+        const row = db.prepare("SELECT value FROM store_meta WHERE key = 'device_id'").get();
+        deviceId = row?.value ?? null;
+    }
+    db.prepare(`
+    INSERT INTO user_topics (id, title, summary, device_id, cwd, conversation_id, priority, tags, scope, search_summary, l1_embedding, source_tool, client_name, client_version, status, created_at, updated_at)
+    VALUES (@id, @title, @summary, @device_id, @cwd, @conversation_id, @priority, @tags, @scope, @search_summary, @l1_embedding, @source_tool, @client_name, @client_version, 'active', @created_at, @updated_at)
+  `).run({
+        id,
+        title: params.title,
+        summary: params.summary,
+        device_id: deviceId,
+        cwd: params.cwd ?? null,
+        conversation_id: params.conversation_id ?? null,
+        priority: params.priority ?? "medium",
+        tags: JSON.stringify(params.tags),
+        scope: params.scope ?? "global",
+        search_summary: params.search_summary ?? null,
+        l1_embedding: params.l1_embedding ?? null,
+        source_tool: params.source_tool ?? null,
+        client_name: params.client_name ?? null,
+        client_version: params.client_version ?? null,
+        created_at: now,
+        updated_at: now,
+    });
+    return db.prepare("SELECT * FROM user_topics WHERE id = ?").get(id);
+}
+export function getUserTopicById(db, id) {
+    return db.prepare("SELECT * FROM user_topics WHERE id = ?").get(id);
+}
+export function updateUserTopic(db, id, updates) {
+    const existing = getUserTopicById(db, id);
+    if (!existing)
+        return undefined;
+    const setClauses = [];
+    const values = { id };
+    if (updates.title !== undefined) {
+        setClauses.push("title = @title");
+        values.title = updates.title;
+    }
+    if (updates.summary !== undefined) {
+        setClauses.push("summary = @summary");
+        values.summary = updates.summary;
+    }
+    if (updates.conversation_id !== undefined) {
+        setClauses.push("conversation_id = @conversation_id");
+        values.conversation_id = updates.conversation_id;
+    }
+    if (updates.cwd !== undefined) {
+        setClauses.push("cwd = @cwd");
+        values.cwd = updates.cwd;
+    }
+    if (updates.priority !== undefined) {
+        setClauses.push("priority = @priority");
+        values.priority = updates.priority;
+    }
+    if (updates.tags !== undefined) {
+        setClauses.push("tags = @tags");
+        values.tags = JSON.stringify(updates.tags);
+    }
+    if (updates.scope !== undefined) {
+        setClauses.push("scope = @scope");
+        values.scope = updates.scope;
+    }
+    if (updates.search_summary !== undefined) {
+        setClauses.push("search_summary = @search_summary");
+        values.search_summary = updates.search_summary;
+    }
+    if (updates.status !== undefined) {
+        setClauses.push("status = @status");
+        values.status = updates.status;
+    }
+    if (setClauses.length === 0)
+        return existing;
+    // summary/title 変更時は l1_embedding を無効化（陳腐化防止、backfill_embeddings で再生成）
+    if (updates.summary !== undefined || updates.title !== undefined) {
+        setClauses.push("l1_embedding = NULL");
+    }
+    setClauses.push("updated_at = @updated_at");
+    values.updated_at = new Date().toISOString();
+    db.prepare(`UPDATE user_topics SET ${setClauses.join(", ")} WHERE id = @id`).run(values);
+    return db.prepare("SELECT * FROM user_topics WHERE id = ?").get(id);
+}
+export function listUserTopics(db, params) {
+    const sanitized = params.query ? sanitizeFtsQuery(params.query) : null;
+    const limit = params.limit ?? 20;
+    const conditions = [];
+    const values = { limit };
+    if (params.status) {
+        conditions.push("m.status = @status");
+        values.status = params.status;
+    }
+    if (params.priority) {
+        conditions.push("m.priority = @priority");
+        values.priority = params.priority;
+    }
+    if (params.tag) {
+        conditions.push("m.tags LIKE @tag_like");
+        values.tag_like = `%"${params.tag}"%`;
+    }
+    if (params.scope) {
+        conditions.push("(m.scope = @scope OR m.scope = 'global')");
+        values.scope = params.scope;
+    }
+    // FTS5検索
+    if (sanitized) {
+        try {
+            const ftsConditions = [...conditions];
+            const ftsWhere = ftsConditions.length > 0 ? "AND " + ftsConditions.join(" AND ") : "";
+            const ftsResults = db.prepare(`
+        SELECT m.* FROM user_topics m
+        JOIN user_topics_fts f ON m.rowid = f.rowid
+        WHERE user_topics_fts MATCH @query ${ftsWhere}
+        ORDER BY rank
+        LIMIT @limit
+      `).all({ ...values, query: sanitized });
+            if (ftsResults.length > 0)
+                return ftsResults;
+        }
+        catch { /* FTSエラー時はLIKEフォールバック */ }
+    }
+    // LIKEフォールバック or 全件取得
+    if (params.query) {
+        const likeParam = `%${params.query.slice(0, 100)}%`;
+        conditions.push("(m.title LIKE @like_query OR m.summary LIKE @like_query OR m.search_summary LIKE @like_query)");
+        values.like_query = likeParam;
+    }
+    const whereClause = conditions.length > 0 ? "WHERE " + conditions.join(" AND ") : "";
+    return db.prepare(`
+    SELECT m.* FROM user_topics m ${whereClause}
+    ORDER BY m.updated_at DESC
+    LIMIT @limit
+  `).all(values);
+}
+export function updateUserTopicL1Embedding(db, id, l1_embedding) {
+    db.prepare("UPDATE user_topics SET l1_embedding = @l1_embedding WHERE id = @id").run({ id, l1_embedding });
+}
+export function getUserTopicsWithoutL1Embedding(db, limit) {
+    return db.prepare("SELECT * FROM user_topics WHERE status = 'active' AND l1_embedding IS NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
+}
+export function getUserTopicsWithL1Embedding(db, scope, limit = 100) {
+    if (scope) {
+        return db.prepare("SELECT * FROM user_topics WHERE status = 'active' AND l1_embedding IS NOT NULL AND (scope = ? OR scope = 'global') ORDER BY updated_at DESC LIMIT ?").all(scope, limit);
+    }
+    return db.prepare("SELECT * FROM user_topics WHERE status = 'active' AND l1_embedding IS NOT NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
+}
 /**
  * 横断検索（FTS5 + LIKEフォールバック）
  * unified_search_items テーブルを使い、全6エンティティを横断してFTS5検索する。
@@ -2662,11 +2823,13 @@ export function unifiedSearch(db, query, scope, entityTypes, limit) {
         scopeFilter = "AND (u.scope = @scope OR u.scope = 'global')";
         baseValues.scope = scope;
     }
+    // entity_types 未指定時はデフォルト検索対象を使用（user_file はオプトイン型のため除外）
+    const effectiveTypes = (entityTypes && entityTypes.length > 0) ? entityTypes : [...DEFAULT_SEARCH_ENTITY_TYPES];
     let typeFilter = "";
-    if (entityTypes && entityTypes.length > 0) {
-        const placeholders = entityTypes.map((_, i) => `@et${i}`).join(", ");
+    {
+        const placeholders = effectiveTypes.map((_, i) => `@et${i}`).join(", ");
         typeFilter = `AND u.entity_type IN (${placeholders})`;
-        entityTypes.forEach((t, i) => { baseValues[`et${i}`] = t; });
+        effectiveTypes.forEach((t, i) => { baseValues[`et${i}`] = t; });
     }
     // 1. FTS5検索
     if (sanitized) {
@@ -2727,10 +2890,12 @@ export function getUnifiedSearchWithL1Embedding(db, scope, entityTypes, limit) {
         conditions.push("(scope = @scope OR scope = 'global')");
         values.scope = scope;
     }
-    if (entityTypes && entityTypes.length > 0) {
-        const placeholders = entityTypes.map((_, i) => `@et${i}`).join(", ");
+    // entity_types 未指定時はデフォルト検索対象を使用（user_file はオプトイン型のため除外）
+    const effectiveTypes = (entityTypes && entityTypes.length > 0) ? entityTypes : [...DEFAULT_SEARCH_ENTITY_TYPES];
+    {
+        const placeholders = effectiveTypes.map((_, i) => `@et${i}`).join(", ");
         conditions.push(`entity_type IN (${placeholders})`);
-        entityTypes.forEach((t, i) => { values[`et${i}`] = t; });
+        effectiveTypes.forEach((t, i) => { values[`et${i}`] = t; });
     }
     const whereClause = conditions.length > 0
         ? "WHERE " + conditions.join(" AND ")
@@ -2834,6 +2999,8 @@ const ENTITY_TYPE_TO_TABLE = {
     user_memo: "user_memos",
     user_plan: "user_plans",
     user_issue: "user_issues",
+    user_topic: "user_topics",
+    user_file: "user_files",
 };
 /**
  * entity_id から entity_type を解決する（unified_search_items を使用）。
@@ -2982,4 +3149,108 @@ export function applyTombstones(db) {
     }
     return deleted;
 }
+// ============================================================
+// UserFile (File Vault)
+// ============================================================
+export function insertUserFile(db, params) {
+    const id = ulid();
+    const now = new Date().toISOString();
+    db.prepare(`
+    INSERT INTO user_files (id, title, description, original_filename, original_encoding, file_data, file_hash, file_size, tags, scope, search_summary, l1_embedding, source_tool, client_name, client_version, status, created_at, updated_at)
+    VALUES (@id, @title, @description, @original_filename, @original_encoding, @file_data, @file_hash, @file_size, @tags, @scope, @search_summary, @l1_embedding, @source_tool, @client_name, @client_version, 'active', @created_at, @updated_at)
+  `).run({
+        id,
+        title: params.title,
+        description: params.description ?? null,
+        original_filename: params.original_filename,
+        original_encoding: params.original_encoding ?? "utf-8",
+        file_data: params.file_data,
+        file_hash: params.file_hash,
+        file_size: params.file_size,
+        tags: JSON.stringify(params.tags),
+        scope: params.scope ?? "global",
+        search_summary: params.search_summary ?? null,
+        l1_embedding: params.l1_embedding ?? null,
+        source_tool: params.source_tool ?? null,
+        client_name: params.client_name ?? null,
+        client_version: params.client_version ?? null,
+        created_at: now,
+        updated_at: now,
+    });
+    return db.prepare("SELECT * FROM user_files WHERE id = ?").get(id);
+}
+export function getUserFileById(db, id) {
+    return db.prepare("SELECT * FROM user_files WHERE id = ?").get(id);
+}
+export function getUserFileByTitle(db, title) {
+    // 完全一致を優先、なければ部分一致
+    const exact = db.prepare("SELECT * FROM user_files WHERE title = ? AND status = 'active'").get(title);
+    if (exact)
+        return exact;
+    return db.prepare("SELECT * FROM user_files WHERE title LIKE ? AND status = 'active' ORDER BY updated_at DESC LIMIT 1").get(`%${title}%`);
+}
+export function updateUserFile(db, id, updates) {
+    const setClauses = [];
+    const params = { id };
+    if (updates.title !== undefined) {
+        setClauses.push("title = @title");
+        params.title = updates.title;
+    }
+    if (updates.description !== undefined) {
+        setClauses.push("description = @description");
+        params.description = updates.description;
+    }
+    if (updates.file_data !== undefined) {
+        setClauses.push("file_data = @file_data");
+        params.file_data = updates.file_data;
+    }
+    if (updates.file_hash !== undefined) {
+        setClauses.push("file_hash = @file_hash");
+        params.file_hash = updates.file_hash;
+    }
+    if (updates.file_size !== undefined) {
+        setClauses.push("file_size = @file_size");
+        params.file_size = updates.file_size;
+    }
+    if (updates.tags !== undefined) {
+        setClauses.push("tags = @tags");
+        params.tags = JSON.stringify(updates.tags);
+    }
+    if (updates.scope !== undefined) {
+        setClauses.push("scope = @scope");
+        params.scope = updates.scope;
+    }
+    if (updates.search_summary !== undefined) {
+        setClauses.push("search_summary = @search_summary");
+        params.search_summary = updates.search_summary;
+    }
+    if (updates.status !== undefined) {
+        setClauses.push("status = @status");
+        params.status = updates.status;
+    }
+    if (setClauses.length === 0)
+        return getUserFileById(db, id);
+    setClauses.push("updated_at = @updated_at");
+    params.updated_at = new Date().toISOString();
+    db.prepare(`UPDATE user_files SET ${setClauses.join(", ")} WHERE id = @id`).run(params);
+    return getUserFileById(db, id);
+}
+export function listUserFiles(db, params) {
+    const conditions = ["status = @status"];
+    const bindParams = { status: params.status ?? "active" };
+    if (params.scope) {
+        conditions.push("(scope = @scope OR scope = 'global')");
+        bindParams.scope = params.scope;
+    }
+    const sql = `SELECT id, title, description, original_filename, original_encoding, file_hash, file_size, tags, scope, search_summary, status, client_name, client_version, source_tool, created_at, updated_at FROM user_files WHERE ${conditions.join(" AND ")} ORDER BY updated_at DESC`;
+    let rows = db.prepare(sql).all(bindParams);
+    // タグフィルタリング（アプリケーション層）
+    if (params.tags && params.tags.length > 0) {
+        rows = rows.filter(r => {
+            const rowTags = JSON.parse(r.tags);
+            return params.tags.some(t => rowTags.includes(t));
+        });
+    }
+    return rows;
+}
 //# sourceMappingURL=queries-core.js.map