@fgbg/mdocs 0.8.18 → 0.8.20

package/README.md

@@ -4,7 +4,7 @@
 
 面向个人开发者与小团队：产品内 **智能助手 + 帮写**，外部 **CLI / Skills** 接入 Cursor / Claude；SQLite + 本地文件，**无账户**即可协作。
 
-[文档站点](https://xuhuafeifei.github.io/mdocs-site/) · [GitHub](https://github.com/xuhuafeifei/mdocs) · [npm `@fgbg/mdocs`](https://www.npmjs.com/package/@fgbg/mdocs) · 当前版本 **0.8.18**
+[文档站点](https://xuhuafeifei.github.io/mdocs-site/) · [GitHub](https://github.com/xuhuafeifei/mdocs) · [npm `@fgbg/mdocs`](https://www.npmjs.com/package/@fgbg/mdocs) · 当前版本 **0.8.20**
 
 <p align="center">
   <img src="image/site主页.png" alt="mdocs 文档站点首页" width="860" />
@@ -104,6 +104,12 @@ pnpm typecheck
 pnpm mdocs visitor list    # 管理 CLI（开发用 tsx 入口）
 ```
 
+全局安装后原地升级（淘宝 npmmirror，保留 `node_modules`，依赖走 `--prefer-offline`）：
+
+```bash
+mdocs update
+```
+
 仓库布局：
 
 ```

package/agent-skills/changelog/SKILL.md

@@ -1,13 +1,25 @@
 ---
 id: changelog
 name: "更新日志"
-description: "- **首屏加速**：编辑器 / 设置 / 助手 / 帮写按需懒加载；Vite 拆分重型 vendor chunk，入口 JS 从约 6MB 降到约 134KB - **更快看到侧栏树**：启动时延后全文索引重建（默认约 15s，可用 `MDOCS_INDEX_INITIAL_DELAY_MS` 调整），减轻 HTML TTFB 被 CPU 拖慢 - **加载壳**：`index.html` 增加"
+description: "- **私人 Agent Skills**：设置 → AI 可 CRUD 私人提示词宏（名称对本账号唯一，仅英文数字下划线）；智能助手 / 帮写可按名称引用，落盘只存引用，请求时再展开进上下文 - **助手可管理 Skill**：`list_user_skills` / `create_user_skill` / `update_user_skill` / `delete_user_skill`；"
 keywords: []
 source: changelog.md
 ---
 
 # 更新日志
 
+## v0.8.20
+
+- **私人 Agent Skills**：设置 → AI 可 CRUD 私人提示词宏（名称对本账号唯一，仅英文数字下划线）；智能助手 / 帮写可按名称引用，落盘只存引用，请求时再展开进上下文
+- **助手可管理 Skill**：`list_user_skills` / `create_user_skill` / `update_user_skill` / `delete_user_skill`；新建与修改弹出带倒计时的表单卡
+- **`mdocs update`**：全局安装后从淘宝 npmmirror 原地升级，保留已有 `node_modules`，依赖走 `--prefer-offline`（已缓存的不再重复下载）
+
+## v0.8.19
+
+- **Meta2d 按需加载**：文档没有流程图时不下载 `@meta2d`；有图 / 插入图 / 打开编辑时再加载
+- **流程图属性「Text」输入**：防抖写回画布，不再每敲一字全量重绘（依赖 `@fgbg/lobe-editor@1.0.0-fork.19`）
+- **构建**：Vite 将 `@meta2d` / `canvas2svg` 单独拆成 `meta2d` chunk
+
 ## v0.8.18
 
 - **首屏加速**：编辑器 / 设置 / 助手 / 帮写按需懒加载；Vite 拆分重型 vendor chunk，入口 JS 从约 6MB 降到约 134KB

package/agent-skills/getting-started-installation/SKILL.md

@@ -188,13 +188,23 @@ npm install typebox@1.1.38 --no-audit --no-fund
 
 ## 升级
 
-通过 npm 安装的版本，直接重新安装即可升级：
+### 推荐：`mdocs update`（原地升级）
+
+已全局安装时，直接：
+
+```bash
+mdocs update
+```
+
+该命令写死从淘宝镜像 [`https://registry.npmmirror.com`](https://registry.npmmirror.com) 拉取最新 `@fgbg/mdocs`，**保留现有 `node_modules`**，再用 `npm install --prefer-offline` 只补差量依赖（本地缓存里已有的包不会再下一遍）。升级后重启服务即可。
+
+### 备选：重新全局安装
 
 ```bash
 npm install -g @fgbg/mdocs@latest --registry=https://registry.npmjs.org/
 ```
 
-小服务器升级时建议仍按上面「清半残目录 + 限制并发」步骤执行，升级后重启服务即可。
+小服务器若遇半残目录或 OOM，仍按上面「清半残目录 + 限制并发」步骤执行。
 
 ## 下一步
 

package/agent-skills/index.json

@@ -2,7 +2,7 @@
   {
     "id": "changelog",
     "name": "更新日志",
-    "description": "- **首屏加速**：编辑器 / 设置 / 助手 / 帮写按需懒加载；Vite 拆分重型 vendor chunk，入口 JS 从约 6MB 降到约 134KB - **更快看到侧栏树**：启动时延后全文索引重建（默认约 15s，可用 `MDOCS_INDEX_INITIAL_DELAY_MS` 调整），减轻 HTML TTFB 被 CPU 拖慢 - **加载壳**：`index.html` 增加",
+    "description": "- **私人 Agent Skills**：设置 → AI 可 CRUD 私人提示词宏（名称对本账号唯一，仅英文数字下划线）；智能助手 / 帮写可按名称引用，落盘只存引用，请求时再展开进上下文 - **助手可管理 Skill**：`list_user_skills` / `create_user_skill` / `update_user_skill` / `delete_user_skill`；",
     "keywords": [],
     "source": "changelog.md"
   },

package/agent-skills/usage-onboarding-ai/SKILL.md

@@ -128,6 +128,17 @@ mdocs 内置 **两种 AI 能力模式**，共用设置页里的 DeepSeek 配置
 
 每人一份配置，仅本人可用；Key 在服务端按访客隔离存储，不会出现在别的访客界面上。配置页可查看配置名称、模型、脱敏后的 Key 与配置 ID；需要改时可点 **编辑**。
 
+### 私人 Agent Skills
+
+同一页下方可管理 **Agent Skills**（私人提示词宏）：
+
+- 名称对本账号唯一，仅英文、数字、下划线
+- 简介可选；正文为 Agent 应遵守的步骤与约束
+- 在智能助手 / 帮写输入区点 **Skill** 多选引用；本轮发送成功后选中标签会清空
+- 也可让助手用工具新建 / 修改（表单卡 + 倒计时）、罗列或按名删除
+
+落盘与会话历史只保存 skill **名称引用**，不会把正文全文写进聊天记录；请求时再按名称展开进模型上下文。
+
 ## 怎么问（智能助手）
 
 可以直接问，例如：

package/agent-skills/usage-settings/SKILL.md

@@ -76,11 +76,25 @@ Token / Cookie 丢失时的自助找回；引入登录密码后已边缘化。
 | 我的收藏 | [收藏功能](./bookmarks.md) |
 | 我的文章 | [我的文章](./my-documents.md) |
 | 域管理 / 域成员模板 | [受限域成员与名单模板](./domain-members.md) |
-| AI | [智能助手（AI）](./onboarding-ai.md) |
+| AI | [智能助手（AI）](./onboarding-ai.md)（含 DeepSeek 配置与私人 Agent Skills） |
 | 保存与发布 | [草稿与同步](./drafts.md) |
 
 ---
 
+## AI 设置里的 Agent Skills
+
+在 **设置 → AI**，DeepSeek 配置下方有 **Agent Skills**：
+
+- 新建 / 编辑 / 删除**私人**提示词宏（仅本人可见）
+- **名称**对本账号唯一，仅允许英文、数字、下划线（如 `weekly_report`）
+- 在智能助手或帮写输入区点 **Skill**，按名称勾选后随本轮消息引用
+
+也可在对话里让助手调用管理工具（列出、新建、修改、删除）；新建与修改会弹出带倒计时的表单卡。
+
+详情见 [智能助手（AI）](./onboarding-ai.md#私人-agent-skills)。
+
+---
+
 ## 常见问题
 
 ### 设置会保存在哪里？

package/bin/mdocs.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
 // mdocs CLI entry — starts the server by default.
-// Subcommands: mdocs visitor list, mdocs visitor migrate
+// Subcommands: mdocs update | mdocs visitor list | mdocs visitor migrate
 
 import("../dist/server/cli/main.js");

package/dist/server/agent/Agent/context-usage.js

@@ -1,8 +1,7 @@
 import { getVisitorAgentConfig, DEFAULT_AGENT_CONTEXT_WINDOW } from "../Config/config.js";
 import { getSkillLoader } from "../Skill/skill-loader.js";
 import { buildSystemPrompt } from "./system-prompt.js";
-import { createSkillTools } from "./tools.js";
-import { createAccountTools } from "./tools-account.js";
+import { createToolsForMode } from "./tools-registry.js";
 import { AgentSessionManager } from "./session-manager.js";
 /** 粗估 token：CJK 约 1 字 1 token，其余约 4 字符 1 token */
 export function estimateTokens(text) {
@@ -25,9 +24,11 @@ export function estimateTokens(text) {
 }
 function estimateToolsTokens(visitorId) {
     const skills = getSkillLoader();
-    const tools = skills.isReady()
-        ? [...createSkillTools(skills), ...createAccountTools(visitorId)]
-        : createAccountTools(visitorId);
+    const tools = createToolsForMode("normal", {
+        visitorId,
+        onEvent: () => { },
+        skills: skills.isReady() ? skills : null,
+    });
     let total = 0;
     for (const t of tools) {
         total += estimateTokens(t.name);

package/dist/server/agent/Agent/context-usage.js.map

@@ -1 +1 @@
-{"version":3,"file":"context-usage.js","sourceRoot":"","sources":["../../../../src/server/agent/Agent/context-usage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"context-usage.js","sourceRoot":"","sources":["../../../../src/server/agent/Agent/context-usage.ts"],"names":[],"mappings":"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"}

package/dist/server/agent/Agent/hydrate-messages.js

@@ -0,0 +1,137 @@
+/**
+ * 用户 skill 用时展开：历史 / 本轮 → Pi messages。
+ * - 合成 load_user_skill toolCall + toolResult（仿 Claude）
+ * - 单次请求内同 skillId 全文只展开一次；越新越先标定展开点
+ * - 用户原文不在此追加（本轮走 prompt）；历史 user 原文照常写入
+ */
+import { randomUUID } from "node:crypto";
+import { skillRefsOfMessage } from "./session-manager.js";
+import { formatSkillExpandBlock, resolveSkillExpandBlocks, } from "./user-skills.js";
+export const LOAD_USER_SKILL_TOOL = "load_user_skill";
+const EMPTY_USAGE = {
+    input: 0,
+    output: 0,
+    cacheRead: 0,
+    cacheWrite: 0,
+    totalTokens: 0,
+    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
+};
+/** 从新到旧：每个 skill 引用（name，或旧 id）→ 最新出现的 user 轮下标 */
+export function markSkillExpandPoints(history) {
+    const expandAt = new Map();
+    for (let i = history.length - 1; i >= 0; i--) {
+        const m = history[i];
+        if (m?.role !== "user")
+            continue;
+        const refs = skillRefsOfMessage(m);
+        if (!refs.length)
+            continue;
+        for (const ref of refs) {
+            if (!expandAt.has(ref))
+                expandAt.set(ref, i);
+        }
+    }
+    return expandAt;
+}
+function buildSyntheticSkillPair(model, block, timestamp) {
+    const toolCallId = `uskill-${randomUUID()}`;
+    const assistant = {
+        role: "assistant",
+        content: [
+            {
+                type: "toolCall",
+                id: toolCallId,
+                name: LOAD_USER_SKILL_TOOL,
+                arguments: { id: block.id, name: block.name },
+            },
+        ],
+        api: model.api,
+        provider: model.provider,
+        model: model.id,
+        usage: EMPTY_USAGE,
+        stopReason: "toolUse",
+        timestamp,
+    };
+    const result = {
+        role: "toolResult",
+        toolCallId,
+        toolName: LOAD_USER_SKILL_TOOL,
+        content: [
+            {
+                type: "text",
+                text: `[user skill loaded]\n${block.content}`,
+            },
+        ],
+        isError: false,
+        timestamp,
+    };
+    return [assistant, result];
+}
+/**
+ * 仅产出本轮应预置的假 tool 对（不含用户原文）。
+ * `alreadyExpanded`：历史 hydrate 已展开过的 id，本轮跳过。
+ */
+export function expandCurrentTurnSkillPairs(visitorId, skillNames, model, alreadyExpanded, timestamp = Date.now()) {
+    const refs = (skillNames ?? []).filter((id) => id && !alreadyExpanded.has(id));
+    if (refs.length === 0)
+        return [];
+    const blocks = resolveSkillExpandBlocks(visitorId, refs);
+    const out = [];
+    for (const b of blocks) {
+        const [a, r] = buildSyntheticSkillPair(model, b, timestamp);
+        out.push(a, r);
+    }
+    return out;
+}
+/**
+ * 历史 → Pi messages。
+ * `expandAt` 若传入（含本轮下标），按该表标定；否则仅就 history 从新到旧标定。
+ */
+export function hydrateSessionMessagesToPi(visitorId, history, model, expandAt = markSkillExpandPoints(history)) {
+    const ts = Date.now();
+    const expandedSkillIds = new Set();
+    const out = [];
+    for (let i = 0; i < history.length; i++) {
+        const m = history[i];
+        if (m.role === "assistant") {
+            out.push({
+                role: "assistant",
+                content: [{ type: "text", text: m.content }],
+                api: model.api,
+                provider: model.provider,
+                model: model.id,
+                usage: EMPTY_USAGE,
+                stopReason: "stop",
+                timestamp: ts,
+            });
+            continue;
+        }
+        const refsThisTurn = skillRefsOfMessage(m).filter((ref) => expandAt.get(ref) === i && !expandedSkillIds.has(ref));
+        if (refsThisTurn.length > 0) {
+            const blocks = resolveSkillExpandBlocks(visitorId, refsThisTurn);
+            for (const b of blocks) {
+                const [a, r] = buildSyntheticSkillPair(model, b, ts);
+                out.push(a, r);
+                expandedSkillIds.add(b.name);
+                expandedSkillIds.add(b.id);
+                for (const ref of refsThisTurn) {
+                    if (ref === b.name || ref === b.id)
+                        expandedSkillIds.add(ref);
+                }
+            }
+        }
+        out.push({ role: "user", content: m.content, timestamp: ts });
+    }
+    return { messages: out, expandedSkillIds };
+}
+/** @deprecated 测试兼容：无 skill 时退化为单条 user */
+export function expandUserMessageForPi(_visitorId, content, skillNames, timestamp) {
+    if (!skillNames?.length) {
+        return [{ role: "user", content, timestamp }];
+    }
+    // 有 skill 时旧 API 不再内联正文；调用方应改用 expandCurrentTurnSkillPairs
+    return [{ role: "user", content, timestamp }];
+}
+// re-export for tests
+export { formatSkillExpandBlock };
+//# sourceMappingURL=hydrate-messages.js.map

package/dist/server/agent/Agent/hydrate-messages.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hydrate-messages.js","sourceRoot":"","sources":["../../../../src/server/agent/Agent/hydrate-messages.ts"],"names":[],"mappings":"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"}

package/dist/server/agent/Agent/run-pi-agent.js

@@ -0,0 +1,109 @@
+import { createToolUiEffectsHandler } from "./tool-ui-effects.js";
+import { cancelVisitorChoices } from "./choice-pending.js";
+import { cancelVisitorSkillForms } from "./skill-form-pending.js";
+export async function runPiAgent(params) {
+    const { agent, message, skillNames, visitorId, sessionId, sessionManager, onEvent, signal, } = params;
+    const track = { emittedError: false, lastUsageInput: 0 };
+    const unsub = agent.subscribe(bindAgentEvents({ sessionId, sessionManager, skillNames, onEvent, track }));
+    const onAbort = () => {
+        cancelVisitorChoices(visitorId);
+        cancelVisitorSkillForms(visitorId);
+        agent.abort();
+    };
+    signal?.addEventListener("abort", onAbort);
+    try {
+        await agent.prompt(message);
+        const leftover = agent.state.errorMessage;
+        // prompt 在模型鉴权失败时仍可能 resolve，再兜底一次
+        if (leftover && !track.emittedError) {
+            onEvent({ type: "error", message: leftover });
+            track.emittedError = true;
+        }
+        return track;
+    }
+    catch (err) {
+        if (signal?.aborted)
+            return track;
+        const msg = err instanceof Error ? err.message : String(err);
+        onEvent({ type: "error", message: msg });
+        throw err;
+    }
+    finally {
+        signal?.removeEventListener("abort", onAbort);
+        cancelVisitorChoices(visitorId);
+        cancelVisitorSkillForms(visitorId);
+        unsub();
+    }
+}
+function extractUserContent(userMsg) {
+    const c = userMsg.content;
+    if (typeof c === "string")
+        return c;
+    if (Array.isArray(c)) {
+        return c
+            .filter((x) => x?.type === "text")
+            .map((x) => x.text)
+            .join("");
+    }
+    return "";
+}
+function extractAssistantVisibleText(assistantMsg) {
+    const content = assistantMsg.content;
+    if (!Array.isArray(content))
+        return "";
+    return content
+        .filter((x) => x?.type === "text")
+        .map((x) => x.text)
+        .join("");
+}
+/** SSE + session 落盘；tool→SSE 见 tool-ui-effects */
+function bindAgentEvents(opts) {
+    const { sessionId, sessionManager, skillNames, onEvent, track } = opts;
+    const onToolUi = createToolUiEffectsHandler(onEvent);
+    let appendedUser = false;
+    let appendedAssistant = false;
+    return async (event) => {
+        if (event.type === "message_update" &&
+            event.assistantMessageEvent.type === "text_delta") {
+            onEvent({ type: "text_delta", text: event.assistantMessageEvent.delta });
+            return;
+        }
+        if (event.type === "message_end") {
+            if (event.message.role === "user") {
+                if (!appendedUser) {
+                    appendedUser = true;
+                    const content = extractUserContent(event.message);
+                    if (content)
+                        await sessionManager.appendUser(sessionId, content, skillNames);
+                }
+                return;
+            }
+            if (event.message.role === "assistant") {
+                const msg = event.message;
+                if (typeof msg.usage?.input === "number" && msg.usage.input > 0) {
+                    track.lastUsageInput = Math.max(track.lastUsageInput, msg.usage.input);
+                }
+                if ((msg.stopReason === "error" || msg.stopReason === "aborted") &&
+                    msg.errorMessage) {
+                    track.emittedError = true;
+                    onEvent({ type: "error", message: msg.errorMessage });
+                    return;
+                }
+                // toolUse = 准备调工具，不是最终可见回答
+                if (!appendedAssistant &&
+                    (msg.stopReason === "stop" || msg.stopReason === "length")) {
+                    appendedAssistant = true;
+                    const visibleText = extractAssistantVisibleText(event.message);
+                    if (visibleText) {
+                        await sessionManager.appendAssistant(sessionId, visibleText);
+                    }
+                }
+                return;
+            }
+        }
+        if (event.type === "tool_execution_end") {
+            onToolUi(event);
+        }
+    };
+}
+//# sourceMappingURL=run-pi-agent.js.map

package/dist/server/agent/Agent/run-pi-agent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-pi-agent.js","sourceRoot":"","sources":["../../../../src/server/agent/Agent/run-pi-agent.ts"],"names":[],"mappings":"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"}