libero-mcp 0.2.10 → 0.2.12

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

@@ -300,6 +300,7 @@ export class InMemoryTimelineRepo {
                 title: b.title,
                 category_emoji: cat?.emoji ?? null,
                 category_name: cat?.name ?? null,
+                category_color: cat?.color ?? null,
             };
         });
         const timers = this.seed.timer_sessions

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

@@ -401,7 +401,8 @@ export class SqliteTimelineRepo {
            tb.status as status,
            tb.title as title,
            c.emoji as category_emoji,
-           c.name as category_name
+           c.name as category_name,
+           c.color as category_color
          FROM time_blocks tb
          LEFT JOIN categories c ON tb.category_id = c.id
          WHERE tb.user_id = ?

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

@@ -42,6 +42,71 @@ export function categoryAsciiToken(name) {
         return `[${latin[0].toUpperCase()}]`;
     return `[${name.trim()[0]}]`;
 }
+/**
+ * S9 v0.2: hex 颜色 → 方块 emoji（粗色相映射，6-7 色）
+ *
+ * 设计意图（见 docs/specs/S9-v0.2-design-plan-colored-tiles.md）：
+ * - 15 个分类压缩到 7 种方块色——保留视觉区分度，避免 15 色用户认不过来
+ * - 用 HSL hue 粗分（不用精确匹配 hex，避免脆弱）
+ * - 灰阶 / 深色 → ⬛（视觉暗色，区分显著）
+ * - 无效输入 → 🟦（默认蓝，跟原 spec v0.1 兼容）
+ */
+export function colorToTile(hex) {
+    if (!hex || typeof hex !== "string" || !hex.startsWith("#"))
+        return "🟦";
+    const r = parseInt(hex.slice(1, 3), 16);
+    const g = parseInt(hex.slice(3, 5), 16);
+    const b = parseInt(hex.slice(5, 7), 16);
+    // 解析失败 → fallback
+    if (Number.isNaN(r) || Number.isNaN(g) || Number.isNaN(b))
+        return "🟦";
+    const { h, s, l } = rgbToHsl(r, g, b);
+    // 灰阶（饱和度 < 12%）或过暗（亮度 < 0.35）→ ⬛
+    // 设计：睡眠(#34495E l=0.29 s=0.29)、内务(#95A5A6 s=0.09)、闲散(#BDC3C7) 等
+    // 深色 / 中性色都归黑，区分显著
+    if (s < 0.12 || l < 0.35)
+        return "⬛";
+    // 色相分段（0-360）
+    if (h < 15 || h >= 345)
+        return "🟥"; // 红
+    if (h < 45)
+        return "🟧"; // 橙
+    if (h < 70)
+        return "🟨"; // 黄
+    if (h < 165)
+        return "🟩"; // 绿
+    if (h < 240)
+        return "🟦"; // 蓝（含青）
+    if (h < 315)
+        return "🟪"; // 紫（240-315）
+    return "🟥"; // 粉红归红
+}
+/** RGB → HSL（h: 0-360, s/l: 0-1） */
+function rgbToHsl(r, g, b) {
+    const rN = r / 255;
+    const gN = g / 255;
+    const bN = b / 255;
+    const max = Math.max(rN, gN, bN);
+    const min = Math.min(rN, gN, bN);
+    const l = (max + min) / 2;
+    let h = 0;
+    let s = 0;
+    if (max !== min) {
+        const d = max - min;
+        s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
+        switch (max) {
+            case rN:
+                h = ((gN - bN) / d + (gN < bN ? 6 : 0)) * 60;
+                break;
+            case gN:
+                h = ((bN - rN) / d + 2) * 60;
+                break;
+            default:
+                h = ((rN - gN) / d + 4) * 60;
+        }
+    }
+    return { h, s, l };
+}
 function timerKey(status) {
     return status === "paused" ? "timer_paused" : "timer_running";
 }
@@ -59,6 +124,17 @@ export function resolveCellSymbol(cell, format) {
         const key = timerKey(cell.status);
         return format === "emoji" ? FIXED_EMOJI[key] : FIXED_ASCII[key];
     }
+    // S9 v0.2: planned 块带 tile 时优先用分类色方块，否则 fallback 到默认 🟦
+    if (cell.kind === "planned") {
+        if (format === "emoji") {
+            if (cell.tile && cell.tile.trim())
+                return cell.tile;
+            return FIXED_EMOJI.planned;
+        }
+        // ascii 用 category 首字母（如 [W]），否则默认 [#]
+        return cell.ascii ?? FIXED_ASCII.planned;
+    }
+    // unverified / empty
     const key = cell.kind;
     return format === "emoji" ? FIXED_EMOJI[key] : FIXED_ASCII[key];
 }
@@ -92,6 +168,16 @@ export function mergeTimelineCells(candidates) {
 function legendMeaning(symbol) {
     if (LEGEND_ZH[symbol])
         return LEGEND_ZH[symbol];
+    // S9 v0.2: 方块色 = 计划块（按分类上色）
+    if (symbol === "🟦" ||
+        symbol === "🟪" ||
+        symbol === "🟩" ||
+        symbol === "🟥" ||
+        symbol === "🟧" ||
+        symbol === "🟨" ||
+        symbol === "⬛") {
+        return "计划";
+    }
     // completed category emoji / ascii letter
     if (symbol.startsWith("[") && symbol.endsWith("]"))
         return "实绩";
@@ -206,26 +292,45 @@ export function renderTimelineCells(input) {
     const textLines = [];
     textLines.push("       00  10  20  30  40  50");
     // ── 表格段（在前）──
+    // S9 v0.3: details 段按 symbol 分组紧凑展示
+    // 用户痛点：移动端窄屏，原格式 "{time}  {symbol}  {title}  [planned]" 长标题折行后 [planned] 跑到第三行，诡异
+    // 新格式：同 symbol 合并到一行，用 · 分隔；移除 [status] 后缀（状态在矩阵方块色已表达）
     const details = input.details ?? [];
     if (details.length > 0) {
-        textLines.push("📋 细项：");
+        textLines.push("📋 明细");
         const inWin = details.filter((d) => d.in_window);
         const outWin = details.filter((d) => !d.in_window);
-        for (const d of inWin) {
-            mark(d.symbol);
-            textLines.push(`${d.time}  ${d.symbol}  ${d.title}  [${d.status}]`);
+        // 按 symbol 分组（保留 inWin 内的原始顺序）
+        const groupBySymbol = (list) => {
+            const groups = [];
+            const symbolToGroup = new Map();
+            for (const d of list) {
+                mark(d.symbol);
+                const entry = `${d.time} ${d.title}`;
+                const idx = symbolToGroup.get(d.symbol);
+                if (idx === undefined) {
+                    symbolToGroup.set(d.symbol, groups.length);
+                    groups.push({ symbol: d.symbol, entries: [entry] });
+                }
+                else {
+                    groups[idx].entries.push(entry);
+                }
+            }
+            return groups;
+        };
+        for (const g of groupBySymbol(inWin)) {
+            textLines.push(`${g.symbol} ${g.entries.join(" · ")}`);
         }
         if (outWin.length > 0) {
-            textLines.push("（窗口外↓）");
-            for (const d of outWin) {
-                mark(d.symbol);
-                textLines.push(`${d.time}  ${d.symbol}  ${d.title}  [${d.status}]`);
+            textLines.push("（窗口外）");
+            for (const g of groupBySymbol(outWin)) {
+                textLines.push(`${g.symbol} ${g.entries.join(" · ")}`);
             }
         }
     }
     else {
         // pressure E-6: details 空 → 给"该时段无安排"提示，不留空段
-        textLines.push("📋 细项：该时段无安排");
+        textLines.push("📋 明细：该时段无安排");
     }
     // ── 矩阵段（在后，作为时间分布概览）──
     const pushEllipsis = () => {
@@ -250,6 +355,15 @@ export function renderTimelineCells(input) {
     }
     if (boundary)
         pushEllipsis();
+    // S9 v0.2: 末尾拼图例（按本次实际出现的色）
+    // 设计：图例短一行，只列实际出现过的符号；颜色块统一标"计划·X 类"
+    if (Object.keys(legend).length > 1) {
+        const legendParts = [];
+        for (const [sym, meaning] of Object.entries(legend)) {
+            legendParts.push(`${sym} ${meaning}`);
+        }
+        textLines.push(`图例：${legendParts.join(" · ")}`);
+    }
     return { rows, rendered_text: textLines.join("\n"), legend };
 }
 export function computeDefaultWindow(now) {
@@ -272,6 +386,18 @@ function cellFromBlock(b) {
             label: b.title,
         };
     }
+    // S9 v0.2: planned 块按分类上色（不再统一 🟦）
+    // unverified 保持 ❓ 不上色（状态优先于分类）
+    if (b.status === "planned") {
+        const ascii = categoryAsciiToken(b.category_name);
+        const tile = colorToTile(b.category_color);
+        return {
+            kind: "planned",
+            tile,
+            ascii,
+            label: b.title,
+        };
+    }
     return { kind: b.status, label: b.title };
 }
 function cellFromTimer(t) {

package/package.json

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