libero-mcp 0.2.16 → 0.2.18

package/data/migrations/013_identity_managed_by.sql

@@ -0,0 +1,3 @@
+-- S44 (2026-08-07): managed_by field for代管 forwarding
+-- 代管人 libero_user_id（NULL = 自己接收追问；非 NULL = 追问发给代管人）
+ALTER TABLE user_identity ADD COLUMN managed_by TEXT;

package/dist/data/migrations/013_identity_managed_by.sql

@@ -0,0 +1,3 @@
+-- S44 (2026-08-07): managed_by field for代管 forwarding
+-- 代管人 libero_user_id（NULL = 自己接收追问；非 NULL = 追问发给代管人）
+ALTER TABLE user_identity ADD COLUMN managed_by TEXT;

package/dist/mcp/server-core.js

@@ -646,6 +646,47 @@ function buildToolRegistry(ctx) {
             }
         },
     });
+    tools.push({
+        name: "profile.getManager",
+        description: "S44 代管转发：查某用户的代管人（managed_by + 代管人 display_name）。" +
+            "用途：扫描 cron 发现用户没自己渠道时，查 managed_by 把追问发给代管人。" +
+            "返回 managed_by=null 表示该用户没代管人（普通独立用户）。",
+        inputSchema: {
+            user_id: z.string().min(1),
+        },
+        handler: async (rawInput) => {
+            try {
+                const result = await profile.getManager({ user_id: rawInput.user_id });
+                return asContent(result);
+            }
+            catch (e) {
+                return errorContent(e.message);
+            }
+        },
+    });
+    tools.push({
+        name: "profile.setManager",
+        description: "S44 代管转发：设置或清除某用户的代管人。" +
+            "用法：profile.setManager({ user_id: '<被代管人>', managed_by: '<代管人 libero_user_id>' })。" +
+            "managed_by=null 清除代管关系；非 null 必须指向存在的 libero_user_id（FK 校验）。" +
+            "典型场景：父母给孩子建账户后，profile.setManager({ user_id: '<孩子>', managed_by: '<父母>' })。",
+        inputSchema: {
+            user_id: z.string().min(1),
+            managed_by: z.string().nullable(),
+        },
+        handler: async (rawInput) => {
+            try {
+                const result = await profile.setManager({
+                    user_id: rawInput.user_id,
+                    managed_by: rawInput.managed_by,
+                });
+                return asContent(result);
+            }
+            catch (e) {
+                return errorContent(e.message);
+            }
+        },
+    });
     // ============================================================
     // reminder (6 tools — S11)
     // ============================================================

package/dist/mcp/src/identity/in-memory.js

@@ -8,6 +8,7 @@
 export class InMemoryIdentityRepo {
     identities = new Map();
     aliases = new Map(); // key = `${platform}:${platform_user_id}`
+    managers = new Map(); // user_id → manager_user_id
     async createIdentity(input) {
         if (this.identities.has(input.libero_user_id)) {
             throw new Error(`identity already exists: libero_user_id=${input.libero_user_id}`);
@@ -60,6 +61,40 @@ export class InMemoryIdentityRepo {
         return null;
     }
     async listAllIdentities() {
-        return Array.from(this.identities.values());
+        return Array.from(this.identities.values()).map((i) => ({
+            ...i,
+            managed_by: this.managers.get(i.libero_user_id) ?? null,
+        }));
+    }
+    async getManager(libero_user_id) {
+        const id = this.identities.get(libero_user_id);
+        if (!id) {
+            throw new Error(`getManager: libero_user_id not found: ${libero_user_id}`);
+        }
+        const managedBy = this.managers.get(libero_user_id) ?? null;
+        const mgr = managedBy ? this.identities.get(managedBy) : null;
+        return {
+            libero_user_id,
+            managed_by: managedBy,
+            manager_display_name: mgr?.display_name ?? null,
+        };
+    }
+    async setManager(input) {
+        if (!this.identities.has(input.libero_user_id)) {
+            throw new Error(`setManager: libero_user_id not found: ${input.libero_user_id}`);
+        }
+        if (input.managed_by !== null) {
+            if (!this.identities.has(input.managed_by)) {
+                throw new Error(`setManager: manager libero_user_id not found: ${input.managed_by}`);
+            }
+            this.managers.set(input.libero_user_id, input.managed_by);
+        }
+        else {
+            this.managers.delete(input.libero_user_id);
+        }
+        return {
+            libero_user_id: input.libero_user_id,
+            managed_by: input.managed_by,
+        };
     }
 }

package/dist/mcp/src/profile/index.js

@@ -188,5 +188,34 @@ export function createProfileTools(repo, identityRepo) {
                 display_name: i.display_name,
             }));
         },
+        /**
+         * S44（2026-08-07）：查某用户的代管人。
+         * 用途：扫描 cron 发现用户没自己渠道时，查 managed_by 把追问发给代管人。
+         */
+        async getManager(input) {
+            if (!identityRepo) {
+                throw new Error("getManager 需要 identityRepo（本部署不支持代管转发）");
+            }
+            if (!input.user_id) {
+                throw new Error("user_id 为必填参数");
+            }
+            return identityRepo.getManager(input.user_id);
+        },
+        /**
+         * S44（2026-08-07）：设置/清除某用户的代管人。
+         * managed_by=null 清除；非 null 必须指向存在的 libero_user_id。
+         */
+        async setManager(input) {
+            if (!identityRepo) {
+                throw new Error("setManager 需要 identityRepo（本部署不支持代管转发）");
+            }
+            if (!input.user_id) {
+                throw new Error("user_id 为必填参数");
+            }
+            return identityRepo.setManager({
+                libero_user_id: input.user_id,
+                managed_by: input.managed_by,
+            });
+        },
     };
 }

package/dist/mcp/src/repo/in-memory.js

@@ -298,6 +298,7 @@ export class InMemoryTimelineRepo {
                 end: b.end_time,
                 status: b.status,
                 title: b.title,
+                category_id: b.category_id ?? null,
                 category_emoji: cat?.emoji ?? null,
                 category_name: cat?.name ?? null,
                 category_color: cat?.color ?? null,

package/dist/mcp/src/repo/sqlite-identity.js

@@ -78,10 +78,52 @@ export class SqliteIdentityRepo {
     }
     async listAllIdentities() {
         const rows = this.db
-            .prepare(`SELECT libero_user_id, display_name, created_at, updated_at
+            .prepare(`SELECT libero_user_id, display_name, managed_by, created_at, updated_at
          FROM user_identity
          ORDER BY created_at ASC`)
             .all();
         return rows.map((r) => ({ ...r }));
     }
+    async getManager(libero_user_id) {
+        const row = this.db
+            .prepare(`SELECT ui.libero_user_id, ui.managed_by, mgr.display_name as manager_display_name
+         FROM user_identity ui
+         LEFT JOIN user_identity mgr ON mgr.libero_user_id = ui.managed_by
+         WHERE ui.libero_user_id = ?`)
+            .get(libero_user_id);
+        if (!row) {
+            throw new Error(`getManager: libero_user_id not found: ${libero_user_id}`);
+        }
+        return {
+            libero_user_id: row.libero_user_id,
+            managed_by: row.managed_by,
+            manager_display_name: row.manager_display_name,
+        };
+    }
+    async setManager(input) {
+        // User existence check
+        const user = this.db
+            .prepare("SELECT 1 FROM user_identity WHERE libero_user_id = ?")
+            .get(input.libero_user_id);
+        if (!user) {
+            throw new Error(`setManager: libero_user_id not found: ${input.libero_user_id}`);
+        }
+        // Manager FK check (if non-null)
+        if (input.managed_by !== null) {
+            const mgr = this.db
+                .prepare("SELECT 1 FROM user_identity WHERE libero_user_id = ?")
+                .get(input.managed_by);
+            if (!mgr) {
+                throw new Error(`setManager: manager libero_user_id not found: ${input.managed_by}`);
+            }
+        }
+        const now = new Date().toISOString().replace("T", " ").replace("Z", "");
+        this.db
+            .prepare("UPDATE user_identity SET managed_by = ?, updated_at = ? WHERE libero_user_id = ?")
+            .run(input.managed_by, now, input.libero_user_id);
+        return {
+            libero_user_id: input.libero_user_id,
+            managed_by: input.managed_by,
+        };
+    }
 }

package/dist/mcp/src/repo/sqlite.js

@@ -404,6 +404,7 @@ export class SqliteTimelineRepo {
            tb.end_time as end,
            tb.status as status,
            tb.title as title,
+           tb.category_id as category_id,
            c.emoji as category_emoji,
            c.name as category_name,
            c.color as category_color

package/dist/mcp/src/timeline/index.js

@@ -291,17 +291,20 @@ export function renderTimelineCells(input) {
     // S9 v0.5（2026-08-07）：表头移到矩阵上方，不再夹在明细前面
     const textLines = [];
     // ── 明细段（在前）──
-    // S9 v0.3: 按 symbol 分组紧凑展示（合并同 symbol 到一行）
+    // S9 v0.3: 按 symbol 分组紧凑展示
     // S9 v0.4: completed → ✓ + ~~划线~~；unverified → ❓ 后缀；插入「📍 现在」分隔线
-    // S9 v0.5（2026-08-07）: 改为每条独占一行（用户反馈"挤在一起乱"）
-    //   格式：`{status} {symbol} {time} {title}`
-    //   status: completed → "✓ "；unverified → "? "；planned/timer_* → "  "（空格占位对齐）
+    // S9 v0.5（2026-08-07）: 每条独占一行
+    // S45（2026-08-07）: 同 category + 时间连续 → 合并成组；中间 ≤15min 短休息 → 吸收
+    //   组（>1 member 或吸收了休息）：组头 + 子任务列表
+    //   组（仅 1 member 无休息）：退化为 v0.5 单行（避免冗余）
     const details = input.details ?? [];
     if (details.length > 0) {
         textLines.push("📋 明细");
         const inWin = details.filter((d) => d.in_window);
         const outWin = details.filter((d) => !d.in_window);
-        // S9 v0.5: 每条独占一行的 entry 构造
+        // S45: inWin 已按 time 排序，可直接分组
+        const inWinGroups = groupDetails(inWin);
+        // S9 v0.5: 单条 entry 格式
         const buildEntry = (d) => {
             let statusMark = "  "; // 默认 2 空格占位（对齐 ✓ 和 ?）
             let titlePart = d.title;
@@ -314,7 +317,28 @@ export function renderTimelineCells(input) {
             }
             return `${statusMark}${d.symbol} ${d.time} ${titlePart}`;
         };
-        // S9 v0.4: 「📍 现在」分隔线判断（v0.5 保留同规则）
+        // S45: 组内子任务 entry（不带组 symbol，状态前缀照旧）
+        const buildSubEntry = (d) => {
+            let statusMark = "  ";
+            let titlePart = d.title;
+            if (d.status === "completed") {
+                statusMark = "✓ ";
+                titlePart = `~~${d.title}~~`;
+            }
+            else if (d.status === "unverified") {
+                statusMark = "? ";
+            }
+            // 子任务缩进 2 空格，时间取自 d.time 的 "HH:MM-HH:MM"
+            return `  ${statusMark}${d.time} ${titlePart}`;
+        };
+        // S45: 组头格式
+        const buildGroupHeader = (g) => {
+            const emoji = g.category_emoji && g.category_emoji.trim() ? g.category_emoji : "•";
+            const name = g.category_name ?? "活动";
+            const breakNote = g.break_total_min > 0 ? `（含休息 ${g.break_total_min}min）` : "";
+            return `${emoji} ${name} ${g.start_time}-${g.end_time}${breakNote}`;
+        };
+        // S9 v0.4: 「📍 现在」分隔线判断
         const parseDetailStart = (time) => {
             const startStr = time.split("-")[0].trim();
             const [h, m] = startStr.split(":").map(Number);
@@ -326,26 +350,34 @@ export function renderTimelineCells(input) {
         const inWinAllPast = inWin.every((d) => parseDetailStart(d.time) <= nowHM);
         const inWinAllFuture = inWin.every((d) => parseDetailStart(d.time) > nowHM);
         const needNowMarker = inWin.length > 0 && !inWinAllPast && !inWinAllFuture;
-        let firstFutureIdx = inWin.length;
-        if (needNowMarker) {
-            for (let i = 0; i < inWin.length; i++) {
-                if (parseDetailStart(inWin[i].time) > nowHM) {
-                    firstFutureIdx = i;
-                    break;
-                }
+        // S45: 渲染组——支持"现在"标识插在第一个未来组之前
+        const renderGroup = (g) => {
+            const isMulti = g.members.length > 1 || g.absorbed_breaks.length > 0;
+            if (!isMulti) {
+                // 退化为 v0.5 单行
+                return [buildEntry(g.members[0])];
             }
-        }
-        // S9 v0.5: 每条独占一行，在 firstFutureIdx 处插分隔线
-        for (let i = 0; i < inWin.length; i++) {
-            if (needNowMarker && i === firstFutureIdx) {
+            const lines = [buildGroupHeader(g)];
+            for (const m of g.members) {
+                lines.push(buildSubEntry(m));
+            }
+            return lines;
+        };
+        for (let i = 0; i < inWinGroups.length; i++) {
+            const g = inWinGroups[i];
+            // 「📍 现在」标识插在第一个未来组之前
+            if (needNowMarker && parseDetailStart(`${g.start_time}-${g.end_time}`) > nowHM && i > 0 && !textLines.includes(`─── 📍 现在 ${nowLabel} ──`)) {
                 textLines.push(`─── 📍 现在 ${nowLabel} ──`);
             }
-            textLines.push(buildEntry(inWin[i]));
+            textLines.push(...renderGroup(g));
         }
+        // 兜底：如果所有组都过去/未来，但 needNowMarker 仍 true（混合）且没插入过 → 不补
+        // (理论上不会发生，因为上面循环会处理)
         if (outWin.length > 0) {
             textLines.push("（窗口外）");
-            for (const d of outWin) {
-                textLines.push(buildEntry(d));
+            const outWinGroups = groupDetails(outWin);
+            for (const g of outWinGroups) {
+                textLines.push(...renderGroup(g));
             }
         }
     }
@@ -389,6 +421,80 @@ export function renderTimelineCells(input) {
     }
     return { rows, rendered_text: textLines.join("\n"), legend };
 }
+const S45_GAP_THRESHOLD_MIN = 15;
+const S45_BREAK_THRESHOLD_MIN = 15;
+function isShortBreak(d) {
+    return !!d.is_break && (d.duration_min ?? 999) <= S45_BREAK_THRESHOLD_MIN;
+}
+/**
+ * S45: 把已排序的 detail 列表分组成 DetailGroup[]。
+ * 输入必须按 start_ms 升序排好。
+ */
+export function groupDetails(details) {
+    if (details.length === 0)
+        return [];
+    const groups = [];
+    let current = null;
+    for (let i = 0; i < details.length; i++) {
+        const d = details[i];
+        if (current === null) {
+            // 首个块 → 开新组（休息块也开自己的"独立组"，members 是它自己）
+            current = newGroup(d);
+            continue;
+        }
+        const gapMin = ((d.start_ms ?? 0) - (current.members[current.members.length - 1]?.end_ms ?? 0)) /
+            (60 * 1000);
+        const sameCategory = !!d.category_id &&
+            d.category_id === current.category_id &&
+            !!current.category_id;
+        // 情况 1：当前块是短休息，且后面（i+1）还有同 category 块 → 吸收到当前组
+        if (isShortBreak(d) && sameCategoryContinuesAfter(details, i, current.category_id)) {
+            current.absorbed_breaks.push(d);
+            current.break_total_min += d.duration_min ?? 0;
+            // 注意：休息块的 end_ms 不更新 current 的 last_end——组的 last_end 取最后一个非休息块
+            continue;
+        }
+        // 情况 2：同 category + gap ≤15min → 加入组
+        if (sameCategory && gapMin >= 0 && gapMin <= S45_GAP_THRESHOLD_MIN) {
+            current.members.push(d);
+            // 更新组的 end_time
+            current.end_time = d.time.split("-")[1]?.trim() ?? current.end_time;
+            continue;
+        }
+        // 情况 3：边界 → 结束当前组，开新组
+        groups.push(current);
+        current = newGroup(d);
+    }
+    if (current)
+        groups.push(current);
+    return groups;
+}
+function newGroup(d) {
+    return {
+        members: [d],
+        absorbed_breaks: [],
+        break_total_min: 0,
+        start_time: d.time.split("-")[0]?.trim() ?? "",
+        end_time: d.time.split("-")[1]?.trim() ?? "",
+        category_id: d.category_id ?? null,
+        category_name: d.category_name ?? null,
+        category_emoji: d.category_emoji ?? null,
+    };
+}
+/** 判断 details[i] 之后是否还有同 category_id 的非休息块（前视，用于休息吸收判定） */
+function sameCategoryContinuesAfter(details, i, categoryId) {
+    if (!categoryId)
+        return false;
+    for (let j = i + 1; j < details.length; j++) {
+        const next = details[j];
+        if (next.is_break)
+            continue; // 跳过中间的休息块
+        if (next.category_id === categoryId)
+            return true;
+        return false; // 遇到非同 category 的非休息块 → 不算后续同 category
+    }
+    return false;
+}
 export function computeDefaultWindow(now) {
     const hour = new Date(now);
     hour.setMinutes(0, 0, 0);
@@ -514,12 +620,23 @@ export function buildTimelineFromEvents(opts) {
         const sym = resolveCellSymbol(cell, format);
         const bStart = new Date(b.start).getTime();
         const bEnd = new Date(b.end).getTime();
+        // S45: is_break 判定——标题含「休息」/「break」/「放松」/「空闲」或 category 是闲散
+        const titleLower = b.title.toLowerCase();
+        const isBreak = /休息|break|放松|空闲|歇|摸鱼|发呆/.test(b.title) ||
+            (b.category_name ?? "").includes("闲散");
         details.push({
             time: detailTimeRange(b.start, b.end),
             symbol: sym,
             title: b.title,
             status: b.status,
             in_window: overlaps(bStart, bEnd, wStart, wEnd),
+            category_id: b.category_id ?? null,
+            category_name: b.category_name ?? null,
+            category_emoji: b.category_emoji ?? null,
+            is_break: isBreak,
+            start_ms: bStart,
+            end_ms: bEnd,
+            duration_min: Math.round((bEnd - bStart) / 60000),
         });
     }
     for (const t of opts.timers) {
@@ -533,6 +650,14 @@ export function buildTimelineFromEvents(opts) {
             title: t.event,
             status: t.status === "running" ? "timer_running" : "timer_paused",
             in_window: overlaps(startMs, endMs, wStart, wEnd),
+            // timer 通常不参与分组（用户主动计时，独立性强）
+            category_id: null,
+            category_name: null,
+            category_emoji: null,
+            is_break: false,
+            start_ms: startMs,
+            end_ms: endMs,
+            duration_min: Math.round((endMs - startMs) / 60000),
         });
     }
     // sort: in_window first, then by time string

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libero-mcp",
-  "version": "0.2.16",
+  "version": "0.2.18",
   "description": "AI 时间管理教练 MCP 工具集——时间块记录、统计、矩阵诊断、计时、分类、profile",
   "license": "MIT",
   "author": "amosyuan",