libero-mcp 0.2.12 → 0.2.13

package/dist/mcp/server-core.js

@@ -1,7 +1,6 @@
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { z } from "zod";
-import { SqliteCategoryRepo, SqliteTimeBlockRepo, SqliteStatsRepo, SqliteTimerRepo, SqliteProfileRepo, SqliteReminderRepo, SqliteTimelineRepo, } from "./src/repo/sqlite.js";
-import { SqliteIdentityRepo } from "./src/repo/sqlite-identity.js";
+import { createRepos } from "./src/repo/factory.js";
 import { createCategoryTools } from "./src/categories/index.js";
 import { createTimeBlockTools } from "./src/timeblock/index.js";
 import { createStatsTools } from "./src/stats/index.js";
@@ -47,47 +46,36 @@ export function errorContent(msg) {
     };
 }
 /**
- * Build the libero MCP server on a given DB connection.
- * Tools throw Error on business violations; handlers let them propagate —
- * the SDK turns thrown errors into MCP tool errors (isError) preserving the message.
+ * Build the full tool registry (48 tools). Each entry is a data-fied version of
+ * the pre-refactor inline registration calls — handlers are byte-for-byte copies
+ * preserving declaration order for diagnostic readability.
  */
-export function buildServer(db) {
-    // MV-COACH-3 Slice 2: resolve default user_id once at server build
-    const defaultUser = resolveDefaultUserId({ db, env: process.env });
-    logResolvedDefaultUserId(defaultUser);
-    const injector = makeUserIdInjector(defaultUser.userId);
-    // ── construct repos (S10 §3.3) ──
-    const categoryRepo = new SqliteCategoryRepo(db);
-    const timeblockRepo = new SqliteTimeBlockRepo(db);
-    const statsRepo = new SqliteStatsRepo(db);
-    const timerRepo = new SqliteTimerRepo(db);
-    const profileRepo = new SqliteProfileRepo(db);
-    const reminderRepo = new SqliteReminderRepo(db);
-    const timelineRepo = new SqliteTimelineRepo(db);
-    const identityRepo = new SqliteIdentityRepo(db);
-    // ── inject tool factories ──
-    const categories = createCategoryTools(categoryRepo);
-    const tb = createTimeBlockTools(timeblockRepo, db);
-    const stats = createStatsTools(statsRepo);
-    const matrix = createMatrixTools(statsRepo); // matrix reuses StatsRepo
-    const timeline = createTimelineTools(timelineRepo);
-    const timer = createTimerTools(timerRepo, timeblockRepo, db);
-    const profile = createProfileTools(profileRepo, identityRepo);
-    const profileConfirm = createProfileConfirmTools(db);
-    const reminder = createReminderTools(reminderRepo, undefined, db);
-    const scheduler = createSchedulerTools(timeblockRepo, reminderRepo, categoryRepo);
-    const task = createTaskTools(db);
-    // instructions 必须放在第 2 参 ServerOptions（不是 serverInfo）—— SDK 只从 options 读
-    const server = new McpServer({ name: "libero-mcp", version: "0.2.3" }, { instructions: buildServerInstructions() });
+function buildToolRegistry(ctx) {
+    const { categories, tb, stats, matrix, timeline, timer, profile, profileConfirm, reminder, scheduler, task, injector, } = ctx;
+    // identityRepo is referenced directly inside handlers below (closure scope),
+    // matching the pre-refactor behavior.
+    const identityRepo = ctx.repos.identityRepo;
+    const tools = [];
     // ============================================================
     // categories (2 tools)
     // ============================================================
-    server.registerTool("categories.getAll", { description: "获取全部时间分类（15 类）", inputSchema: {} }, async () => asContent(await categories.getAllCategories()));
-    server.registerTool("categories.getById", { description: "按 id 获取单个分类", inputSchema: { id: z.string().min(1) } }, async ({ id }) => asContent(await categories.getCategoryById(id)));
+    tools.push({
+        name: "categories.getAll",
+        description: "获取全部时间分类（15 类）",
+        inputSchema: {},
+        handler: async () => asContent(await categories.getAllCategories()),
+    });
+    tools.push({
+        name: "categories.getById",
+        description: "按 id 获取单个分类",
+        inputSchema: { id: z.string().min(1) },
+        handler: async ({ id }) => asContent(await categories.getCategoryById(id)),
+    });
     // ============================================================
-    // timer (6 tools — positional userId args, R4 pattern)
+    // timer (9 tools — positional userId args, R4 pattern)
     // ============================================================
-    server.registerTool("timer.start", {
+    tools.push({
+        name: "timer.start",
         description: "开始一个计时会话",
         inputSchema: {
             user_id: z.string().optional(),
@@ -96,55 +84,90 @@ export function buildServer(db) {
             categoryId: z.string().optional(),
             task_id: z.string().optional(),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await timer.start(r.user_id, r.event, r.categoryId, r.task_id, r.target_user_id));
-    });
-    server.registerTool("timer.pause", { description: "暂停当前计时", inputSchema: { user_id: z.string().optional() } }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await timer.pause(r.user_id));
-    });
-    server.registerTool("timer.resume", { description: "恢复已暂停的计时", inputSchema: { user_id: z.string().optional() } }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await timer.resume(r.user_id));
-    });
-    server.registerTool("timer.stop", {
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await timer.start(r.user_id, r.event, r.categoryId, r.task_id, r.target_user_id));
+        },
+    });
+    tools.push({
+        name: "timer.pause",
+        description: "暂停当前计时",
+        inputSchema: { user_id: z.string().optional() },
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await timer.pause(r.user_id));
+        },
+    });
+    tools.push({
+        name: "timer.resume",
+        description: "恢复已暂停的计时",
+        inputSchema: { user_id: z.string().optional() },
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await timer.resume(r.user_id));
+        },
+    });
+    tools.push({
+        name: "timer.stop",
         description: "停止计时并返回记录（传 rating 时自动落盘 timeblock）",
         inputSchema: {
             user_id: z.string().optional(),
             rating: z.number().min(1).max(5).optional(),
             rating_reason: z.string().optional(),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await timer.stop(r.user_id, {
-            rating: r.rating,
-            rating_reason: r.rating_reason,
-        }));
-    });
-    server.registerTool("timer.status", { description: "查询某用户当前计时状态", inputSchema: { user_id: z.string().optional() } }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await timer.status(r.user_id));
-    });
-    server.registerTool("timer.elapsed", { description: "查询当前计时已过毫秒数", inputSchema: { user_id: z.string().optional() } }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await timer.elapsed(r.user_id));
-    });
-    server.registerTool("timer.statusAll", { description: "查询所有用户的当前计时状态（调试/兜底用）", inputSchema: {} }, async () => asContent(await timer.statusAll()));
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await timer.stop(r.user_id, {
+                rating: r.rating,
+                rating_reason: r.rating_reason,
+            }));
+        },
+    });
+    tools.push({
+        name: "timer.status",
+        description: "查询某用户当前计时状态",
+        inputSchema: { user_id: z.string().optional() },
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await timer.status(r.user_id));
+        },
+    });
+    tools.push({
+        name: "timer.elapsed",
+        description: "查询当前计时已过毫秒数",
+        inputSchema: { user_id: z.string().optional() },
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await timer.elapsed(r.user_id));
+        },
+    });
+    tools.push({
+        name: "timer.statusAll",
+        description: "查询所有用户的当前计时状态（调试/兜底用）",
+        inputSchema: {},
+        handler: async () => asContent(await timer.statusAll()),
+    });
     // ── S26: pomodoro v1 tools ──
-    server.registerTool("timer.startFocus", {
+    tools.push({
+        name: "timer.startFocus",
         description: "开始一个专注计时（番茄钟），带目标时长",
         inputSchema: {
             user_id: z.string().optional(),
@@ -153,27 +176,33 @@ export function buildServer(db) {
             categoryId: z.string().optional(),
             task_id: z.string().optional(),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await timer.startFocus(r.user_id, r.event, r.focusMin, r.categoryId, r.task_id));
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await timer.startFocus(r.user_id, r.event, r.focusMin, r.categoryId, r.task_id));
+        },
     });
-    server.registerTool("timer.remaining", {
+    tools.push({
+        name: "timer.remaining",
         description: "查询专注计时剩余时间（负数=超时）",
         inputSchema: {
             user_id: z.string().optional(),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await timer.remaining(r.user_id));
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await timer.remaining(r.user_id));
+        },
     });
     // ============================================================
-    // timeblock (5 tools — single-object args)
+    // timeblock (6 tools — single-object args)
     // ============================================================
-    server.registerTool("timeblock.create", {
+    tools.push({
+        name: "timeblock.create",
         description: "创建一条时间记录",
         inputSchema: {
             user_id: z.string().optional(),
@@ -187,26 +216,32 @@ export function buildServer(db) {
             rating_reason: z.string().optional(),
             notes: z.string().optional(),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await tb.create(r));
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await tb.create(r));
+        },
     });
-    server.registerTool("timeblock.getById", {
+    tools.push({
+        name: "timeblock.getById",
         description: "按 id 获取单条时间记录。" +
             "S41 多用户：默认按当前 user_id 过滤，跨用户查不到返回 null。",
         inputSchema: {
             id: z.string().min(1),
             user_id: z.string().optional(),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await tb.getById(rawInput.id, r.user_id));
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await tb.getById(rawInput.id, r.user_id));
+        },
     });
-    server.registerTool("timeblock.update", {
+    tools.push({
+        name: "timeblock.update",
         description: "更新一条时间记录（标题/时间/评分/status 等）。" +
             "MV-COACH-3 Slice 4 用户主权状态机：" +
             "① 开工 cron 触发到点 → status='unverified'（等用户核实，**不计入实绩**）；" +
@@ -227,16 +262,25 @@ export function buildServer(db) {
             notes: z.string().optional(),
             status: z.enum(["planned", "unverified", "completed"]).optional(),
         },
-    }, async ({ id, ...rest }) => asContent(await tb.update(id, rest)));
-    server.registerTool("timeblock.remove", {
+        handler: async ({ id, ...rest }) => asContent(await tb.update(id, rest)),
+    });
+    tools.push({
+        name: "timeblock.remove",
         description: "软删除一条时间记录",
         inputSchema: {
             id: z.string().min(1),
             target_user_id: z.string().min(1).optional(),
         },
-    }, async ({ id, target_user_id }) => asContent(await tb.remove(id, { target_user_id })));
-    server.registerTool("timeblock.restore", { description: "恢复一条已软删除的时间记录", inputSchema: { id: z.string().min(1) } }, async ({ id }) => asContent(await tb.restore(id)));
-    server.registerTool("timeblock.list", {
+        handler: async ({ id, target_user_id }) => asContent(await tb.remove(id, { target_user_id })),
+    });
+    tools.push({
+        name: "timeblock.restore",
+        description: "恢复一条已软删除的时间记录",
+        inputSchema: { id: z.string().min(1) },
+        handler: async ({ id }) => asContent(await tb.restore(id)),
+    });
+    tools.push({
+        name: "timeblock.list",
         description: "按条件查询时间记录列表",
         inputSchema: {
             user_id: z.string().optional(),
@@ -249,16 +293,19 @@ export function buildServer(db) {
             limit: z.number().optional(),
             offset: z.number().optional(),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await tb.list(r));
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await tb.list(r));
+        },
     });
     // ============================================================
     // stats (2 tools — single-object filters)
     // ============================================================
-    server.registerTool("stats.summarize", {
+    tools.push({
+        name: "stats.summarize",
         description: "按分类汇总时间统计（占比/记录数）",
         inputSchema: {
             user_id: z.string().optional(),
@@ -267,13 +314,16 @@ export function buildServer(db) {
             to: z.string().optional(),
             category_id: z.string().optional(),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await stats.summarize(r));
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await stats.summarize(r));
+        },
     });
-    server.registerTool("stats.dailyBreakdown", {
+    tools.push({
+        name: "stats.dailyBreakdown",
         description: "按天×分类拆分时间明细",
         inputSchema: {
             user_id: z.string().optional(),
@@ -282,32 +332,38 @@ export function buildServer(db) {
             to: z.string().optional(),
             category_id: z.string().optional(),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await stats.dailyBreakdown(r));
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await stats.dailyBreakdown(r));
+        },
     });
     // ============================================================
     // matrix (1 tool — single-object filters, reuses StatsRepo)
     // ============================================================
-    server.registerTool("matrix.renderMatrix", {
+    tools.push({
+        name: "matrix.renderMatrix",
         description: "时间×评分四象限矩阵（能耗黑洞/保持区/亮点区/可放弃）",
         inputSchema: {
             user_id: z.string().optional(),
             from: z.string().optional(),
             to: z.string().optional(),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await matrix.renderMatrix(r));
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await matrix.renderMatrix(r));
+        },
     });
     // ============================================================
     // schedule.timeline (emoji matrix + detail table)
     // ============================================================
-    server.registerTool("schedule.timeline", {
+    tools.push({
+        name: "schedule.timeline",
         description: "看日程/复盘的首选视图：emoji 矩阵+细项表格，含计划/计时中/未回应/实绩全状态。" +
             "用户说「看今天/看日程/在干啥/复盘/接下来 N 小时」时调本工具，并直接 echo rendered_text（不重写、不改格式）。" +
             "不要调 scheduler.listSchedules（那是内部排程查询，不是用户视图）。",
@@ -318,45 +374,58 @@ export function buildServer(db) {
             to: z.string().optional(),
             format: z.enum(["emoji", "ascii"]).optional(),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await timeline.renderTimeline(r));
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await timeline.renderTimeline(r));
+        },
     });
     // ============================================================
     // clock (3 tools — pure functions, no repo)
     // ============================================================
-    server.registerTool("clock.now", {
+    tools.push({
+        name: "clock.now",
         description: "返回当前 ISO 时间字符串（可选时区偏移）",
         inputSchema: {
             offsetMinutes: z.number().optional(),
         },
-    }, async ({ offsetMinutes }) => asContent(offsetMinutes !== undefined ? nowLocal(offsetMinutes) : nowLocal()));
-    server.registerTool("clock.formatTime", {
+        handler: async ({ offsetMinutes }) => asContent(offsetMinutes !== undefined ? nowLocal(offsetMinutes) : nowLocal()),
+    });
+    tools.push({
+        name: "clock.formatTime",
         description: "按指定格式格式化 ISO 时间",
         inputSchema: {
             iso: z.string().min(1),
             format: z.string().min(1),
         },
-    }, async ({ iso, format }) => asContent(formatTime(iso, format)));
-    server.registerTool("clock.parseTime", {
+        handler: async ({ iso, format }) => asContent(formatTime(iso, format)),
+    });
+    tools.push({
+        name: "clock.parseTime",
         description: "解析 ISO 时间字符串为结构化字段",
         inputSchema: { iso: z.string().min(1) },
-    }, async ({ iso }) => asContent(parseTime(iso)));
+        handler: async ({ iso }) => asContent(parseTime(iso)),
+    });
     // ============================================================
-    // profile (2 tools — get / upsert)
+    // profile (8 tools — get / upsert / markInactivityNudge / claimNudge /
+    //                   confirm_default / bindAlias / listMyChannels / createUser)
     // ============================================================
-    server.registerTool("profile.get", {
+    tools.push({
+        name: "profile.get",
         description: "获取用户 profile（含结构化约定）",
         inputSchema: { user_id: z.string().optional() },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await profile.get(r.user_id));
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await profile.get(r.user_id));
+        },
     });
-    server.registerTool("profile.upsert", {
+    tools.push({
+        name: "profile.upsert",
         description: "创建或更新用户 profile（display_name / expectations / settings）。首次确认请用 profile.confirm_default。",
         inputSchema: {
             user_id: z.string().optional(),
@@ -367,13 +436,16 @@ export function buildServer(db) {
                 .passthrough()
                 .optional(),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await profile.upsert(r));
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await profile.upsert(r));
+        },
     });
-    server.registerTool("profile.markInactivityNudge", {
+    tools.push({
+        name: "profile.markInactivityNudge",
         description: "MV-COACH-3 slice 2（防重复失效专用）：触发「5 天没记录轻触」问候后必调。" +
             "专门写 settings.last_inactivity_nudge_at = now。" +
             "⚠️ 不要用 profile.upsert 写这个字段——upsert 是 whole-replace 会清掉其它 settings key。" +
@@ -381,13 +453,16 @@ export function buildServer(db) {
         inputSchema: {
             user_id: z.string().optional(),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await profile.markInactivityNudge({ user_id: r.user_id }));
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await profile.markInactivityNudge({ user_id: r.user_id }));
+        },
     });
-    server.registerTool("profile.claimNudge", {
+    tools.push({
+        name: "profile.claimNudge",
         description: "S40 slice 2（多 cron 并发 atomic 抢占）：nag fan-out 多渠道时用。" +
             "window_minutes 内只有第一个调用赢（won=true），其它返回 won=false。" +
             "**调用方必须看返回的 won 字段**：" +
@@ -397,28 +472,33 @@ export function buildServer(db) {
             user_id: z.string().optional(),
             window_minutes: z.number().optional(),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await profile.claimNudge({
-            user_id: r.user_id,
-            window_minutes: typeof rawInput.window_minutes === "number"
-                ? rawInput.window_minutes
-                : undefined,
-        }));
-    });
-    server.registerTool("profile.confirm_default", {
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await profile.claimNudge({
+                user_id: r.user_id,
+                window_minutes: typeof rawInput.window_minutes === "number"
+                    ? rawInput.window_minutes
+                    : undefined,
+            }));
+        },
+    });
+    tools.push({
+        name: "profile.confirm_default",
         description: "首次写入前确认默认用户：写入 user_profile，设置 display_name 与 default_confirmed_at。display_name 重名则拒绝。",
         inputSchema: {
             platform_user_id: z.string().min(1),
             display_name: z.string().min(1),
         },
-    }, async (input) => asContent(await profileConfirm.confirmDefault(input)));
+        handler: async (input) => asContent(await profileConfirm.confirmDefault(input)),
+    });
     // ============================================================
-    // S40: cross-platform identity (2 tools)
+    // S40: cross-platform identity (bindAlias / listMyChannels)
     // ============================================================
-    server.registerTool("profile.bindAlias", {
+    tools.push({
+        name: "profile.bindAlias",
         description: "S40 跨平台身份层：把一个平台 chat_id 绑定到已有 libero 用户身份。" +
             "场景：用户在新设备（如飞书）首次开口，主会话问『要和已有账号（如企微）合并吗』，得到肯定后调这个。" +
             "libero_user_id 为空 = 首次绑定，自动建一个 libero_user_id。" +
@@ -430,59 +510,64 @@ export function buildServer(db) {
             chat_id: z.string().optional(),
             display_name: z.string().optional(),
         },
-    }, async (input) => {
-        const crypto = await import("node:crypto");
-        let lid = input.libero_user_id;
-        if (!lid) {
-            lid = `u_libero_${crypto.randomUUID().replace(/-/g, "").slice(0, 16)}`;
-            await identityRepo.createIdentity({
-                libero_user_id: lid,
-                display_name: input.display_name ?? input.platform_user_id.slice(0, 16),
-            });
-        }
-        else {
-            const existing = await identityRepo.getIdentity(lid);
-            if (!existing) {
-                return errorContent(`libero_user_id not found: ${lid}`);
+        handler: async (input) => {
+            const crypto = await import("node:crypto");
+            let lid = input.libero_user_id;
+            if (!lid) {
+                lid = `u_libero_${crypto.randomUUID().replace(/-/g, "").slice(0, 16)}`;
+                await identityRepo.createIdentity({
+                    libero_user_id: lid,
+                    display_name: input.display_name ?? input.platform_user_id.slice(0, 16),
+                });
             }
-        }
-        try {
-            await identityRepo.bindAlias({
-                libero_user_id: lid,
-                platform: input.platform,
-                platform_user_id: input.platform_user_id,
-                chat_id: input.chat_id,
-            });
-        }
-        catch (e) {
-            return errorContent(e.message);
-        }
-        const aliases = await identityRepo.listAliases(lid);
-        return asContent({ libero_user_id: lid, bound_aliases: aliases });
-    });
-    server.registerTool("profile.listMyChannels", {
+            else {
+                const existing = await identityRepo.getIdentity(lid);
+                if (!existing) {
+                    return errorContent(`libero_user_id not found: ${lid}`);
+                }
+            }
+            try {
+                await identityRepo.bindAlias({
+                    libero_user_id: lid,
+                    platform: input.platform,
+                    platform_user_id: input.platform_user_id,
+                    chat_id: input.chat_id,
+                });
+            }
+            catch (e) {
+                return errorContent(e.message);
+            }
+            const aliases = await identityRepo.listAliases(lid);
+            return asContent({ libero_user_id: lid, bound_aliases: aliases });
+        },
+    });
+    tools.push({
+        name: "profile.listMyChannels",
         description: "S40 跨平台身份层：列出当前用户绑定的所有平台渠道。" +
             "用途：nag fan-out（按渠道建独立 cron）、跨平台数据查询、身份确认。",
         inputSchema: {
             user_id: z.string().optional(),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        const lid = await resolveUserId(identityRepo, r.user_id);
-        const aliases = await identityRepo.listAliases(lid);
-        return asContent({
-            libero_user_id: lid,
-            channels: aliases.map((a) => ({
-                platform: a.platform,
-                platform_user_id: a.platform_user_id,
-                chat_id: a.chat_id,
-                bound_at: a.bound_at,
-            })),
-        });
-    });
-    server.registerTool("profile.createUser", {
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            const lid = await resolveUserId(identityRepo, r.user_id);
+            const aliases = await identityRepo.listAliases(lid);
+            return asContent({
+                libero_user_id: lid,
+                channels: aliases.map((a) => ({
+                    platform: a.platform,
+                    platform_user_id: a.platform_user_id,
+                    chat_id: a.chat_id,
+                    bound_at: a.bound_at,
+                })),
+            });
+        },
+    });
+    tools.push({
+        name: "profile.createUser",
         description: "S41 多用户建档：建立新 libero 用户（父母代管模式）。" +
             "用户体感：「帮我建一个新用户」「我要给我儿子建档」时调用。" +
             "返回新 libero_user_id，建档后该 user_id 立即可用于所有 libero 工具调用。" +
@@ -498,26 +583,28 @@ export function buildServer(db) {
             platform_user_id: z.string().optional(),
             chat_id: z.string().optional(),
         },
-    }, async (rawInput) => {
-        try {
-            const result = await profile.createUser({
-                display_name: rawInput.display_name,
-                focus_areas: rawInput.focus_areas,
-                goals: rawInput.goals,
-                platform: rawInput.platform,
-                platform_user_id: rawInput.platform_user_id,
-                chat_id: rawInput.chat_id,
-            });
-            return asContent(result);
-        }
-        catch (e) {
-            return errorContent(e.message);
-        }
+        handler: async (rawInput) => {
+            try {
+                const result = await profile.createUser({
+                    display_name: rawInput.display_name,
+                    focus_areas: rawInput.focus_areas,
+                    goals: rawInput.goals,
+                    platform: rawInput.platform,
+                    platform_user_id: rawInput.platform_user_id,
+                    chat_id: rawInput.chat_id,
+                });
+                return asContent(result);
+            }
+            catch (e) {
+                return errorContent(e.message);
+            }
+        },
     });
     // ============================================================
     // reminder (6 tools — S11)
     // ============================================================
-    server.registerTool("reminder.create", {
+    tools.push({
+        name: "reminder.create",
         description: "⚠️ 仅写 DB，不主动推送（libero-mcp 无 background sender）。" +
             "在 hermes 等有 cronjob 工具的平台上，用户要'X 时间提醒我 Y'请调宿主 cronjob（action=create, deliver=origin），不要用本工具。" +
             "本工具仅用于：① 无 cron 能力的平台兜底；② 查询场景配合 getDue/getMissed。",
@@ -529,48 +616,62 @@ export function buildServer(db) {
             channel: z.string().optional(),
             timeblock_id: z.string().optional(),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await reminder.create(r));
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await reminder.create(r));
+        },
     });
-    server.registerTool("reminder.getDue", {
+    tools.push({
+        name: "reminder.getDue",
         description: "获取到期且待发送的提醒列表",
         inputSchema: {
             user_id: z.string().optional(),
             until: z.string().optional(),
         },
-    }, async (input) => asContent(await reminder.getDueReminders(input)));
-    server.registerTool("reminder.getNextDue", {
+        handler: async (input) => asContent(await reminder.getDueReminders(input)),
+    });
+    tools.push({
+        name: "reminder.getNextDue",
         description: "获取下一条待发送提醒的时间",
         inputSchema: {
             user_id: z.string().optional(),
         },
-    }, async (input) => asContent(await reminder.getNextDue(input)));
-    server.registerTool("reminder.getMissed", {
+        handler: async (input) => asContent(await reminder.getNextDue(input)),
+    });
+    tools.push({
+        name: "reminder.getMissed",
         description: "获取过期但未送达的提醒（被动补发用）",
         inputSchema: {
             user_id: z.string().optional(),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await reminder.getMissedReminders({ user_id: r.user_id }));
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await reminder.getMissedReminders({ user_id: r.user_id }));
+        },
     });
-    server.registerTool("reminder.markSent", {
+    tools.push({
+        name: "reminder.markSent",
         description: "标记提醒为已发送（幂等）",
         inputSchema: { id: z.string().min(1) },
-    }, async ({ id }) => asContent(await reminder.markSent(id)));
-    server.registerTool("reminder.cancel", {
+        handler: async ({ id }) => asContent(await reminder.markSent(id)),
+    });
+    tools.push({
+        name: "reminder.cancel",
         description: "取消一条提醒（幂等）",
         inputSchema: { id: z.string().min(1) },
-    }, async ({ id }) => asContent(await reminder.cancelReminder(id)));
+        handler: async ({ id }) => asContent(await reminder.cancelReminder(id)),
+    });
     // ============================================================
     // scheduler (3 tools — S27, reuses timeblockRepo)
     // ============================================================
-    server.registerTool("scheduler.createSchedule", {
+    tools.push({
+        name: "scheduler.createSchedule",
         description: "创建一个日程（planned 时间块）。" +
             "⚠️ MV-COACH-3 Slice 4 v2 教练闭环（用户主权模型）：建完 schedule 后，**必须**在同一回复里完成：" +
             "① 调 cronjob(action=create, deliver=origin) 建开工 cron（schedule=日程开始时间），cron prompt 必须用 libero-coach skill 的'开工 cron 标准 prompt 模板'——**不允许自创结构**。" +
@@ -589,13 +690,16 @@ export function buildServer(db) {
             rating_reason: z.string().optional(),
             notes: z.string().optional(),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await scheduler.createSchedule(r));
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await scheduler.createSchedule(r));
+        },
     });
-    server.registerTool("scheduler.listSchedules", {
+    tools.push({
+        name: "scheduler.listSchedules",
         description: "内部工具：查询 planned 日程块用于排程冲突检查。" +
             "⚠️ 用户「看今天/看日程/复盘/在干啥」请调 schedule.timeline（含矩阵+表格+全状态视图，不要调本工具）。" +
             "本工具仅用于排程编排时的内部查询。",
@@ -604,29 +708,35 @@ export function buildServer(db) {
             from: z.string().optional(),
             to: z.string().optional(),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await scheduler.listSchedules(r));
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await scheduler.listSchedules(r));
+        },
     });
-    server.registerTool("scheduler.checkConflict", {
+    tools.push({
+        name: "scheduler.checkConflict",
         description: "检查时间段是否与已有日程冲突",
         inputSchema: {
             user_id: z.string().optional(),
             start_time: z.string(),
             end_time: z.string(),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await scheduler.checkConflict(r));
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await scheduler.checkConflict(r));
+        },
     });
     // ============================================================
-    // task (7 tools — S29 P2-3 + 事一 draft/commit, takes raw db)
+    // task (6 tools — S29 P2-3 + 事一 draft/commit, takes raw db)
     // ============================================================
-    server.registerTool("task.create", {
+    tools.push({
+        name: "task.create",
         description: "建单个独立任务（不挂任何 timeblock）。⚠️ 拆解请用 decompose.split，本工具一次只能建一个任务、不能建子任务。",
         // S33 v3: 用 z.object().strict() 显式拒 parent_id（zod 默认 strip 不报错，
         // 严格模式让多余键触发 safeParse 失败 → MCP 返回 isError）。
@@ -639,30 +749,38 @@ export function buildServer(db) {
             est_minutes: z.number().optional(),
         })
             .strict(),
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await task.createTask(r));
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await task.createTask(r));
+        },
     });
-    server.registerTool("task.get", {
+    tools.push({
+        name: "task.get",
         description: "按 id 获取任务（含递归子树）",
         inputSchema: { id: z.string().min(1) },
-    }, async ({ id }) => asContent(await task.getTask(id)));
-    server.registerTool("task.list", {
+        handler: async ({ id }) => asContent(await task.getTask(id)),
+    });
+    tools.push({
+        name: "task.list",
         description: "列出任务（parent_id=null 仅根；给定则该父的子；省略则全部）",
         inputSchema: {
             user_id: z.string().optional(),
             target_user_id: z.string().min(1).optional(),
             parent_id: z.string().nullable().optional(),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await task.listTasks(r));
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await task.listTasks(r));
+        },
     });
-    server.registerTool("task.update", {
+    tools.push({
+        name: "task.update",
         description: "更新任务（title/est_minutes/status；状态机校验非法流转）",
         inputSchema: {
             id: z.string().min(1),
@@ -670,25 +788,31 @@ export function buildServer(db) {
             est_minutes: z.number().optional(),
             status: z.string().optional(),
         },
-    }, async ({ id, ...rest }) => asContent(await task.updateTask(id, rest)));
-    server.registerTool("task.linkTimeblock", {
+        handler: async ({ id, ...rest }) => asContent(await task.updateTask(id, rest)),
+    });
+    tools.push({
+        name: "task.linkTimeblock",
         description: "把任务关联到一个时间块（子任务开工执行时）",
         inputSchema: {
             task_id: z.string().min(1),
             block_id: z.string().min(1),
         },
-    }, async ({ task_id, block_id }) => asContent(await task.linkTimeblock(task_id, block_id)));
-    server.registerTool("task.findPlan", {
+        handler: async ({ task_id, block_id }) => asContent(await task.linkTimeblock(task_id, block_id)),
+    });
+    tools.push({
+        name: "task.findPlan",
         description: "按事件名 exact-match 查拆解计划：返回根任务 + 第一块未完成子任务（record 开工时链 task_id，驱动闭环正反馈）",
         inputSchema: {
             user_id: z.string().optional(),
             title: z.string().min(1),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        return asContent(await task.findPlan(r));
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            return asContent(await task.findPlan(r));
+        },
     });
     // S33 v3: task.draftPlan / task.commitPlan 从 MCP 工具列表移除（不再暴露给 mimo）。
     // 拆解唯一入口 = decompose.split（见下方 decompose 段）。
@@ -698,7 +822,8 @@ export function buildServer(db) {
     // decompose.split = 拆解唯一入口。状态机强制 draft→confirm→commit。
     // 错误返回 isError content（不 throw），避 hermes 熔断器（v2 实证坑）。
     // ============================================================
-    server.registerTool("decompose.split", {
+    tools.push({
+        name: "decompose.split",
         description: "拆解 timeblock 为结构化子任务树（拆解唯一入口）。第一次调用出方案（不写库），第二次带 confirm_token 落地。状态机强制 draft→confirm→commit。⚠️ 拆子任务请用本工具，不要用 task.create。",
         inputSchema: {
             user_id: z.string().optional(),
@@ -711,24 +836,75 @@ export function buildServer(db) {
                 .min(1),
             confirm_token: z.string().optional(),
         },
-    }, async (rawInput) => {
-        const r = injector(rawInput);
-        if ("error" in r)
-            return errorContent(r.error);
-        const result = await task.splitDecompose(r);
-        // DecomposeErrorResult → isError content（不 throw，避 hermes 熔断器）
-        if ("ok" in result && result.ok === false) {
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: JSON.stringify(result),
-                    },
-                ],
-                isError: true,
-            };
-        }
-        return asContent(result);
+        needsUserIdInjection: true,
+        handler: async (rawInput) => {
+            const r = injector(rawInput);
+            if ("error" in r)
+                return errorContent(r.error);
+            const result = await task.splitDecompose(r);
+            // DecomposeErrorResult → isError content（不 throw，避 hermes 熔断器）
+            if ("ok" in result && result.ok === false) {
+                return {
+                    content: [
+                        {
+                            type: "text",
+                            text: JSON.stringify(result),
+                        },
+                    ],
+                    isError: true,
+                };
+            }
+            return asContent(result);
+        },
     });
+    return tools;
+}
+/**
+ * Build the libero MCP server on a given DB connection.
+ * Tools throw Error on business violations; handlers let them propagate —
+ * the SDK turns thrown errors into MCP tool errors (isError) preserving the message.
+ */
+export function buildServer(db) {
+    // MV-COACH-3 Slice 2: resolve default user_id once at server build
+    const defaultUser = resolveDefaultUserId({ db, env: process.env });
+    logResolvedDefaultUserId(defaultUser);
+    const injector = makeUserIdInjector(defaultUser.userId);
+    // ── construct repos via MC-0a factory (default sqlite; postgres reserved) ──
+    const repos = createRepos(db);
+    // ── inject tool factories ──
+    const categories = createCategoryTools(repos.categoryRepo);
+    const tb = createTimeBlockTools(repos.timeblockRepo, db);
+    const stats = createStatsTools(repos.statsRepo);
+    const matrix = createMatrixTools(repos.statsRepo); // matrix reuses StatsRepo
+    const timeline = createTimelineTools(repos.timelineRepo);
+    const timer = createTimerTools(repos.timerRepo, repos.timeblockRepo, db);
+    const profile = createProfileTools(repos.profileRepo, repos.identityRepo);
+    const profileConfirm = createProfileConfirmTools(db);
+    const reminder = createReminderTools(repos.reminderRepo, undefined, db);
+    const scheduler = createSchedulerTools(repos.timeblockRepo, repos.reminderRepo, repos.categoryRepo);
+    const task = createTaskTools(db);
+    // instructions 必须放在第 2 参 ServerOptions（不是 serverInfo）—— SDK 只从 options 读
+    const server = new McpServer({ name: "libero-mcp", version: "0.2.3" }, { instructions: buildServerInstructions() });
+    // ── MC-0a: build registry once, register in a single traversal ──
+    const ctx = {
+        repos,
+        categories,
+        tb,
+        stats,
+        matrix,
+        timeline,
+        timer,
+        profile,
+        profileConfirm,
+        reminder,
+        scheduler,
+        task,
+        injector,
+        db,
+    };
+    const registry = buildToolRegistry(ctx);
+    for (const tool of registry) {
+        server.registerTool(tool.name, { description: tool.description, inputSchema: tool.inputSchema }, tool.handler);
+    }
     return server;
 }