@fgbg/mdocs 1.3.32 → 1.4.1
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 +1 -1
- package/agent-skills/changelog/SKILL.md +31 -0
- package/agent-skills/usage-onboarding-ai/SKILL.md +17 -5
- package/agent-skills/usage-settings/SKILL.md +1 -1
- package/dist/server/agent/Agent/run-manager.js +316 -0
- package/dist/server/agent/Agent/run-manager.js.map +1 -0
- package/dist/server/agent/Agent/run-manager.test.js +122 -0
- package/dist/server/agent/Agent/run-manager.test.js.map +1 -0
- package/dist/server/agent/Agent/run-store.js +141 -0
- package/dist/server/agent/Agent/run-store.js.map +1 -0
- package/dist/server/agent/Agent/run-store.test.js +64 -0
- package/dist/server/agent/Agent/run-store.test.js.map +1 -0
- package/dist/server/agent/Agent/system-prompt.js +2 -2
- package/dist/server/agent/Agent/tools-registry.test.js +1 -0
- package/dist/server/agent/Agent/tools-registry.test.js.map +1 -1
- package/dist/server/agent/Agent/tools-user-skills.js +50 -39
- package/dist/server/agent/Agent/tools-user-skills.js.map +1 -1
- package/dist/server/agent/Agent/user-skills.js +11 -5
- package/dist/server/agent/Agent/user-skills.js.map +1 -1
- package/dist/server/agent/Config/config.js +16 -0
- package/dist/server/agent/Config/config.js.map +1 -1
- package/dist/server/agent/Config/config.test.js +29 -0
- package/dist/server/agent/Config/config.test.js.map +1 -1
- package/dist/server/app.js +3 -0
- package/dist/server/app.js.map +1 -1
- package/dist/server/db/repositories/agent-model-config.repo.js +4 -4
- package/dist/server/db/repositories/agent-model-config.repo.js.map +1 -1
- package/dist/server/db/repositories/agent-user-skill.repo.js +7 -5
- package/dist/server/db/repositories/agent-user-skill.repo.js.map +1 -1
- package/dist/server/db/repositories/agent-user-skill.repo.test.js +31 -0
- package/dist/server/db/repositories/agent-user-skill.repo.test.js.map +1 -0
- package/dist/server/db/schema.js +10 -0
- package/dist/server/db/schema.js.map +1 -1
- package/dist/server/routes/agent.routes.js +107 -18
- package/dist/server/routes/agent.routes.js.map +1 -1
- package/dist/server/search/document-index-manager.js +51 -8
- package/dist/server/search/document-index-manager.js.map +1 -1
- package/dist/server/search/document-index-manager.test.js +78 -2
- package/dist/server/search/document-index-manager.test.js.map +1 -1
- package/dist/shared/file-type-policy.js +1 -1
- package/dist/shared/file-type-policy.js.map +1 -1
- package/dist/shared/file-type-policy.test.js +3 -2
- package/dist/shared/file-type-policy.test.js.map +1 -1
- package/dist/web/assets/AgentChatPanel-BMOzVvwA.js +42 -0
- package/dist/web/assets/{AiWriteWorkbench-B7MnIKzJ.js → AiWriteWorkbench-ob4AeDFt.js} +3 -3
- package/dist/web/assets/{DiagramEditor-NtNY3sZL-D12WH5JY.js → DiagramEditor-NtNY3sZL-BuZCaqLT.js} +1 -1
- package/dist/web/assets/DocChrome-DwSYxHOP.js +16 -0
- package/dist/web/assets/{DocumentEditor-BcktjJUV.js → DocumentEditor-C_TFaCan.js} +1 -1
- package/dist/web/assets/{HtmlEditor-D-H5FPUP.js → HtmlEditor-CYPTi1_L.js} +1 -1
- package/dist/web/assets/{MergeView-a2_gRrrh.js → MergeView-FPF3k11v.js} +1 -1
- package/dist/web/assets/{PlaygroundPage-BXmSDi40.js → PlaygroundPage-Bt53Sr06.js} +1 -1
- package/dist/web/assets/SettingsPage-C2SYz-8K.js +21 -0
- package/dist/web/assets/SheetEditor-BOF-OgqU.js +26 -0
- package/dist/web/assets/SheetEditor-BPTMQ2s5.css +1 -0
- package/dist/web/assets/{Toolbar-Caimz2EG.js → Toolbar-LRioFemr.js} +1 -1
- package/dist/web/assets/{VisitorPickerModal-BiMxEHCX.js → VisitorPickerModal-iK2QsYfY.js} +1 -1
- package/dist/web/assets/{check-IPzs2Va9.js → check-65pb-o1o.js} +1 -1
- package/dist/web/assets/{copy-Bp0JPDN6.js → copy-BT35-MU9.js} +1 -1
- package/dist/web/assets/{file-type-policy-C6Nun42Q.js → file-type-policy-aRrzC4LZ.js} +1 -1
- package/dist/web/assets/{index-DHKGh7I3.js → index-92xZ1zjh.js} +46 -46
- package/dist/web/assets/{index-C1Mc0Svw.css → index-DE_nAopH.css} +1 -1
- package/dist/web/assets/{italic-BOhgURiY.js → italic-BmGXEOKX.js} +1 -1
- package/dist/web/assets/{meta2dEngine-BD2XbzaV-Bjx9jCbC.js → meta2dEngine-BD2XbzaV-DeIPntMM.js} +1 -1
- package/dist/web/assets/{plus-BMAfiGed.js → plus-Ss1czARp.js} +1 -1
- package/dist/web/assets/{react-BiN5Ertc.js → react-DHtvOuT-.js} +3 -3
- package/dist/web/index.html +2 -2
- package/package.json +1 -1
- package/dist/web/assets/AgentChatPanel-BJ49TwV5.js +0 -42
- package/dist/web/assets/DocChrome-CjNrjXnZ.js +0 -16
- package/dist/web/assets/SettingsPage-xJkP4WaU.js +0 -21
- package/dist/web/assets/SheetEditor-BV3loL4j.js +0 -26
- package/dist/web/assets/SheetEditor-DbT_K_Ia.css +0 -1
|
@@ -0,0 +1,141 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Agent run 落盘:metadata JSON + 序号事件 JSONL。
|
|
3
|
+
* 不污染 session transcript(模型历史仍只在 *.jsonl user/assistant)。
|
|
4
|
+
*/
|
|
5
|
+
import fs from "node:fs";
|
|
6
|
+
import path from "node:path";
|
|
7
|
+
import { getConfig } from "../../config/index.js";
|
|
8
|
+
function runsDir(visitorId) {
|
|
9
|
+
const { dataDir } = getConfig();
|
|
10
|
+
return path.join(dataDir, "tenant", visitorId, "agent", "runs");
|
|
11
|
+
}
|
|
12
|
+
function metaPath(visitorId, runId) {
|
|
13
|
+
return path.join(runsDir(visitorId), `${runId}.json`);
|
|
14
|
+
}
|
|
15
|
+
function eventsPath(visitorId, runId) {
|
|
16
|
+
return path.join(runsDir(visitorId), `${runId}.events.jsonl`);
|
|
17
|
+
}
|
|
18
|
+
function activeIndexPath(visitorId) {
|
|
19
|
+
return path.join(runsDir(visitorId), "active.json");
|
|
20
|
+
}
|
|
21
|
+
function ensureDir(visitorId) {
|
|
22
|
+
fs.mkdirSync(runsDir(visitorId), { recursive: true });
|
|
23
|
+
}
|
|
24
|
+
function safeReadJson(file) {
|
|
25
|
+
try {
|
|
26
|
+
if (!fs.existsSync(file))
|
|
27
|
+
return null;
|
|
28
|
+
return JSON.parse(fs.readFileSync(file, "utf8"));
|
|
29
|
+
}
|
|
30
|
+
catch {
|
|
31
|
+
return null;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
export function writeRunMeta(meta) {
|
|
35
|
+
ensureDir(meta.visitorId);
|
|
36
|
+
const tmp = `${metaPath(meta.visitorId, meta.runId)}.tmp`;
|
|
37
|
+
fs.writeFileSync(tmp, `${JSON.stringify(meta, null, 2)}\n`);
|
|
38
|
+
fs.renameSync(tmp, metaPath(meta.visitorId, meta.runId));
|
|
39
|
+
}
|
|
40
|
+
export function readRunMeta(visitorId, runId) {
|
|
41
|
+
return safeReadJson(metaPath(visitorId, runId));
|
|
42
|
+
}
|
|
43
|
+
export function appendRunEvent(visitorId, runId, event) {
|
|
44
|
+
ensureDir(visitorId);
|
|
45
|
+
const meta = readRunMeta(visitorId, runId);
|
|
46
|
+
const seq = (meta?.lastSeq ?? 0) + 1;
|
|
47
|
+
const record = {
|
|
48
|
+
seq,
|
|
49
|
+
ts: new Date().toISOString(),
|
|
50
|
+
event,
|
|
51
|
+
};
|
|
52
|
+
fs.appendFileSync(eventsPath(visitorId, runId), `${JSON.stringify(record)}\n`);
|
|
53
|
+
if (meta) {
|
|
54
|
+
meta.lastSeq = seq;
|
|
55
|
+
writeRunMeta(meta);
|
|
56
|
+
}
|
|
57
|
+
return record;
|
|
58
|
+
}
|
|
59
|
+
export function readRunEventsAfter(visitorId, runId, afterSeq) {
|
|
60
|
+
const file = eventsPath(visitorId, runId);
|
|
61
|
+
if (!fs.existsSync(file))
|
|
62
|
+
return [];
|
|
63
|
+
const lines = fs.readFileSync(file, "utf8").split("\n").filter(Boolean);
|
|
64
|
+
const out = [];
|
|
65
|
+
for (const line of lines) {
|
|
66
|
+
try {
|
|
67
|
+
const rec = JSON.parse(line);
|
|
68
|
+
if (typeof rec.seq === "number" && rec.seq > afterSeq)
|
|
69
|
+
out.push(rec);
|
|
70
|
+
}
|
|
71
|
+
catch {
|
|
72
|
+
/* skip */
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
return out;
|
|
76
|
+
}
|
|
77
|
+
export function readActiveRunIndex(visitorId) {
|
|
78
|
+
return safeReadJson(activeIndexPath(visitorId)) ?? {};
|
|
79
|
+
}
|
|
80
|
+
export function setActiveRun(visitorId, sessionId, runId) {
|
|
81
|
+
ensureDir(visitorId);
|
|
82
|
+
const idx = readActiveRunIndex(visitorId);
|
|
83
|
+
if (runId)
|
|
84
|
+
idx[sessionId] = runId;
|
|
85
|
+
else
|
|
86
|
+
delete idx[sessionId];
|
|
87
|
+
const tmp = `${activeIndexPath(visitorId)}.tmp`;
|
|
88
|
+
fs.writeFileSync(tmp, `${JSON.stringify(idx, null, 2)}\n`);
|
|
89
|
+
fs.renameSync(tmp, activeIndexPath(visitorId));
|
|
90
|
+
}
|
|
91
|
+
export function getActiveRunId(visitorId, sessionId) {
|
|
92
|
+
return readActiveRunIndex(visitorId)[sessionId] ?? null;
|
|
93
|
+
}
|
|
94
|
+
/** 启动时:把磁盘上仍标 running/waiting_user 的 run 标为 interrupted */
|
|
95
|
+
export function markStaleRunsInterrupted(visitorId) {
|
|
96
|
+
const dir = runsDir(visitorId);
|
|
97
|
+
if (!fs.existsSync(dir))
|
|
98
|
+
return;
|
|
99
|
+
const idx = readActiveRunIndex(visitorId);
|
|
100
|
+
let idxChanged = false;
|
|
101
|
+
for (const [sessionId, runId] of Object.entries(idx)) {
|
|
102
|
+
const meta = readRunMeta(visitorId, runId);
|
|
103
|
+
if (!meta) {
|
|
104
|
+
delete idx[sessionId];
|
|
105
|
+
idxChanged = true;
|
|
106
|
+
continue;
|
|
107
|
+
}
|
|
108
|
+
if (meta.status === "running" || meta.status === "waiting_user") {
|
|
109
|
+
meta.status = "interrupted";
|
|
110
|
+
meta.finishedAt = new Date().toISOString();
|
|
111
|
+
meta.abortReason = "process_restart";
|
|
112
|
+
writeRunMeta(meta);
|
|
113
|
+
appendRunEvent(visitorId, runId, {
|
|
114
|
+
type: "run_status",
|
|
115
|
+
status: "interrupted",
|
|
116
|
+
reason: "process_restart",
|
|
117
|
+
});
|
|
118
|
+
delete idx[sessionId];
|
|
119
|
+
idxChanged = true;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
if (idxChanged) {
|
|
123
|
+
const tmp = `${activeIndexPath(visitorId)}.tmp`;
|
|
124
|
+
fs.writeFileSync(tmp, `${JSON.stringify(idx, null, 2)}\n`);
|
|
125
|
+
fs.renameSync(tmp, activeIndexPath(visitorId));
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
export function listVisitorIdsWithRuns() {
|
|
129
|
+
const { dataDir } = getConfig();
|
|
130
|
+
const tenantRoot = path.join(dataDir, "tenant");
|
|
131
|
+
if (!fs.existsSync(tenantRoot))
|
|
132
|
+
return [];
|
|
133
|
+
const out = [];
|
|
134
|
+
for (const name of fs.readdirSync(tenantRoot)) {
|
|
135
|
+
const runs = path.join(tenantRoot, name, "agent", "runs");
|
|
136
|
+
if (fs.existsSync(runs))
|
|
137
|
+
out.push(name);
|
|
138
|
+
}
|
|
139
|
+
return out;
|
|
140
|
+
}
|
|
141
|
+
//# sourceMappingURL=run-store.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-store.js","sourceRoot":"","sources":["../../../../src/server/agent/Agent/run-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import fs from "node:fs";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import { randomUUID } from "node:crypto";
|
|
4
|
+
import { afterEach, describe, expect, it } from "vitest";
|
|
5
|
+
import { getConfig } from "../../config/index.js";
|
|
6
|
+
import { appendRunEvent, getActiveRunId, markStaleRunsInterrupted, readRunEventsAfter, readRunMeta, setActiveRun, writeRunMeta, } from "./run-store.js";
|
|
7
|
+
const cleanupDirs = [];
|
|
8
|
+
afterEach(() => {
|
|
9
|
+
for (const d of cleanupDirs.splice(0)) {
|
|
10
|
+
fs.rmSync(d, { recursive: true, force: true });
|
|
11
|
+
}
|
|
12
|
+
});
|
|
13
|
+
function baseMeta(visitorId, overrides = {}) {
|
|
14
|
+
const runId = overrides.runId ?? randomUUID();
|
|
15
|
+
const sessionId = overrides.sessionId ?? randomUUID();
|
|
16
|
+
return {
|
|
17
|
+
runId,
|
|
18
|
+
sessionId,
|
|
19
|
+
visitorId,
|
|
20
|
+
mode: "normal",
|
|
21
|
+
status: "running",
|
|
22
|
+
startedAt: new Date().toISOString(),
|
|
23
|
+
deadlineAt: new Date(Date.now() + 300_000).toISOString(),
|
|
24
|
+
lastSeq: 0,
|
|
25
|
+
message: "hi",
|
|
26
|
+
...overrides,
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
describe("run-store", () => {
|
|
30
|
+
it("persists meta and appends sequenced events", () => {
|
|
31
|
+
const visitorId = randomUUID();
|
|
32
|
+
cleanupDirs.push(path.join(getConfig().dataDir, "tenant", visitorId));
|
|
33
|
+
const meta = baseMeta(visitorId);
|
|
34
|
+
writeRunMeta(meta);
|
|
35
|
+
setActiveRun(visitorId, meta.sessionId, meta.runId);
|
|
36
|
+
const e1 = appendRunEvent(visitorId, meta.runId, {
|
|
37
|
+
type: "text_delta",
|
|
38
|
+
text: "a",
|
|
39
|
+
});
|
|
40
|
+
const e2 = appendRunEvent(visitorId, meta.runId, { type: "done" });
|
|
41
|
+
expect(e1.seq).toBe(1);
|
|
42
|
+
expect(e2.seq).toBe(2);
|
|
43
|
+
expect(readRunMeta(visitorId, meta.runId)?.lastSeq).toBe(2);
|
|
44
|
+
expect(getActiveRunId(visitorId, meta.sessionId)).toBe(meta.runId);
|
|
45
|
+
const after = readRunEventsAfter(visitorId, meta.runId, 1);
|
|
46
|
+
expect(after).toHaveLength(1);
|
|
47
|
+
expect(after[0]?.event).toEqual({ type: "done" });
|
|
48
|
+
});
|
|
49
|
+
it("marks stale active runs interrupted on restart", () => {
|
|
50
|
+
const visitorId = randomUUID();
|
|
51
|
+
cleanupDirs.push(path.join(getConfig().dataDir, "tenant", visitorId));
|
|
52
|
+
const meta = baseMeta(visitorId, { status: "waiting_user" });
|
|
53
|
+
writeRunMeta(meta);
|
|
54
|
+
setActiveRun(visitorId, meta.sessionId, meta.runId);
|
|
55
|
+
markStaleRunsInterrupted(visitorId);
|
|
56
|
+
const after = readRunMeta(visitorId, meta.runId);
|
|
57
|
+
expect(after?.status).toBe("interrupted");
|
|
58
|
+
expect(after?.abortReason).toBe("process_restart");
|
|
59
|
+
expect(getActiveRunId(visitorId, meta.sessionId)).toBeNull();
|
|
60
|
+
const events = readRunEventsAfter(visitorId, meta.runId, 0);
|
|
61
|
+
expect(events.some((e) => e.event.type === "run_status")).toBe(true);
|
|
62
|
+
});
|
|
63
|
+
});
|
|
64
|
+
//# sourceMappingURL=run-store.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-store.test.js","sourceRoot":"","sources":["../../../../src/server/agent/Agent/run-store.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ const NORMAL_RULES = `你是 mdocs 智能助手:上手向导 + 账号助理。
|
|
|
7
7
|
4. 若需要用户在若干方案中做选择(例如选 A/B),必须调用「请用户选择」(ask_user_choice)。但用户要改某篇已有 md/html 文档时:禁止用 ask_user_choice 自拟「无法覆写 / 新建一篇 / 我自己处理」等绕道选项;必须直接调用 overwrite_document,让工具出卡。工具返回后再如实说明结果。表格(fileType=sheet)禁止 overwrite_document,改用 sheet_*(整表替换用 sheet_overwrite)。
|
|
8
8
|
5. 用户要求写作或改 md/html 正文:调用 overwrite_document(documentId, content)。md→完整 Markdown;html→完整 HTML。格式必须与 fileType 一致,禁止互转。新建 HTML:create_document(fileType=html)。操作表格:一个 .sheet 文件是工作簿,内含多个工作表标签。先 sheet_get_schema(含 sheets 列表)/ sheet_list_rows;写操作可传 sheet=表名。改格 sheet_set_cells;改已有行 sheet_update_row(rowId 必填);表末追加 sheet_append_rows;插在某行后面 sheet_insert_rows_at(afterRowId 必填);整表替换 sheet_overwrite(列名数组+二维行);改列名 sheet_rename_column;删行/列 sheet_delete_rows / sheet_delete_columns;样式 sheet_set_cell_style(bg/color/bold/italic/fontSize);合并/拆分 sheet_merge_cells / sheet_unmerge_cells;工作表标签 sheet_add_sheet / sheet_rename_sheet / sheet_delete_sheet(至少留一表)。新建:create_document(fileType=sheet)。
|
|
9
9
|
6. 上下文中若出现工具 load_user_skill 的结果,或带 <skill> 标签的内容,表示宿主**已经为你加载**的私人 Skill 指令,必须遵照执行;不得声称「未激活 / 只是用户粘贴 / 技能未生效」。
|
|
10
|
-
7. 管理私人 Skill:罗列用 list_user_skills;新建用 create_user_skill
|
|
10
|
+
7. 管理私人 Skill:罗列用 list_user_skills;读取完整正文用 get_user_skill(name);新建用 create_user_skill(出表单卡);修改时先读取,再用 update_user_skill 直接写入完整正文并携带 expectedUpdatedAt;删除用 delete_user_skill(name)。名称对本访客唯一,且仅允许英文、数字、下划线。交互与索引一律用 name,不要用内部 id。
|
|
11
11
|
8. 用户问现在几点、今天几号、星期几或任何日期相关问题时,必须调用「获取当前时间」(get_now),禁止臆造时间;以工具返回的 local / iso / timeZone 为准。
|
|
12
12
|
9. 用户明确要求开关或调整思考强度时,调用「设置思考强度」(set_thinking_level):off / low / high / max;禁止擅自调高。
|
|
13
13
|
10. 先给出工具结果与结论,再给简短下一步建议;回答简洁、面向操作步骤。需要流程图/时序图时用 Markdown mermaid 围栏写源码即可(前端渲染,不要输出 SVG)。
|
|
@@ -22,7 +22,7 @@ const CODING_RULES = `你是 mdocs「帮写」助手(coding 模式):在纯
|
|
|
22
22
|
4. 允许使用账号结构工具辅助;不要发布、不要删除。
|
|
23
23
|
5. 特殊块(mermaid / markmap / meta2d)用 Markdown 围栏源码书写即可;不要输出 SVG,前端按源码渲染。
|
|
24
24
|
6. 上下文中若出现工具 load_user_skill 的结果,或带 <skill> 标签的内容,表示宿主**已经为你加载**的私人 Skill 指令,必须遵照执行;不得声称「未激活 / 只是用户粘贴 / 技能未生效」。
|
|
25
|
-
7. 管理私人 Skill:list_user_skills / create_user_skill / update_user_skill / delete_user_skill
|
|
25
|
+
7. 管理私人 Skill:list_user_skills / get_user_skill / create_user_skill / update_user_skill / delete_user_skill;仅 create 出表单卡,update 先 get 后携带 expectedUpdatedAt 直接写入完整正文。名称唯一且仅英文数字下划线;用 name 交互。
|
|
26
26
|
8. 用户问现在几点、今天几号、星期几或任何日期相关问题时,必须调用「获取当前时间」(get_now),禁止臆造时间。
|
|
27
27
|
9. 用户明确要求开关或调整思考强度时,调用 set_thinking_level(off/low/high/max);禁止擅自调高。
|
|
28
28
|
10. 先简短说明你要改什么,再调用工具;工具返回后如实确认已更新提案。
|
|
@@ -40,6 +40,7 @@ const UTILITY_NAMES = ["get_now", "set_thinking_level"];
|
|
|
40
40
|
/** 用户自建 skill 的增删改查:两种 mode 都无条件注册(与 SkillLoader 无关) */
|
|
41
41
|
const USER_SKILL_NAMES = [
|
|
42
42
|
"list_user_skills",
|
|
43
|
+
"get_user_skill",
|
|
43
44
|
"create_user_skill",
|
|
44
45
|
"update_user_skill",
|
|
45
46
|
"delete_user_skill",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools-registry.test.js","sourceRoot":"","sources":["../../../../src/server/agent/Agent/tools-registry.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tools-registry.test.js","sourceRoot":"","sources":["../../../../src/server/agent/Agent/tools-registry.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ export function listUserSkillsTool({ visitorId }) {
|
|
|
12
12
|
return {
|
|
13
13
|
name: "list_user_skills",
|
|
14
14
|
label: "列出私人 Skill",
|
|
15
|
-
description: "列出当前访客已保存的私人 Agent Skill。返回 name / description / updatedAt
|
|
15
|
+
description: "列出当前访客已保存的私人 Agent Skill。返回 name / description / updatedAt,不含正文;需要正文时调用 get_user_skill。名称对本访客唯一,交互请用 name。",
|
|
16
16
|
parameters: Type.Object({}),
|
|
17
17
|
execute: async () => {
|
|
18
18
|
const skills = listUserSkills(visitorId).map((s) => ({
|
|
@@ -25,6 +25,26 @@ export function listUserSkillsTool({ visitorId }) {
|
|
|
25
25
|
},
|
|
26
26
|
};
|
|
27
27
|
}
|
|
28
|
+
/** 读取单个 skill 的完整内容,供 Agent 修改前获取版本。 */
|
|
29
|
+
export function getUserSkillTool({ visitorId }) {
|
|
30
|
+
return {
|
|
31
|
+
name: "get_user_skill",
|
|
32
|
+
label: "读取私人 Skill",
|
|
33
|
+
description: "按 name 读取私人 Skill 的完整 description、body 与 updatedAt。修改前先读取,并把 updatedAt 传给 update_user_skill。",
|
|
34
|
+
parameters: Type.Object({
|
|
35
|
+
name: Type.String({ description: "要读取的 skill 名称" }),
|
|
36
|
+
}),
|
|
37
|
+
execute: async (_id, params) => {
|
|
38
|
+
const name = String(params.name ?? "").trim();
|
|
39
|
+
if (!name)
|
|
40
|
+
throw new Error("skill_name_required");
|
|
41
|
+
const skill = getUserSkillByName(visitorId, name);
|
|
42
|
+
if (!skill)
|
|
43
|
+
return asToolResult({ status: "error", error: "skill_not_found", name });
|
|
44
|
+
return asToolResult({ status: "found", skill });
|
|
45
|
+
},
|
|
46
|
+
};
|
|
47
|
+
}
|
|
28
48
|
/** 删除:按 name,无前端卡 */
|
|
29
49
|
export function deleteUserSkillTool({ visitorId }) {
|
|
30
50
|
return {
|
|
@@ -53,9 +73,8 @@ async function runSkillForm(params) {
|
|
|
53
73
|
params.onEvent({
|
|
54
74
|
type: "skill_form_card",
|
|
55
75
|
requestId,
|
|
56
|
-
mode:
|
|
76
|
+
mode: "create",
|
|
57
77
|
title: params.title,
|
|
58
|
-
currentName: params.currentName,
|
|
59
78
|
initialName: params.initial.name,
|
|
60
79
|
initialDescription: params.initial.description,
|
|
61
80
|
initialBody: params.initial.body,
|
|
@@ -70,30 +89,20 @@ async function runSkillForm(params) {
|
|
|
70
89
|
return asToolResult({ status: "cancelled", message: "表单已取消" });
|
|
71
90
|
}
|
|
72
91
|
try {
|
|
73
|
-
|
|
74
|
-
const saved = createUserSkill({
|
|
75
|
-
ownerVisitorId: params.visitorId,
|
|
76
|
-
name: result.name,
|
|
77
|
-
description: result.description,
|
|
78
|
-
body: result.body,
|
|
79
|
-
});
|
|
80
|
-
return asToolResult({ status: "created", skill: saved });
|
|
81
|
-
}
|
|
82
|
-
const saved = updateUserSkillByName({
|
|
92
|
+
const saved = createUserSkill({
|
|
83
93
|
ownerVisitorId: params.visitorId,
|
|
84
|
-
currentName: params.currentName,
|
|
85
94
|
name: result.name,
|
|
86
95
|
description: result.description,
|
|
87
96
|
body: result.body,
|
|
88
97
|
});
|
|
89
|
-
return asToolResult({ status: "
|
|
98
|
+
return asToolResult({ status: "created", skill: saved });
|
|
90
99
|
}
|
|
91
100
|
catch (err) {
|
|
92
101
|
const msg = err instanceof Error ? err.message : String(err);
|
|
93
102
|
return asToolResult({ status: "error", error: msg });
|
|
94
103
|
}
|
|
95
104
|
}
|
|
96
|
-
/**
|
|
105
|
+
/** 新增:弹出表单卡。 */
|
|
97
106
|
export function createUserSkillTool({ visitorId, onEvent, signal, }) {
|
|
98
107
|
return {
|
|
99
108
|
name: "create_user_skill",
|
|
@@ -112,7 +121,6 @@ export function createUserSkillTool({ visitorId, onEvent, signal, }) {
|
|
|
112
121
|
visitorId,
|
|
113
122
|
onEvent,
|
|
114
123
|
signal,
|
|
115
|
-
mode: "create",
|
|
116
124
|
title: (p.title ?? "新建 Skill").trim() || "新建 Skill",
|
|
117
125
|
initial: {
|
|
118
126
|
name: typeof p.suggestedName === "string" ? p.suggestedName : "",
|
|
@@ -124,50 +132,53 @@ export function createUserSkillTool({ visitorId, onEvent, signal, }) {
|
|
|
124
132
|
},
|
|
125
133
|
};
|
|
126
134
|
}
|
|
127
|
-
/**
|
|
128
|
-
export function updateUserSkillTool({ visitorId
|
|
135
|
+
/** 修改:Agent 直接写入;expectedUpdatedAt 防止覆盖并发编辑。 */
|
|
136
|
+
export function updateUserSkillTool({ visitorId }) {
|
|
129
137
|
return {
|
|
130
138
|
name: "update_user_skill",
|
|
131
139
|
label: "修改私人 Skill",
|
|
132
|
-
description: "
|
|
140
|
+
description: "直接修改已有私人 Skill。先调用 get_user_skill 取得完整正文和 updatedAt,再提交完整 description/body;expectedUpdatedAt 不一致时拒绝覆盖。newName 可选,仍须英文数字下划线且唯一。",
|
|
133
141
|
parameters: Type.Object({
|
|
134
142
|
name: Type.String({ description: "要修改的 skill 当前名称" }),
|
|
135
|
-
|
|
136
|
-
|
|
143
|
+
newName: Type.Optional(Type.String({ description: "可选的新名称" })),
|
|
144
|
+
description: Type.String({ description: "完整的新简介" }),
|
|
145
|
+
body: Type.String({ description: "完整的新正文" }),
|
|
146
|
+
expectedUpdatedAt: Type.String({
|
|
147
|
+
description: "get_user_skill 返回的 updatedAt,用于防止覆盖并发修改",
|
|
148
|
+
}),
|
|
137
149
|
}),
|
|
138
150
|
execute: async (_id, params) => {
|
|
139
151
|
const p = params;
|
|
140
152
|
const currentName = String(p.name ?? "").trim();
|
|
141
153
|
if (!currentName)
|
|
142
154
|
throw new Error("skill_name_required");
|
|
143
|
-
|
|
144
|
-
|
|
155
|
+
try {
|
|
156
|
+
const skill = updateUserSkillByName({
|
|
157
|
+
ownerVisitorId: visitorId,
|
|
158
|
+
currentName,
|
|
159
|
+
name: typeof p.newName === "string" && p.newName.trim()
|
|
160
|
+
? p.newName
|
|
161
|
+
: currentName,
|
|
162
|
+
description: p.description,
|
|
163
|
+
body: String(p.body ?? ""),
|
|
164
|
+
expectedUpdatedAt: String(p.expectedUpdatedAt ?? ""),
|
|
165
|
+
});
|
|
166
|
+
return asToolResult({ status: "updated", skill });
|
|
167
|
+
}
|
|
168
|
+
catch (err) {
|
|
145
169
|
return asToolResult({
|
|
146
170
|
status: "error",
|
|
147
|
-
error:
|
|
171
|
+
error: err instanceof Error ? err.message : String(err),
|
|
148
172
|
name: currentName,
|
|
149
173
|
});
|
|
150
174
|
}
|
|
151
|
-
return runSkillForm({
|
|
152
|
-
visitorId,
|
|
153
|
-
onEvent,
|
|
154
|
-
signal,
|
|
155
|
-
mode: "update",
|
|
156
|
-
currentName: existing.name,
|
|
157
|
-
title: (p.title ?? `修改 Skill:${existing.name}`).trim() || "修改 Skill",
|
|
158
|
-
initial: {
|
|
159
|
-
name: existing.name,
|
|
160
|
-
description: existing.description,
|
|
161
|
-
body: existing.body,
|
|
162
|
-
},
|
|
163
|
-
timeoutMs: formTimeoutMs(p.timeoutMs),
|
|
164
|
-
});
|
|
165
175
|
},
|
|
166
176
|
};
|
|
167
177
|
}
|
|
168
178
|
export function userSkillTools(deps) {
|
|
169
179
|
return [
|
|
170
180
|
listUserSkillsTool(deps),
|
|
181
|
+
getUserSkillTool(deps),
|
|
171
182
|
createUserSkillTool(deps),
|
|
172
183
|
updateUserSkillTool(deps),
|
|
173
184
|
deleteUserSkillTool(deps),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools-user-skills.js","sourceRoot":"","sources":["../../../../src/server/agent/Agent/tools-user-skills.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAE7C,OAAO,EAAE,YAAY,EAAiB,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EACL,6BAA6B,EAC7B,gBAAgB,GACjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,cAAc,EACd,qBAAqB,EACrB,qBAAqB,GACtB,MAAM,kBAAkB,CAAC;AAE1B,SAAS,aAAa,CAAC,GAAY;IACjC,OAAO,OAAO,GAAG,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC;QACpD,CAAC,CAAC,GAAG;QACL,CAAC,CAAC,6BAA6B,CAAC;AACpC,CAAC;AAED,0BAA0B;AAC1B,MAAM,UAAU,kBAAkB,CAAC,EAAE,SAAS,EAAY;IACxD,OAAO;QACL,IAAI,EAAE,kBAAkB;QACxB,KAAK,EAAE,YAAY;QACnB,WAAW,EACT,
|
|
1
|
+
{"version":3,"file":"tools-user-skills.js","sourceRoot":"","sources":["../../../../src/server/agent/Agent/tools-user-skills.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,6 +61,10 @@ export function updateUserSkillByName(input) {
|
|
|
61
61
|
const existing = findAgentUserSkillByName(db, input.ownerVisitorId, input.currentName.trim());
|
|
62
62
|
if (!existing)
|
|
63
63
|
throw new Error("skill_not_found");
|
|
64
|
+
if (input.expectedUpdatedAt !== undefined &&
|
|
65
|
+
input.expectedUpdatedAt !== existing.updated_at) {
|
|
66
|
+
throw new Error("skill_update_conflict");
|
|
67
|
+
}
|
|
64
68
|
const name = normalizeName(input.name);
|
|
65
69
|
const description = normalizeDescription(input.description);
|
|
66
70
|
const body = normalizeBody(input.body);
|
|
@@ -69,7 +73,8 @@ export function updateUserSkillByName(input) {
|
|
|
69
73
|
if (clash)
|
|
70
74
|
throw new Error("skill_name_taken");
|
|
71
75
|
}
|
|
72
|
-
const
|
|
76
|
+
const currentMs = Date.parse(existing.updated_at);
|
|
77
|
+
const now = new Date(Math.max(Date.now(), Number.isFinite(currentMs) ? currentMs + 1 : 0)).toISOString();
|
|
73
78
|
try {
|
|
74
79
|
const ok = updateAgentUserSkill(db, {
|
|
75
80
|
id: existing.id,
|
|
@@ -78,13 +83,14 @@ export function updateUserSkillByName(input) {
|
|
|
78
83
|
description,
|
|
79
84
|
body,
|
|
80
85
|
updated_at: now,
|
|
81
|
-
});
|
|
82
|
-
if (!ok)
|
|
83
|
-
throw new Error("skill_not_found");
|
|
86
|
+
}, input.expectedUpdatedAt);
|
|
87
|
+
if (!ok) {
|
|
88
|
+
throw new Error(input.expectedUpdatedAt ? "skill_update_conflict" : "skill_not_found");
|
|
89
|
+
}
|
|
84
90
|
}
|
|
85
91
|
catch (err) {
|
|
86
92
|
const msg = err instanceof Error ? err.message : String(err);
|
|
87
|
-
if (msg === "skill_not_found")
|
|
93
|
+
if (msg === "skill_not_found" || msg === "skill_update_conflict")
|
|
88
94
|
throw err;
|
|
89
95
|
if (msg.includes("UNIQUE") || msg.includes("unique")) {
|
|
90
96
|
throw new Error("skill_name_taken");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-skills.js","sourceRoot":"","sources":["../../../../src/server/agent/Agent/user-skills.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EACL,0BAA0B,EAC1B,sBAAsB,EACtB,wBAAwB,EACxB,wBAAwB,EACxB,0BAA0B,EAC1B,oBAAoB,EACpB,0BAA0B,EAC1B,oBAAoB,GAErB,MAAM,gDAAgD,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,MAAM,GAAG,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC;AAErC,wBAAwB;AACxB,MAAM,CAAC,MAAM,yBAAyB,GAAG,EAAE,GAAG,IAAI,CAAC;AACnD,aAAa;AACb,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC;AACpC,MAAM,QAAQ,GAAG,EAAE,CAAC;AACpB,MAAM,QAAQ,GAAG,GAAG,CAAC;AAErB,gBAAgB;AAChB,MAAM,CAAC,MAAM,kBAAkB,GAAG,iBAAiB,CAAC;AAUpD,MAAM,UAAU,iBAAiB,CAAC,GAAsB;IACtD,OAAO;QACL,EAAE,EAAE,GAAG,CAAC,EAAE;QACV,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,SAAS,EAAE,GAAG,CAAC,UAAU;KAC1B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,cAAsB;IACnD,OAAO,0BAA0B,CAAC,KAAK,EAAE,EAAE,cAAc,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;AACpF,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,cAAsB,EACtB,IAAY;IAEZ,MAAM,GAAG,GAAG,wBAAwB,CAAC,KAAK,EAAE,EAAE,cAAc,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3E,OAAO,GAAG,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAK/B;IACC,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,WAAW,GAAG,oBAAoB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC5D,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;IACnB,IAAI,wBAAwB,CAAC,EAAE,EAAE,KAAK,CAAC,cAAc,EAAE,IAAI,CAAC,EAAE,CAAC;QAC7D,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACtC,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACrC,MAAM,GAAG,GAAsB;QAC7B,EAAE,EAAE,UAAU,EAAE;QAChB,gBAAgB,EAAE,KAAK,CAAC,cAAc;QACtC,IAAI;QACJ,WAAW;QACX,IAAI;QACJ,UAAU,EAAE,GAAG;KAChB,CAAC;IACF,IAAI,CAAC;QACH,oBAAoB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAChC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7D,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrD,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtC,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;IACD,OAAO,iBAAiB,CAAC,GAAG,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,
|
|
1
|
+
{"version":3,"file":"user-skills.js","sourceRoot":"","sources":["../../../../src/server/agent/Agent/user-skills.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,6 +55,18 @@ export function normalizeThinkingLevel(raw) {
|
|
|
55
55
|
}
|
|
56
56
|
return "low";
|
|
57
57
|
}
|
|
58
|
+
export const DEFAULT_AGENT_RUN_TIMEOUT_SECONDS = 300;
|
|
59
|
+
export const MIN_AGENT_RUN_TIMEOUT_SECONDS = 60;
|
|
60
|
+
export const MAX_AGENT_RUN_TIMEOUT_SECONDS = 3600;
|
|
61
|
+
export function normalizeRunTimeoutSeconds(value, fallback = DEFAULT_AGENT_RUN_TIMEOUT_SECONDS) {
|
|
62
|
+
const n = typeof value === "number" ? value : typeof value === "string" ? Number(value) : NaN;
|
|
63
|
+
if (!Number.isFinite(n))
|
|
64
|
+
return fallback;
|
|
65
|
+
const rounded = Math.floor(n);
|
|
66
|
+
if (rounded < MIN_AGENT_RUN_TIMEOUT_SECONDS)
|
|
67
|
+
return MIN_AGENT_RUN_TIMEOUT_SECONDS;
|
|
68
|
+
return Math.min(rounded, MAX_AGENT_RUN_TIMEOUT_SECONDS);
|
|
69
|
+
}
|
|
58
70
|
export function isAgentModelId(v) {
|
|
59
71
|
return AGENT_MODEL_IDS.includes(v);
|
|
60
72
|
}
|
|
@@ -117,6 +129,7 @@ function rowToConfig(row) {
|
|
|
117
129
|
apiKey: effectiveApiKey,
|
|
118
130
|
contextWindow: normalizeContextWindow(row.context_window),
|
|
119
131
|
thinkingLevel: normalizeThinkingLevel(row.thinking_level),
|
|
132
|
+
runTimeoutSeconds: normalizeRunTimeoutSeconds(row.run_timeout_seconds),
|
|
120
133
|
compat: parseCompat(row.compat_json),
|
|
121
134
|
isDefault: row.is_default === 1,
|
|
122
135
|
};
|
|
@@ -185,6 +198,7 @@ function buildConfigRow(input) {
|
|
|
185
198
|
: existing?.name ?? resolveConfigName(undefined, input.visitorName, kind);
|
|
186
199
|
const contextWindow = normalizeContextWindow(input.contextWindow ?? existing?.context_window);
|
|
187
200
|
const thinkingLevel = normalizeThinkingLevel(input.thinkingLevel ?? existing?.thinking_level ?? "low");
|
|
201
|
+
const runTimeoutSeconds = normalizeRunTimeoutSeconds(input.runTimeoutSeconds ?? existing?.run_timeout_seconds);
|
|
188
202
|
const updated_at = new Date().toISOString();
|
|
189
203
|
if (kind === "custom") {
|
|
190
204
|
const baseUrlRaw = (input.baseUrl ?? existing?.base_url ?? "").trim().replace(/\/+$/, "");
|
|
@@ -222,6 +236,7 @@ function buildConfigRow(input) {
|
|
|
222
236
|
api_key: "", // apiKey 存 secrets 文件,DB 不再存明文
|
|
223
237
|
context_window: contextWindow,
|
|
224
238
|
thinking_level: thinkingLevel,
|
|
239
|
+
run_timeout_seconds: runTimeoutSeconds,
|
|
225
240
|
is_default: input.isDefault ? 1 : 0,
|
|
226
241
|
updated_at,
|
|
227
242
|
};
|
|
@@ -241,6 +256,7 @@ function buildConfigRow(input) {
|
|
|
241
256
|
api_key: "", // apiKey 存 secrets 文件,DB 不再存明文
|
|
242
257
|
context_window: contextWindow,
|
|
243
258
|
thinking_level: thinkingLevel,
|
|
259
|
+
run_timeout_seconds: runTimeoutSeconds,
|
|
244
260
|
is_default: input.isDefault ? 1 : 0,
|
|
245
261
|
updated_at,
|
|
246
262
|
};
|