watashi-db 0.0.13 → 0.0.15

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 ごとにキャッシュ */
@@ -57,8 +58,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, 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)
+    INSERT INTO claims (id, l2_subject, l2_predicate, l2_object, category, scope, confidence, l2_evidence, l2_falsifier, l1_content, search_summary, l1_embedding, user_input, source_tool, session_id, client_name, client_version, validity_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, @user_input, @source_tool, @session_id, @client_name, @client_version, 'active', @created_at, @updated_at)
   `).run({
         id,
         l2_subject: params.subject,
@@ -72,8 +73,9 @@ export function insertClaim(db, params) {
         l1_content: params.l1_content ?? null,
         search_summary: params.search_summary ?? null,
         l1_embedding: params.l1_embedding ?? null,
+        user_input: params.user_input ?? null,
         source_tool: params.source_tool ?? null,
-        source_session: params.source_session ?? null,
+        session_id: params.session_id ?? null,
         client_name: params.client_name ?? null,
         client_version: params.client_version ?? null,
         created_at: now,
@@ -140,20 +142,20 @@ export function retractClaim(db, id, reason) {
     const existing = getClaimById(db, id);
     if (!existing)
         return undefined;
-    if (existing.status !== "active")
+    if (existing.validity_status !== "active")
         return existing;
     const now = new Date().toISOString();
     db.transaction(() => {
         db.prepare(`
       INSERT INTO claim_history (id, claim_id, field_name, old_value, new_value, reason, changed_at)
-      VALUES (@id, @claim_id, 'status', 'active', 'retracted', @reason, @changed_at)
+      VALUES (@id, @claim_id, 'validity_status', 'active', 'invalidated', @reason, @changed_at)
     `).run({
             id: ulid(),
             claim_id: id,
             reason,
             changed_at: now,
         });
-        db.prepare("UPDATE claims SET status = 'retracted', updated_at = @updated_at WHERE id = @id").run({
+        db.prepare("UPDATE claims SET validity_status = 'invalidated', updated_at = @updated_at WHERE id = @id").run({
             id,
             updated_at: now,
         });
@@ -165,20 +167,20 @@ export function supersedeClaim(db, oldId, newId, reason) {
     const newClaim = getClaimById(db, newId);
     if (!oldClaim || !newClaim)
         return undefined;
-    if (oldClaim.status !== "active")
+    if (oldClaim.validity_status !== "active")
         return undefined;
     const now = new Date().toISOString();
     db.transaction(() => {
         db.prepare(`
       INSERT INTO claim_history (id, claim_id, field_name, old_value, new_value, reason, changed_at)
-      VALUES (@id, @claim_id, 'status', 'active', 'superseded', @reason, @changed_at)
+      VALUES (@id, @claim_id, 'validity_status', 'active', 'superseded', @reason, @changed_at)
     `).run({
             id: ulid(),
             claim_id: oldId,
             reason,
             changed_at: now,
         });
-        db.prepare("UPDATE claims SET status = 'superseded', updated_at = @updated_at WHERE id = @id").run({
+        db.prepare("UPDATE claims SET validity_status = 'superseded', updated_at = @updated_at WHERE id = @id").run({
             id: oldId,
             updated_at: now,
         });
@@ -202,12 +204,12 @@ export function updateDecisionStatus(db, id, newStatus, reason) {
     const existing = getDecisionById(db, id);
     if (!existing)
         return undefined;
-    if (existing.status !== "active")
+    if (existing.validity_status !== "active")
         return existing;
     const now = new Date().toISOString();
-    db.prepare("UPDATE decisions SET status = @status, updated_at = @updated_at WHERE id = @id").run({
+    db.prepare("UPDATE decisions SET validity_status = @validity_status, updated_at = @updated_at WHERE id = @id").run({
         id,
-        status: newStatus,
+        validity_status: newStatus,
         updated_at: now,
     });
     return getDecisionById(db, id);
@@ -223,8 +225,10 @@ export function searchClaims(db, params) {
         const conditions = [];
         const values = { limit: params.limit };
         if (params.status) {
-            conditions.push("c.status = @status");
-            values.status = params.status;
+            conditions.push("c.validity_status = @validity_status");
+            conditions.push("c.is_archived = 0");
+            conditions.push("c.promoted_to IS NULL");
+            values.validity_status = params.status;
         }
         if (params.category) {
             conditions.push("c.category = @category");
@@ -273,8 +277,10 @@ export function searchClaims(db, params) {
     const conditions = [];
     const values = { limit: params.limit };
     if (params.status) {
-        conditions.push("status = @status");
-        values.status = params.status;
+        conditions.push("validity_status = @validity_status");
+        conditions.push("is_archived = 0");
+        conditions.push("promoted_to IS NULL");
+        values.validity_status = params.status;
     }
     if (params.category) {
         conditions.push("category = @category");
@@ -422,7 +428,7 @@ function queryClaimContext(db, topic, scope, limit) {
         SELECT c.* FROM claims c
         JOIN claims_fts f ON c.rowid = f.rowid
         WHERE claims_fts MATCH @query
-        AND c.status = 'active'
+        AND c.validity_status = 'active' AND c.is_archived = 0 AND c.promoted_to IS NULL
         ${scopeFilter}
         ORDER BY rank
         LIMIT @limit
@@ -437,7 +443,7 @@ function queryClaimContext(db, topic, scope, limit) {
     const likeQuery = `%${topic}%`;
     return db.prepare(`
     SELECT c.* FROM claims c
-    WHERE c.status = 'active'
+    WHERE c.validity_status = 'active' AND c.is_archived = 0 AND c.promoted_to IS NULL
     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
@@ -459,7 +465,7 @@ function queryEpisodeContext(db, topic, scope, limit) {
         SELECT e.* FROM episodes e
         JOIN episodes_fts f ON e.rowid = f.rowid
         WHERE episodes_fts MATCH @query
-        AND e.status = 'active'
+        AND e.validity_status = 'active' AND e.is_archived = 0 AND e.promoted_to IS NULL
         ${scopeFilter}
         ORDER BY rank
         LIMIT @limit
@@ -474,7 +480,7 @@ function queryEpisodeContext(db, topic, scope, limit) {
     const likeQuery = `%${topic}%`;
     return db.prepare(`
     SELECT e.* FROM episodes e
-    WHERE e.status = 'active'
+    WHERE e.validity_status = 'active' AND e.is_archived = 0 AND e.promoted_to IS NULL
     AND (e.title LIKE @like_query OR e.l1_content LIKE @like_query OR e.l2_context LIKE @like_query OR e.l2_trigger LIKE @like_query OR e.l2_principles LIKE @like_query OR e.l2_problems LIKE @like_query OR e.l2_desires LIKE @like_query OR e.l2_outcomes LIKE @like_query OR e.l2_decisions LIKE @like_query OR e.search_summary LIKE @like_query)
     ${scopeFilter}
     ORDER BY e.updated_at DESC
@@ -496,7 +502,7 @@ function queryDecisionContext(db, topic, scope, limit) {
         SELECT d.* FROM decisions d
         JOIN decisions_fts f ON d.rowid = f.rowid
         WHERE decisions_fts MATCH @query
-        AND d.status = 'active'
+        AND d.validity_status = 'active' AND d.is_archived = 0 AND d.promoted_to IS NULL
         ${scopeFilter}
         ORDER BY rank
         LIMIT @limit
@@ -511,7 +517,7 @@ function queryDecisionContext(db, topic, scope, limit) {
     const likeQuery = `%${topic}%`;
     return db.prepare(`
     SELECT d.* FROM decisions d
-    WHERE d.status = 'active'
+    WHERE d.validity_status = 'active' AND d.is_archived = 0 AND d.promoted_to IS NULL
     AND (d.title LIKE @like_query OR d.description LIKE @like_query OR d.l2_reasoning LIKE @like_query OR d.search_summary LIKE @like_query)
     ${scopeFilter}
     ORDER BY d.created_at DESC
@@ -528,8 +534,8 @@ export function insertDecision(db, params) {
     const id = ulid();
     const now = new Date().toISOString();
     db.prepare(`
-    INSERT INTO decisions (id, title, description, l1_content, l2_reasoning, l2_alternatives, related_claim_ids, scope, status, search_summary, l1_embedding, source_tool, client_name, client_version, user_input, created_at, updated_at)
-    VALUES (@id, @title, @description, @l1_content, @l2_reasoning, @l2_alternatives, @related_claim_ids, @scope, 'active', @search_summary, @l1_embedding, @source_tool, @client_name, @client_version, @user_input, @created_at, @updated_at)
+    INSERT INTO decisions (id, title, description, l1_content, l2_reasoning, l2_alternatives, related_claim_ids, scope, validity_status, search_summary, l1_embedding, source_tool, session_id, client_name, client_version, user_input, created_at, updated_at)
+    VALUES (@id, @title, @description, @l1_content, @l2_reasoning, @l2_alternatives, @related_claim_ids, @scope, 'active', @search_summary, @l1_embedding, @source_tool, @session_id, @client_name, @client_version, @user_input, @created_at, @updated_at)
   `).run({
         id,
         title: params.title,
@@ -542,6 +548,7 @@ export function insertDecision(db, params) {
         search_summary: params.search_summary ?? null,
         l1_embedding: params.l1_embedding ?? null,
         source_tool: params.source_tool ?? null,
+        session_id: params.session_id ?? null,
         client_name: params.client_name ?? null,
         client_version: params.client_version ?? null,
         user_input: params.user_input ?? null,
@@ -559,8 +566,10 @@ export function listDecisions(db, params) {
         const conditions = [];
         const values = { limit: params.limit };
         if (params.status) {
-            conditions.push("d.status = @status");
-            values.status = params.status;
+            conditions.push("d.validity_status = @validity_status");
+            conditions.push("d.is_archived = 0");
+            conditions.push("d.promoted_to IS NULL");
+            values.validity_status = params.status;
         }
         if (params.scope) {
             conditions.push("(d.scope = @scope OR d.scope = 'global')");
@@ -606,8 +615,10 @@ export function listDecisions(db, params) {
     const conditions = [];
     const values = { limit: params.limit };
     if (params.status) {
-        conditions.push("status = @status");
-        values.status = params.status;
+        conditions.push("validity_status = @validity_status");
+        conditions.push("is_archived = 0");
+        conditions.push("promoted_to IS NULL");
+        values.validity_status = params.status;
     }
     if (params.scope) {
         conditions.push("(scope = @scope OR scope = 'global')");
@@ -625,34 +636,34 @@ export function listDecisions(db, params) {
 // === 統計 ===
 export function getStats(db) {
     const total_claims = db.prepare("SELECT COUNT(*) as count FROM claims").get().count;
-    const active_claims = db.prepare("SELECT COUNT(*) as count FROM claims WHERE status = 'active'").get().count;
-    const retracted_claims = db.prepare("SELECT COUNT(*) as count FROM claims WHERE status = 'retracted'").get().count;
-    const superseded_claims = db.prepare("SELECT COUNT(*) as count FROM claims WHERE status = 'superseded'").get().count;
+    const active_claims = db.prepare("SELECT COUNT(*) as count FROM claims WHERE validity_status = 'active' AND is_archived = 0 AND promoted_to IS NULL").get().count;
+    const retracted_claims = db.prepare("SELECT COUNT(*) as count FROM claims WHERE validity_status = 'invalidated'").get().count;
+    const superseded_claims = db.prepare("SELECT COUNT(*) as count FROM claims WHERE validity_status = 'superseded'").get().count;
     const total_decisions = db.prepare("SELECT COUNT(*) as count FROM decisions").get().count;
-    const active_decisions = db.prepare("SELECT COUNT(*) as count FROM decisions WHERE status = 'active'").get().count;
+    const active_decisions = db.prepare("SELECT COUNT(*) as count FROM decisions WHERE validity_status = 'active' AND is_archived = 0 AND promoted_to IS NULL").get().count;
     const total_history_entries = db.prepare("SELECT COUNT(*) as count FROM claim_history").get().count;
     // 2026-02-23 追加 (Issue #39 Part D): Episode/Insight/Theory/Model の安全なカウント
     let active_episodes = 0;
     try {
-        active_episodes = db.prepare("SELECT COUNT(*) as count FROM episodes WHERE status = 'active'").get().count;
+        active_episodes = db.prepare("SELECT COUNT(*) as count FROM episodes WHERE validity_status = 'active' AND is_archived = 0 AND promoted_to IS NULL").get().count;
     }
     catch { /* テーブル未存在等 */ }
     let active_insights = 0;
     try {
-        active_insights = db.prepare("SELECT COUNT(*) as count FROM insights WHERE status = 'active'").get().count;
+        active_insights = db.prepare("SELECT COUNT(*) as count FROM insights WHERE validity_status = 'active' AND is_archived = 0 AND promoted_to IS NULL").get().count;
     }
     catch { /* テーブル未存在等 */ }
     let active_theories = 0;
     try {
-        active_theories = db.prepare("SELECT COUNT(*) as count FROM theories WHERE status = 'active'").get().count;
+        active_theories = db.prepare("SELECT COUNT(*) as count FROM theories WHERE validity_status = 'active' AND is_archived = 0 AND promoted_to IS NULL").get().count;
     }
     catch { /* テーブル未存在等 */ }
     let active_models = 0;
     try {
-        active_models = db.prepare("SELECT COUNT(*) as count FROM models WHERE status = 'active'").get().count;
+        active_models = db.prepare("SELECT COUNT(*) as count FROM models WHERE validity_status = 'active' AND is_archived = 0 AND promoted_to IS NULL").get().count;
     }
     catch { /* テーブル未存在等 */ }
-    const categoryRows = db.prepare("SELECT category, COUNT(*) as count FROM claims WHERE status = 'active' GROUP BY category").all();
+    const categoryRows = db.prepare("SELECT category, COUNT(*) as count FROM claims WHERE validity_status = 'active' AND is_archived = 0 AND promoted_to IS NULL GROUP BY category").all();
     const categories = {};
     for (const row of categoryRows) {
         categories[row.category] = row.count;
@@ -673,10 +684,10 @@ export function getStats(db) {
     };
 }
 export function getAllActiveClaims(db) {
-    return db.prepare("SELECT * FROM claims WHERE status = 'active' ORDER BY category, updated_at DESC").all();
+    return db.prepare("SELECT * FROM claims WHERE validity_status = 'active' AND is_archived = 0 ORDER BY category, updated_at DESC").all();
 }
 export function getRecentDecisions(db, limit = 10) {
-    return db.prepare("SELECT * FROM decisions WHERE status = 'active' ORDER BY created_at DESC LIMIT ?").all(limit);
+    return db.prepare("SELECT * FROM decisions WHERE validity_status = 'active' AND is_archived = 0 ORDER BY created_at DESC LIMIT ?").all(limit);
 }
 // === L2 Core v0: Claim関係 ===
 export function insertClaimRelation(db, params) {
@@ -748,11 +759,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 +775,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,
     });
 }
@@ -808,7 +819,7 @@ export function insertEpisode(db, params) {
     const id = ulid();
     const now = new Date().toISOString();
     db.prepare(`
-    INSERT INTO episodes (id, title, l1_content, l2_context, l2_trigger, l2_problems, l2_desires, l2_decisions, l2_outcomes, l2_principles, evidence_refs, tags, scope, status, search_summary, l1_embedding, source_tool, session_id, client_name, client_version, user_input, created_at, updated_at)
+    INSERT INTO episodes (id, title, l1_content, l2_context, l2_trigger, l2_problems, l2_desires, l2_decisions, l2_outcomes, l2_principles, evidence_refs, tags, scope, validity_status, search_summary, l1_embedding, source_tool, session_id, client_name, client_version, user_input, created_at, updated_at)
     VALUES (@id, @title, @l1_content, @l2_context, @l2_trigger, @l2_problems, @l2_desires, @l2_decisions, @l2_outcomes, @l2_principles, @evidence_refs, @tags, @scope, 'active', @search_summary, @l1_embedding, @source_tool, @session_id, @client_name, @client_version, @user_input, @created_at, @updated_at)
   `).run({
         id,
@@ -845,8 +856,10 @@ export function listEpisodes(db, params) {
         const conditions = [];
         const values = { limit: params.limit };
         if (params.status) {
-            conditions.push("e.status = @status");
-            values.status = params.status;
+            conditions.push("e.validity_status = @validity_status");
+            conditions.push("e.is_archived = 0");
+            conditions.push("e.promoted_to IS NULL");
+            values.validity_status = params.status;
         }
         if (params.tag) {
             conditions.push("e.tags LIKE @tag_like");
@@ -896,8 +909,10 @@ export function listEpisodes(db, params) {
     const conditions = [];
     const values = { limit: params.limit };
     if (params.status) {
-        conditions.push("status = @status");
-        values.status = params.status;
+        conditions.push("validity_status = @validity_status");
+        conditions.push("is_archived = 0");
+        conditions.push("promoted_to IS NULL");
+        values.validity_status = params.status;
     }
     if (params.tag) {
         conditions.push("tags LIKE @tag_like");
@@ -918,14 +933,14 @@ export function listEpisodes(db, params) {
 }
 export function getEpisodeStats(db) {
     const total_episodes = db.prepare("SELECT COUNT(*) as count FROM episodes").get().count;
-    const active_episodes = db.prepare("SELECT COUNT(*) as count FROM episodes WHERE status = 'active'").get().count;
-    const archived_episodes = db.prepare("SELECT COUNT(*) as count FROM episodes WHERE status = 'archived'").get().count;
+    const active_episodes = db.prepare("SELECT COUNT(*) as count FROM episodes WHERE validity_status = 'active' AND is_archived = 0").get().count;
+    const archived_episodes = db.prepare("SELECT COUNT(*) as count FROM episodes WHERE is_archived = 1").get().count;
     return { total_episodes, active_episodes, archived_episodes };
 }
 // === Issue #40 Phase 3: Episode棚卸 ===
 // 2026-02-23 追加 (Issue #40 Phase 3): 未グルーミングのEpisodeを取得
 export function listUngroomedEpisodes(db, params) {
-    const conditions = ["e.status = 'active'"];
+    const conditions = ["e.validity_status = 'active' AND e.is_archived = 0"];
     const values = { limit: params.limit };
     if (!params.include_groomed) {
         conditions.push("e.groomed_at IS NULL");
@@ -952,19 +967,19 @@ export function listUngroomedEpisodes(db, params) {
     LEFT JOIN (
       SELECT j.value AS eid, COUNT(*) AS cnt
       FROM insights, json_each(insights.supporting_episode_ids) AS j
-      WHERE insights.status = 'active'
+      WHERE insights.validity_status = 'active' AND insights.is_archived = 0
       GROUP BY j.value
     ) li ON li.eid = e.id
     LEFT JOIN (
       SELECT j.value AS eid, COUNT(*) AS cnt
       FROM models, json_each(models.supporting_episode_ids) AS j
-      WHERE models.status = 'active'
+      WHERE models.validity_status = 'active' AND models.is_archived = 0
       GROUP BY j.value
     ) lm ON lm.eid = e.id
     LEFT JOIN (
       SELECT j.value AS eid, COUNT(*) AS cnt
       FROM theories, json_each(theories.supporting_episode_ids) AS j
-      WHERE theories.status = 'active'
+      WHERE theories.validity_status = 'active' AND theories.is_archived = 0
       GROUP BY j.value
     ) lt ON lt.eid = e.id
     WHERE ${whereClause}
@@ -987,7 +1002,7 @@ export function markEpisodesGroomed(db, episodeIds) {
     const markedIds = [];
     const transaction = db.transaction(() => {
         for (const id of episodeIds) {
-            const result = db.prepare("UPDATE episodes SET groomed_at = @now WHERE id = @id AND status = 'active' AND groomed_at IS NULL").run({ id, now });
+            const result = db.prepare("UPDATE episodes SET groomed_at = @now WHERE id = @id AND validity_status = 'active' AND is_archived = 0 AND groomed_at IS NULL").run({ id, now });
             if (result.changes > 0) {
                 markedIds.push(id);
             }
@@ -1003,7 +1018,7 @@ export function archiveEpisodes(db, params) {
     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 stmt = db.prepare("UPDATE episodes SET is_archived = 1, updated_at = @now WHERE id = @id AND validity_status = 'active' AND is_archived = 0");
         const now = new Date().toISOString();
         for (const id of params.episodeIds) {
             const result = stmt.run({ id, now });
@@ -1018,7 +1033,7 @@ export function archiveEpisodes(db, params) {
     // 最新 keepLatest 件の ID を取得（保護対象）
     const protectedIds = db.prepare(`
     SELECT id FROM episodes
-    WHERE status = 'active'${scopeFilter}
+    WHERE validity_status = 'active' AND is_archived = 0${scopeFilter}
     ORDER BY created_at DESC
     LIMIT @keepLatest
   `).all({ ...scopeValues, keepLatest });
@@ -1026,11 +1041,11 @@ export function archiveEpisodes(db, params) {
     // groomed_at IS NOT NULL かつ保護対象外をアーカイブ
     const candidates = db.prepare(`
     SELECT id FROM episodes
-    WHERE status = 'active' AND groomed_at IS NOT NULL${scopeFilter}
+    WHERE validity_status = 'active' AND is_archived = 0 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");
+    const stmt = db.prepare("UPDATE episodes SET is_archived = 1, updated_at = @now WHERE id = @id");
     for (const r of toArchive) {
         stmt.run({ id: r.id, now });
     }
@@ -1041,7 +1056,7 @@ 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 stmt = db.prepare("UPDATE decisions SET is_archived = 1, updated_at = @now WHERE id = @id AND validity_status = 'active' AND is_archived = 0");
         const now = new Date().toISOString();
         for (const id of params.decisionIds) {
             const result = stmt.run({ id, now });
@@ -1055,18 +1070,18 @@ export function archiveDecisions(db, params) {
     const scopeValues = params.scope ? { scope: params.scope } : {};
     const protectedIds = db.prepare(`
     SELECT id FROM decisions
-    WHERE status = 'active'${scopeFilter}
+    WHERE validity_status = 'active' AND is_archived = 0${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}
+    WHERE validity_status = 'active' AND is_archived = 0${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");
+    const stmt = db.prepare("UPDATE decisions SET is_archived = 1, updated_at = @now WHERE id = @id");
     for (const r of toArchive) {
         stmt.run({ id: r.id, now });
     }
@@ -1079,7 +1094,7 @@ export function getTopicSummary(db, tagLimit = 10, decisionLimit = 5, scope) {
     const scopeFilter = scope ? " AND (scope = @scope OR scope = 'global')" : "";
     const scopeValues = scope ? { scope } : {};
     // カテゴリ分布
-    const categoryRows = db.prepare(`SELECT category, COUNT(*) as count FROM claims WHERE status = 'active'${scopeFilter} GROUP BY category`).all(scopeValues);
+    const categoryRows = db.prepare(`SELECT category, COUNT(*) as count FROM claims WHERE validity_status = 'active' AND is_archived = 0${scopeFilter} GROUP BY category`).all(scopeValues);
     const categories = {};
     for (const row of categoryRows) {
         categories[row.category] = row.count;
@@ -1089,13 +1104,13 @@ export function getTopicSummary(db, tagLimit = 10, decisionLimit = 5, scope) {
     try {
         topTags = db.prepare(`
       SELECT tag, COUNT(*) as count FROM (
-        SELECT j.value as tag FROM episodes, json_each(episodes.tags) AS j WHERE episodes.status = 'active'${scopeFilter.replace("scope", "episodes.scope")}
+        SELECT j.value as tag FROM episodes, json_each(episodes.tags) AS j WHERE episodes.validity_status = 'active' AND episodes.is_archived = 0${scopeFilter.replace("scope", "episodes.scope")}
         UNION ALL
-        SELECT j.value as tag FROM theories, json_each(theories.tags) AS j WHERE theories.status = 'active'${scopeFilter.replace("scope", "theories.scope")}
+        SELECT j.value as tag FROM theories, json_each(theories.tags) AS j WHERE theories.validity_status = 'active' AND theories.is_archived = 0${scopeFilter.replace("scope", "theories.scope")}
         UNION ALL
-        SELECT j.value as tag FROM insights, json_each(insights.tags) AS j WHERE insights.status = 'active'${scopeFilter.replace("scope", "insights.scope")}
+        SELECT j.value as tag FROM insights, json_each(insights.tags) AS j WHERE insights.validity_status = 'active' AND insights.is_archived = 0${scopeFilter.replace("scope", "insights.scope")}
         UNION ALL
-        SELECT j.value as tag FROM models, json_each(models.tags) AS j WHERE models.status = 'active'${scopeFilter.replace("scope", "models.scope")}
+        SELECT j.value as tag FROM models, json_each(models.tags) AS j WHERE models.validity_status = 'active' AND models.is_archived = 0${scopeFilter.replace("scope", "models.scope")}
       ) GROUP BY tag ORDER BY count DESC LIMIT @tagLimit
     `).all({ ...scopeValues, tagLimit });
     }
@@ -1103,38 +1118,43 @@ export function getTopicSummary(db, tagLimit = 10, decisionLimit = 5, scope) {
         // json_each 非対応環境のフォールバック: 空配列
     }
     // 最近のDecision
-    const recentDecisions = db.prepare(`SELECT title, created_at FROM decisions WHERE status = 'active'${scopeFilter} ORDER BY created_at DESC LIMIT @decisionLimit`).all({ ...scopeValues, decisionLimit });
+    const recentDecisions = db.prepare(`SELECT title, created_at FROM decisions WHERE validity_status = 'active' AND is_archived = 0${scopeFilter} ORDER BY created_at DESC LIMIT @decisionLimit`).all({ ...scopeValues, decisionLimit });
     // アクティブスコープ一覧
-    const scopeRows = db.prepare(`SELECT DISTINCT scope FROM claims WHERE status = 'active'${scopeFilter} ORDER BY scope`).all(scopeValues);
+    const scopeRows = db.prepare(`SELECT DISTINCT scope FROM claims WHERE validity_status = 'active' AND is_archived = 0${scopeFilter} ORDER BY scope`).all(scopeValues);
     const activeScopes = scopeRows.map(r => r.scope);
     // 4テーブルのアクティブ件数
-    const activeClaims = db.prepare(`SELECT COUNT(*) as count FROM claims WHERE status = 'active'${scopeFilter}`).get(scopeValues).count;
-    const activeEpisodes = db.prepare(`SELECT COUNT(*) as count FROM episodes WHERE status = 'active'${scopeFilter}`).get(scopeValues).count;
-    const activeDecisions = db.prepare(`SELECT COUNT(*) as count FROM decisions WHERE status = 'active'${scopeFilter}`).get(scopeValues).count;
-    const activeTheories = db.prepare(`SELECT COUNT(*) as count FROM theories WHERE status = 'active'${scopeFilter}`).get(scopeValues).count;
+    const activeClaims = db.prepare(`SELECT COUNT(*) as count FROM claims WHERE validity_status = 'active' AND is_archived = 0${scopeFilter}`).get(scopeValues).count;
+    const activeEpisodes = db.prepare(`SELECT COUNT(*) as count FROM episodes WHERE validity_status = 'active' AND is_archived = 0${scopeFilter}`).get(scopeValues).count;
+    const activeDecisions = db.prepare(`SELECT COUNT(*) as count FROM decisions WHERE validity_status = 'active' AND is_archived = 0${scopeFilter}`).get(scopeValues).count;
+    const activeTheories = db.prepare(`SELECT COUNT(*) as count FROM theories WHERE validity_status = 'active' AND is_archived = 0${scopeFilter}`).get(scopeValues).count;
     // 2026-02-23 追加 (Issue #40): Insight/Model のアクティブ件数
-    const activeInsights = db.prepare(`SELECT COUNT(*) as count FROM insights WHERE status = 'active'${scopeFilter}`).get(scopeValues).count;
-    const activeModels = db.prepare(`SELECT COUNT(*) as count FROM models WHERE status = 'active'${scopeFilter}`).get(scopeValues).count;
+    const activeInsights = db.prepare(`SELECT COUNT(*) as count FROM insights WHERE validity_status = 'active' AND is_archived = 0${scopeFilter}`).get(scopeValues).count;
+    const activeModels = db.prepare(`SELECT COUNT(*) as count FROM models WHERE validity_status = 'active' AND is_archived = 0${scopeFilter}`).get(scopeValues).count;
     // 2026-02-25 リネーム: memos → user_memos (Issue #45 Phase 1)
     let activeMemos = 0;
     try {
-        activeMemos = db.prepare(`SELECT COUNT(*) as count FROM user_memos WHERE status = 'active'${scopeFilter}`).get(scopeValues).count;
+        activeMemos = db.prepare(`SELECT COUNT(*) as count FROM user_memos WHERE memo_status = 'active' AND is_archived = 0${scopeFilter}`).get(scopeValues).count;
     }
     catch { /* V16未適用 */ }
+    let activeFiles = 0;
+    try {
+        activeFiles = db.prepare(`SELECT COUNT(*) as count FROM user_files WHERE file_status = 'active' AND is_archived = 0${scopeFilter}`).get(scopeValues).count;
+    }
+    catch { /* V31未適用 */ }
     // Issue #47: エンティティタイトルから具体的キーワード候補を抽出
     let topicKeywords = [];
     try {
         const keywordRows = db.prepare(`
       SELECT title FROM (
-        SELECT title, updated_at FROM episodes WHERE status = 'active'${scopeFilter.replace("scope", "episodes.scope")}
+        SELECT title, updated_at FROM episodes WHERE validity_status = 'active' AND is_archived = 0${scopeFilter.replace("scope", "episodes.scope")}
         UNION ALL
-        SELECT title, updated_at FROM decisions WHERE status = 'active'${scopeFilter.replace("scope", "decisions.scope")}
+        SELECT title, updated_at FROM decisions WHERE validity_status = 'active' AND is_archived = 0${scopeFilter.replace("scope", "decisions.scope")}
         UNION ALL
-        SELECT title, updated_at FROM theories WHERE status = 'active'${scopeFilter.replace("scope", "theories.scope")}
+        SELECT title, updated_at FROM theories WHERE validity_status = 'active' AND is_archived = 0${scopeFilter.replace("scope", "theories.scope")}
         UNION ALL
-        SELECT title, updated_at FROM insights WHERE status = 'active'${scopeFilter.replace("scope", "insights.scope")}
+        SELECT title, updated_at FROM insights WHERE validity_status = 'active' AND is_archived = 0${scopeFilter.replace("scope", "insights.scope")}
         UNION ALL
-        SELECT title, updated_at FROM models WHERE status = 'active'${scopeFilter.replace("scope", "models.scope")}
+        SELECT title, updated_at FROM models WHERE validity_status = 'active' AND is_archived = 0${scopeFilter.replace("scope", "models.scope")}
       ) ORDER BY updated_at DESC LIMIT 20
     `).all(scopeValues);
         topicKeywords = keywordRows.map(r => r.title.length > 30 ? r.title.slice(0, 30) + "…" : r.title);
@@ -1148,7 +1168,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 ===
@@ -1161,7 +1181,7 @@ export function insertTheory(db, params) {
     INSERT INTO theories (id, title, description, l1_content,
       l2_core_thesis, l2_principles, l2_trigger_conditions, l2_resolution_steps, l2_applicable_context,
       non_goals, open_questions,
-      supporting_episode_ids, supporting_claim_ids, evidence_refs, tags, scope, confidence, status, search_summary, l1_embedding,
+      supporting_episode_ids, supporting_claim_ids, evidence_refs, tags, scope, confidence, validity_status, search_summary, l1_embedding,
       source_tool, session_id, client_name, client_version, created_at, updated_at)
     VALUES (@id, @title, @description, @l1_content,
       @l2_core_thesis, @l2_principles, @l2_trigger_conditions, @l2_resolution_steps, @l2_applicable_context,
@@ -1206,8 +1226,10 @@ export function listTheories(db, params) {
         const conditions = [];
         const values = { limit: params.limit };
         if (params.status) {
-            conditions.push("t.status = @status");
-            values.status = params.status;
+            conditions.push("t.validity_status = @validity_status");
+            conditions.push("t.is_archived = 0");
+            conditions.push("t.promoted_to IS NULL");
+            values.validity_status = params.status;
         }
         if (params.tag) {
             conditions.push("t.tags LIKE @tag_like");
@@ -1257,8 +1279,10 @@ export function listTheories(db, params) {
     const conditions = [];
     const values = { limit: params.limit };
     if (params.status) {
-        conditions.push("status = @status");
-        values.status = params.status;
+        conditions.push("validity_status = @validity_status");
+        conditions.push("is_archived = 0");
+        conditions.push("promoted_to IS NULL");
+        values.validity_status = params.status;
     }
     if (params.tag) {
         conditions.push("tags LIKE @tag_like");
@@ -1292,7 +1316,7 @@ function queryInsightContext(db, topic, scope, limit) {
         SELECT t.* FROM insights t
         JOIN insights_fts f ON t.rowid = f.rowid
         WHERE insights_fts MATCH @query
-        AND t.status = 'active'
+        AND t.validity_status = 'active' AND t.is_archived = 0 AND t.promoted_to IS NULL
         ${scopeFilter}
         ORDER BY rank
         LIMIT @limit
@@ -1308,7 +1332,7 @@ function queryInsightContext(db, topic, scope, limit) {
     // 2026-03-01 修正 (Issue #53): l1/l2 カラム名に対応
     return db.prepare(`
     SELECT t.* FROM insights t
-    WHERE t.status = 'active'
+    WHERE t.validity_status = 'active' AND t.is_archived = 0 AND t.promoted_to IS NULL
     AND (t.title LIKE @like_query OR t.description LIKE @like_query OR t.l1_content LIKE @like_query OR t.l2_core_thesis LIKE @like_query OR t.l2_principles LIKE @like_query OR t.tags LIKE @like_query OR t.search_summary LIKE @like_query)
     ${scopeFilter}
     ORDER BY t.updated_at DESC
@@ -1330,7 +1354,7 @@ function queryModelContext(db, topic, scope, limit) {
         SELECT t.* FROM models t
         JOIN models_fts f ON t.rowid = f.rowid
         WHERE models_fts MATCH @query
-        AND t.status = 'active'
+        AND t.validity_status = 'active' AND t.is_archived = 0 AND t.promoted_to IS NULL
         ${scopeFilter}
         ORDER BY rank
         LIMIT @limit
@@ -1345,7 +1369,7 @@ function queryModelContext(db, topic, scope, limit) {
     const likeQuery = `%${topic}%`;
     return db.prepare(`
     SELECT t.* FROM models t
-    WHERE t.status = 'active'
+    WHERE t.validity_status = 'active' AND t.is_archived = 0 AND t.promoted_to IS NULL
     AND (t.title LIKE @like_query OR t.description LIKE @like_query OR t.l1_content LIKE @like_query OR t.l2_core_thesis LIKE @like_query OR t.l2_principles LIKE @like_query OR t.tags LIKE @like_query OR t.search_summary LIKE @like_query)
     ${scopeFilter}
     ORDER BY t.updated_at DESC
@@ -1366,7 +1390,7 @@ export function searchPrinciplesForRecall(db, promptText, limit) {
         SELECT e.* FROM episodes e
         JOIN episodes_fts f ON e.rowid = f.rowid
         WHERE episodes_fts MATCH @query
-        AND e.status = 'active'
+        AND e.validity_status = 'active' AND e.is_archived = 0 AND e.promoted_to IS NULL
         AND e.l2_principles != '[]'
         ORDER BY rank
         LIMIT @limit
@@ -1380,7 +1404,7 @@ export function searchPrinciplesForRecall(db, promptText, limit) {
         const likeQuery = `%${querySnippet}%`;
         episodeRows = db.prepare(`
       SELECT e.* FROM episodes e
-      WHERE e.status = 'active'
+      WHERE e.validity_status = 'active' AND e.is_archived = 0 AND e.promoted_to IS NULL
       AND e.l2_principles != '[]'
       AND (e.title LIKE @like_query OR e.l1_content LIKE @like_query OR e.l2_context LIKE @like_query OR e.l2_trigger LIKE @like_query OR e.l2_principles LIKE @like_query OR e.l2_problems LIKE @like_query OR e.l2_desires LIKE @like_query OR e.l2_outcomes LIKE @like_query OR e.l2_decisions LIKE @like_query OR e.search_summary LIKE @like_query)
       ORDER BY e.updated_at DESC
@@ -1429,7 +1453,7 @@ export function searchPrinciplesForRecall(db, promptText, limit) {
     try {
         const insightRows = db.prepare(`
       SELECT * FROM insights
-      WHERE status = 'active'
+      WHERE validity_status = 'active' AND is_archived = 0
       AND l2_principles != '[]'
       AND (${insightLike.clause})
       ORDER BY updated_at DESC
@@ -1450,7 +1474,7 @@ export function searchPrinciplesForRecall(db, promptText, limit) {
     try {
         const theoryRows = db.prepare(`
       SELECT * FROM theories
-      WHERE status = 'active'
+      WHERE validity_status = 'active' AND is_archived = 0
       AND (l2_principles != '[]' OR open_questions != '[]')
       AND (${theoryLike.clause})
       ORDER BY updated_at DESC
@@ -1484,7 +1508,7 @@ export function listEpisodesWithPrinciples(db, limit, scope) {
     }
     return db.prepare(`
     SELECT * FROM episodes
-    WHERE status = 'active' AND l2_principles != '[]'
+    WHERE validity_status = 'active' AND is_archived = 0 AND l2_principles != '[]'
     ${scopeFilter}
     ORDER BY updated_at DESC
     LIMIT @limit
@@ -1505,7 +1529,7 @@ export function listEscalationCandidates(db, params) {
              json_array_length(supporting_episode_ids) as supporting_episode_count,
              scope, created_at, description
       FROM insights
-      WHERE status = 'active'
+      WHERE validity_status = 'active' AND is_archived = 0
         AND confidence >= 0.8
         AND l2_principles != '[]'
         AND json_array_length(supporting_episode_ids) >= 2
@@ -1533,7 +1557,7 @@ export function listEscalationCandidates(db, params) {
              json_array_length(supporting_episode_ids) as supporting_episode_count,
              scope, created_at, description
       FROM theories
-      WHERE status = 'active'
+      WHERE validity_status = 'active' AND is_archived = 0
         AND confidence >= 0.8
         AND l2_principles != '[]'
         AND json_array_length(supporting_episode_ids) >= 2
@@ -1561,7 +1585,7 @@ export function listEscalationCandidates(db, params) {
              json_array_length(supporting_episode_ids) as supporting_episode_count,
              scope, created_at, l2_core_thesis
       FROM models
-      WHERE status = 'active'
+      WHERE validity_status = 'active' AND is_archived = 0
         AND confidence >= 0.8
         AND l2_principles != '[]'
         AND json_array_length(supporting_episode_ids) >= 2
@@ -1603,7 +1627,7 @@ function queryTheoryContext(db, topic, scope, limit) {
         SELECT t.* FROM theories t
         JOIN theories_fts f ON t.rowid = f.rowid
         WHERE theories_fts MATCH @query
-        AND t.status = 'active'
+        AND t.validity_status = 'active' AND t.is_archived = 0 AND t.promoted_to IS NULL
         ${scopeFilter}
         ORDER BY rank
         LIMIT @limit
@@ -1618,7 +1642,7 @@ function queryTheoryContext(db, topic, scope, limit) {
     const likeQuery = `%${topic}%`;
     return db.prepare(`
     SELECT t.* FROM theories t
-    WHERE t.status = 'active'
+    WHERE t.validity_status = 'active' AND t.is_archived = 0 AND t.promoted_to IS NULL
     AND (t.title LIKE @like_query OR t.description LIKE @like_query OR t.l1_content LIKE @like_query OR t.l2_core_thesis LIKE @like_query OR t.l2_principles LIKE @like_query OR t.tags LIKE @like_query OR t.search_summary LIKE @like_query)
     ${scopeFilter}
     ORDER BY t.updated_at DESC
@@ -1632,7 +1656,7 @@ function queryTheoryContext(db, topic, scope, limit) {
  * TypeScript 側で陳腐化スコアを計算してソート・フィルタする。
  */
 export function getStaleClaims(db, params) {
-    const conditions = ["c.status = 'active'"];
+    const conditions = ["c.validity_status = 'active'", "c.is_archived = 0"];
     const values = {};
     if (params.scope) {
         conditions.push("(c.scope = @scope OR c.scope = 'global')");
@@ -1763,11 +1787,11 @@ export function countUnconsolidatedItems(db) {
     try {
         const row = db.prepare(`
       SELECT MAX(created_at) AS last_at FROM (
-        SELECT created_at FROM theories WHERE status = 'active'
+        SELECT created_at FROM theories WHERE validity_status = 'active' AND is_archived = 0
         UNION ALL
-        SELECT created_at FROM insights WHERE status = 'active'
+        SELECT created_at FROM insights WHERE validity_status = 'active' AND is_archived = 0
         UNION ALL
-        SELECT created_at FROM models WHERE status = 'active'
+        SELECT created_at FROM models WHERE validity_status = 'active' AND is_archived = 0
       )
     `).get();
         lastAt = row?.last_at ?? null;
@@ -1778,9 +1802,9 @@ export function countUnconsolidatedItems(db) {
     if (lastAt) {
         const result = db.prepare(`
       SELECT (
-        (SELECT COUNT(*) FROM claims WHERE status = 'active' AND created_at > @since) +
-        (SELECT COUNT(*) FROM decisions WHERE status = 'active' AND created_at > @since) +
-        (SELECT COUNT(*) FROM episodes WHERE status = 'active' AND created_at > @since)
+        (SELECT COUNT(*) FROM claims WHERE validity_status = 'active' AND is_archived = 0 AND created_at > @since) +
+        (SELECT COUNT(*) FROM decisions WHERE validity_status = 'active' AND is_archived = 0 AND created_at > @since) +
+        (SELECT COUNT(*) FROM episodes WHERE validity_status = 'active' AND is_archived = 0 AND created_at > @since)
       ) AS count
     `).get({ since: lastAt });
         return result.count;
@@ -1788,9 +1812,9 @@ export function countUnconsolidatedItems(db) {
     // Theory/Insight/Model が一件もない場合: 全アクティブアイテム合計
     const result = db.prepare(`
     SELECT (
-      (SELECT COUNT(*) FROM claims WHERE status = 'active') +
-      (SELECT COUNT(*) FROM decisions WHERE status = 'active') +
-      (SELECT COUNT(*) FROM episodes WHERE status = 'active')
+      (SELECT COUNT(*) FROM claims WHERE validity_status = 'active' AND is_archived = 0) +
+      (SELECT COUNT(*) FROM decisions WHERE validity_status = 'active' AND is_archived = 0) +
+      (SELECT COUNT(*) FROM episodes WHERE validity_status = 'active' AND is_archived = 0)
     ) AS count
   `).get();
     return result.count;
@@ -1801,7 +1825,7 @@ export function countUnconsolidatedItems(db) {
 export function countStaleClaims(db) {
     const result = db.prepare(`
     SELECT COUNT(*) AS count FROM claims
-    WHERE status = 'active'
+    WHERE validity_status = 'active' AND is_archived = 0
     AND julianday('now') - julianday(updated_at) > 30
   `).get();
     return result.count;
@@ -1884,44 +1908,44 @@ export function updateTheoryL1Embedding(db, id, l1_embedding) {
 }
 /** l1_embedding が NULL の active Claim を取得（バックフィル用） */
 export function getClaimsWithoutL1Embedding(db, limit) {
-    return db.prepare("SELECT * FROM claims WHERE status = 'active' AND l1_embedding IS NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
+    return db.prepare("SELECT * FROM claims WHERE validity_status = 'active' AND is_archived = 0 AND l1_embedding IS NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
 /** l1_embedding が NULL の active Decision を取得（バックフィル用） */
 export function getDecisionsWithoutL1Embedding(db, limit) {
-    return db.prepare("SELECT * FROM decisions WHERE status = 'active' AND l1_embedding IS NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
+    return db.prepare("SELECT * FROM decisions WHERE validity_status = 'active' AND is_archived = 0 AND l1_embedding IS NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
 /** l1_embedding が NULL の active Episode を取得（バックフィル用） */
 export function getEpisodesWithoutL1Embedding(db, limit) {
-    return db.prepare("SELECT * FROM episodes WHERE status = 'active' AND l1_embedding IS NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
+    return db.prepare("SELECT * FROM episodes WHERE validity_status = 'active' AND is_archived = 0 AND l1_embedding IS NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
 /** l1_embedding が NULL の active Theory を取得（バックフィル用） */
 export function getTheoriesWithoutL1Embedding(db, limit) {
-    return db.prepare("SELECT * FROM theories WHERE status = 'active' AND l1_embedding IS NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
+    return db.prepare("SELECT * FROM theories WHERE validity_status = 'active' AND is_archived = 0 AND l1_embedding IS NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
 /** 指定テーブルで l1_embedding が存在するレコードを取得 */
 export function getClaimsWithL1Embedding(db, scope, limit = 100) {
     if (scope) {
-        return db.prepare("SELECT * FROM claims WHERE status = 'active' AND l1_embedding IS NOT NULL AND scope = ? ORDER BY updated_at DESC LIMIT ?").all(scope, limit);
+        return db.prepare("SELECT * FROM claims WHERE validity_status = 'active' AND is_archived = 0 AND l1_embedding IS NOT NULL AND scope = ? ORDER BY updated_at DESC LIMIT ?").all(scope, limit);
     }
-    return db.prepare("SELECT * FROM claims WHERE status = 'active' AND l1_embedding IS NOT NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
+    return db.prepare("SELECT * FROM claims WHERE validity_status = 'active' AND is_archived = 0 AND l1_embedding IS NOT NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
 export function getDecisionsWithL1Embedding(db, scope, limit = 100) {
     if (scope) {
-        return db.prepare("SELECT * FROM decisions WHERE status = 'active' AND l1_embedding IS NOT NULL AND scope = ? ORDER BY updated_at DESC LIMIT ?").all(scope, limit);
+        return db.prepare("SELECT * FROM decisions WHERE validity_status = 'active' AND is_archived = 0 AND l1_embedding IS NOT NULL AND scope = ? ORDER BY updated_at DESC LIMIT ?").all(scope, limit);
     }
-    return db.prepare("SELECT * FROM decisions WHERE status = 'active' AND l1_embedding IS NOT NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
+    return db.prepare("SELECT * FROM decisions WHERE validity_status = 'active' AND is_archived = 0 AND l1_embedding IS NOT NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
 export function getEpisodesWithL1Embedding(db, scope, limit = 100) {
     if (scope) {
-        return db.prepare("SELECT * FROM episodes WHERE status = 'active' AND l1_embedding IS NOT NULL AND scope = ? ORDER BY updated_at DESC LIMIT ?").all(scope, limit);
+        return db.prepare("SELECT * FROM episodes WHERE validity_status = 'active' AND is_archived = 0 AND l1_embedding IS NOT NULL AND scope = ? ORDER BY updated_at DESC LIMIT ?").all(scope, limit);
     }
-    return db.prepare("SELECT * FROM episodes WHERE status = 'active' AND l1_embedding IS NOT NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
+    return db.prepare("SELECT * FROM episodes WHERE validity_status = 'active' AND is_archived = 0 AND l1_embedding IS NOT NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
 export function getTheoriesWithL1Embedding(db, scope, limit = 100) {
     if (scope) {
-        return db.prepare("SELECT * FROM theories WHERE status = 'active' AND l1_embedding IS NOT NULL AND scope = ? ORDER BY updated_at DESC LIMIT ?").all(scope, limit);
+        return db.prepare("SELECT * FROM theories WHERE validity_status = 'active' AND is_archived = 0 AND l1_embedding IS NOT NULL AND scope = ? ORDER BY updated_at DESC LIMIT ?").all(scope, limit);
     }
-    return db.prepare("SELECT * FROM theories WHERE status = 'active' AND l1_embedding IS NOT NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
+    return db.prepare("SELECT * FROM theories WHERE validity_status = 'active' AND is_archived = 0 AND l1_embedding IS NOT NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
 // === V12: Insight CRUD (Issue #40) ===
 // 2026-03-01 修正 (Issue #53): l1/l2 カラム拡張 — core_thesis → l2_core_thesis, principles → l2_principles, 新カラム4つ追加
@@ -1934,7 +1958,7 @@ export function insertInsight(db, params) {
       l2_core_thesis, l2_principles, l2_trigger_conditions, l2_resolution_steps, l2_applicable_context,
       tags, scope, confidence, search_summary, l1_embedding,
       supporting_episode_ids, supporting_claim_ids, evidence_refs,
-      status,
+      validity_status,
       source_tool, session_id, client_name, client_version, created_at, updated_at)
     VALUES (@id, @title, @description,
       @l1_content,
@@ -1979,8 +2003,10 @@ export function listInsights(db, params) {
         const conditions = [];
         const values = { limit: params.limit };
         if (params.status) {
-            conditions.push("t.status = @status");
-            values.status = params.status;
+            conditions.push("t.validity_status = @validity_status");
+            conditions.push("t.is_archived = 0");
+            conditions.push("t.promoted_to IS NULL");
+            values.validity_status = params.status;
         }
         if (params.tag) {
             conditions.push("t.tags LIKE @tag_like");
@@ -2029,8 +2055,10 @@ export function listInsights(db, params) {
     const conditions = [];
     const values = { limit: params.limit };
     if (params.status) {
-        conditions.push("status = @status");
-        values.status = params.status;
+        conditions.push("validity_status = @validity_status");
+        conditions.push("is_archived = 0");
+        conditions.push("promoted_to IS NULL");
+        values.validity_status = params.status;
     }
     if (params.tag) {
         conditions.push("tags LIKE @tag_like");
@@ -2055,13 +2083,13 @@ export function updateInsightL1Embedding(db, id, l1_embedding) {
 }
 /** l1_embedding が NULL の active Insight を取得（バックフィル用） */
 export function getInsightsWithoutL1Embedding(db, limit) {
-    return db.prepare("SELECT * FROM insights WHERE status = 'active' AND l1_embedding IS NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
+    return db.prepare("SELECT * FROM insights WHERE validity_status = 'active' AND is_archived = 0 AND l1_embedding IS NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
 export function getInsightsWithL1Embedding(db, scope, limit = 100) {
     if (scope) {
-        return db.prepare("SELECT * FROM insights WHERE status = 'active' AND l1_embedding IS NOT NULL AND scope = ? ORDER BY updated_at DESC LIMIT ?").all(scope, limit);
+        return db.prepare("SELECT * FROM insights WHERE validity_status = 'active' AND is_archived = 0 AND l1_embedding IS NOT NULL AND scope = ? ORDER BY updated_at DESC LIMIT ?").all(scope, limit);
     }
-    return db.prepare("SELECT * FROM insights WHERE status = 'active' AND l1_embedding IS NOT NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
+    return db.prepare("SELECT * FROM insights WHERE validity_status = 'active' AND is_archived = 0 AND l1_embedding IS NOT NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
 // === V12: Model CRUD (Issue #40) ===
 // 2026-03-01 修正 (Issue #59): core_thesis → l2_core_thesis, principles → l2_principles + 新l2カラム + l1_content
@@ -2073,7 +2101,7 @@ export function insertModel(db, params) {
     INSERT INTO models (id, title, description, l1_content,
       l2_core_thesis, l2_principles, l2_trigger_conditions, l2_resolution_steps, l2_applicable_context,
       non_goals, open_questions,
-      supporting_episode_ids, supporting_claim_ids, evidence_refs, tags, scope, confidence, status, search_summary, l1_embedding,
+      supporting_episode_ids, supporting_claim_ids, evidence_refs, tags, scope, confidence, validity_status, search_summary, l1_embedding,
       source_tool, session_id, client_name, client_version, created_at, updated_at)
     VALUES (@id, @title, @description, @l1_content,
       @l2_core_thesis, @l2_principles, @l2_trigger_conditions, @l2_resolution_steps, @l2_applicable_context,
@@ -2118,8 +2146,10 @@ export function listModels(db, params) {
         const conditions = [];
         const values = { limit: params.limit };
         if (params.status) {
-            conditions.push("t.status = @status");
-            values.status = params.status;
+            conditions.push("t.validity_status = @validity_status");
+            conditions.push("t.is_archived = 0");
+            conditions.push("t.promoted_to IS NULL");
+            values.validity_status = params.status;
         }
         if (params.tag) {
             conditions.push("t.tags LIKE @tag_like");
@@ -2168,8 +2198,10 @@ export function listModels(db, params) {
     const conditions = [];
     const values = { limit: params.limit };
     if (params.status) {
-        conditions.push("status = @status");
-        values.status = params.status;
+        conditions.push("validity_status = @validity_status");
+        conditions.push("is_archived = 0");
+        conditions.push("promoted_to IS NULL");
+        values.validity_status = params.status;
     }
     if (params.tag) {
         conditions.push("tags LIKE @tag_like");
@@ -2192,22 +2224,55 @@ export function listModels(db, params) {
 export function updateModelL1Embedding(db, id, l1_embedding) {
     db.prepare("UPDATE models SET l1_embedding = @l1_embedding WHERE id = @id").run({ id, l1_embedding });
 }
+/** Theory/Insight/Model の共通フィールドを更新 (Issue #3 user_issue) */
+export function updateKnowledge(db, kind, id, updates) {
+    const table = kind === "theory" ? "theories" : kind === "insight" ? "insights" : "models";
+    const getById = kind === "theory" ? getTheoryById : kind === "insight" ? getInsightById : getModelById;
+    const existing = getById(db, id);
+    if (!existing)
+        return undefined;
+    const now = new Date().toISOString();
+    const setClauses = ["updated_at = @updated_at"];
+    const values = { id, updated_at: now };
+    const stringFields = ["title", "description", "l1_content", "l2_core_thesis", "l2_applicable_context", "scope", "search_summary", "validity_status"];
+    for (const field of stringFields) {
+        if (updates[field] !== undefined) {
+            setClauses.push(`${field} = @${field}`);
+            values[field] = updates[field];
+        }
+    }
+    if (updates.confidence !== undefined) {
+        setClauses.push("confidence = @confidence");
+        values.confidence = updates.confidence;
+    }
+    const arrayFields = ["l2_principles", "l2_trigger_conditions", "l2_resolution_steps", "supporting_episode_ids", "supporting_claim_ids", "evidence_refs", "tags", "non_goals", "open_questions"];
+    for (const field of arrayFields) {
+        if (updates[field] !== undefined) {
+            setClauses.push(`${field} = @${field}`);
+            values[field] = JSON.stringify(updates[field]);
+        }
+    }
+    if (setClauses.length <= 1)
+        return existing; // updated_at のみ = 変更なし
+    db.prepare(`UPDATE ${table} SET ${setClauses.join(", ")} WHERE id = @id`).run(values);
+    return getById(db, id);
+}
 /** l1_embedding が NULL の active Model を取得（バックフィル用） */
 export function getModelsWithoutL1Embedding(db, limit) {
-    return db.prepare("SELECT * FROM models WHERE status = 'active' AND l1_embedding IS NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
+    return db.prepare("SELECT * FROM models WHERE validity_status = 'active' AND is_archived = 0 AND l1_embedding IS NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
 export function getModelsWithL1Embedding(db, scope, limit = 100) {
     if (scope) {
-        return db.prepare("SELECT * FROM models WHERE status = 'active' AND l1_embedding IS NOT NULL AND scope = ? ORDER BY updated_at DESC LIMIT ?").all(scope, limit);
+        return db.prepare("SELECT * FROM models WHERE validity_status = 'active' AND is_archived = 0 AND l1_embedding IS NOT NULL AND scope = ? ORDER BY updated_at DESC LIMIT ?").all(scope, limit);
     }
-    return db.prepare("SELECT * FROM models WHERE status = 'active' AND l1_embedding IS NOT NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
+    return db.prepare("SELECT * FROM models WHERE validity_status = 'active' AND is_archived = 0 AND l1_embedding IS NOT NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
 // 2026-03-04 修正 (Issue #54): content → l1_content, user_input 追加
 export function insertUserMemo(db, params) {
     const id = ulid();
     const now = new Date().toISOString();
     db.prepare(`
-    INSERT INTO user_memos (id, title, l1_content, usage_policy, tags, scope, search_summary, user_input, l1_embedding, source_tool, client_name, client_version, status, created_at, updated_at)
+    INSERT INTO user_memos (id, title, l1_content, usage_policy, tags, scope, search_summary, user_input, l1_embedding, source_tool, client_name, client_version, memo_status, created_at, updated_at)
     VALUES (@id, @title, @l1_content, @usage_policy, @tags, @scope, @search_summary, @user_input, @l1_embedding, @source_tool, @client_name, @client_version, 'active', @created_at, @updated_at)
   `).run({
         id,
@@ -2261,9 +2326,13 @@ export function updateUserMemo(db, id, updates) {
         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 (updates.memo_status !== undefined) {
+        setClauses.push("memo_status = @memo_status");
+        values.memo_status = updates.memo_status;
+    }
+    if (updates.is_archived !== undefined) {
+        setClauses.push("is_archived = @is_archived");
+        values.is_archived = updates.is_archived;
     }
     if (setClauses.length === 0)
         return existing;
@@ -2278,8 +2347,9 @@ export function listUserMemos(db, params) {
     const conditions = [];
     const values = { limit };
     if (params.status) {
-        conditions.push("m.status = @status");
-        values.status = params.status;
+        conditions.push("m.memo_status = @memo_status");
+        conditions.push("m.is_archived = 0");
+        values.memo_status = params.status;
     }
     if (params.usage_policy) {
         conditions.push("m.usage_policy = @usage_policy");
@@ -2325,28 +2395,28 @@ export function listUserMemos(db, params) {
 }
 export function listAutoUserMemos(db, scope, limit = 5) {
     if (scope) {
-        return db.prepare("SELECT * FROM user_memos WHERE status = 'active' AND usage_policy = 'auto' AND (scope = ? OR scope = 'global') ORDER BY updated_at DESC LIMIT ?").all(scope, limit);
+        return db.prepare("SELECT * FROM user_memos WHERE memo_status = 'active' AND is_archived = 0 AND usage_policy = 'auto' AND (scope = ? OR scope = 'global') ORDER BY updated_at DESC LIMIT ?").all(scope, limit);
     }
-    return db.prepare("SELECT * FROM user_memos WHERE status = 'active' AND usage_policy = 'auto' ORDER BY updated_at DESC LIMIT ?").all(limit);
+    return db.prepare("SELECT * FROM user_memos WHERE memo_status = 'active' AND is_archived = 0 AND usage_policy = 'auto' ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
 export function updateUserMemoL1Embedding(db, id, l1_embedding) {
     db.prepare("UPDATE user_memos SET l1_embedding = @l1_embedding WHERE id = @id").run({ id, l1_embedding });
 }
 export function getUserMemosWithoutL1Embedding(db, limit) {
-    return db.prepare("SELECT * FROM user_memos WHERE status = 'active' AND l1_embedding IS NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
+    return db.prepare("SELECT * FROM user_memos WHERE memo_status = 'active' AND is_archived = 0 AND l1_embedding IS NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
 export function getUserMemosWithL1Embedding(db, scope, limit = 100) {
     if (scope) {
-        return db.prepare("SELECT * FROM user_memos 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_memos WHERE memo_status = 'active' AND is_archived = 0 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_memos WHERE status = 'active' AND l1_embedding IS NOT NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
+    return db.prepare("SELECT * FROM user_memos WHERE memo_status = 'active' AND is_archived = 0 AND l1_embedding IS NOT NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
 // 2026-03-04 修正 (Issue #54): content → l1_content
 export function insertUserPlan(db, params) {
     const id = ulid();
     const now = new Date().toISOString();
     db.prepare(`
-    INSERT INTO user_plans (id, title, l1_content, usage_policy, tags, scope, search_summary, user_input, l1_embedding, source_tool, client_name, client_version, status, created_at, updated_at)
+    INSERT INTO user_plans (id, title, l1_content, usage_policy, tags, scope, search_summary, user_input, l1_embedding, source_tool, client_name, client_version, plan_status, created_at, updated_at)
     VALUES (@id, @title, @l1_content, @usage_policy, @tags, @scope, @search_summary, @user_input, @l1_embedding, @source_tool, @client_name, @client_version, 'active', @created_at, @updated_at)
   `).run({
         id,
@@ -2400,9 +2470,13 @@ export function updateUserPlan(db, id, updates) {
         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 (updates.plan_status !== undefined) {
+        setClauses.push("plan_status = @plan_status");
+        values.plan_status = updates.plan_status;
+    }
+    if (updates.is_archived !== undefined) {
+        setClauses.push("is_archived = @is_archived");
+        values.is_archived = updates.is_archived;
     }
     if (setClauses.length === 0)
         return existing;
@@ -2414,11 +2488,11 @@ export function updateUserPlan(db, id, updates) {
 export function listUserPlans(db, params) {
     const sanitized = params.query ? sanitizeFtsQuery(params.query) : null;
     const limit = params.limit ?? 20;
-    const conditions = [];
+    const conditions = ["m.is_archived = 0"];
     const values = { limit };
     if (params.status) {
-        conditions.push("m.status = @status");
-        values.status = params.status;
+        conditions.push("m.plan_status = @plan_status");
+        values.plan_status = params.status;
     }
     if (params.usage_policy) {
         conditions.push("m.usage_policy = @usage_policy");
@@ -2464,27 +2538,29 @@ export function listUserPlans(db, params) {
 }
 export function listAutoUserPlans(db, scope, limit = 10) {
     if (scope) {
-        return db.prepare("SELECT * FROM user_plans WHERE status = 'active' AND usage_policy = 'auto' AND (scope = ? OR scope = 'global') ORDER BY updated_at DESC LIMIT ?").all(scope, limit);
+        return db.prepare("SELECT * FROM user_plans WHERE plan_status = 'active' AND is_archived = 0 AND usage_policy = 'auto' AND (scope = ? OR scope = 'global') ORDER BY updated_at DESC LIMIT ?").all(scope, limit);
     }
-    return db.prepare("SELECT * FROM user_plans WHERE status = 'active' AND usage_policy = 'auto' ORDER BY updated_at DESC LIMIT ?").all(limit);
+    return db.prepare("SELECT * FROM user_plans WHERE plan_status = 'active' AND is_archived = 0 AND usage_policy = 'auto' ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
 /**
  * Hook 用: アクティブなプランの軽量情報を取得する。
  * auto compact 後にLLMがプランを再認識できるよう、Hook の additionalContext に注入する。
  * l1_content は先頭500文字に切り詰めてトークン消費を抑える。
  */
-export function getActivePlansForHook(db, scope, limit = 3) {
+// 2026-03-25 修正: limit デフォルト 3→2、プレビュー 500→200 文字に短縮
+// 元の実装: limit=3, 500文字 → Hook の情報量が多いとのフィードバック
+export function getActivePlansForHook(db, scope, limit = 2) {
     let rows;
     if (scope) {
-        rows = db.prepare("SELECT id, title, l1_content, updated_at FROM user_plans WHERE status = 'active' AND usage_policy = 'auto' AND (scope = ? OR scope = 'global') ORDER BY updated_at DESC LIMIT ?").all(scope, limit);
+        rows = db.prepare("SELECT id, title, l1_content, updated_at FROM user_plans WHERE plan_status = 'active' AND is_archived = 0 AND usage_policy = 'auto' AND (scope = ? OR scope = 'global') ORDER BY updated_at DESC LIMIT ?").all(scope, limit);
     }
     else {
-        rows = db.prepare("SELECT id, title, l1_content, updated_at FROM user_plans WHERE status = 'active' AND usage_policy = 'auto' ORDER BY updated_at DESC LIMIT ?").all(limit);
+        rows = db.prepare("SELECT id, title, l1_content, updated_at FROM user_plans WHERE plan_status = 'active' AND is_archived = 0 AND usage_policy = 'auto' ORDER BY updated_at DESC LIMIT ?").all(limit);
     }
     return rows.map(r => ({
         id: r.id,
         title: r.title,
-        l1_content_preview: r.l1_content.length > 500 ? r.l1_content.slice(0, 500) + "…" : r.l1_content,
+        l1_content_preview: r.l1_content.length > 200 ? r.l1_content.slice(0, 200) + "…" : r.l1_content,
         updated_at: r.updated_at,
     }));
 }
@@ -2492,13 +2568,13 @@ export function updateUserPlanL1Embedding(db, id, l1_embedding) {
     db.prepare("UPDATE user_plans SET l1_embedding = @l1_embedding WHERE id = @id").run({ id, l1_embedding });
 }
 export function getUserPlansWithoutL1Embedding(db, limit) {
-    return db.prepare("SELECT * FROM user_plans WHERE status = 'active' AND l1_embedding IS NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
+    return db.prepare("SELECT * FROM user_plans WHERE plan_status = 'active' AND is_archived = 0 AND l1_embedding IS NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
 export function getUserPlansWithL1Embedding(db, scope, limit = 100) {
     if (scope) {
-        return db.prepare("SELECT * FROM user_plans 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_plans WHERE plan_status = 'active' AND is_archived = 0 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_plans WHERE status = 'active' AND l1_embedding IS NOT NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
+    return db.prepare("SELECT * FROM user_plans WHERE plan_status = 'active' AND is_archived = 0 AND l1_embedding IS NOT NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
 // === Issue #57: UserIssue CRUD ===
 // 2026-03-04 修正 (Issue #54): content → l1_content
@@ -2506,7 +2582,7 @@ export function insertUserIssue(db, params) {
     const id = ulid();
     const now = new Date().toISOString();
     db.prepare(`
-    INSERT INTO user_issues (id, title, l1_content, entries, kind, priority, usage_policy, tags, scope, search_summary, user_input, l1_embedding, source_tool, client_name, client_version, status, created_at, updated_at)
+    INSERT INTO user_issues (id, title, l1_content, entries, kind, priority, usage_policy, tags, scope, search_summary, user_input, l1_embedding, source_tool, client_name, client_version, issue_status, created_at, updated_at)
     VALUES (@id, @title, @l1_content, @entries, @kind, @priority, @usage_policy, @tags, @scope, @search_summary, @user_input, @l1_embedding, @source_tool, @client_name, @client_version, 'open', @created_at, @updated_at)
   `).run({
         id,
@@ -2551,6 +2627,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;
@@ -2571,9 +2651,13 @@ export function updateUserIssue(db, id, updates) {
         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 (updates.issue_status !== undefined) {
+        setClauses.push("issue_status = @issue_status");
+        values.issue_status = updates.issue_status;
+    }
+    if (updates.is_archived !== undefined) {
+        setClauses.push("is_archived = @is_archived");
+        values.is_archived = updates.is_archived;
     }
     if (setClauses.length === 0)
         return existing;
@@ -2585,11 +2669,11 @@ export function updateUserIssue(db, id, updates) {
 export function listUserIssues(db, params) {
     const sanitized = params.query ? sanitizeFtsQuery(params.query) : null;
     const limit = params.limit ?? 20;
-    const conditions = [];
+    const conditions = ["m.is_archived = 0"];
     const values = { limit };
     if (params.status) {
-        conditions.push("m.status = @status");
-        values.status = params.status;
+        conditions.push("m.issue_status = @issue_status");
+        values.issue_status = params.status;
     }
     if (params.priority) {
         conditions.push("m.priority = @priority");
@@ -2641,13 +2725,168 @@ export function updateUserIssueL1Embedding(db, id, l1_embedding) {
     db.prepare("UPDATE user_issues SET l1_embedding = @l1_embedding WHERE id = @id").run({ id, l1_embedding });
 }
 export function getUserIssuesWithoutL1Embedding(db, limit) {
-    return db.prepare("SELECT * FROM user_issues WHERE status = 'open' AND l1_embedding IS NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
+    return db.prepare("SELECT * FROM user_issues WHERE issue_status = 'open' AND is_archived = 0 AND l1_embedding IS NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
 export function getUserIssuesWithL1Embedding(db, scope, limit = 100) {
     if (scope) {
-        return db.prepare("SELECT * FROM user_issues WHERE status = 'open' 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_issues WHERE issue_status = 'open' AND is_archived = 0 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_issues WHERE status = 'open' AND l1_embedding IS NOT NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
+    return db.prepare("SELECT * FROM user_issues WHERE issue_status = 'open' AND is_archived = 0 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, topic_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.topic_status !== undefined) {
+        setClauses.push("topic_status = @topic_status");
+        values.topic_status = updates.topic_status;
+    }
+    if (updates.is_archived !== undefined) {
+        setClauses.push("is_archived = @is_archived");
+        values.is_archived = updates.is_archived;
+    }
+    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 = ["m.is_archived = 0"];
+    const values = { limit };
+    if (params.status) {
+        conditions.push("m.topic_status = @topic_status");
+        values.topic_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 topic_status = 'active' AND is_archived = 0 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 topic_status = 'active' AND is_archived = 0 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 topic_status = 'active' AND is_archived = 0 AND l1_embedding IS NOT NULL ORDER BY updated_at DESC LIMIT ?").all(limit);
 }
 /**
  * 横断検索（FTS5 + LIKEフォールバック）
@@ -2662,11 +2901,13 @@ export function unifiedSearch(db, query, scope, entityTypes, limit) {
         scopeFilter = "AND (u.scope = @scope OR u.scope = 'global')";
         baseValues.scope = scope;
     }
+    // entity_types 未指定時はデフォルト検索対象を使用
+    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 +2968,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 未指定時はデフォルト検索対象を使用
+    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 ")
@@ -2813,7 +3056,7 @@ export function rebuildUnifiedSearch(db) {
         INSERT OR REPLACE INTO unified_search_items(${columns})
         SELECT '${e.type}', id, scope, ${e.categoryExpr}, ${e.titleExpr}, ${e.searchExpr}, ${e.searchSummary}, ${e.tagsExpr}, created_at, updated_at
         FROM ${e.table}
-        WHERE status = 'active'
+        WHERE validity_status = 'active' AND is_archived = 0 AND promoted_to IS NULL
       `);
         }
         db.exec("INSERT INTO unified_search_fts(unified_search_fts) VALUES('rebuild')");
@@ -2834,6 +3077,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 +3227,119 @@ export function applyTombstones(db) {
     }
     return deleted;
 }
+// ============================================================
+// UserFile (File Vault)
+// ============================================================
+export function insertUserFile(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_files (id, title, description, device_id, original_filename, original_encoding, file_data, file_hash, file_size, tags, scope, search_summary, l1_embedding, source_tool, client_name, client_version, file_status, created_at, updated_at)
+    VALUES (@id, @title, @description, @device_id, @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,
+        device_id: deviceId,
+        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 file_status = 'active' AND is_archived = 0").get(title);
+    if (exact)
+        return exact;
+    return db.prepare("SELECT * FROM user_files WHERE title LIKE ? AND file_status = 'active' AND is_archived = 0 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.file_status !== undefined) {
+        setClauses.push("file_status = @file_status");
+        params.file_status = updates.file_status;
+    }
+    if (updates.is_archived !== undefined) {
+        setClauses.push("is_archived = @is_archived");
+        params.is_archived = updates.is_archived;
+    }
+    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 = ["file_status = @file_status", "is_archived = @is_archived"];
+    const bindParams = { file_status: params.file_status ?? "active", is_archived: params.is_archived ?? 0 };
+    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, file_status, is_archived, 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