@fgbg/mdocs 0.8.19 → 0.8.21

package/dist/server/agent/Agent/skill-form-pending.js

@@ -0,0 +1,77 @@
+import { randomUUID } from "node:crypto";
+import { DEFAULT_CHOICE_TIMEOUT_MS } from "./choice-pending.js";
+const pending = new Map();
+export { DEFAULT_CHOICE_TIMEOUT_MS as DEFAULT_SKILL_FORM_TIMEOUT_MS };
+export function waitForSkillForm(params) {
+    const requestId = randomUUID();
+    const timeoutMs = Math.min(Math.max(params.timeoutMs ?? DEFAULT_CHOICE_TIMEOUT_MS, 3_000), 300_000);
+    const promise = new Promise((resolve) => {
+        const finish = (result) => {
+            const cur = pending.get(requestId);
+            if (!cur)
+                return;
+            clearTimeout(cur.timer);
+            pending.delete(requestId);
+            resolve(result);
+        };
+        const timer = setTimeout(() => finish({ status: "timeout" }), timeoutMs);
+        pending.set(requestId, {
+            visitorId: params.visitorId,
+            resolve: finish,
+            timer,
+        });
+        const onAbort = () => finish({ status: "cancelled" });
+        if (params.signal) {
+            if (params.signal.aborted) {
+                onAbort();
+                return;
+            }
+            params.signal.addEventListener("abort", onAbort, { once: true });
+        }
+    });
+    return { requestId, promise };
+}
+export function resolveSkillForm(visitorId, requestId, fields) {
+    const entry = pending.get(requestId);
+    if (!entry)
+        throw new Error("skill_form_not_found");
+    if (entry.visitorId !== visitorId)
+        throw new Error("skill_form_forbidden");
+    const result = {
+        status: "submitted",
+        name: fields.name,
+        description: fields.description,
+        body: fields.body,
+    };
+    entry.resolve(result);
+    return result;
+}
+export function expireSkillForm(visitorId, requestId) {
+    const entry = pending.get(requestId);
+    if (!entry)
+        throw new Error("skill_form_not_found");
+    if (entry.visitorId !== visitorId)
+        throw new Error("skill_form_forbidden");
+    entry.resolve({ status: "timeout" });
+}
+/** 用户主动取消表单（与超时区分） */
+export function cancelSkillForm(visitorId, requestId) {
+    const entry = pending.get(requestId);
+    if (!entry)
+        throw new Error("skill_form_not_found");
+    if (entry.visitorId !== visitorId)
+        throw new Error("skill_form_forbidden");
+    entry.resolve({ status: "cancelled" });
+}
+export function cancelVisitorSkillForms(visitorId) {
+    for (const [id, entry] of pending) {
+        if (entry.visitorId === visitorId) {
+            entry.resolve({ status: "cancelled" });
+            if (pending.has(id)) {
+                clearTimeout(entry.timer);
+                pending.delete(id);
+            }
+        }
+    }
+}
+//# sourceMappingURL=skill-form-pending.js.map

package/dist/server/agent/Agent/skill-form-pending.js.map

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

package/dist/server/agent/Agent/stream-events.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=stream-events.js.map

package/dist/server/agent/Agent/stream-events.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream-events.js","sourceRoot":"","sources":["../../../../src/server/agent/Agent/stream-events.ts"],"names":[],"mappings":""}

package/dist/server/agent/Agent/system-prompt.js

@@ -6,8 +6,10 @@ const NORMAL_RULES = `你是 mdocs 智能助手：上手向导 + 账号助理。
 3. 允许调用账号工具执行：列域、建域、搜文、列树、列我的文档、建空文档、建文件夹；以及列访客、列/添加域成员、读取文档内容、移动文档、覆写文档正文。执行后基于工具 JSON 结果如实反馈，不得编造工具未返回的字段。用户问某篇具体内容时用「读取文档内容」（documentId）；搜文/列树只给摘要或元数据。用户问「有哪些人可以邀请」时调用「列出活跃访客」；问某域现有成员时调用「列出域成员」；要把某人加进 restricted 域时先列访客再「添加域成员」。移动文档用「移动文档」（parentId 为文件夹 id，不传则到域根）；仅创建者可移动。
 4. 若需要用户在若干方案中做选择（例如选 A/B），必须调用「请用户选择」(ask_user_choice)。但用户要改某篇已有文档时：禁止用 ask_user_choice 自拟「无法覆写 / 新建一篇 / 我自己处理」等绕道选项；必须直接调用 overwrite_document，让工具出卡。工具返回后再如实说明结果。
 5. 用户要求写作或改文档正文：调用 overwrite_document(documentId, 完整 markdown)；按工具返回说明已覆写、已打开帮写、或用户取消/超时。可读取用户有权查看的文档来回答问题。
-6. 先给出工具结果与结论，再给简短下一步建议；回答简洁、面向操作步骤。
-7. 每轮回答正文结束后，另起一段追加一句引导（只追加一次，不要反复追问）：先问「您还有什么想了解的吗？」，再给 1～2 个与本轮话题相关、可继续深挖的具体问题示例。示例要短、可直接当作下一句提问；与当前无关的主题不要乱推。`;
+6. 上下文中若出现工具 load_user_skill 的结果，或带 <skill> 标签的内容，表示宿主**已经为你加载**的私人 Skill 指令，必须遵照执行；不得声称「未激活 / 只是用户粘贴 / 技能未生效」。
+7. 管理私人 Skill：罗列用 list_user_skills；新建用 create_user_skill（出表单卡）；修改须先确定 name 再 update_user_skill（出表单卡）；删除用 delete_user_skill(name)。名称对本访客唯一，且仅允许英文、数字、下划线。交互与索引一律用 name，不要用内部 id。
+8. 先给出工具结果与结论，再给简短下一步建议；回答简洁、面向操作步骤。
+9. 每轮回答正文结束后，另起一段追加一句引导（只追加一次，不要反复追问）：先问「您还有什么想了解的吗？」，再给 1～2 个与本轮话题相关、可继续深挖的具体问题示例。示例要短、可直接当作下一句提问；与当前无关的主题不要乱推。`;
 const CODING_RULES = `你是 mdocs「帮写」助手（coding 模式）：在纯 Markdown 工作台协助用户起草/改稿。
 
 规则：
@@ -16,8 +18,10 @@ const CODING_RULES = `你是 mdocs「帮写」助手（coding 模式）：在纯
 3. 每次 set_markdown_document 应给出当前完整正文（不要只给局部补丁）。可另用搜文、列树、读取文档内容收集参考材料。
 4. 允许使用账号结构工具辅助；不要发布、不要删除。
 5. 特殊块（mermaid / markmap / meta2d）用 Markdown 围栏源码书写即可。
-6. 先简短说明你要改什么，再调用工具；工具返回后如实确认已更新提案。
-7. 回答简洁；不要编造工具未返回的字段。`;
+6. 上下文中若出现工具 load_user_skill 的结果，或带 <skill> 标签的内容，表示宿主**已经为你加载**的私人 Skill 指令，必须遵照执行；不得声称「未激活 / 只是用户粘贴 / 技能未生效」。
+7. 管理私人 Skill：list_user_skills / create_user_skill / update_user_skill / delete_user_skill；create/update 会出表单卡。名称唯一且仅英文数字下划线；用 name 交互。
+8. 先简短说明你要改什么，再调用工具；工具返回后如实确认已更新提案。
+9. 回答简洁；不要编造工具未返回的字段。`;
 export function buildSystemPrompt(mode = "normal") {
     return mode === "coding" ? CODING_RULES : NORMAL_RULES;
 }

package/dist/server/agent/Agent/system-prompt.js.map

@@ -1 +1 @@
-{"version":3,"file":"system-prompt.js","sourceRoot":"","sources":["../../../../src/server/agent/Agent/system-prompt.ts"],"names":[],"mappings":"AAEA,MAAM,YAAY,GAAG;;;;;;;;;iHAS4F,CAAC;AAElH,MAAM,YAAY,GAAG;;;;;;;;;sBASC,CAAC;AAEvB,MAAM,UAAU,iBAAiB,CAAC,OAAkB,QAAQ;IAC1D,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC;AACzD,CAAC"}
+{"version":3,"file":"system-prompt.js","sourceRoot":"","sources":["../../../../src/server/agent/Agent/system-prompt.ts"],"names":[],"mappings":"AAEA,MAAM,YAAY,GAAG;;;;;;;;;;;iHAW4F,CAAC;AAElH,MAAM,YAAY,GAAG;;;;;;;;;;;sBAWC,CAAC;AAEvB,MAAM,UAAU,iBAAiB,CAAC,OAAkB,QAAQ;IAC1D,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC;AACzD,CAAC"}

package/dist/server/agent/Agent/tool-deps.js

@@ -0,0 +1,7 @@
+export function asToolResult(payload) {
+    return {
+        content: [{ type: "text", text: JSON.stringify(payload, null, 2) }],
+        details: payload,
+    };
+}
+//# sourceMappingURL=tool-deps.js.map

package/dist/server/agent/Agent/tool-deps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-deps.js","sourceRoot":"","sources":["../../../../src/server/agent/Agent/tool-deps.ts"],"names":[],"mappings":"AAsBA,MAAM,UAAU,YAAY,CAAC,OAAgB;IAC3C,OAAO;QACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;QAC5E,OAAO,EAAE,OAAO;KACjB,CAAC;AACJ,CAAC"}

package/dist/server/agent/Agent/tool-ui-effects.js

@@ -0,0 +1,170 @@
+const TREE_MUTATING_TOOLS = new Set([
+    "create_document",
+    "create_folder",
+    "move_document",
+]);
+/**
+ * 一次 chat 运行内复用：手册 sources 去重等状态挂在闭包。
+ */
+export function createToolUiEffectsHandler(onEvent) {
+    const sourcesById = new Map();
+    return (event) => {
+        if (event.isError)
+            return;
+        if (event.toolName === "mdocs_manual_content") {
+            const source = event.result?.details?.source;
+            if (source?.url && !sourcesById.has(source.id)) {
+                sourcesById.set(source.id, source);
+                onEvent({ type: "sources", items: [...sourcesById.values()] });
+            }
+            return;
+        }
+        if (TREE_MUTATING_TOOLS.has(event.toolName)) {
+            onEvent({ type: "tree_changed", reason: event.toolName });
+        }
+        const details = event.result
+            ?.details;
+        if (event.toolName === "search_documents") {
+            const results = details?.results ?? [];
+            const rows = results
+                .map((r) => ({
+                documentId: String(r.documentId ?? "").trim(),
+                title: String(r.displayName ?? "").trim() || "未命名文档",
+                summary: String(r.snippet ?? "").trim(),
+            }))
+                .filter((r) => r.documentId);
+            onEvent({
+                type: "document_table",
+                title: `搜索结果（${rows.length}）`,
+                rows,
+            });
+            return;
+        }
+        if (event.toolName === "list_my_documents") {
+            const documents = details?.documents ?? [];
+            const rows = documents
+                .map((d) => ({
+                documentId: String(d.documentId ?? "").trim(),
+                title: String(d.displayName ?? "").trim() || "未命名文档",
+                summary: String(d.relativePath ?? "").trim(),
+            }))
+                .filter((r) => r.documentId);
+            onEvent({
+                type: "document_table",
+                title: `我的文档（${rows.length}）`,
+                rows,
+            });
+            return;
+        }
+        if (event.toolName === "list_tree") {
+            const items = details?.items ?? [];
+            const rows = items
+                .map((it) => {
+                const documentId = String(it.documentId ?? "").trim();
+                const title = String(it.displayName ?? "").trim() ||
+                    String(it.name ?? "").trim() ||
+                    "未命名";
+                const kind = it.type === "folder" ? "文件夹" : "文档";
+                const path = String(it.path ?? "").trim();
+                return {
+                    documentId,
+                    title: it.type === "folder" ? `[目录] ${title}` : title,
+                    summary: path ? `${kind} · ${path}` : kind,
+                };
+            })
+                .filter((r) => r.documentId);
+            onEvent({
+                type: "document_table",
+                title: `域树（${rows.length}${details?.truncated ? "+" : ""}）`,
+                rows,
+            });
+            return;
+        }
+        if (event.toolName === "get_document") {
+            const documentId = String(details?.documentId ?? "").trim();
+            if (!documentId)
+                return;
+            const content = String(details?.content ?? "");
+            const preview = content.length > 280 ? `${content.slice(0, 280)}…` : content;
+            onEvent({
+                type: "document_card",
+                documentId,
+                title: String(details?.displayName ?? "").trim() || "未命名文档",
+                path: String(details?.relativePath ?? "").trim(),
+                preview,
+            });
+            return;
+        }
+        if (event.toolName === "create_document") {
+            const name = String(details?.displayName ?? "").trim() || "未命名文档";
+            onEvent({
+                type: "tool_notice",
+                toolName: event.toolName,
+                text: `已创建空文档「${name}」`,
+            });
+            return;
+        }
+        if (event.toolName === "create_folder") {
+            const path = String(details?.path ?? "").trim();
+            onEvent({
+                type: "tool_notice",
+                toolName: event.toolName,
+                text: path ? `已创建文件夹「${path}」` : "已创建文件夹",
+            });
+            return;
+        }
+        if (event.toolName === "move_document") {
+            const name = String(details?.displayName ?? "").trim() || "文档";
+            const path = String(details?.relativePath ?? "").trim();
+            onEvent({
+                type: "tool_notice",
+                toolName: event.toolName,
+                text: path ? `已移动「${name}」→ ${path}` : `已移动「${name}」`,
+            });
+            return;
+        }
+        if (event.toolName === "overwrite_document") {
+            const status = String(details?.status ?? "");
+            const name = String(details?.displayName ?? "").trim() || "文档";
+            if (status === "overwritten") {
+                onEvent({
+                    type: "tool_notice",
+                    toolName: event.toolName,
+                    text: `已覆写「${name}」`,
+                });
+                const documentId = String(details?.documentId ?? "");
+                const headCommitId = String(details?.headCommitId ?? "");
+                if (documentId && headCommitId) {
+                    onEvent({ type: "document_overwritten", documentId, headCommitId });
+                }
+                onEvent({ type: "tree_changed", reason: "overwrite_document" });
+            }
+            else if (status === "redirected_to_coding") {
+                onEvent({
+                    type: "tool_notice",
+                    toolName: event.toolName,
+                    text: `「${name}」已打开帮写`,
+                });
+            }
+            return;
+        }
+        if (event.toolName === "get_working_document") {
+            onEvent({
+                type: "tool_notice",
+                toolName: event.toolName,
+                text: "读取帮写工作稿",
+            });
+            return;
+        }
+        if (event.toolName === "set_markdown_document") {
+            const markdown = String(details?.markdown ?? "");
+            onEvent({ type: "markdown_set", markdown });
+            onEvent({
+                type: "tool_notice",
+                toolName: event.toolName,
+                text: "设置帮写正文",
+            });
+        }
+    };
+}
+//# sourceMappingURL=tool-ui-effects.js.map

package/dist/server/agent/Agent/tool-ui-effects.js.map

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

package/dist/server/agent/Agent/tools-choice.js

@@ -1,11 +1,6 @@
 import { Type } from "@earendil-works/pi-ai";
 import { DEFAULT_CHOICE_TIMEOUT_MS, waitForUserChoice, } from "./choice-pending.js";
-function asToolResult(payload) {
-    return {
-        content: [{ type: "text", text: JSON.stringify(payload, null, 2) }],
-        details: payload,
-    };
-}
+import { asToolResult } from "./tool-deps.js";
 function normalizeOptions(raw) {
     if (!Array.isArray(raw))
         return [];
@@ -20,51 +15,50 @@ function normalizeOptions(raw) {
     return out;
 }
 /** 向用户展示选项并阻塞等待内容字符串选择（可自由输入） */
-export function createChoiceTools(visitorId, hooks) {
-    return [
-        {
-            name: "ask_user_choice",
-            label: "请用户选择",
-            description: "向用户展示一张选择卡片：options 为内容字符串列表（你自填、不固定）。调用后会阻塞直到用户点选某项、自行输入一段文字、超时或取消。需要用户做二选一/多选一时必须用本工具，禁止只在口头上问。返回 JSON 含 status 与 choice（选中的内容字符串）。",
-            parameters: Type.Object({
-                title: Type.Optional(Type.String({ description: "卡片标题/问题" })),
-                options: Type.Array(Type.String({ description: "一个可点选项的文案" }), {
-                    description: "至少 2 个选项文案",
-                    minItems: 2,
-                }),
-                timeoutMs: Type.Optional(Type.Number({ description: "超时毫秒，默认 120000（2 分钟）" })),
+export function askUserChoiceTool({ visitorId, onEvent, signal, }) {
+    return {
+        name: "ask_user_choice",
+        label: "请用户选择",
+        description: "向用户展示一张选择卡片：options 为内容字符串列表（你自填、不固定）。调用后会阻塞直到用户点选某项、自行输入一段文字、超时或取消。需要用户做二选一/多选一时必须用本工具，禁止只在口头上问。返回 JSON 含 status 与 choice（选中的内容字符串）。",
+        parameters: Type.Object({
+            title: Type.Optional(Type.String({ description: "卡片标题/问题" })),
+            options: Type.Array(Type.String({ description: "一个可点选项的文案" }), {
+                description: "至少 2 个选项文案",
+                minItems: 2,
             }),
-            execute: async (_id, params) => {
-                const title = typeof params.title === "string"
-                    ? params.title.trim()
-                    : "请选择";
-                const options = normalizeOptions(params.options);
-                if (options.length < 2) {
-                    throw new Error("options must contain at least 2 non-empty strings");
-                }
-                const timeoutRaw = params.timeoutMs;
-                const timeoutMs = typeof timeoutRaw === "number" && Number.isFinite(timeoutRaw)
-                    ? timeoutRaw
-                    : DEFAULT_CHOICE_TIMEOUT_MS;
-                const { requestId, promise } = waitForUserChoice({
-                    visitorId,
-                    timeoutMs,
-                    signal: hooks.signal,
-                });
-                const expiresAt = new Date(Date.now() + timeoutMs).toISOString();
-                hooks.onChoiceCard({
-                    requestId,
-                    title: title || "请选择",
-                    options,
-                    expiresAt,
-                });
-                const result = await promise;
-                if (result.status === "timeout") {
-                    hooks.onChoiceExpired?.(requestId);
-                }
-                return asToolResult(result);
-            },
+            timeoutMs: Type.Optional(Type.Number({ description: "超时毫秒，默认 120000（2 分钟）" })),
+        }),
+        execute: async (_id, params) => {
+            const title = typeof params.title === "string"
+                ? params.title.trim()
+                : "请选择";
+            const options = normalizeOptions(params.options);
+            if (options.length < 2) {
+                throw new Error("options must contain at least 2 non-empty strings");
+            }
+            const timeoutRaw = params.timeoutMs;
+            const timeoutMs = typeof timeoutRaw === "number" && Number.isFinite(timeoutRaw)
+                ? timeoutRaw
+                : DEFAULT_CHOICE_TIMEOUT_MS;
+            const { requestId, promise } = waitForUserChoice({
+                visitorId,
+                timeoutMs,
+                signal,
+            });
+            const expiresAt = new Date(Date.now() + timeoutMs).toISOString();
+            onEvent({
+                type: "choice_card",
+                requestId,
+                title: title || "请选择",
+                options,
+                expiresAt,
+            });
+            const result = await promise;
+            if (result.status === "timeout") {
+                onEvent({ type: "choice_expired", requestId });
+            }
+            return asToolResult(result);
         },
-    ];
+    };
 }
 //# sourceMappingURL=tools-choice.js.map

package/dist/server/agent/Agent/tools-choice.js.map

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

package/dist/server/agent/Agent/tools-coding.get-working.test.js

@@ -1,13 +1,15 @@
 import { describe, it, expect } from "vitest";
-import { createCodingWriteTools } from "./tools-coding.js";
+import { getWorkingDocumentTool } from "./tools-coding.js";
 async function runGetWorking(params = {}) {
-    const tool = createCodingWriteTools({
-        documentId: "doc-1",
-        workingMarkdown: "# working\nhello",
-        baseMarkdown: "# base\nold",
-    }).find((t) => t.name === "get_working_document");
-    if (!tool)
-        throw new Error("get_working_document missing");
+    const tool = getWorkingDocumentTool({
+        visitorId: "v1",
+        onEvent: () => { },
+        coding: {
+            documentId: "doc-1",
+            workingMarkdown: "# working\nhello",
+            baseMarkdown: "# base\nold",
+        },
+    });
     return tool.execute("call-1", params, undefined, undefined);
 }
 describe("get_working_document", () => {

package/dist/server/agent/Agent/tools-coding.get-working.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"tools-coding.get-working.test.js","sourceRoot":"","sources":["../../../../src/server/agent/Agent/tools-coding.get-working.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,KAAK,UAAU,aAAa,CAAC,SAAkC,EAAE;IAC/D,MAAM,IAAI,GAAG,sBAAsB,CAAC;QAClC,UAAU,EAAE,OAAO;QACnB,eAAe,EAAE,kBAAkB;QACnC,YAAY,EAAE,aAAa;KAC5B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,sBAAsB,CAAC,CAAC;IAClD,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAC3D,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAe,EAAE,SAAkB,EAAE,SAAkB,CAAC,CAAC;AACzF,CAAC;AAED,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,MAAM,GAAG,MAAM,aAAa,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,MAAM,CAAC,OAKtB,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC5C,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACrD,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACvC,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QACzD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAkC,CAAC;QAC1D,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,WAAW,EAAE,CAAC;QAC9C,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,aAAa,EAAE,CAAC;IAC/C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"tools-coding.get-working.test.js","sourceRoot":"","sources":["../../../../src/server/agent/Agent/tools-coding.get-working.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,KAAK,UAAU,aAAa,CAAC,SAAkC,EAAE;IAC/D,MAAM,IAAI,GAAG,sBAAsB,CAAC;QAClC,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC;QACjB,MAAM,EAAE;YACN,UAAU,EAAE,OAAO;YACnB,eAAe,EAAE,kBAAkB;YACnC,YAAY,EAAE,aAAa;SAC5B;KACF,CAAC,CAAC;IACH,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAe,EAAE,SAAkB,EAAE,SAAkB,CAAC,CAAC;AACzF,CAAC;AAED,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,MAAM,GAAG,MAAM,aAAa,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,MAAM,CAAC,OAKtB,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC5C,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACrD,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACvC,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QACzD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAkC,CAAC;QAC1D,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,WAAW,EAAE,CAAC;QAC9C,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,aAAa,EAAE,CAAC;IAC/C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/server/agent/Agent/tools-coding.js

@@ -1,12 +1,6 @@
 import { Type } from "@earendil-works/pi-ai";
-import { createAccountTools } from "./tools-account.js";
+import { asToolResult, } from "./tool-deps.js";
 const WORKING_DOC_MAX_CHARS = 50_000;
-function asToolResult(payload) {
-    return {
-        content: [{ type: "text", text: JSON.stringify(payload, null, 2) }],
-        details: payload,
-    };
-}
 function clipMarkdown(md) {
     const charCount = md.length;
     if (charCount <= WORKING_DOC_MAX_CHARS) {
@@ -18,58 +12,57 @@ function clipMarkdown(md) {
         charCount,
     };
 }
-/** coding 模式专用：读/写前端 MD buffer，不写磁盘 */
-export function createCodingWriteTools(ctx) {
-    return [
-        {
-            name: "get_working_document",
-            label: "读取帮写工作稿",
-            description: "读取本轮帮写工作台中的文章：进场快照（base）与当前工作稿（working，含已接受的修改）。改稿前应先调用。内容来自本次请求，不是服务器磁盘。",
-            parameters: Type.Object({
-                which: Type.Optional(Type.Union([Type.Literal("working"), Type.Literal("base"), Type.Literal("both")], {
-                    description: "读哪一份；默认 both",
-                })),
-            }),
-            execute: async (_id, params) => {
-                const which = params.which ?? "both";
-                const working = clipMarkdown(ctx.workingMarkdown);
-                const base = clipMarkdown(ctx.baseMarkdown);
-                const payload = {
-                    documentId: ctx.documentId,
-                    source: "request_body",
-                };
-                if (which === "working" || which === "both") {
-                    payload.workingMarkdown = working.text;
-                    payload.workingTruncated = working.truncated;
-                    payload.workingCharCount = working.charCount;
-                }
-                if (which === "base" || which === "both") {
-                    payload.baseMarkdown = base.text;
-                    payload.baseTruncated = base.truncated;
-                    payload.baseCharCount = base.charCount;
-                }
-                return asToolResult(payload);
-            },
-        },
-        {
-            name: "set_markdown_document",
-            label: "设置帮写正文",
-            description: "用完整 Markdown 覆写帮写工作台右侧提案正文。不写入服务器文档；用户按段接受后才会写回。每次调用应给出当前完整 MD。改稿前请先 get_working_document。",
-            parameters: Type.Object({
-                markdown: Type.String({ description: "完整 Markdown 正文" }),
-            }),
-            execute: async (_id, params) => {
-                const markdown = String(params.markdown ?? "");
-                return asToolResult({ markdown, applied: true });
-            },
+function requireCoding(deps) {
+    if (!deps.coding)
+        throw new Error("coding tools require coding ctx");
+    return deps.coding;
+}
+/** coding：读前端 MD buffer，不写磁盘 */
+export function getWorkingDocumentTool(deps) {
+    const ctx = requireCoding(deps);
+    return {
+        name: "get_working_document",
+        label: "读取帮写工作稿",
+        description: "读取本轮帮写工作台中的文章：进场快照（base）与当前工作稿（working，含已接受的修改）。改稿前应先调用。内容来自本次请求，不是服务器磁盘。",
+        parameters: Type.Object({
+            which: Type.Optional(Type.Union([Type.Literal("working"), Type.Literal("base"), Type.Literal("both")], { description: "读哪一份；默认 both" })),
+        }),
+        execute: async (_id, params) => {
+            const which = params.which ?? "both";
+            const working = clipMarkdown(ctx.workingMarkdown);
+            const base = clipMarkdown(ctx.baseMarkdown);
+            const payload = {
+                documentId: ctx.documentId,
+                source: "request_body",
+            };
+            if (which === "working" || which === "both") {
+                payload.workingMarkdown = working.text;
+                payload.workingTruncated = working.truncated;
+                payload.workingCharCount = working.charCount;
+            }
+            if (which === "base" || which === "both") {
+                payload.baseMarkdown = base.text;
+                payload.baseTruncated = base.truncated;
+                payload.baseCharCount = base.charCount;
+            }
+            return asToolResult(payload);
         },
-    ];
+    };
 }
-/** coding：账号结构 tools + 读写 buffer tools（手册 tools 在 run 里另挂；不含服务端覆写） */
-export function createCodingTools(visitorId, ctx, choiceHooks) {
-    return [
-        ...createAccountTools(visitorId, choiceHooks, { withOverwrite: false }),
-        ...createCodingWriteTools(ctx),
-    ];
+/** coding：写前端提案正文，不写磁盘 */
+export function setMarkdownDocumentTool(deps) {
+    requireCoding(deps);
+    return {
+        name: "set_markdown_document",
+        label: "设置帮写正文",
+        description: "用完整 Markdown 覆写帮写工作台右侧提案正文。不写入服务器文档；用户按段接受后才会写回。每次调用应给出当前完整 MD。改稿前请先 get_working_document。",
+        parameters: Type.Object({
+            markdown: Type.String({ description: "完整 Markdown 正文" }),
+        }),
+        execute: async (_id, params) => {
+            const markdown = String(params.markdown ?? "");
+            return asToolResult({ markdown, applied: true });
+        },
+    };
 }
 //# sourceMappingURL=tools-coding.js.map

package/dist/server/agent/Agent/tools-coding.js.map

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