@fgbg/mdocs 0.8.15 → 0.8.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +114 -76
- package/agent-skills/changelog/SKILL.md +23 -1
- package/agent-skills/index/SKILL.md +1 -1
- package/agent-skills/index.json +4 -4
- package/agent-skills/usage-agent-dev-loop/SKILL.md +7 -7
- package/agent-skills/usage-onboarding-ai/SKILL.md +109 -17
- package/agent-skills/usage-settings/SKILL.md +4 -4
- package/dist/server/agent/Agent/almost-empty.js +15 -0
- package/dist/server/agent/Agent/almost-empty.js.map +1 -0
- package/dist/server/agent/Agent/almost-empty.test.js +20 -0
- package/dist/server/agent/Agent/almost-empty.test.js.map +1 -0
- package/dist/server/agent/Agent/choice-pending.js +71 -0
- package/dist/server/agent/Agent/choice-pending.js.map +1 -0
- package/dist/server/agent/Agent/choice-pending.test.js +58 -0
- package/dist/server/agent/Agent/choice-pending.test.js.map +1 -0
- package/dist/server/agent/Agent/run.js +80 -5
- package/dist/server/agent/Agent/run.js.map +1 -1
- package/dist/server/agent/Agent/session-manager.doc-scope.test.js +15 -0
- package/dist/server/agent/Agent/session-manager.doc-scope.test.js.map +1 -0
- package/dist/server/agent/Agent/session-manager.js +181 -37
- package/dist/server/agent/Agent/session-manager.js.map +1 -1
- package/dist/server/agent/Agent/system-prompt.js +19 -9
- package/dist/server/agent/Agent/system-prompt.js.map +1 -1
- package/dist/server/agent/Agent/tools-account.js +16 -3
- package/dist/server/agent/Agent/tools-account.js.map +1 -1
- package/dist/server/agent/Agent/tools-choice.js +70 -0
- package/dist/server/agent/Agent/tools-choice.js.map +1 -0
- package/dist/server/agent/Agent/tools-coding.get-working.test.js +29 -0
- package/dist/server/agent/Agent/tools-coding.get-working.test.js.map +1 -0
- package/dist/server/agent/Agent/tools-coding.js +75 -0
- package/dist/server/agent/Agent/tools-coding.js.map +1 -0
- package/dist/server/agent/Agent/tools-overwrite.js +158 -0
- package/dist/server/agent/Agent/tools-overwrite.js.map +1 -0
- package/dist/server/routes/agent.routes.js +130 -6
- package/dist/server/routes/agent.routes.js.map +1 -1
- package/dist/server/routes/assets.routes.js +58 -11
- package/dist/server/routes/assets.routes.js.map +1 -1
- package/dist/server/search/document-index-manager.js +11 -8
- package/dist/server/search/document-index-manager.js.map +1 -1
- package/dist/web/assets/AgentChatPanel-DHy3KgSW.js +1 -0
- package/dist/web/assets/AiWriteWorkbench-Ce_OaED4.js +6 -0
- package/dist/web/assets/DocumentEditor-B2H3rHSg.js +21 -0
- package/dist/web/assets/{MergeView-0Q5K5-jO.js → MergeView-Cy4Pi3Je.js} +2 -2
- package/dist/web/assets/PlaygroundPage-hHfIzPO5.js +8 -0
- package/dist/web/assets/SettingsPage-BRAPdqW9.js +1 -0
- package/dist/web/assets/Toolbar-DPkTtGNL.js +126 -0
- package/dist/web/assets/VisitorPickerModal-CJ0K2gj8.js +1 -0
- package/dist/web/assets/copy-DCKasK29.js +11 -0
- package/dist/web/assets/diagram-BJFhx-27.js +3016 -0
- package/dist/web/assets/editor-BBXgdU3Q.js +16 -0
- package/dist/web/assets/history-BQkmetJ0.js +6 -0
- package/dist/web/assets/index-BksNm27A.css +1 -0
- package/dist/web/assets/index-CA7lpALZ.js +185 -0
- package/dist/web/assets/motion-D-I76zAi.js +8 -0
- package/dist/web/assets/plus-B2rZTPWV.js +6 -0
- package/dist/web/assets/react-CQByW0Rg.js +2236 -0
- package/dist/web/assets/react-vendor-BNpqFP9B.js +242 -0
- package/dist/web/assets/ui-C3xtW1w8.js +3126 -0
- package/dist/web/index.html +28 -3
- package/package.json +2 -2
- package/dist/web/assets/_baseUniq-BISfv-Mh.js +0 -1
- package/dist/web/assets/arc-C-3Bi1Jy.js +0 -1
- package/dist/web/assets/architectureDiagram-Q4EWVU46-CusFjwbL.js +0 -36
- package/dist/web/assets/blockDiagram-DXYQGD6D-B0jPfa7U.js +0 -132
- package/dist/web/assets/c4Diagram-AHTNJAMY-Oe6MTT6L.js +0 -10
- package/dist/web/assets/channel-DB58qUXq.js +0 -1
- package/dist/web/assets/chunk-4BX2VUAB-CmxvxupC.js +0 -1
- package/dist/web/assets/chunk-4TB4RGXK-Bzj2dbY7.js +0 -206
- package/dist/web/assets/chunk-55IACEB6-CqfjDrYS.js +0 -1
- package/dist/web/assets/chunk-EDXVE4YY-CWoGAuuy.js +0 -1
- package/dist/web/assets/chunk-FMBD7UC4-WFLld2bI.js +0 -15
- package/dist/web/assets/chunk-OYMX7WX6-CSyOxg1H.js +0 -231
- package/dist/web/assets/chunk-QZHKN3VN-Cyee_8uW.js +0 -1
- package/dist/web/assets/chunk-YZCP3GAM-C7J3AIM1.js +0 -1
- package/dist/web/assets/classDiagram-6PBFFD2Q-BlGKxrV2.js +0 -1
- package/dist/web/assets/classDiagram-v2-HSJHXN6E-BlGKxrV2.js +0 -1
- package/dist/web/assets/clone-rVZWwKcK.js +0 -1
- package/dist/web/assets/cose-bilkent-S5V4N54A-BCHs5xNn.js +0 -1
- package/dist/web/assets/cytoscape.esm-BiciSPf8.js +0 -331
- package/dist/web/assets/dagre-KV5264BT-Cqyy62Ql.js +0 -4
- package/dist/web/assets/defaultLocale-DX6XiGOO.js +0 -1
- package/dist/web/assets/diagram-5BDNPKRD-BNlGWRfQ.js +0 -10
- package/dist/web/assets/diagram-G4DWMVQ6-Qtz-K4Lr.js +0 -24
- package/dist/web/assets/diagram-MMDJMWI5-D5yn6u63.js +0 -43
- package/dist/web/assets/diagram-TYMM5635-CR-RaIAP.js +0 -24
- package/dist/web/assets/erDiagram-SMLLAGMA-BccF6Qsp.js +0 -85
- package/dist/web/assets/flowDiagram-DWJPFMVM-B0OEEMQt.js +0 -162
- package/dist/web/assets/ganttDiagram-T4ZO3ILL-B8kfqGyD.js +0 -292
- package/dist/web/assets/gitGraphDiagram-UUTBAWPF-BJntaoFE.js +0 -106
- package/dist/web/assets/graph-Dt01jPc-.js +0 -1
- package/dist/web/assets/index-CMSpZccR.js +0 -6276
- package/dist/web/assets/index-CPYNlnGV.css +0 -1
- package/dist/web/assets/infoDiagram-42DDH7IO-YITqxZHx.js +0 -2
- package/dist/web/assets/ishikawaDiagram-UXIWVN3A-B2HEjE4j.js +0 -70
- package/dist/web/assets/journeyDiagram-VCZTEJTY-BfWiWY1h.js +0 -139
- package/dist/web/assets/kanban-definition-6JOO6SKY-L7VcnCp4.js +0 -89
- package/dist/web/assets/layout-CN5HZPYy.js +0 -1
- package/dist/web/assets/linear-J-E2mhNr.js +0 -1
- package/dist/web/assets/min-DG8d4OWa.js +0 -1
- package/dist/web/assets/mindmap-definition-QFDTVHPH-4QKB3LVg.js +0 -96
- package/dist/web/assets/pieDiagram-DEJITSTG-BpbKNaYV.js +0 -30
- package/dist/web/assets/quadrantDiagram-34T5L4WZ-BsJUNf_y.js +0 -7
- package/dist/web/assets/requirementDiagram-MS252O5E-CEEvTN62.js +0 -84
- package/dist/web/assets/sankeyDiagram-XADWPNL6-C-OIxGQH.js +0 -10
- package/dist/web/assets/sequenceDiagram-FGHM5R23-DYNvxdh-.js +0 -157
- package/dist/web/assets/stateDiagram-FHFEXIEX-Ct9mBbpM.js +0 -1
- package/dist/web/assets/stateDiagram-v2-QKLJ7IA2-Bq3YuMeU.js +0 -1
- package/dist/web/assets/timeline-definition-GMOUNBTQ-CV15Blkv.js +0 -120
- package/dist/web/assets/vennDiagram-DHZGUBPP-DI7bqTnV.js +0 -34
- package/dist/web/assets/wardley-RL74JXVD-C6O53D0O.js +0 -162
- package/dist/web/assets/wardleyDiagram-NUSXRM2D-CaAQ_aSA.js +0 -20
- package/dist/web/assets/xychartDiagram-5P7HB3ND-Bw31tQmi.js +0 -7
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import { Type } from "@earendil-works/pi-ai";
|
|
2
|
+
import { createAccountTools } from "./tools-account.js";
|
|
3
|
+
const WORKING_DOC_MAX_CHARS = 50_000;
|
|
4
|
+
function asToolResult(payload) {
|
|
5
|
+
return {
|
|
6
|
+
content: [{ type: "text", text: JSON.stringify(payload, null, 2) }],
|
|
7
|
+
details: payload,
|
|
8
|
+
};
|
|
9
|
+
}
|
|
10
|
+
function clipMarkdown(md) {
|
|
11
|
+
const charCount = md.length;
|
|
12
|
+
if (charCount <= WORKING_DOC_MAX_CHARS) {
|
|
13
|
+
return { text: md, truncated: false, charCount };
|
|
14
|
+
}
|
|
15
|
+
return {
|
|
16
|
+
text: md.slice(0, WORKING_DOC_MAX_CHARS) + "\n\n…(truncated)",
|
|
17
|
+
truncated: true,
|
|
18
|
+
charCount,
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
/** coding 模式专用:读/写前端 MD buffer,不写磁盘 */
|
|
22
|
+
export function createCodingWriteTools(ctx) {
|
|
23
|
+
return [
|
|
24
|
+
{
|
|
25
|
+
name: "get_working_document",
|
|
26
|
+
label: "读取帮写工作稿",
|
|
27
|
+
description: "读取本轮帮写工作台中的文章:进场快照(base)与当前工作稿(working,含已接受的修改)。改稿前应先调用。内容来自本次请求,不是服务器磁盘。",
|
|
28
|
+
parameters: Type.Object({
|
|
29
|
+
which: Type.Optional(Type.Union([Type.Literal("working"), Type.Literal("base"), Type.Literal("both")], {
|
|
30
|
+
description: "读哪一份;默认 both",
|
|
31
|
+
})),
|
|
32
|
+
}),
|
|
33
|
+
execute: async (_id, params) => {
|
|
34
|
+
const which = params.which ?? "both";
|
|
35
|
+
const working = clipMarkdown(ctx.workingMarkdown);
|
|
36
|
+
const base = clipMarkdown(ctx.baseMarkdown);
|
|
37
|
+
const payload = {
|
|
38
|
+
documentId: ctx.documentId,
|
|
39
|
+
source: "request_body",
|
|
40
|
+
};
|
|
41
|
+
if (which === "working" || which === "both") {
|
|
42
|
+
payload.workingMarkdown = working.text;
|
|
43
|
+
payload.workingTruncated = working.truncated;
|
|
44
|
+
payload.workingCharCount = working.charCount;
|
|
45
|
+
}
|
|
46
|
+
if (which === "base" || which === "both") {
|
|
47
|
+
payload.baseMarkdown = base.text;
|
|
48
|
+
payload.baseTruncated = base.truncated;
|
|
49
|
+
payload.baseCharCount = base.charCount;
|
|
50
|
+
}
|
|
51
|
+
return asToolResult(payload);
|
|
52
|
+
},
|
|
53
|
+
},
|
|
54
|
+
{
|
|
55
|
+
name: "set_markdown_document",
|
|
56
|
+
label: "设置帮写正文",
|
|
57
|
+
description: "用完整 Markdown 覆写帮写工作台右侧提案正文。不写入服务器文档;用户按段接受后才会写回。每次调用应给出当前完整 MD。改稿前请先 get_working_document。",
|
|
58
|
+
parameters: Type.Object({
|
|
59
|
+
markdown: Type.String({ description: "完整 Markdown 正文" }),
|
|
60
|
+
}),
|
|
61
|
+
execute: async (_id, params) => {
|
|
62
|
+
const markdown = String(params.markdown ?? "");
|
|
63
|
+
return asToolResult({ markdown, applied: true });
|
|
64
|
+
},
|
|
65
|
+
},
|
|
66
|
+
];
|
|
67
|
+
}
|
|
68
|
+
/** coding:账号结构 tools + 读写 buffer tools(手册 tools 在 run 里另挂;不含服务端覆写) */
|
|
69
|
+
export function createCodingTools(visitorId, ctx, choiceHooks) {
|
|
70
|
+
return [
|
|
71
|
+
...createAccountTools(visitorId, choiceHooks, { withOverwrite: false }),
|
|
72
|
+
...createCodingWriteTools(ctx),
|
|
73
|
+
];
|
|
74
|
+
}
|
|
75
|
+
//# sourceMappingURL=tools-coding.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tools-coding.js","sourceRoot":"","sources":["../../../../src/server/agent/Agent/tools-coding.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,158 @@
|
|
|
1
|
+
import { Type } from "@earendil-works/pi-ai";
|
|
2
|
+
import { assertDocumentAccess, DocumentError } from "../../access/access-control.js";
|
|
3
|
+
import { getDocument, updateDocument } from "../../documents/document.service.js";
|
|
4
|
+
import { isAlmostEmptyDocumentText } from "./almost-empty.js";
|
|
5
|
+
import { DEFAULT_CHOICE_TIMEOUT_MS, waitForUserChoice, } from "./choice-pending.js";
|
|
6
|
+
const OVERWRITE_OPTION = "直接覆写";
|
|
7
|
+
const OPEN_CODING_OPTION = "打开帮写审阅";
|
|
8
|
+
const CANCEL_OPTION = "取消";
|
|
9
|
+
function asToolResult(payload) {
|
|
10
|
+
return {
|
|
11
|
+
content: [{ type: "text", text: JSON.stringify(payload, null, 2) }],
|
|
12
|
+
details: payload,
|
|
13
|
+
};
|
|
14
|
+
}
|
|
15
|
+
function classifyChoice(choice) {
|
|
16
|
+
const t = choice.trim();
|
|
17
|
+
if (t === OVERWRITE_OPTION || t === "覆写" || t.includes("直接覆写")) {
|
|
18
|
+
return "overwrite";
|
|
19
|
+
}
|
|
20
|
+
if (t === OPEN_CODING_OPTION || t.includes("帮写")) {
|
|
21
|
+
return "coding";
|
|
22
|
+
}
|
|
23
|
+
if (t === CANCEL_OPTION || t.includes("取消")) {
|
|
24
|
+
return "cancel";
|
|
25
|
+
}
|
|
26
|
+
// 自由输入:含「覆写」优先;否则不当作同意覆写
|
|
27
|
+
if (t.includes("覆写"))
|
|
28
|
+
return "overwrite";
|
|
29
|
+
return "cancel";
|
|
30
|
+
}
|
|
31
|
+
function doOverwrite(params) {
|
|
32
|
+
const updated = updateDocument({
|
|
33
|
+
actorVisitorId: params.visitorId,
|
|
34
|
+
documentId: params.documentId,
|
|
35
|
+
content: params.markdown,
|
|
36
|
+
contentFormat: "markdown",
|
|
37
|
+
version: { localBaseCommitId: params.localBaseCommitId },
|
|
38
|
+
});
|
|
39
|
+
return asToolResult({
|
|
40
|
+
status: "overwritten",
|
|
41
|
+
documentId: updated.documentId,
|
|
42
|
+
displayName: updated.displayName,
|
|
43
|
+
headCommitId: updated.headCommitId ?? null,
|
|
44
|
+
overwritten: true,
|
|
45
|
+
localBaseCommitId: params.localBaseCommitId,
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* Ask 覆写:空文直写;有正文则请用户选「直接覆写 / 打开帮写 / 取消」。
|
|
50
|
+
*/
|
|
51
|
+
export function createOverwriteTools(visitorId, hooks) {
|
|
52
|
+
return [
|
|
53
|
+
{
|
|
54
|
+
name: "overwrite_document",
|
|
55
|
+
label: "覆写文档正文",
|
|
56
|
+
description: "将完整 Markdown 写入指定文档(服务端)。几乎空则直接写入;已有实质正文时本工具会弹出选择卡,选项固定为以下三项(勿另调 ask_user_choice 自拟其它文案):「直接覆写」「打开帮写审阅」「取消」。有正文不是无法覆写,只是要用户点选。必须传入完整 markdown。",
|
|
57
|
+
parameters: Type.Object({
|
|
58
|
+
documentId: Type.String({ description: "目标文档 documentId" }),
|
|
59
|
+
markdown: Type.String({ description: "要写入的完整 Markdown 正文" }),
|
|
60
|
+
}),
|
|
61
|
+
execute: async (_id, params) => {
|
|
62
|
+
const documentId = String(params.documentId ?? "").trim();
|
|
63
|
+
const markdown = String(params.markdown ?? "");
|
|
64
|
+
if (!documentId)
|
|
65
|
+
throw new Error("documentId is required");
|
|
66
|
+
try {
|
|
67
|
+
assertDocumentAccess(documentId, visitorId, "edit");
|
|
68
|
+
const doc = getDocument(documentId, visitorId, "text");
|
|
69
|
+
const plain = doc.content ?? "";
|
|
70
|
+
const displayName = String(doc.displayName ?? "").trim() || "未命名文档";
|
|
71
|
+
const headCommitId = doc.headCommitId;
|
|
72
|
+
if (!headCommitId) {
|
|
73
|
+
throw new Error("DOCUMENT_HAS_NO_HEAD: 文档缺少 headCommitId,无法安全覆写");
|
|
74
|
+
}
|
|
75
|
+
if (isAlmostEmptyDocumentText(plain)) {
|
|
76
|
+
return doOverwrite({
|
|
77
|
+
visitorId,
|
|
78
|
+
documentId,
|
|
79
|
+
markdown,
|
|
80
|
+
localBaseCommitId: headCommitId,
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
const { requestId, promise } = waitForUserChoice({
|
|
84
|
+
visitorId,
|
|
85
|
+
timeoutMs: DEFAULT_CHOICE_TIMEOUT_MS,
|
|
86
|
+
signal: hooks.signal,
|
|
87
|
+
});
|
|
88
|
+
const expiresAt = new Date(Date.now() + DEFAULT_CHOICE_TIMEOUT_MS).toISOString();
|
|
89
|
+
hooks.onChoiceCard({
|
|
90
|
+
requestId,
|
|
91
|
+
title: `「${displayName}」已有正文,请选择`,
|
|
92
|
+
options: [OVERWRITE_OPTION, OPEN_CODING_OPTION, CANCEL_OPTION],
|
|
93
|
+
expiresAt,
|
|
94
|
+
});
|
|
95
|
+
const choiceResult = await promise;
|
|
96
|
+
if (choiceResult.status === "timeout") {
|
|
97
|
+
hooks.onChoiceExpired?.(requestId);
|
|
98
|
+
return asToolResult({
|
|
99
|
+
status: "timeout",
|
|
100
|
+
documentId,
|
|
101
|
+
overwritten: false,
|
|
102
|
+
message: "用户未在时限内选择;未覆写、未打开帮写",
|
|
103
|
+
});
|
|
104
|
+
}
|
|
105
|
+
if (choiceResult.status === "cancelled") {
|
|
106
|
+
return asToolResult({
|
|
107
|
+
status: "cancelled",
|
|
108
|
+
documentId,
|
|
109
|
+
overwritten: false,
|
|
110
|
+
message: "选择已取消;未覆写、未打开帮写",
|
|
111
|
+
});
|
|
112
|
+
}
|
|
113
|
+
const choice = choiceResult.choice ?? "";
|
|
114
|
+
const action = classifyChoice(choice);
|
|
115
|
+
if (action === "overwrite") {
|
|
116
|
+
// 同意后重新读 head,避免等待期间被他人推进
|
|
117
|
+
const fresh = getDocument(documentId, visitorId, "text");
|
|
118
|
+
const base = fresh.headCommitId;
|
|
119
|
+
if (!base) {
|
|
120
|
+
throw new Error("DOCUMENT_HAS_NO_HEAD: 文档缺少 headCommitId,无法安全覆写");
|
|
121
|
+
}
|
|
122
|
+
return doOverwrite({
|
|
123
|
+
visitorId,
|
|
124
|
+
documentId,
|
|
125
|
+
markdown,
|
|
126
|
+
localBaseCommitId: base,
|
|
127
|
+
});
|
|
128
|
+
}
|
|
129
|
+
if (action === "coding") {
|
|
130
|
+
hooks.onOpenCoding({ documentId, displayName });
|
|
131
|
+
return asToolResult({
|
|
132
|
+
status: "redirected_to_coding",
|
|
133
|
+
documentId,
|
|
134
|
+
displayName,
|
|
135
|
+
choice,
|
|
136
|
+
overwritten: false,
|
|
137
|
+
message: "已请前端打开帮写;Ask 未覆写服务端正文",
|
|
138
|
+
});
|
|
139
|
+
}
|
|
140
|
+
return asToolResult({
|
|
141
|
+
status: "declined",
|
|
142
|
+
documentId,
|
|
143
|
+
choice,
|
|
144
|
+
overwritten: false,
|
|
145
|
+
message: "用户取消;未覆写、未打开帮写",
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
catch (err) {
|
|
149
|
+
if (err instanceof DocumentError) {
|
|
150
|
+
throw new Error(`${err.code}: ${err.message}`);
|
|
151
|
+
}
|
|
152
|
+
throw err;
|
|
153
|
+
}
|
|
154
|
+
},
|
|
155
|
+
},
|
|
156
|
+
];
|
|
157
|
+
}
|
|
158
|
+
//# sourceMappingURL=tools-overwrite.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tools-overwrite.js","sourceRoot":"","sources":["../../../../src/server/agent/Agent/tools-overwrite.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Router } from "express";
|
|
2
2
|
import { getAgentStatus, getAgentContextUsageForApi, runOnboardingChat, } from "../agent/Agent/run.js";
|
|
3
|
-
import { getAgentSessionForApi, createAgentSessionForApi, listAgentSessionsForApi, openAgentSessionForApi } from "../agent/Agent/session-manager.js";
|
|
3
|
+
import { getAgentSessionForApi, createAgentSessionForApi, listAgentSessionsForApi, openAgentSessionForApi, bindCodingSessionDocumentForApi } from "../agent/Agent/session-manager.js";
|
|
4
|
+
import { resolveUserChoice, expireUserChoice } from "../agent/Agent/choice-pending.js";
|
|
4
5
|
import { getVisitorAgentConfig, isAgentModelId, normalizeContextWindow, toPublicAgentConfig, upsertVisitorAgentConfig, } from "../agent/Config/config.js";
|
|
5
6
|
import { useLogger } from "../logger/logger.js";
|
|
6
7
|
const log = useLogger("agent-route");
|
|
@@ -8,6 +9,18 @@ function writeSse(res, event) {
|
|
|
8
9
|
if (!res.writableEnded)
|
|
9
10
|
res.write(`data: ${JSON.stringify(event)}\n\n`);
|
|
10
11
|
}
|
|
12
|
+
function parseAgentMode(raw) {
|
|
13
|
+
return typeof raw === "string" && raw.trim() === "coding" ? "coding" : "normal";
|
|
14
|
+
}
|
|
15
|
+
/** query/body 的 documentId;空串视为 null(空白帮写) */
|
|
16
|
+
function parseDocumentId(raw) {
|
|
17
|
+
if (raw === undefined || raw === null)
|
|
18
|
+
return undefined;
|
|
19
|
+
if (typeof raw !== "string")
|
|
20
|
+
return undefined;
|
|
21
|
+
const t = raw.trim();
|
|
22
|
+
return t || null;
|
|
23
|
+
}
|
|
11
24
|
/** 薄封装:校验入参 → 调 agent 层 → 把 onEvent 写成 SSE */
|
|
12
25
|
export function buildAgentRouter() {
|
|
13
26
|
const router = Router();
|
|
@@ -82,7 +95,9 @@ export function buildAgentRouter() {
|
|
|
82
95
|
res.status(401).json({ error: { code: "UNAUTHORIZED", message: "login required" } });
|
|
83
96
|
return;
|
|
84
97
|
}
|
|
85
|
-
const
|
|
98
|
+
const mode = parseAgentMode(req.query?.mode);
|
|
99
|
+
const documentId = mode === "coding" ? parseDocumentId(req.query?.documentId) : undefined;
|
|
100
|
+
const data = await getAgentSessionForApi(req.visitor.visitor_id, mode, documentId ?? null);
|
|
86
101
|
res.json({ data });
|
|
87
102
|
});
|
|
88
103
|
router.get("/context-usage", async (req, res) => {
|
|
@@ -98,7 +113,9 @@ export function buildAgentRouter() {
|
|
|
98
113
|
res.status(401).json({ error: { code: "UNAUTHORIZED", message: "login required" } });
|
|
99
114
|
return;
|
|
100
115
|
}
|
|
101
|
-
const
|
|
116
|
+
const mode = parseAgentMode(req.query?.mode);
|
|
117
|
+
const documentId = mode === "coding" ? parseDocumentId(req.query?.documentId) : undefined;
|
|
118
|
+
const data = await listAgentSessionsForApi(req.visitor.visitor_id, mode, documentId ?? null);
|
|
102
119
|
res.json({ data });
|
|
103
120
|
});
|
|
104
121
|
router.post("/sessions", async (req, res) => {
|
|
@@ -106,7 +123,11 @@ export function buildAgentRouter() {
|
|
|
106
123
|
res.status(401).json({ error: { code: "UNAUTHORIZED", message: "login required" } });
|
|
107
124
|
return;
|
|
108
125
|
}
|
|
109
|
-
const
|
|
126
|
+
const mode = parseAgentMode(req.body?.mode ?? req.query?.mode);
|
|
127
|
+
const documentId = mode === "coding"
|
|
128
|
+
? parseDocumentId(req.body?.documentId ?? req.query?.documentId)
|
|
129
|
+
: undefined;
|
|
130
|
+
const data = await createAgentSessionForApi(req.visitor.visitor_id, mode, documentId ?? null);
|
|
110
131
|
res.json({ data });
|
|
111
132
|
});
|
|
112
133
|
router.post("/session/open", async (req, res) => {
|
|
@@ -120,15 +141,103 @@ export function buildAgentRouter() {
|
|
|
120
141
|
return;
|
|
121
142
|
}
|
|
122
143
|
try {
|
|
123
|
-
const
|
|
144
|
+
const mode = parseAgentMode(req.body?.mode ?? req.query?.mode);
|
|
145
|
+
const documentId = mode === "coding"
|
|
146
|
+
? parseDocumentId(req.body?.documentId ?? req.query?.documentId)
|
|
147
|
+
: undefined;
|
|
148
|
+
const data = await openAgentSessionForApi(req.visitor.visitor_id, sessionId, mode, documentId ?? null);
|
|
149
|
+
res.json({ data });
|
|
150
|
+
}
|
|
151
|
+
catch (err) {
|
|
152
|
+
const msg = err instanceof Error ? err.message : String(err);
|
|
153
|
+
if (msg === "invalid_session_id" ||
|
|
154
|
+
msg === "session_not_found" ||
|
|
155
|
+
msg === "session_document_mismatch") {
|
|
156
|
+
res.status(404).json({ error: { code: "NOT_FOUND", message: msg } });
|
|
157
|
+
return;
|
|
158
|
+
}
|
|
159
|
+
throw err;
|
|
160
|
+
}
|
|
161
|
+
});
|
|
162
|
+
router.post("/session/bind-document", async (req, res) => {
|
|
163
|
+
if (!req.visitor) {
|
|
164
|
+
res.status(401).json({ error: { code: "UNAUTHORIZED", message: "login required" } });
|
|
165
|
+
return;
|
|
166
|
+
}
|
|
167
|
+
const sessionId = typeof req.body?.sessionId === "string" ? req.body.sessionId.trim() : "";
|
|
168
|
+
const documentId = typeof req.body?.documentId === "string" ? req.body.documentId.trim() : "";
|
|
169
|
+
if (!sessionId || !documentId) {
|
|
170
|
+
res.status(400).json({
|
|
171
|
+
error: { code: "BAD_REQUEST", message: "sessionId and documentId are required" },
|
|
172
|
+
});
|
|
173
|
+
return;
|
|
174
|
+
}
|
|
175
|
+
try {
|
|
176
|
+
const data = await bindCodingSessionDocumentForApi(req.visitor.visitor_id, sessionId, documentId);
|
|
177
|
+
res.json({ data });
|
|
178
|
+
}
|
|
179
|
+
catch (err) {
|
|
180
|
+
const msg = err instanceof Error ? err.message : String(err);
|
|
181
|
+
if (msg === "invalid_session_id" ||
|
|
182
|
+
msg === "session_not_found" ||
|
|
183
|
+
msg === "document_id_required" ||
|
|
184
|
+
msg === "bind_only_coding") {
|
|
185
|
+
res.status(400).json({ error: { code: "BAD_REQUEST", message: msg } });
|
|
186
|
+
return;
|
|
187
|
+
}
|
|
188
|
+
throw err;
|
|
189
|
+
}
|
|
190
|
+
});
|
|
191
|
+
router.post("/choice", (req, res) => {
|
|
192
|
+
if (!req.visitor) {
|
|
193
|
+
res.status(401).json({ error: { code: "UNAUTHORIZED", message: "login required" } });
|
|
194
|
+
return;
|
|
195
|
+
}
|
|
196
|
+
const requestId = typeof req.body?.requestId === "string" ? req.body.requestId.trim() : "";
|
|
197
|
+
if (!requestId) {
|
|
198
|
+
res.status(400).json({ error: { code: "BAD_REQUEST", message: "requestId is required" } });
|
|
199
|
+
return;
|
|
200
|
+
}
|
|
201
|
+
// 前端倒计时结束:显式取消 pending(与服务端 timer 双保险)
|
|
202
|
+
if (req.body?.expire === true || req.body?.cancel === true) {
|
|
203
|
+
try {
|
|
204
|
+
expireUserChoice(req.visitor.visitor_id, requestId);
|
|
205
|
+
res.json({ data: { status: "timeout" } });
|
|
206
|
+
}
|
|
207
|
+
catch (err) {
|
|
208
|
+
const msg = err instanceof Error ? err.message : String(err);
|
|
209
|
+
if (msg === "choice_not_found") {
|
|
210
|
+
// 可能后端 timer 已先解冻
|
|
211
|
+
res.json({ data: { status: "timeout" } });
|
|
212
|
+
return;
|
|
213
|
+
}
|
|
214
|
+
if (msg === "choice_forbidden") {
|
|
215
|
+
res.status(403).json({ error: { code: "FORBIDDEN", message: msg } });
|
|
216
|
+
return;
|
|
217
|
+
}
|
|
218
|
+
throw err;
|
|
219
|
+
}
|
|
220
|
+
return;
|
|
221
|
+
}
|
|
222
|
+
const choice = typeof req.body?.choice === "string" ? req.body.choice : "";
|
|
223
|
+
try {
|
|
224
|
+
const data = resolveUserChoice(req.visitor.visitor_id, requestId, choice);
|
|
124
225
|
res.json({ data });
|
|
125
226
|
}
|
|
126
227
|
catch (err) {
|
|
127
228
|
const msg = err instanceof Error ? err.message : String(err);
|
|
128
|
-
if (msg === "
|
|
229
|
+
if (msg === "choice_not_found") {
|
|
129
230
|
res.status(404).json({ error: { code: "NOT_FOUND", message: msg } });
|
|
130
231
|
return;
|
|
131
232
|
}
|
|
233
|
+
if (msg === "choice_forbidden") {
|
|
234
|
+
res.status(403).json({ error: { code: "FORBIDDEN", message: msg } });
|
|
235
|
+
return;
|
|
236
|
+
}
|
|
237
|
+
if (msg === "choice_empty") {
|
|
238
|
+
res.status(400).json({ error: { code: "BAD_REQUEST", message: msg } });
|
|
239
|
+
return;
|
|
240
|
+
}
|
|
132
241
|
throw err;
|
|
133
242
|
}
|
|
134
243
|
});
|
|
@@ -152,6 +261,17 @@ export function buildAgentRouter() {
|
|
|
152
261
|
});
|
|
153
262
|
return;
|
|
154
263
|
}
|
|
264
|
+
const modeRaw = typeof req.body?.mode === "string" ? req.body.mode.trim() : "";
|
|
265
|
+
const mode = modeRaw === "coding" ? "coding" : "normal";
|
|
266
|
+
const workingMarkdown = mode === "coding" && typeof req.body?.workingMarkdown === "string"
|
|
267
|
+
? req.body.workingMarkdown
|
|
268
|
+
: undefined;
|
|
269
|
+
const baseMarkdown = mode === "coding" && typeof req.body?.baseMarkdown === "string"
|
|
270
|
+
? req.body.baseMarkdown
|
|
271
|
+
: undefined;
|
|
272
|
+
const documentId = mode === "coding" && typeof req.body?.documentId === "string"
|
|
273
|
+
? req.body.documentId.trim() || null
|
|
274
|
+
: undefined;
|
|
155
275
|
res.setHeader("Content-Type", "text/event-stream; charset=utf-8");
|
|
156
276
|
res.setHeader("Cache-Control", "no-cache");
|
|
157
277
|
res.setHeader("Connection", "keep-alive");
|
|
@@ -166,6 +286,10 @@ export function buildAgentRouter() {
|
|
|
166
286
|
await runOnboardingChat({
|
|
167
287
|
visitorId: req.visitor.visitor_id,
|
|
168
288
|
message,
|
|
289
|
+
mode,
|
|
290
|
+
documentId,
|
|
291
|
+
workingMarkdown,
|
|
292
|
+
baseMarkdown,
|
|
169
293
|
signal: ac.signal,
|
|
170
294
|
onEvent: (event) => writeSse(res, event),
|
|
171
295
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.routes.js","sourceRoot":"","sources":["../../../src/server/routes/agent.routes.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"agent.routes.js","sourceRoot":"","sources":["../../../src/server/routes/agent.routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,10 +8,10 @@ import { getDb } from "../db/connection.js";
|
|
|
8
8
|
import { findDocumentById } from "../db/repositories/document.repo.js";
|
|
9
9
|
import { useLogger } from "../logger/logger.js";
|
|
10
10
|
const log = useLogger("assets-route");
|
|
11
|
-
// 单文件最大
|
|
12
|
-
const MAX_BYTES =
|
|
13
|
-
|
|
14
|
-
const
|
|
11
|
+
// 单文件最大 55 MB(附件:zip / 音频等)
|
|
12
|
+
const MAX_BYTES = 55 * 1024 * 1024;
|
|
13
|
+
/** Images only — used by link-to-img remote fetch. */
|
|
14
|
+
const IMAGE_EXT = new Set([
|
|
15
15
|
".png",
|
|
16
16
|
".jpg",
|
|
17
17
|
".jpeg",
|
|
@@ -23,7 +23,19 @@ const ALLOWED_EXT = new Set([
|
|
|
23
23
|
".jfif",
|
|
24
24
|
".pjpeg",
|
|
25
25
|
]);
|
|
26
|
-
|
|
26
|
+
/** Editor attachments: images + zip + common audio. */
|
|
27
|
+
const ALLOWED_UPLOAD_EXT = new Set([
|
|
28
|
+
...IMAGE_EXT,
|
|
29
|
+
".zip",
|
|
30
|
+
".mp3",
|
|
31
|
+
".wav",
|
|
32
|
+
".m4a",
|
|
33
|
+
".ogg",
|
|
34
|
+
".flac",
|
|
35
|
+
".aac",
|
|
36
|
+
".oga",
|
|
37
|
+
]);
|
|
38
|
+
// MIME 类型到扩展名的映射表(远程图片转存)
|
|
27
39
|
const MIME_TO_EXT = {
|
|
28
40
|
"image/png": ".png",
|
|
29
41
|
"image/jpeg": ".jpg",
|
|
@@ -92,7 +104,7 @@ function assertDocumentOwner(req, documentId) {
|
|
|
92
104
|
*/
|
|
93
105
|
function extFromUrl(u) {
|
|
94
106
|
const ext = path.extname(u.pathname).toLowerCase();
|
|
95
|
-
if (
|
|
107
|
+
if (IMAGE_EXT.has(ext))
|
|
96
108
|
return ext;
|
|
97
109
|
return ".png";
|
|
98
110
|
}
|
|
@@ -149,12 +161,29 @@ function createUploader() {
|
|
|
149
161
|
limits: { fileSize: MAX_BYTES, files: 24 },
|
|
150
162
|
fileFilter: (_req, file, cb) => {
|
|
151
163
|
const ext = path.extname(file.originalname).toLowerCase();
|
|
152
|
-
if (!
|
|
164
|
+
if (!ALLOWED_UPLOAD_EXT.has(ext)) {
|
|
153
165
|
cb(new Error("unsupported file type"));
|
|
154
166
|
return;
|
|
155
167
|
}
|
|
156
|
-
|
|
157
|
-
|
|
168
|
+
const mime = (file.mimetype || "").toLowerCase();
|
|
169
|
+
if (IMAGE_EXT.has(ext)) {
|
|
170
|
+
if (mime && !mime.startsWith("image/")) {
|
|
171
|
+
cb(new Error("not an image"));
|
|
172
|
+
return;
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
else if (ext === ".zip") {
|
|
176
|
+
if (mime &&
|
|
177
|
+
mime !== "application/zip" &&
|
|
178
|
+
mime !== "application/x-zip-compressed" &&
|
|
179
|
+
mime !== "application/octet-stream" &&
|
|
180
|
+
mime !== "multipart/x-zip") {
|
|
181
|
+
cb(new Error("unsupported file type"));
|
|
182
|
+
return;
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
else if (mime && !mime.startsWith("audio/") && mime !== "application/octet-stream") {
|
|
186
|
+
cb(new Error("unsupported file type"));
|
|
158
187
|
return;
|
|
159
188
|
}
|
|
160
189
|
cb(null, true);
|
|
@@ -203,7 +232,25 @@ export function serveAssetFile(req, res) {
|
|
|
203
232
|
? "image/x-icon"
|
|
204
233
|
: ext === ".bmp"
|
|
205
234
|
? "image/bmp"
|
|
206
|
-
: "
|
|
235
|
+
: ext === ".zip"
|
|
236
|
+
? "application/zip"
|
|
237
|
+
: ext === ".mp3"
|
|
238
|
+
? "audio/mpeg"
|
|
239
|
+
: ext === ".wav"
|
|
240
|
+
? "audio/wav"
|
|
241
|
+
: ext === ".m4a"
|
|
242
|
+
? "audio/mp4"
|
|
243
|
+
: ext === ".ogg" || ext === ".oga"
|
|
244
|
+
? "audio/ogg"
|
|
245
|
+
: ext === ".flac"
|
|
246
|
+
? "audio/flac"
|
|
247
|
+
: ext === ".aac"
|
|
248
|
+
? "audio/aac"
|
|
249
|
+
: "application/octet-stream";
|
|
250
|
+
// Attachment downloads: suggest filename for non-images
|
|
251
|
+
if (!IMAGE_EXT.has(ext)) {
|
|
252
|
+
res.setHeader("Content-Disposition", `attachment; filename="${path.basename(abs)}"`);
|
|
253
|
+
}
|
|
207
254
|
res.setHeader("Content-Type", ct);
|
|
208
255
|
res.setHeader("Cache-Control", "public, max-age=86400, immutable");
|
|
209
256
|
fs.createReadStream(abs).pipe(res);
|
|
@@ -328,7 +375,7 @@ export function buildAssetsUploadRouter() {
|
|
|
328
375
|
}
|
|
329
376
|
// 根据 Content-Type 或 URL 推断扩展名,并校验是否在白名单中
|
|
330
377
|
const ext = MIME_TO_EXT[ct] ?? extFromUrl(u);
|
|
331
|
-
if (!
|
|
378
|
+
if (!IMAGE_EXT.has(ext)) {
|
|
332
379
|
res.status(400).json(vditorError("unsupported image type").body);
|
|
333
380
|
return;
|
|
334
381
|
}
|