@thread-memory/core 0.1.1 → 1.0.1

package/dist/store.js

@@ -2,7 +2,8 @@ import Database from "better-sqlite3";
 import { createHash } from "node:crypto";
 import { MAX_BODY_CHARS, truncateBody } from "./events.js";
 import { assertTransition } from "./state.js";
-import { ensureSchema } from "./schema.js";
+import { ensureSchema, EVENTS_FTS_DDL, EVENTS_FTS_TRI_DDL } from "./schema.js";
+import { segment, segmentQuery } from "./segment.js";
 import { SpillPolicy, isIndexable } from "./governor.js";
 export const EVENTS_SCHEMA = `
 CREATE TABLE IF NOT EXISTS events (
@@ -22,12 +23,9 @@ CREATE TABLE IF NOT EXISTS events (
 );
 CREATE INDEX IF NOT EXISTS idx_events_session ON events(session_id, seq);
 
-CREATE VIRTUAL TABLE IF NOT EXISTS events_fts USING fts5(
-  body,
-  content='events',
-  content_rowid='id',
-  tokenize='unicode61'
-);
+${EVENTS_FTS_DDL}
+
+${EVENTS_FTS_TRI_DDL}
 
 CREATE TABLE IF NOT EXISTS episodes (
   id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -77,6 +75,7 @@ CREATE TABLE IF NOT EXISTS goals (
   status TEXT NOT NULL DEFAULT 'active',
   source_event INTEGER,
   created_at TEXT NOT NULL,
+  updated_at TEXT,
   project_key TEXT,
   scope TEXT NOT NULL DEFAULT 'project',
   origin TEXT,
@@ -107,6 +106,7 @@ CREATE TABLE IF NOT EXISTS feedback (
   kind TEXT NOT NULL DEFAULT 'preference',
   source_event INTEGER,
   created_at TEXT NOT NULL,
+  updated_at TEXT,
   project_key TEXT,
   scope TEXT NOT NULL DEFAULT 'project',
   origin TEXT,
@@ -161,6 +161,56 @@ CREATE TABLE IF NOT EXISTS metrics (
   value REAL NOT NULL,
   ts TEXT NOT NULL
 );
+
+CREATE TABLE IF NOT EXISTS pending_candidates (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  session_id TEXT NOT NULL,
+  text TEXT NOT NULL,
+  kind TEXT NOT NULL DEFAULT 'preference',
+  status TEXT NOT NULL DEFAULT 'pending',
+  source_event INTEGER,
+  created_at TEXT NOT NULL,
+  updated_at TEXT,
+  prompt_count INTEGER NOT NULL DEFAULT 0,
+  last_prompt_ts TEXT,
+  project_key TEXT,
+  isolation INTEGER NOT NULL DEFAULT 0
+);
+CREATE INDEX IF NOT EXISTS idx_pending_project ON pending_candidates(project_key, status);
+CREATE INDEX IF NOT EXISTS idx_pending_session ON pending_candidates(session_id, status);
+
+CREATE TABLE IF NOT EXISTS knowledge_assets (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  path TEXT NOT NULL,
+  title TEXT NOT NULL,
+  topic TEXT,
+  scenario TEXT,
+  session_id TEXT NOT NULL,
+  source_event INTEGER,
+  created_at TEXT NOT NULL,
+  isolation INTEGER NOT NULL DEFAULT 0
+);
+CREATE INDEX IF NOT EXISTS idx_assets_session ON knowledge_assets(session_id, created_at);
+CREATE INDEX IF NOT EXISTS idx_assets_visible ON knowledge_assets(isolation, created_at);
+
+CREATE TABLE IF NOT EXISTS todos (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  session_id TEXT NOT NULL,
+  text TEXT NOT NULL,
+  basis TEXT,
+  status TEXT NOT NULL DEFAULT 'pending',
+  created_at TEXT NOT NULL,
+  project_key TEXT,
+  isolation INTEGER NOT NULL DEFAULT 0
+);
+CREATE INDEX IF NOT EXISTS idx_todos_project ON todos(project_key, status);
+CREATE INDEX IF NOT EXISTS idx_todos_session ON todos(session_id, status);
+
+CREATE TABLE IF NOT EXISTS thread_meta (
+  key TEXT PRIMARY KEY,
+  value TEXT NOT NULL,
+  updated_at TEXT NOT NULL
+);
 `;
 export class ThreadStore {
     eventsDb;
@@ -214,6 +264,219 @@ export class ThreadStore {
         this.eventsDb.close();
         this.structuredDb.close();
     }
+    // ─── 轻确认候选（§1.5.3d）：规则粗筛暂存，未确认绝不进正式表 ───
+    addPendingCandidate(input) {
+        const now = new Date().toISOString();
+        const row = this.structuredDb
+            .prepare(`INSERT INTO pending_candidates (session_id, text, kind, status, source_event, created_at, updated_at, project_key, isolation)
+         VALUES (?, ?, ?, 'pending', ?, ?, ?, ?, ?) RETURNING *`)
+            .get(input.sessionId, input.text, input.kind, input.sourceEvent ?? null, now, now, input.projectKey ?? null, input.isolation ? 1 : 0);
+        return row;
+    }
+    listPendingCandidates(opts = {}) {
+        const where = ["status = 'pending'"];
+        const params = [];
+        if (opts.projectKey) {
+            where.push("project_key = ?");
+            params.push(opts.projectKey);
+        }
+        else if (opts.sessionId) {
+            where.push("session_id = ?");
+            params.push(opts.sessionId);
+        }
+        return this.structuredDb
+            .prepare(`SELECT * FROM pending_candidates WHERE ${where.join(" AND ")} ORDER BY id DESC LIMIT 20`)
+            .all(...params);
+    }
+    confirmCandidate(id) {
+        return this.structuredDb
+            .prepare(`UPDATE pending_candidates SET status = 'confirmed', updated_at = ? WHERE id = ? AND status = 'pending' RETURNING *`)
+            .get(new Date().toISOString(), id);
+    }
+    ignoreCandidate(id) {
+        return this.structuredDb
+            .prepare(`UPDATE pending_candidates SET status = 'ignored', updated_at = ? WHERE id = ? AND status = 'pending' RETURNING *`)
+            .get(new Date().toISOString(), id);
+    }
+    // /thread-pending cancel-all（1.3）：批量丢弃 pending 候选
+    ignoreAllPendingCandidates(opts = {}) {
+        const now = new Date().toISOString();
+        if (opts.projectKey) {
+            const info = this.structuredDb
+                .prepare(`UPDATE pending_candidates SET status = 'ignored', updated_at = ? WHERE status = 'pending' AND project_key = ?`)
+                .run(now, opts.projectKey);
+            return info.changes;
+        }
+        if (opts.sessionId) {
+            const info = this.structuredDb
+                .prepare(`UPDATE pending_candidates SET status = 'ignored', updated_at = ? WHERE status = 'pending' AND session_id = ?`)
+                .run(now, opts.sessionId);
+            return info.changes;
+        }
+        const info = this.structuredDb.prepare(`UPDATE pending_candidates SET status = 'ignored', updated_at = ? WHERE status = 'pending'`).run(now);
+        return info.changes;
+    }
+    markCandidatePrompted(id) {
+        this.structuredDb
+            .prepare(`UPDATE pending_candidates SET prompt_count = prompt_count + 1, last_prompt_ts = ?, updated_at = ? WHERE id = ?`)
+            .run(new Date().toISOString(), new Date().toISOString(), id);
+    }
+    // 候选超时（2026-08-20 收口修订）：pending 候选超龄 → ignored（原文仍在事件流水 + 行保留，决策不丢）。
+    // 覆盖两类：被提示过（last_prompt_ts 超龄）与从未被提示（created_at 超龄，headless 无弹窗堆积场景）
+    expireCandidates(opts) {
+        const where = `status = 'pending' AND COALESCE(last_prompt_ts, created_at) < ?`;
+        if (opts.projectKey) {
+            const info = this.structuredDb
+                .prepare(`UPDATE pending_candidates SET status = 'ignored', updated_at = ? WHERE ${where} AND project_key = ?`)
+                .run(new Date().toISOString(), opts.before, opts.projectKey);
+            return info.changes;
+        }
+        const info = this.structuredDb
+            .prepare(`UPDATE pending_candidates SET status = 'ignored', updated_at = ? WHERE ${where}`)
+            .run(new Date().toISOString(), opts.before);
+        return info.changes;
+    }
+    pendingCount(opts = {}) {
+        const where = ["status = 'pending'"];
+        const params = [];
+        if (opts.projectKey) {
+            where.push("project_key = ?");
+            params.push(opts.projectKey);
+        }
+        else if (opts.sessionId) {
+            where.push("session_id = ?");
+            params.push(opts.sessionId);
+        }
+        const row = this.structuredDb
+            .prepare(`SELECT COUNT(*) AS c FROM pending_candidates WHERE ${where.join(" AND ")}`)
+            .get(...params);
+        return row.c;
+    }
+    // ─── 产出/待办/水位（v7，MAX 批 1 地基）───
+    // 产出登记 + 写时建边（单事务）：produces(session→asset) + references(asset→source_event)。
+    // 与事件 append 跨库（events/structured 双库），无法同 SQLite 事务——事件已由 origin 幂等，
+    // 资产登记为结构化库内原子事务；调用方失败重试同事件采集（旁路可失败不阻塞）。
+    registerAsset(input) {
+        const ts = input.ts ?? new Date().toISOString();
+        const tx = this.structuredDb.transaction(() => {
+            // 路径幂等（2026-08-21 狗粮实证）：同一文件每次 write/edit 都会触发登记 → 同 path 重复堆行
+            //（生产 README 同 path 12 行）。可见范围（isolation=0 或本会话）内已有同 path 行 →
+            // 只刷新标题并返回既有行，不再插入；血缘边在首次登记时已建立。
+            const existing = this.structuredDb
+                .prepare(`SELECT * FROM knowledge_assets WHERE path = ? AND (isolation = 0 OR session_id = ?) ORDER BY id LIMIT 1`)
+                .get(input.path, input.sessionId);
+            if (existing) {
+                if (existing.title !== input.title) {
+                    this.structuredDb.prepare(`UPDATE knowledge_assets SET title = ? WHERE id = ?`).run(input.title, existing.id);
+                    existing.title = input.title;
+                }
+                return existing;
+            }
+            const row = this.structuredDb
+                .prepare(`INSERT INTO knowledge_assets (path, title, topic, scenario, session_id, source_event, created_at, isolation)
+           VALUES (?, ?, ?, ?, ?, ?, ?, ?) RETURNING *`)
+                .get(input.path, input.title, input.topic ?? null, input.scenario ?? null, input.sessionId, input.sourceEvent ?? null, ts, input.isolation ? 1 : 0);
+            this.addLineageEdge(input.sessionId, "session", null, "asset", row.id, "produces", {
+                ref: input.sessionId,
+                ts,
+            });
+            if (input.sourceEvent) {
+                this.addLineageEdge(input.sessionId, "asset", row.id, "event", input.sourceEvent, "references", { ts });
+            }
+            return row;
+        });
+        return tx();
+    }
+    listAssets(opts = {}) {
+        const where = [];
+        const params = [];
+        if (opts.sessionId) {
+            where.push("session_id = ?");
+            params.push(opts.sessionId);
+        }
+        if (opts.visibleToSession) {
+            where.push("(isolation = 0 OR session_id = ?)");
+            params.push(opts.visibleToSession);
+        }
+        const sql = `SELECT * FROM knowledge_assets${where.length ? ` WHERE ${where.join(" AND ")}` : ""} ORDER BY id DESC LIMIT ${opts.limit ?? 50}`;
+        return this.structuredDb.prepare(sql).all(...params);
+    }
+    getAsset(id) {
+        return this.structuredDb.prepare(`SELECT * FROM knowledge_assets WHERE id = ?`).get(id);
+    }
+    // 产出解除登记（2026-08-21 /thread-rev ast）：硬删除 + 血缘边清理（双库：session→asset produces 在结构化库，
+    // asset→event references 在事件库）——事件流水保留原文，只解除结构化登记。
+    deleteAsset(id) {
+        const exists = this.structuredDb.prepare(`SELECT id FROM knowledge_assets WHERE id = ?`).get(id);
+        if (!exists) {
+            return false;
+        }
+        this.structuredDb.prepare(`DELETE FROM knowledge_assets WHERE id = ?`).run(id);
+        for (const db of [this.structuredDb, this.eventsDb]) {
+            db
+                .prepare(`DELETE FROM lineage_edges WHERE (src_type = 'asset' AND src_id = ?) OR (dst_type = 'asset' AND dst_id = ?)`)
+                .run(id, id);
+        }
+        return true;
+    }
+    // 发现层（2.4）：最近 N 个非隔离、有产出的会话（各带最新产出标题/时间）
+    listActiveSessionsWithAssets(limit) {
+        return this.structuredDb
+            .prepare(`SELECT a.session_id, a.title AS latest_title, a.created_at AS latest_ts
+         FROM knowledge_assets a
+         JOIN (
+           SELECT session_id, MAX(created_at) AS m FROM knowledge_assets WHERE isolation = 0 GROUP BY session_id
+         ) b ON a.session_id = b.session_id AND a.created_at = b.m AND a.isolation = 0
+         ORDER BY a.created_at DESC
+         LIMIT ?`)
+            .all(limit);
+    }
+    addTodo(input) {
+        const row = this.structuredDb
+            .prepare(`INSERT INTO todos (session_id, text, basis, status, created_at, project_key, isolation)
+         VALUES (?, ?, ?, 'pending', ?, ?, ?) RETURNING *`)
+            .get(input.sessionId, input.text, input.basis ?? null, input.ts ?? new Date().toISOString(), input.projectKey ?? null, input.isolation ? 1 : 0);
+        return row;
+    }
+    listTodos(opts = {}) {
+        const where = [];
+        const params = [];
+        if (opts.sessionId) {
+            where.push("session_id = ?");
+            params.push(opts.sessionId);
+        }
+        if (opts.projectKey) {
+            where.push("project_key = ?");
+            params.push(opts.projectKey);
+        }
+        if (opts.status) {
+            where.push("status = ?");
+            params.push(opts.status);
+        }
+        if (opts.basis !== undefined) {
+            where.push("basis = ?");
+            params.push(opts.basis);
+        }
+        if (opts.visibleToSession) {
+            where.push("(isolation = 0 OR session_id = ?)");
+            params.push(opts.visibleToSession);
+        }
+        const sql = `SELECT * FROM todos${where.length ? ` WHERE ${where.join(" AND ")}` : ""} ORDER BY id DESC LIMIT ${opts.limit ?? 100}`;
+        return this.structuredDb.prepare(sql).all(...params);
+    }
+    updateTodoStatus(id, status) {
+        const info = this.structuredDb.prepare(`UPDATE todos SET status = ? WHERE id = ?`).run(status, id);
+        return info.changes > 0;
+    }
+    getMeta(key) {
+        const row = this.structuredDb.prepare(`SELECT value FROM thread_meta WHERE key = ?`).get(key);
+        return row?.value;
+    }
+    setMeta(key, value) {
+        this.structuredDb
+            .prepare(`INSERT INTO thread_meta (key, value, updated_at) VALUES (?, ?, ?) ON CONFLICT(key) DO UPDATE SET value = excluded.value, updated_at = excluded.updated_at`)
+            .run(key, value, new Date().toISOString());
+    }
     append(event, opts = {}) {
         return this.eventsDb.transaction(() => {
             if (opts.origin) {
@@ -247,7 +510,8 @@ export class ThreadStore {
                     .run(eventId.id, spill.ref ?? `spill:${eventId.id}`, body, sha256, event.ts);
             }
             if (isIndexable(event.kind)) {
-                this.eventsDb.prepare(`INSERT INTO events_fts(rowid, body) VALUES (?, ?)`).run(eventId.id, cjkSpace(storedBody));
+                this.eventsDb.prepare(`INSERT INTO events_fts(rowid, body_seg) VALUES (?, ?)`).run(eventId.id, segment(storedBody));
+                this.eventsDb.prepare(`INSERT INTO events_fts_tri(rowid, body) VALUES (?, ?)`).run(eventId.id, storedBody);
             }
             const eventMeta = event.meta;
             if (typeof eventMeta?.file_path === "string") {
@@ -282,15 +546,26 @@ export class ThreadStore {
         return this.structuredDb.transaction(fn)();
     }
     search(query, opts = {}) {
-        const ftsQuery = toFtsQuery(query);
-        if (!ftsQuery) {
+        const hits = this.runFtsSearch(query, opts, "seg");
+        if (hits.length > 0) {
+            return hits;
+        }
+        // 0-e 定案第 5 条（trigram 子串召回兜底）：主路径 0 命中（jieba 分词失败 /
+        // "用户只记得半句"——查询是正文 token 的连续子串）时，用 trigram 表
+        // 短语匹配召回连续字符序列；隔离/会话过滤语义与主路径一致。
+        return this.runFtsSearch(query, opts, "tri");
+    }
+    runFtsSearch(query, opts, kind) {
+        const match = kind === "tri" ? toTrigramMatch(query) : toFtsMatch(query);
+        if (!match) {
             return [];
         }
+        const ftsTable = kind === "tri" ? "events_fts_tri" : "events_fts";
         let sql = `
-      SELECT e.id, e.session_id, e.kind, e.ts, e.seq, e.body, e.truncated, bm25(events_fts) AS score
-      FROM events_fts f JOIN events e ON e.id = f.rowid
-      WHERE events_fts MATCH ?`;
-        const params = [ftsQuery];
+      SELECT e.id, e.session_id, e.kind, e.ts, e.seq, e.body, e.truncated, bm25(${ftsTable}) AS score
+      FROM ${ftsTable} f JOIN events e ON e.id = f.rowid
+      WHERE ${ftsTable} MATCH ?`;
+        const params = [match];
         if (opts.sessionId) {
             // 当前会话可见自己的全部内容（含隔离），其他会话只见未隔离行
             sql += ` AND (e.session_id = ? OR e.isolation = 0)`;
@@ -299,7 +574,14 @@ export class ThreadStore {
         else {
             sql += ` AND e.isolation = 0`;
         }
-        sql += ` ORDER BY score LIMIT ?`;
+        if (kind === "tri") {
+            // 兜底路径：trigram 打分区分度差，纯时间衰减排序（近期优先）
+            sql += ` ORDER BY e.ts DESC LIMIT ?`;
+        }
+        else {
+            // bm25 负值越小越相关（ASC）；时间衰减 = 同分近期优先（ts DESC 二级排序，零成本先上，深调留 B⑤ 度量）
+            sql += ` ORDER BY score ASC, e.ts DESC LIMIT ?`;
+        }
         params.push(opts.limit ?? 20);
         return this.eventsDb.prepare(sql).all(...params);
     }
@@ -320,9 +602,9 @@ export class ThreadStore {
         }
         const ts = opts.ts ?? new Date().toISOString();
         const goal = this.structuredDb
-            .prepare(`INSERT INTO goals (session_id, text, status, source_event, created_at, project_key, scope, origin, isolation)
-         VALUES (?, ?, 'active', ?, ?, ?, ?, ?, ?) RETURNING *`)
-            .get(sessionId, text, opts.sourceEvent ?? null, ts, opts.scope === "global" ? null : opts.projectKey ?? this.projectKey ?? null, opts.scope ?? "project", opts.origin ?? null, opts.isolation ? 1 : 0);
+            .prepare(`INSERT INTO goals (session_id, text, status, source_event, created_at, updated_at, project_key, scope, origin, isolation)
+         VALUES (?, ?, 'active', ?, ?, ?, ?, ?, ?, ?) RETURNING *`)
+            .get(sessionId, text, opts.sourceEvent ?? null, ts, ts, opts.scope === "global" ? null : opts.projectKey ?? this.projectKey ?? null, opts.scope ?? "project", opts.origin ?? null, opts.isolation ? 1 : 0);
         if (opts.sourceEvent) {
             this.addLineageEdge(sessionId, "goal", goal.id, "event", opts.sourceEvent, "derived_from", {
                 ts,
@@ -335,6 +617,12 @@ export class ThreadStore {
             .prepare(`SELECT * FROM goals WHERE session_id = ? AND status = 'active' ORDER BY id`)
             .all(sessionId);
     }
+    // 目标全量（2026-08-21 /thread-reg gol 无参列表的 id 可见来源）：含 active/completed/abandoned
+    getGoals(sessionId) {
+        return this.structuredDb
+            .prepare(`SELECT * FROM goals WHERE session_id = ? ORDER BY id DESC`)
+            .all(sessionId);
+    }
     getFeedback(sessionId, limit = 5) {
         return this.structuredDb
             .prepare(`SELECT * FROM feedback WHERE session_id = ? ORDER BY id DESC LIMIT ?`)
@@ -351,9 +639,17 @@ export class ThreadStore {
         }));
     }
     updateGoalStatus(sessionId, goalId, status) {
-        return this.structuredDb
-            .prepare(`UPDATE goals SET status = ? WHERE id = ? AND session_id = ? RETURNING *`)
-            .get(status, goalId, sessionId);
+        const goal = this.structuredDb
+            .prepare(`UPDATE goals SET status = ?, updated_at = ? WHERE id = ? AND session_id = ? RETURNING *`)
+            .get(status, new Date().toISOString(), goalId, sessionId);
+        // 目标 → 待办生命周期同步（2026-08-20 关闭即沉淀）：收尾沉淀产生的 todo 随目标状态自愈
+        if (goal) {
+            const todoStatus = status === "completed" ? "done" : status === "abandoned" ? "dropped" : "pending";
+            this.structuredDb
+                .prepare(`UPDATE todos SET status = ? WHERE session_id = ? AND basis = ? AND status = 'pending'`)
+                .run(todoStatus, sessionId, `goal:${goalId}`);
+        }
+        return goal;
     }
     addFeedback(sessionId, text, kind, opts = {}) {
         const existing = this.findByOrigin("feedback", opts.origin);
@@ -362,9 +658,9 @@ export class ThreadStore {
         }
         const ts = opts.ts ?? new Date().toISOString();
         return this.structuredDb
-            .prepare(`INSERT INTO feedback (session_id, text, kind, source_event, created_at, project_key, scope, origin, isolation)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING *`)
-            .get(sessionId, text, kind, opts.sourceEvent ?? null, ts, opts.scope === "global" ? null : opts.projectKey ?? this.projectKey ?? null, opts.scope ?? "project", opts.origin ?? null, opts.isolation ? 1 : 0);
+            .prepare(`INSERT INTO feedback (session_id, text, kind, source_event, created_at, updated_at, project_key, scope, origin, isolation)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING *`)
+            .get(sessionId, text, kind, opts.sourceEvent ?? null, ts, ts, opts.scope === "global" ? null : opts.projectKey ?? this.projectKey ?? null, opts.scope ?? "project", opts.origin ?? null, opts.isolation ? 1 : 0);
     }
     // 反馈治理（B⑥-② 恢复通道）：按 id 删除反馈行——教训可删即恢复；事件流水保留（真相源不变）。
     // 单用户语义：跨会话行亦可删（治理动作由用户/其代理发起）。
@@ -404,40 +700,67 @@ export class ThreadStore {
             .prepare(`SELECT * FROM ${table} WHERE origin = ? LIMIT 1`)
             .get(origin);
     }
-    confirmLatestProposed(sessionId, opts = {}) {
-        const target = this.structuredDb
-            .prepare(`SELECT * FROM decisions WHERE session_id = ? AND status = 'proposed' ORDER BY id DESC LIMIT 1`)
-            .get(sessionId);
-        if (!target) {
+    // ─── 显式决策通道（2026-08-21 结构通道化）───
+    // NL 判定停用后，决策只经三条显式路径：/thread-decision（用户命令）、record_decision（模型工具）、
+    // /thread-pending update（候选转正）。全部直接落 active——显式意图不再走 propose→confirm 两段。
+    // 命令/工具创建：origin/文本双幂等沿用 proposeDecision，插入即转 active
+    addDecision(sessionId, text, opts = {}) {
+        const d = this.proposeDecision(sessionId, text, opts);
+        return d.status === "active" ? d : this.transitionDecision(d, "active", opts.ts);
+    }
+    // 候选转正（修 1.3 语义缺口）：旧 confirm 只翻候选状态、从不落 decisions 行 = 死路。
+    // update <id> [新文本] → 候选 → active 决策；候选 session/项目/隔离/血缘随行，文本可先修正。
+    promoteCandidate(id, newText) {
+        const candidate = this.structuredDb
+            .prepare(`SELECT * FROM pending_candidates WHERE id = ? AND status = 'pending'`)
+            .get(id);
+        if (!candidate) {
             return undefined;
         }
-        return this.transitionDecision(target, "active", opts.ts);
+        const text = (newText ?? "").trim() || candidate.text;
+        const decision = this.addDecision(candidate.session_id, text, {
+            projectKey: candidate.project_key ?? undefined,
+            isolation: candidate.isolation === 1,
+            sourceEvent: candidate.source_event ?? undefined,
+        });
+        this.structuredDb
+            .prepare(`UPDATE pending_candidates SET status = 'confirmed', updated_at = ? WHERE id = ?`)
+            .run(new Date().toISOString(), id);
+        return decision;
     }
-    revokeLatestActive(sessionId, opts = {}) {
-        const target = this.structuredDb
-            .prepare(`SELECT * FROM decisions WHERE session_id = ? AND status IN ('proposed', 'active') ORDER BY id DESC LIMIT 1`)
-            .get(sessionId);
-        if (!target) {
-            return undefined;
+    // 决策删除（feedback-del 同风格）：硬删除 + 血缘边（双库）/决策-实体边/superseded_by 引用连带清理。
+    // 事件流水保留原文 = 真相源不变，删除只影响结构化表视图。
+    deleteDecision(id) {
+        const exists = this.structuredDb.prepare(`SELECT id FROM decisions WHERE id = ?`).get(id);
+        if (!exists) {
+            return false;
         }
-        return this.transitionDecision(target, "revoked", opts.ts);
+        this.structuredDb.prepare(`DELETE FROM decisions WHERE id = ?`).run(id);
+        this.structuredDb.prepare(`DELETE FROM decision_entities WHERE decision_id = ?`).run(id);
+        for (const db of [this.structuredDb, this.eventsDb]) {
+            db
+                .prepare(`DELETE FROM lineage_edges WHERE (src_type = 'decision' AND src_id = ?) OR (dst_type = 'decision' AND dst_id = ?)`)
+                .run(id, id);
+        }
+        this.structuredDb.prepare(`UPDATE decisions SET superseded_by = NULL WHERE superseded_by = ?`).run(id);
+        return true;
     }
-    supersedeLatestActive(sessionId, replacementText, opts = {}) {
+    // 按 id 取代（/thread-decision <text> --supersedes <id>）：旧决策转 superseded + supersedes 血缘边；
+    // replacement 继承目标行的 project_key/scope/isolation（修正旧 latest 版 replacement 丢项目字段的缺陷）。
+    supersedeDecisionById(sessionId, id, replacementText, opts = {}) {
         const target = this.structuredDb
-            .prepare(`SELECT * FROM decisions WHERE session_id = ? AND status IN ('proposed', 'active') ORDER BY id DESC LIMIT 1`)
-            .get(sessionId);
-        const ts = opts.ts ?? new Date().toISOString();
+            .prepare(`SELECT * FROM decisions WHERE id = ? AND session_id = ? AND status IN ('proposed', 'active')`)
+            .get(id, sessionId);
         if (!target) {
             return undefined;
         }
+        const ts = opts.ts ?? new Date().toISOString();
         const replacement = this.structuredDb
-            .prepare(`INSERT INTO decisions (session_id, text, status, superseded_by, source_event, created_at, updated_at, isolation)
-         VALUES (?, ?, 'active', NULL, ?, ?, ?, ?) RETURNING *`)
-            .get(sessionId, replacementText, opts.sourceEvent ?? null, ts, ts, target.isolation ?? 0);
+            .prepare(`INSERT INTO decisions (session_id, text, status, superseded_by, source_event, created_at, updated_at, project_key, scope, origin, isolation)
+         VALUES (?, ?, 'active', NULL, ?, ?, ?, ?, ?, NULL, ?) RETURNING *`)
+            .get(sessionId, replacementText, opts.sourceEvent ?? null, ts, ts, target.project_key ?? null, target.scope ?? "project", target.isolation ?? 0);
         const superseded = this.transitionDecision(target, "superseded", ts, replacement.id);
-        this.addLineageEdge(sessionId, "decision", target.id, "decision", replacement.id, "supersedes", {
-            ts,
-        });
+        this.addLineageEdge(sessionId, "decision", target.id, "decision", replacement.id, "supersedes", { ts });
         return { superseded, replacement };
     }
     getActiveDecisions(sessionId) {
@@ -459,6 +782,25 @@ export class ThreadStore {
          ORDER BY id`)
             .all(sessionId, projectKey, sessionId);
     }
+    // 决策变更情境（§1.5.3c 机制 3）：项目级最近变更的决策（含 proposed/active，按 updated_at 倒序），
+    // 供状态卡"最近决策"块——模型打开会话即见项目刚定的决策，不靠自觉查询。
+    getRecentDecisionsMerged(sessionId, projectKey, limit = 3) {
+        if (!projectKey) {
+            return this.structuredDb
+                .prepare(`SELECT * FROM decisions
+           WHERE session_id = ? OR isolation = 0
+           ORDER BY updated_at DESC, id DESC
+           LIMIT ?`)
+                .all(sessionId, limit);
+        }
+        return this.structuredDb
+            .prepare(`SELECT * FROM decisions
+         WHERE (session_id = ? OR (project_key = ? AND scope = 'project'))
+           AND (session_id = ? OR isolation = 0)
+         ORDER BY updated_at DESC, id DESC
+         LIMIT ?`)
+            .all(sessionId, projectKey, sessionId, limit);
+    }
     getActiveGoalsMerged(sessionId, projectKey) {
         if (!projectKey) {
             return this.getActiveGoals(sessionId);
@@ -504,17 +846,33 @@ export class ThreadStore {
             .get(sessionId);
         return row?.isolated === 1;
     }
-    // 沉淀：清除指定结构化行的隔离标记（隔离会话期间产生的决策按需转共享）
+    // 沉淀：清除指定结构化行的隔离标记（隔离会话期间产生的行按需转共享；2026-08-21 覆盖 ast 产出）
     unisolateRow(sessionId, table, id) {
         const row = this.structuredDb
             .prepare(`UPDATE ${table} SET isolation = 0 WHERE id = ? AND session_id = ? RETURNING id`)
             .get(id, sessionId);
         return row !== undefined;
     }
-    getLatestProposed(sessionId) {
-        return this.structuredDb
-            .prepare(`SELECT * FROM decisions WHERE session_id = ? AND status = 'proposed' ORDER BY id DESC LIMIT 1`)
-            .get(sessionId);
+    // 隔离行清单（2026-08-21：/thread-pub 无参列表——pub 只对 isolation=1 行生效，此清单即用户可见 id 来源；
+    // 2026-08-21 扩展 ast 资源：隔离期登记的产出同样可转共享）
+    listIsolatedRows(sessionId) {
+        const rows = [];
+        const assets = this.structuredDb
+            .prepare(`SELECT id, path, title FROM knowledge_assets WHERE session_id = ? AND isolation = 1 ORDER BY id`)
+            .all(sessionId);
+        for (const r of assets) {
+            rows.push({ kind: "ast", id: r.id, text: r.title || r.path });
+        }
+        for (const table of ["goals", "decisions", "feedback"]) {
+            const found = this.structuredDb
+                .prepare(`SELECT id, text FROM ${table} WHERE session_id = ? AND isolation = 1 ORDER BY id`)
+                .all(sessionId);
+            const kind = table === "goals" ? "goal" : table === "decisions" ? "decision" : "feedback";
+            for (const r of found) {
+                rows.push({ kind, id: r.id, text: r.text });
+            }
+        }
+        return rows;
     }
     getDecisions(sessionId, status) {
         if (status) {
@@ -612,12 +970,24 @@ function openDb(path, schema, kind) {
 function isToolKind(kind) {
     return kind === "tool_call" || kind === "tool_result";
 }
-function toFtsQuery(query) {
-    const tokens = cjkSpace(query).split(/\s+/).filter(Boolean);
+// 主路径 MATCH 表达式：全 OR + BM25 排序（召回优先，精度交给 bm25 打分与时间衰减）。
+// 主表 events_fts 只有 body_seg 一列，无需列限定。
+function toFtsMatch(query) {
+    const tokens = segmentQuery(query);
     if (tokens.length === 0) {
         return "";
     }
-    return tokens.map((t) => `"${t.replaceAll('"', '""')}"`).join(" AND ");
+    return tokens.map((t) => `"${t.replaceAll('"', '""')}"`).join(" OR ");
+}
+// trigram 兜底 MATCH 表达式（0-e 定案第 5 条）：查询折叠为连续字符序列（去空白/标点），
+// trigram 对 ≥3 字符短语做子串匹配——"用户只记得半句"时主路径 0 命中由它召回。
+// 兜底表 events_fts_tri 的列名是 body，MATCH 直接给短语即可（表内唯一列）。
+function toTrigramMatch(query) {
+    const collapsed = query.replace(/\s+/g, "").replace(/[^\p{L}\p{N}]+/gu, "");
+    if (collapsed.length < 3) {
+        return "";
+    }
+    return `"${collapsed.replaceAll('"', '""')}"`;
 }
 const EPISODE_SUMMARY_CHARS = 4000;
 function safeParse(text) {
@@ -631,12 +1001,6 @@ function safeParse(text) {
 function sha256Hex(text) {
     return createHash("sha256").update(text).digest("hex");
 }
-function cjkSpace(text) {
-    return text
-        .replace(/([\u3400-\u9fff\uf900-\ufaff])/g, " $1 ")
-        .replace(/\s+/g, " ")
-        .trim();
-}
 // 分层优先级裁决（B③）：同事实（归一化 text）跨层级出现时保留最高优先级 会话内>项目>用户>全局
 const SCOPE_PRIORITY = { session: 3, project: 2, global: 1 };
 export function applyScopePriority(rows) {