watashi-db 0.0.11 → 0.0.13

package/dist/database/queries-core.js

@@ -57,8 +57,8 @@ export function insertClaim(db, params) {
     const id = ulid();
     const now = new Date().toISOString();
     db.prepare(`
-    INSERT INTO claims (id, l2_subject, l2_predicate, l2_object, category, scope, confidence, evidence, falsifier, l1_content, search_summary, l1_embedding, source_tool, source_session, client_name, client_version, status, created_at, updated_at)
-    VALUES (@id, @l2_subject, @l2_predicate, @l2_object, @category, @scope, @confidence, @evidence, @falsifier, @l1_content, @search_summary, @l1_embedding, @source_tool, @source_session, @client_name, @client_version, 'active', @created_at, @updated_at)
+    INSERT INTO claims (id, l2_subject, l2_predicate, l2_object, category, scope, confidence, l2_evidence, l2_falsifier, l1_content, search_summary, l1_embedding, source_tool, source_session, client_name, client_version, status, created_at, updated_at)
+    VALUES (@id, @l2_subject, @l2_predicate, @l2_object, @category, @scope, @confidence, @l2_evidence, @l2_falsifier, @l1_content, @search_summary, @l1_embedding, @source_tool, @source_session, @client_name, @client_version, 'active', @created_at, @updated_at)
   `).run({
         id,
         l2_subject: params.subject,
@@ -67,8 +67,8 @@ export function insertClaim(db, params) {
         category: params.category,
         scope: params.scope,
         confidence: params.confidence,
-        evidence: params.evidence ?? null,
-        falsifier: params.falsifier ?? null,
+        l2_evidence: params.evidence ?? null,
+        l2_falsifier: params.falsifier ?? null,
         l1_content: params.l1_content ?? null,
         search_summary: params.search_summary ?? null,
         l1_embedding: params.l1_embedding ?? null,
@@ -98,7 +98,8 @@ export function updateClaim(db, id, updates, reason) {
     // 2026-02-22 修正 (Issue #22): search_summary を追加
     // 元の実装: search_summary は store 時のみ設定可能だった
     // 2026-03-03 修正 (Issue #64): l1_content を追加
-    const allowedFields = ["l2_subject", "l2_predicate", "l2_object", "category", "scope", "confidence", "evidence", "falsifier", "l1_content", "search_summary"];
+    // 2026-03-13 修正: evidence → l2_evidence, falsifier → l2_falsifier
+    const allowedFields = ["l2_subject", "l2_predicate", "l2_object", "category", "scope", "confidence", "l2_evidence", "l2_falsifier", "l1_content", "search_summary"];
     const transaction = db.transaction(() => {
         for (const [field, newValue] of Object.entries(mappedUpdates)) {
             if (!allowedFields.includes(field))
@@ -258,7 +259,7 @@ export function searchClaims(db, params) {
         const likeValues = { ...values, limit: params.limit };
         delete likeValues.query;
         likeValues.like_query = `%${params.query}%`;
-        likeConditions.push("(c.l2_subject LIKE @like_query OR c.l2_predicate LIKE @like_query OR c.l2_object LIKE @like_query OR c.evidence LIKE @like_query OR c.search_summary LIKE @like_query)");
+        likeConditions.push("(c.l2_subject LIKE @like_query OR c.l2_predicate LIKE @like_query OR c.l2_object LIKE @like_query OR c.l2_evidence LIKE @like_query OR c.search_summary LIKE @like_query)");
         const likeWhere = likeConditions.length > 0
             ? "WHERE " + likeConditions.join(" AND ")
             : "";
@@ -437,7 +438,7 @@ function queryClaimContext(db, topic, scope, limit) {
     return db.prepare(`
     SELECT c.* FROM claims c
     WHERE c.status = 'active'
-    AND (c.l2_subject LIKE @like_query OR c.l2_predicate LIKE @like_query OR c.l2_object LIKE @like_query OR c.evidence LIKE @like_query OR c.search_summary LIKE @like_query)
+    AND (c.l2_subject LIKE @like_query OR c.l2_predicate LIKE @like_query OR c.l2_object LIKE @like_query OR c.l2_evidence LIKE @like_query OR c.search_summary LIKE @like_query)
     ${scopeFilter}
     ORDER BY c.updated_at DESC
     LIMIT @limit
@@ -995,6 +996,82 @@ export function markEpisodesGroomed(db, episodeIds) {
     transaction();
     return markedIds;
 }
+// === Episode/Decision アーカイブ ===
+/** Episode をアーカイブ（蒸留済み + 最新N件を除外） */
+export function archiveEpisodes(db, params) {
+    const keepLatest = params.keepLatest ?? 20;
+    if (params.episodeIds && params.episodeIds.length > 0) {
+        // 個別指定モード: 指定IDのみアーカイブ
+        const updated = [];
+        const stmt = db.prepare("UPDATE episodes SET status = 'archived', updated_at = @now WHERE id = @id AND status = 'active'");
+        const now = new Date().toISOString();
+        for (const id of params.episodeIds) {
+            const result = stmt.run({ id, now });
+            if (result.changes > 0)
+                updated.push(id);
+        }
+        return { archivedIds: updated, archivedCount: updated.length };
+    }
+    // 自動モード: groomed_at IS NOT NULL かつ最新 keepLatest 件を除外
+    const scopeFilter = params.scope ? " AND scope = @scope" : "";
+    const scopeValues = params.scope ? { scope: params.scope } : {};
+    // 最新 keepLatest 件の ID を取得（保護対象）
+    const protectedIds = db.prepare(`
+    SELECT id FROM episodes
+    WHERE status = 'active'${scopeFilter}
+    ORDER BY created_at DESC
+    LIMIT @keepLatest
+  `).all({ ...scopeValues, keepLatest });
+    const protectedSet = new Set(protectedIds.map(r => r.id));
+    // groomed_at IS NOT NULL かつ保護対象外をアーカイブ
+    const candidates = db.prepare(`
+    SELECT id FROM episodes
+    WHERE status = 'active' AND groomed_at IS NOT NULL${scopeFilter}
+  `).all(scopeValues);
+    const toArchive = candidates.filter(r => !protectedSet.has(r.id));
+    const now = new Date().toISOString();
+    const stmt = db.prepare("UPDATE episodes SET status = 'archived', updated_at = @now WHERE id = @id");
+    for (const r of toArchive) {
+        stmt.run({ id: r.id, now });
+    }
+    return { archivedIds: toArchive.map(r => r.id), archivedCount: toArchive.length };
+}
+/** Decision をアーカイブ（最新N件を除外） */
+export function archiveDecisions(db, params) {
+    const keepLatest = params.keepLatest ?? 20;
+    if (params.decisionIds && params.decisionIds.length > 0) {
+        const updated = [];
+        const stmt = db.prepare("UPDATE decisions SET status = 'archived', updated_at = @now WHERE id = @id AND status = 'active'");
+        const now = new Date().toISOString();
+        for (const id of params.decisionIds) {
+            const result = stmt.run({ id, now });
+            if (result.changes > 0)
+                updated.push(id);
+        }
+        return { archivedIds: updated, archivedCount: updated.length };
+    }
+    // 自動モード: 最新 keepLatest 件を除外してアーカイブ
+    const scopeFilter = params.scope ? " AND scope = @scope" : "";
+    const scopeValues = params.scope ? { scope: params.scope } : {};
+    const protectedIds = db.prepare(`
+    SELECT id FROM decisions
+    WHERE status = 'active'${scopeFilter}
+    ORDER BY created_at DESC
+    LIMIT @keepLatest
+  `).all({ ...scopeValues, keepLatest });
+    const protectedSet = new Set(protectedIds.map(r => r.id));
+    const candidates = db.prepare(`
+    SELECT id FROM decisions
+    WHERE status = 'active'${scopeFilter}
+  `).all(scopeValues);
+    const toArchive = candidates.filter(r => !protectedSet.has(r.id));
+    const now = new Date().toISOString();
+    const stmt = db.prepare("UPDATE decisions SET status = 'archived', updated_at = @now WHERE id = @id");
+    for (const r of toArchive) {
+        stmt.run({ id: r.id, now });
+    }
+    return { archivedIds: toArchive.map(r => r.id), archivedCount: toArchive.length };
+}
 // === Issue #35: トピック集計 ===
 // 2026-02-22 修正 (Codex P2指摘): scope パラメータを追加し、スコープ絞り込みに対応
 export function getTopicSummary(db, tagLimit = 10, decisionLimit = 5, scope) {
@@ -1608,8 +1685,8 @@ export function getStaleClaims(db, params) {
             reasons.push("never_hit");
             score += 10;
         }
-        // no_evidence: evidence === null → 10点
-        if (row.evidence === null) {
+        // no_evidence: l2_evidence === null → 10点
+        if (row.l2_evidence === null) {
             reasons.push("no_evidence");
             score += 10;
         }
@@ -1618,8 +1695,8 @@ export function getStaleClaims(db, params) {
             reasons.push("no_checks");
             score += 15;
         }
-        // falsifier_unevaluated: falsifier設定済みだが falsifier_eval 未実施 → 20点
-        if (row.falsifier && row.has_falsifier_eval === 0) {
+        // falsifier_unevaluated: l2_falsifier設定済みだが falsifier_eval 未実施 → 20点
+        if (row.l2_falsifier && row.has_falsifier_eval === 0) {
             reasons.push("falsifier_unevaluated");
             score += 20;
         }
@@ -1659,8 +1736,8 @@ export function getStaleClaims(db, params) {
             category: row.category,
             scope: row.scope,
             confidence: row.confidence,
-            evidence: row.evidence,
-            falsifier: row.falsifier,
+            l2_evidence: row.l2_evidence,
+            l2_falsifier: row.l2_falsifier,
             hit_count: row.hit_count,
             updated_at: row.updated_at,
             staleness_score: score,
@@ -1749,7 +1826,7 @@ export function updateDecisionL1Embedding(db, id, l1_embedding) {
 export function updateEpisodeL1Embedding(db, id, l1_embedding) {
     db.prepare("UPDATE episodes SET l1_embedding = @l1_embedding WHERE id = @id").run({ id, l1_embedding });
 }
-/** Episode の l2 フィールドを更新（2フェーズ書き込み Phase 2） */
+/** Episode のフィールドを更新（2フェーズ書き込み Phase 2: l1_content 補完） */
 export function updateEpisode(db, id, updates) {
     const existing = getEpisodeById(db, id);
     if (!existing)
@@ -1757,7 +1834,7 @@ export function updateEpisode(db, id, updates) {
     const now = new Date().toISOString();
     const setClauses = ["updated_at = @updated_at"];
     const values = { id, updated_at: now };
-    const stringFields = ["l2_context", "l2_trigger", "search_summary"];
+    const stringFields = ["l1_content", "l2_context", "l2_trigger", "search_summary"];
     for (const field of stringFields) {
         if (updates[field] !== undefined) {
             setClauses.push(`${field} = @${field}`);
@@ -1774,7 +1851,7 @@ export function updateEpisode(db, id, updates) {
     db.prepare(`UPDATE episodes SET ${setClauses.join(", ")} WHERE id = @id`).run(values);
     return getEpisodeById(db, id);
 }
-/** Decision の l2 フィールドを更新（2フェーズ書き込み Phase 2） */
+/** Decision のフィールドを更新（2フェーズ書き込み Phase 2: l1_content 補完） */
 export function updateDecision(db, id, updates) {
     const existing = getDecisionById(db, id);
     if (!existing)
@@ -1782,6 +1859,10 @@ export function updateDecision(db, id, updates) {
     const now = new Date().toISOString();
     const setClauses = ["updated_at = @updated_at"];
     const values = { id, updated_at: now };
+    if (updates.l1_content !== undefined) {
+        setClauses.push("l1_content = @l1_content");
+        values.l1_content = updates.l1_content;
+    }
     if (updates.l2_reasoning !== undefined) {
         setClauses.push("l2_reasoning = @l2_reasoning");
         values.l2_reasoning = updates.l2_reasoning;
@@ -2675,7 +2756,7 @@ export function rebuildUnifiedSearch(db) {
             type: "claim", table: "claims",
             categoryExpr: "category",
             titleExpr: "l2_subject || ' ' || l2_predicate || ' ' || l2_object",
-            searchExpr: `l2_subject || ' ' || l2_predicate || ' ' || l2_object || ' ' || ${coal("evidence")} || ' ' || ${coal("falsifier")} || ' ' || ${coal("l1_content")} || ' ' || ${coal("search_summary")}`,
+            searchExpr: `l2_subject || ' ' || l2_predicate || ' ' || l2_object || ' ' || ${coal("l2_evidence")} || ' ' || ${coal("l2_falsifier")} || ' ' || ${coal("l1_content")} || ' ' || ${coal("search_summary")}`,
             searchSummary: "search_summary",
             tagsExpr: "'[]'",
         },
@@ -2779,6 +2860,42 @@ export function updateSearchSummary(db, entityType, entityId, searchSummary) {
     const result = db.prepare(`UPDATE ${table} SET search_summary = @searchSummary, updated_at = @now WHERE id = @entityId`).run({ searchSummary, now, entityId });
     return result.changes;
 }
+// === archived 含む検索（フォールバック用） ===
+/** archived を含む FTS 検索（unified_search_items ではなくソーステーブルの FTS を直接クエリ） */
+export function searchIncludingArchived(db, params) {
+    const results = [];
+    const targets = [
+        { fts: "episodes_fts", table: "episodes", type: "episode", titleExpr: "t.title" },
+        { fts: "decisions_fts", table: "decisions", type: "decision", titleExpr: "t.title" },
+        { fts: "claims_fts", table: "claims", type: "claim", titleExpr: "t.l2_subject || ' ' || t.l2_predicate || ' ' || t.l2_object" },
+    ];
+    for (const target of targets) {
+        try {
+            const scopeFilter = params.scope
+                ? " AND (t.scope = @scope OR t.scope = 'global')"
+                : "";
+            const rows = db.prepare(`
+        SELECT t.id as entity_id, '${target.type}' as entity_type,
+               ${target.titleExpr} as title_summary, t.scope,
+               COALESCE(t.search_summary, '') as search_summary,
+               '[]' as tags, '' as search_text,
+               NULL as l1_embedding,
+               t.created_at, t.updated_at,
+               NULL as _fts_rank, NULL as category
+        FROM ${target.table} t
+        JOIN ${target.fts} f ON f.rowid = t.rowid
+        WHERE ${target.fts} MATCH @query${scopeFilter}
+        ORDER BY rank
+        LIMIT @limit
+      `).all({ query: params.query, scope: params.scope, limit: params.limit });
+            results.push(...rows);
+        }
+        catch {
+            // FTS テーブル未存在等はスキップ
+        }
+    }
+    return results.slice(0, params.limit);
+}
 // === Issue #63: 物理削除 + tombstone ===
 /**
  * エンティティを物理削除し、tombstone を記録する。