libero-mcp 0.2.17 → 0.2.19

package/data/migrations/014_task_difficulty_priority.sql

@@ -0,0 +1,6 @@
+-- S46 (2026-08-07): task difficulty/priority 持久化
+-- 用于"快速启动 + 峰终"智能排程
+-- 难度（easy/medium/hard，默认 medium）
+ALTER TABLE tasks ADD COLUMN difficulty TEXT DEFAULT 'medium';
+-- 优先级（high/medium/low，默认 medium）
+ALTER TABLE tasks ADD COLUMN priority TEXT DEFAULT 'medium';

package/dist/data/migrations/014_task_difficulty_priority.sql

@@ -0,0 +1,6 @@
+-- S46 (2026-08-07): task difficulty/priority 持久化
+-- 用于"快速启动 + 峰终"智能排程
+-- 难度（easy/medium/hard，默认 medium）
+ALTER TABLE tasks ADD COLUMN difficulty TEXT DEFAULT 'medium';
+-- 优先级（high/medium/low，默认 medium）
+ALTER TABLE tasks ADD COLUMN priority TEXT DEFAULT 'medium';

package/dist/mcp/server-core.js

@@ -824,7 +824,7 @@ function buildToolRegistry(ctx) {
     // ============================================================
     tools.push({
         name: "task.create",
-        description: "建单个独立任务（不挂任何 timeblock）。⚠️ 拆解请用 decompose.split，本工具一次只能建一个任务、不能建子任务。",
+        description: "建单个独立任务（不挂任何 timeblock）。⚠️ 拆解请用 decompose.split，本工具一次只能建一个任务、不能建子任务。S46 支持 difficulty（easy/medium/hard，默认 medium）+ priority（high/medium/low，默认 medium），用于'快速启动+峰终'智能排程。",
         // S33 v3: 用 z.object().strict() 显式拒 parent_id（zod 默认 strip 不报错，
         // 严格模式让多余键触发 safeParse 失败 → MCP 返回 isError）。
         // 底层 createTask 仍保留 parent_id 能力（task.test.ts 单测不破）。
@@ -834,6 +834,8 @@ function buildToolRegistry(ctx) {
             target_user_id: z.string().min(1).optional(),
             title: z.string().min(1),
             est_minutes: z.number().optional(),
+            difficulty: z.enum(["easy", "medium", "hard"]).optional(),
+            priority: z.enum(["high", "medium", "low"]).optional(),
         })
             .strict(),
         needsUserIdInjection: true,
@@ -868,12 +870,14 @@ function buildToolRegistry(ctx) {
     });
     tools.push({
         name: "task.update",
-        description: "更新任务（title/est_minutes/status；状态机校验非法流转）",
+        description: "更新任务（title/est_minutes/status/difficulty/priority；状态机校验非法流转）",
         inputSchema: {
             id: z.string().min(1),
             title: z.string().optional(),
             est_minutes: z.number().optional(),
             status: z.string().optional(),
+            difficulty: z.enum(["easy", "medium", "hard"]).optional(),
+            priority: z.enum(["high", "medium", "low"]).optional(),
         },
         handler: async ({ id, ...rest }) => asContent(await task.updateTask(id, rest)),
     });
@@ -886,6 +890,16 @@ function buildToolRegistry(ctx) {
         },
         handler: async ({ task_id, block_id }) => asContent(await task.linkTimeblock(task_id, block_id)),
     });
+    tools.push({
+        name: "task.updateDifficulty",
+        description: "S46: 仅更新 task 的 difficulty（easy/medium/hard）或 priority（high/medium/low）。用户主动调整时用，默认 medium。用于'快速启动+峰终'智能排程。",
+        inputSchema: {
+            task_id: z.string().min(1),
+            difficulty: z.enum(["easy", "medium", "hard"]).optional(),
+            priority: z.enum(["high", "medium", "low"]).optional(),
+        },
+        handler: async ({ task_id, difficulty, priority }) => asContent(await task.updateDifficulty(task_id, { difficulty, priority })),
+    });
     tools.push({
         name: "task.findPlan",
         description: "按事件名 exact-match 查拆解计划：返回根任务 + 第一块未完成子任务（record 开工时链 task_id，驱动闭环正反馈）",

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.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/task/index.js

@@ -19,6 +19,13 @@ function nowStr() {
     return (new Date().toISOString().replace("T", " ").replace("Z", "") +
         String(Math.floor(performance.now() * 100000) % 100000).padStart(5, "0"));
 }
+// S46: difficulty/priority 归一化（不合法值 → medium）
+function normalizeDiff(v) {
+    return v === "easy" || v === "medium" || v === "hard" ? v : "medium";
+}
+function normalizePrio(v) {
+    return v === "high" || v === "medium" || v === "low" ? v : "medium";
+}
 function rowToTask(row) {
     return {
         id: row.id,
@@ -30,6 +37,9 @@ function rowToTask(row) {
         category_id: row.category_id ?? null,
         linked_timeblock_id: row.linked_timeblock_id ?? null,
         order_index: row.order_index ?? 0,
+        // S46: difficulty/priority（migration 014 加的列；旧库未 migrate 时回退 medium）
+        difficulty: row.difficulty ?? "medium",
+        priority: row.priority ?? "medium",
         created_at: row.created_at,
         updated_at: row.updated_at,
         deleted_at: row.deleted_at ?? null,
@@ -81,8 +91,11 @@ export function createTaskTools(db) {
             }
             const id = crypto.randomUUID();
             const now = nowStr();
-            db.prepare(`INSERT INTO tasks (id, user_id, parent_id, title, status, est_minutes, category_id, linked_timeblock_id, order_index, created_at, updated_at, deleted_at)
-         VALUES (?, ?, ?, ?, 'draft', ?, NULL, NULL, 0, ?, ?, NULL)`).run(id, userId, input.parent_id ?? null, input.title, input.est_minutes ?? null, now, now);
+            // S46: difficulty/priority 默认 medium，校验入参合法值
+            const difficulty = normalizeDiff(input.difficulty);
+            const priority = normalizePrio(input.priority);
+            db.prepare(`INSERT INTO tasks (id, user_id, parent_id, title, status, est_minutes, category_id, linked_timeblock_id, order_index, difficulty, priority, created_at, updated_at, deleted_at)
+         VALUES (?, ?, ?, ?, 'draft', ?, NULL, NULL, 0, ?, ?, ?, ?, NULL)`).run(id, userId, input.parent_id ?? null, input.title, input.est_minutes ?? null, difficulty, priority, now, now);
             const row = getTaskRow(id);
             return {
                 ...rowToTask(row),
@@ -142,6 +155,15 @@ export function createTaskTools(db) {
                 sets.push("status = ?");
                 params.push(patch.status);
             }
+            // S46: difficulty/priority 可独立更新
+            if (patch.difficulty !== undefined) {
+                sets.push("difficulty = ?");
+                params.push(normalizeDiff(patch.difficulty));
+            }
+            if (patch.priority !== undefined) {
+                sets.push("priority = ?");
+                params.push(normalizePrio(patch.priority));
+            }
             // Always refresh updated_at
             sets.push("updated_at = ?");
             params.push(nowStr());
@@ -168,6 +190,32 @@ export function createTaskTools(db) {
             const row = getTaskRow(taskId);
             return rowToTask(row);
         },
+        /** S46: 仅更新 difficulty/priority（用户主动调整） */
+        async updateDifficulty(taskId, patch) {
+            const existing = getTaskRow(taskId);
+            if (!existing) {
+                throw new Error("任务不存在");
+            }
+            if (patch.difficulty === undefined && patch.priority === undefined) {
+                throw new Error("至少传一个字段 difficulty 或 priority");
+            }
+            const sets = [];
+            const params = [];
+            if (patch.difficulty !== undefined) {
+                sets.push("difficulty = ?");
+                params.push(normalizeDiff(patch.difficulty));
+            }
+            if (patch.priority !== undefined) {
+                sets.push("priority = ?");
+                params.push(normalizePrio(patch.priority));
+            }
+            sets.push("updated_at = ?");
+            params.push(nowStr());
+            params.push(taskId);
+            db.prepare(`UPDATE tasks SET ${sets.join(", ")} WHERE id = ?`).run(...params);
+            const row = getTaskRow(taskId);
+            return rowToTask(row);
+        },
         async findPlan(input) {
             // exact-match a startable root task (aligned/executing) by title
             const rootRow = db
@@ -241,13 +289,13 @@ export function createTaskTools(db) {
             const result = db.transaction(() => {
                 const rootId = crypto.randomUUID();
                 const now = nowStr();
-                db.prepare(`INSERT INTO tasks (id, user_id, parent_id, title, status, est_minutes, category_id, linked_timeblock_id, order_index, created_at, updated_at, deleted_at)
-           VALUES (?, ?, NULL, ?, 'aligned', NULL, NULL, NULL, 0, ?, ?, NULL)`).run(rootId, plan.user_id, plan.root_title, now, now);
+                db.prepare(`INSERT INTO tasks (id, user_id, parent_id, title, status, est_minutes, category_id, linked_timeblock_id, order_index, difficulty, priority, created_at, updated_at, deleted_at)
+           VALUES (?, ?, NULL, ?, 'aligned', NULL, NULL, NULL, 0, 'medium', 'medium', ?, ?, NULL)`).run(rootId, plan.user_id, plan.root_title, now, now);
                 const children = plan.children.map((c, i) => {
                     const childId = crypto.randomUUID();
                     const cnow = nowStr();
-                    db.prepare(`INSERT INTO tasks (id, user_id, parent_id, title, status, est_minutes, category_id, linked_timeblock_id, order_index, created_at, updated_at, deleted_at)
-             VALUES (?, ?, ?, ?, 'draft', ?, NULL, NULL, ?, ?, ?, NULL)`).run(childId, plan.user_id, rootId, c.title, c.est_minutes, i, cnow, cnow);
+                    db.prepare(`INSERT INTO tasks (id, user_id, parent_id, title, status, est_minutes, category_id, linked_timeblock_id, order_index, difficulty, priority, created_at, updated_at, deleted_at)
+             VALUES (?, ?, ?, ?, 'draft', ?, NULL, NULL, ?, 'medium', 'medium', ?, ?, NULL)`).run(childId, plan.user_id, rootId, c.title, c.est_minutes, i, cnow, cnow);
                     return rowToTask(getTaskRow(childId));
                 });
                 return { root: rowToTask(getTaskRow(rootId)), children };
@@ -334,13 +382,13 @@ export function createTaskTools(db) {
             const result = db.transaction(() => {
                 const rootId = crypto.randomUUID();
                 const now = nowStr();
-                db.prepare(`INSERT INTO tasks (id, user_id, parent_id, title, status, est_minutes, category_id, linked_timeblock_id, order_index, created_at, updated_at, deleted_at)
-           VALUES (?, ?, NULL, ?, 'aligned', NULL, NULL, ?, 0, ?, ?, NULL)`).run(rootId, plan.user_id, plan.root_title, plan.timeblock_id, now, now);
+                db.prepare(`INSERT INTO tasks (id, user_id, parent_id, title, status, est_minutes, category_id, linked_timeblock_id, order_index, difficulty, priority, created_at, updated_at, deleted_at)
+           VALUES (?, ?, NULL, ?, 'aligned', NULL, NULL, ?, 0, 'medium', 'medium', ?, ?, NULL)`).run(rootId, plan.user_id, plan.root_title, plan.timeblock_id, now, now);
                 const children = plan.children.map((c, i) => {
                     const childId = crypto.randomUUID();
                     const cnow = nowStr();
-                    db.prepare(`INSERT INTO tasks (id, user_id, parent_id, title, status, est_minutes, category_id, linked_timeblock_id, order_index, created_at, updated_at, deleted_at)
-             VALUES (?, ?, ?, ?, 'draft', ?, NULL, NULL, ?, ?, ?, NULL)`).run(childId, plan.user_id, rootId, c.title, c.est_minutes, i, cnow, cnow);
+                    db.prepare(`INSERT INTO tasks (id, user_id, parent_id, title, status, est_minutes, category_id, linked_timeblock_id, order_index, difficulty, priority, created_at, updated_at, deleted_at)
+             VALUES (?, ?, ?, ?, 'draft', ?, NULL, NULL, ?, 'medium', 'medium', ?, ?, NULL)`).run(childId, plan.user_id, rootId, c.title, c.est_minutes, i, cnow, cnow);
                     return {
                         id: childId,
                         title: c.title,

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.17",
+  "version": "0.2.19",
   "description": "AI 时间管理教练 MCP 工具集——时间块记录、统计、矩阵诊断、计时、分类、profile",
   "license": "MIT",
   "author": "amosyuan",