agent-loft 0.2.121 → 0.2.122
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 +15 -0
- package/package.json +1 -1
- package/src/bot-event-runner.ts +131 -0
- package/src/channels/feishu/bot.ts +82 -31
- package/src/channels/feishu/cards.ts +6 -2
- package/src/channels/feishu/client.ts +3 -3
- package/src/channels/feishu/index.ts +3 -1
- package/src/channels/web/access.ts +8 -5
- package/src/channels/web/api.ts +64 -3
- package/src/channels/web/bot-events-api.ts +82 -0
- package/src/channels/web/http.ts +1 -1
- package/src/channels/web/server.ts +9 -0
- package/src/channels/web/tasks-api.ts +6 -2
- package/src/core/backup.ts +6 -0
- package/src/core/bot-events.ts +88 -0
- package/src/core/command-catalog.ts +1 -0
- package/src/core/db.ts +18 -0
- package/src/core/hub.ts +28 -15
- package/src/core/personal.ts +2 -0
- package/src/core/store.ts +15 -3
- package/src/core/task-runner.ts +1 -0
- package/src/core/tasks-bridge.ts +8 -2
- package/src/core/tasks.ts +9 -1
- package/src/core/ui-prefs.ts +1 -1
- package/src/main.ts +3 -0
- package/web/css/tasks.css +8 -0
- package/web/lib/ws.js +3 -0
- package/web/views/assistants.js +82 -0
- package/web/views/bot-events.js +96 -0
- package/web/views/layout.js +11 -4
- package/web/views/sidebar-nav.js +1 -0
- package/web/views/tasks.js +7 -4
package/src/core/store.ts
CHANGED
|
@@ -53,6 +53,8 @@ export type Conversation = {
|
|
|
53
53
|
cwd: string;
|
|
54
54
|
/** cwd 是否用户显式指定。没指定过的跟随 workspaceRoot 变化 */
|
|
55
55
|
cwdExplicit?: boolean;
|
|
56
|
+
/** 联系人主会话、已移除的主会话或由它派生的私人会话。 */
|
|
57
|
+
assistant?: "active" | "removed" | "related";
|
|
56
58
|
perAgent: Record<string, AgentBinding>;
|
|
57
59
|
/** 最后一次有人说话的时间,用于闲置过期 */
|
|
58
60
|
activeAt: number;
|
|
@@ -80,6 +82,8 @@ export type Conversation = {
|
|
|
80
82
|
* 账号时记下(见 core/feishu-links.ts)。飞书群聊、没绑定的私聊和升级前就有的 Web 会话没有,归管理员。
|
|
81
83
|
*/
|
|
82
84
|
owner?: string;
|
|
85
|
+
/** 已绑定飞书私聊的发送人,用于再次核对 bot 消息的目的地。 */
|
|
86
|
+
boundOpenId?: string;
|
|
83
87
|
/** 定时任务的专用对话:是哪个任务的(见 core/tasks.ts)。任务删了就清掉 */
|
|
84
88
|
taskId?: string;
|
|
85
89
|
};
|
|
@@ -202,6 +206,7 @@ export function ensureConversation(params: {
|
|
|
202
206
|
title?: string;
|
|
203
207
|
owner?: string;
|
|
204
208
|
cwd?: string;
|
|
209
|
+
assistant?: Conversation["assistant"];
|
|
205
210
|
}): Conversation {
|
|
206
211
|
const existing = getConversation(params.key);
|
|
207
212
|
if (existing) return existing;
|
|
@@ -214,6 +219,7 @@ export function ensureConversation(params: {
|
|
|
214
219
|
...(params.expert ? { expert: params.expert } : {}),
|
|
215
220
|
cwd: params.cwd ?? config().workspaceRoot,
|
|
216
221
|
...(params.cwd && params.cwd !== config().workspaceRoot ? { cwdExplicit: true } : {}),
|
|
222
|
+
...(params.assistant ? { assistant: params.assistant } : {}),
|
|
217
223
|
perAgent: {},
|
|
218
224
|
activeAt: now,
|
|
219
225
|
createdAt: now,
|
|
@@ -255,9 +261,9 @@ export function touchConversation(key: string): void {
|
|
|
255
261
|
persist();
|
|
256
262
|
}
|
|
257
263
|
|
|
258
|
-
export function isExpired(conv: Conversation, now = Date.now()): boolean {
|
|
264
|
+
export function isExpired(conv: Conversation, now = Date.now(), lastActive = conv.activeAt): boolean {
|
|
259
265
|
const ttl = config().sessionTtlMs;
|
|
260
|
-
return ttl > 0 && now -
|
|
266
|
+
return conv.assistant !== "active" && ttl > 0 && now - lastActive > ttl;
|
|
261
267
|
}
|
|
262
268
|
|
|
263
269
|
export function listConversations(): Conversation[] {
|
|
@@ -281,11 +287,17 @@ export function putConversation(conv: Conversation): void {
|
|
|
281
287
|
// 记下每个 agent 会话 id 是哪个用户的对话里开出来的。没记过的(飞书、终端里开的、升级前的)归管理员。
|
|
282
288
|
|
|
283
289
|
/** 第一次见到这个会话 id 时记下主人;已经有主了不改 */
|
|
284
|
-
export function recordSessionOwner(sessionId: string | undefined, userId: string | undefined): void {
|
|
290
|
+
export function recordSessionOwner(sessionId: string | undefined, userId: string | undefined, privateAssistant = false): void {
|
|
285
291
|
if (!sessionId || !userId) return;
|
|
292
|
+
if (privateAssistant) sql("INSERT OR IGNORE INTO assistant_sessions (session_id, owner) VALUES (?, ?)").run(sessionId, userId);
|
|
286
293
|
sql("INSERT OR IGNORE INTO session_owners (session_id, user_id) VALUES (?, ?)").run(sessionId, userId);
|
|
287
294
|
}
|
|
288
295
|
|
|
296
|
+
export function assistantSessionOwner(sessionId: string): string | undefined {
|
|
297
|
+
const row = sql("SELECT owner FROM assistant_sessions WHERE session_id = ?").get(sessionId) as { owner: string } | undefined;
|
|
298
|
+
return row?.owner;
|
|
299
|
+
}
|
|
300
|
+
|
|
289
301
|
export function sessionOwner(sessionId: string): string | undefined {
|
|
290
302
|
const row = sql("SELECT user_id FROM session_owners WHERE session_id = ?").get(sessionId) as { user_id: string } | undefined;
|
|
291
303
|
return row?.user_id;
|
package/src/core/task-runner.ts
CHANGED
|
@@ -85,6 +85,7 @@ function resolveConv(task: Task): Resolved {
|
|
|
85
85
|
...(task.expert ? { expert: task.expert } : {}),
|
|
86
86
|
...(cwd ? { cwd } : {}),
|
|
87
87
|
owner: task.owner,
|
|
88
|
+
...(task.assistantKey ? { assistant: "related" } : {}),
|
|
88
89
|
title: task.title.slice(0, 80),
|
|
89
90
|
});
|
|
90
91
|
updateConversation(key, { titleAuto: false, taskId: task.id });
|
package/src/core/tasks-bridge.ts
CHANGED
|
@@ -18,7 +18,7 @@ import { expertIdOf, getConversation } from "./store.js";
|
|
|
18
18
|
import { forgetTask } from "./task-runner.js";
|
|
19
19
|
import { describeSchedule, formatDateTime, nextRun, normalizeSchedule, parseLocalDateTime, serverTimeZone, type TaskSchedule } from "./task-schedule.js";
|
|
20
20
|
import { TASK_TOOL_TIMEOUT_SEC, tasksSocketPath, verifyTaskCaller } from "./tasks-mcp.js";
|
|
21
|
-
import { createTask, DEFAULT_PUSH, deleteTask, getTask, listTasks, PUSH_CHANNELS, taskPush, TASKS_PER_USER, updateTask, type PushChannel, type Task, type TaskInput } from "./tasks.js";
|
|
21
|
+
import { createTask, DEFAULT_PUSH, deleteTask, getTask, listTasks, taskBelongsToAssistant, PUSH_CHANNELS, taskPush, TASKS_PER_USER, updateTask, type PushChannel, type Task, type TaskInput } from "./tasks.js";
|
|
22
22
|
import { getUser } from "./users.js";
|
|
23
23
|
import { SKILL_TOOL_NAMES, skillToolCall } from "./skills-bridge.js";
|
|
24
24
|
|
|
@@ -131,6 +131,12 @@ async function call(userId: string, convKey: string, tool: string, args: Record<
|
|
|
131
131
|
if (tool === "list_tasks") {
|
|
132
132
|
const tasks = listTasks(user.id);
|
|
133
133
|
const head = `现在是 ${formatDateTime(now)}(${serverTimeZone()})。`;
|
|
134
|
+
if (conv.assistant === "active") {
|
|
135
|
+
const assigned = tasks.filter((t) => taskBelongsToAssistant(t, convKey));
|
|
136
|
+
const rest = tasks.filter((t) => !taskBelongsToAssistant(t, convKey));
|
|
137
|
+
const section = (title: string, list: Task[]) => title + (list.length ? "\n" + list.map((t) => describeTask(t, convKey)).join("\n") : ":无");
|
|
138
|
+
return { text: head + "\n" + section("这个 bot 负责的定时任务", assigned) + "\n" + section("用户的其他定时任务", rest) };
|
|
139
|
+
}
|
|
134
140
|
if (tasks.length === 0) return { text: `${head}用户还没有定时任务。` };
|
|
135
141
|
return { text: `${head}用户有 ${tasks.length} 个定时任务(最多 ${TASKS_PER_USER} 个):\n\n${tasks.map((t) => describeTask(t, convKey)).join("\n")}` };
|
|
136
142
|
}
|
|
@@ -182,7 +188,7 @@ async function call(userId: string, convKey: string, tool: string, args: Record<
|
|
|
182
188
|
);
|
|
183
189
|
if (!ok) return fail("用户没有同意,任务没有建。");
|
|
184
190
|
try {
|
|
185
|
-
const task = createTask(user.id, input, "agent");
|
|
191
|
+
const task = createTask(user.id, input, "agent", Date.now(), conv.assistant === "active" ? convKey : undefined);
|
|
186
192
|
return {
|
|
187
193
|
text: `已建好 [${task.id}]「${task.title}」:${describeSchedule(task.schedule)},${task.nextRunAt ? `下次 ${formatDateTime(task.nextRunAt)}` : "没有下次"}。用户可以在网页侧栏「定时任务」里查看和修改。`,
|
|
188
194
|
};
|
package/src/core/tasks.ts
CHANGED
|
@@ -70,6 +70,8 @@ export type Task = {
|
|
|
70
70
|
updatedAt: number;
|
|
71
71
|
/** 谁建的:用户在页面上建的,还是 agent 在对话里建的 */
|
|
72
72
|
createdBy: "user" | "agent";
|
|
73
|
+
/** 创建时明确交办的 bot,独立运行的任务也能追溯来源。 */
|
|
74
|
+
assistantKey?: string;
|
|
73
75
|
nextRunAt?: number;
|
|
74
76
|
/** 最近的在前 */
|
|
75
77
|
runs: TaskRun[];
|
|
@@ -134,6 +136,11 @@ export function listTasks(owner: string): Task[] {
|
|
|
134
136
|
.sort((a, b) => b.createdAt - a.createdAt);
|
|
135
137
|
}
|
|
136
138
|
|
|
139
|
+
/** 调用方先按 owner 取任务,再按交办来源或投递会话找到相关事项。 */
|
|
140
|
+
export function taskBelongsToAssistant(task: Task, key: string): boolean {
|
|
141
|
+
return task.assistantKey === key || task.target.key === key;
|
|
142
|
+
}
|
|
143
|
+
|
|
137
144
|
/** 只认主人:别人的任务一律当不存在 */
|
|
138
145
|
export function getTask(owner: string, id: string): Task | undefined {
|
|
139
146
|
return load().find((t) => t.id === id && t.owner === owner);
|
|
@@ -233,7 +240,7 @@ function cleanTarget(v: unknown, prev?: TaskTarget): TaskTarget {
|
|
|
233
240
|
return prev?.kind === "dedicated" ? prev : { kind: "dedicated" };
|
|
234
241
|
}
|
|
235
242
|
|
|
236
|
-
export function createTask(owner: string, input: TaskInput, by: "user" | "agent", now = Date.now()): Task {
|
|
243
|
+
export function createTask(owner: string, input: TaskInput, by: "user" | "agent", now = Date.now(), assistantKey?: string): Task {
|
|
237
244
|
if (listTasks(owner).length >= TASKS_PER_USER) throw new Error(`每人最多 ${TASKS_PER_USER} 个定时任务,先删掉几个不用的`);
|
|
238
245
|
const prompt = cleanPrompt(input.prompt);
|
|
239
246
|
const schedule = normalizeSchedule(input.schedule, now);
|
|
@@ -259,6 +266,7 @@ export function createTask(owner: string, input: TaskInput, by: "user" | "agent"
|
|
|
259
266
|
createdAt: now,
|
|
260
267
|
updatedAt: now,
|
|
261
268
|
createdBy: by,
|
|
269
|
+
...(assistantKey ? { assistantKey } : {}),
|
|
262
270
|
runs: [],
|
|
263
271
|
};
|
|
264
272
|
task.nextRunAt = task.enabled ? nextRun(schedule, now) : undefined;
|
package/src/core/ui-prefs.ts
CHANGED
|
@@ -4,7 +4,7 @@ import path from "node:path";
|
|
|
4
4
|
import { dataDir, readJson, writeJsonAtomic } from "../home.js";
|
|
5
5
|
|
|
6
6
|
export type SidebarNavItem = { id: string; visible: boolean };
|
|
7
|
-
const NAV_IDS = ["search", "tasks", "library", "remote", "settings"];
|
|
7
|
+
const NAV_IDS = ["search", "tasks", "assistants", "library", "remote", "settings"];
|
|
8
8
|
type Prefs = { dirOrder?: string[]; sidebarNav?: SidebarNavItem[]; expertOrder?: string[] };
|
|
9
9
|
|
|
10
10
|
const prefsPath = path.join(dataDir, "ui-prefs.json");
|
package/src/main.ts
CHANGED
|
@@ -20,6 +20,7 @@ import { buildHistoryIndex } from "./core/chat-history.js";
|
|
|
20
20
|
import { migrateAllMemoryItems, migrateMemoryDefault } from "./core/memory.js";
|
|
21
21
|
import { listUsers } from "./core/users.js";
|
|
22
22
|
import { startScheduler, stopScheduler } from "./core/scheduled.js";
|
|
23
|
+
import { startBotEvents, stopBotEvents } from "./bot-event-runner.js";
|
|
23
24
|
import { startTaskRunner, stopTaskRunner } from "./core/task-runner.js";
|
|
24
25
|
import { startTasksBridge, stopTasksBridge } from "./core/tasks-bridge.js";
|
|
25
26
|
|
|
@@ -101,6 +102,7 @@ async function main(): Promise<void> {
|
|
|
101
102
|
// 定时任务:agent 用的工具通道先开,再开始按点运行(停机期间错过的补跑)
|
|
102
103
|
startTasksBridge();
|
|
103
104
|
startTaskRunner();
|
|
105
|
+
startBotEvents();
|
|
104
106
|
// 先查一遍 agent 装没装、登没登录,网页打开时新对话里就只列出能用的
|
|
105
107
|
void agentHealth().catch(() => {});
|
|
106
108
|
// 读一次 Claude 的命令表:成员会话的技能白名单要带上 Claude Code 自带的那些(见 claude/session.ts 的 claudeBuiltins)
|
|
@@ -120,6 +122,7 @@ async function main(): Promise<void> {
|
|
|
120
122
|
console.log(`[退出] 收到 ${signal},正在收尾…`);
|
|
121
123
|
const force = setTimeout(() => process.exit(0), 8000);
|
|
122
124
|
force.unref();
|
|
125
|
+
stopBotEvents();
|
|
123
126
|
stopScheduler();
|
|
124
127
|
stopFeishu();
|
|
125
128
|
stopWeixin();
|
package/web/css/tasks.css
CHANGED
|
@@ -544,3 +544,11 @@ button.task-run:hover {
|
|
|
544
544
|
text-overflow: ellipsis;
|
|
545
545
|
white-space: nowrap;
|
|
546
546
|
}
|
|
547
|
+
|
|
548
|
+
.assistant-list, .assistant-card { display: grid; gap: 12px; }
|
|
549
|
+
.assistant-card { border: 1px solid var(--border); border-radius: 12px; padding: 12px; }
|
|
550
|
+
.assistant-row, .assistant-task { display: flex; gap: 8px; align-items: center; flex-wrap: wrap; }
|
|
551
|
+
.assistant-list .grow { flex: 1 1 8em; min-width: 0; overflow-wrap: anywhere; }
|
|
552
|
+
.assistant-row select { flex: 1; min-width: 0; }
|
|
553
|
+
.assistant-list small { display: block; color: var(--muted); overflow-wrap: anywhere; }
|
|
554
|
+
.assistant-task { padding-top: 8px; border-top: 1px solid var(--border); }
|
package/web/lib/ws.js
CHANGED
|
@@ -285,6 +285,9 @@ function onWsMessage(msg) {
|
|
|
285
285
|
case "ix":
|
|
286
286
|
upsertInteraction(msg.interaction);
|
|
287
287
|
return;
|
|
288
|
+
case "bot-events":
|
|
289
|
+
document.dispatchEvent(new Event("aim:bot-events"));
|
|
290
|
+
break;
|
|
288
291
|
case "tasks":
|
|
289
292
|
// 自己的定时任务变了:定时任务页开着的话会去重新拉(views/tasks.js)
|
|
290
293
|
document.dispatchEvent(new Event("aim:tasks"));
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
import { api } from "../lib/api.js";
|
|
2
|
+
import { fill, h, toast } from "../lib/dom.js";
|
|
3
|
+
import { confirmDialog, modal } from "../lib/overlay.js";
|
|
4
|
+
import { expertChoices, expertIcon } from "./experts.js";
|
|
5
|
+
import { openConversation } from "./messages.js";
|
|
6
|
+
import { closeSide } from "./sidebar.js";
|
|
7
|
+
import { openBotEvents } from "./bot-events.js";
|
|
8
|
+
import { editTaskById, openTaskForm, runStatusText } from "./tasks.js";
|
|
9
|
+
|
|
10
|
+
/** 每次打开读取本账号的联系人。多设备改变任务时刷新正在查看的列表。 */
|
|
11
|
+
export function openAssistants() {
|
|
12
|
+
closeSide();
|
|
13
|
+
const body = h("div", { class: "modal-body assistant-list", "aria-live": "polite" });
|
|
14
|
+
const controller = new AbortController();
|
|
15
|
+
const dismiss = modal({ title: "bot", body, beforeClose: () => controller.abort() });
|
|
16
|
+
const close = () => { controller.abort(); dismiss(); };
|
|
17
|
+
let generation = 0;
|
|
18
|
+
|
|
19
|
+
const open = (key) => { close(); void openConversation(key); };
|
|
20
|
+
const button = (label, action, disabled = false) => h("button", { class: "btn", disabled, onclick: action }, label);
|
|
21
|
+
|
|
22
|
+
async function remove(assistant) {
|
|
23
|
+
if (!await confirmDialog({ title: "移除这个 bot?", message: "将删除这个 bot 的事件监听和事件记录。已有定时任务继续运行,聊天记录会保留。重新添加这个专家可以接着聊。", confirmText: "移除" })) return;
|
|
24
|
+
try {
|
|
25
|
+
await api("/api/assistants", { method: "DELETE", body: { key: assistant.key } });
|
|
26
|
+
await load();
|
|
27
|
+
} catch (err) { toast(err.message); }
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
function taskRow(t) {
|
|
31
|
+
const state = t.pending ? "待你处理" : t.last ? runStatusText(t.last.status) : "尚未运行";
|
|
32
|
+
const next = t.enabled && t.nextRunAt ? "下次 " + new Date(t.nextRunAt).toLocaleString() : "已停用";
|
|
33
|
+
return h("div", { class: "assistant-task" },
|
|
34
|
+
h("div", { class: "grow" }, h("strong", {}, t.title), h("small", {}, state + " · " + next),
|
|
35
|
+
t.last?.preview || t.last?.note ? h("small", {}, t.last.preview || t.last.note) : null),
|
|
36
|
+
t.resultKey ? button("查看对话", () => open(t.resultKey)) : null,
|
|
37
|
+
button("编辑", () => { close(); void editTaskById(t.id); }));
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
function contact(a) {
|
|
41
|
+
const label = a.expert.missing ? a.title || "已失效的 bot" : a.expert.name;
|
|
42
|
+
return h("section", { class: "assistant-card" },
|
|
43
|
+
h("div", { class: "assistant-row" }, expertIcon({ ...a.expert, engine: a.agent }),
|
|
44
|
+
h("strong", { class: "grow" }, label),
|
|
45
|
+
button(a.pending ? "待你处理 · " + a.pending : a.unavailable ? "查看历史" : "打开对话", () => open(a.key)),
|
|
46
|
+
button("移除", () => void remove(a))),
|
|
47
|
+
a.unavailable || a.busy ? h("small", {}, a.unavailable || "正在回复") : null,
|
|
48
|
+
h("div", { class: "assistant-row" }, h("span", { class: "grow" }, "定时任务(" + a.tasks.length + ")"),
|
|
49
|
+
button("事件监听", () => { close(); openBotEvents({ key: a.key }); }),
|
|
50
|
+
button("新建任务", () => {
|
|
51
|
+
close();
|
|
52
|
+
openTaskForm(null, { assistantKey: a.key, expert: a.expert.id, cwd: a.cwd, target: { kind: "conv", key: a.key }, convKey: a.key, convTitle: label, convExpert: { ...a.expert, engine: a.agent }, convCwd: a.cwd, convPermission: a.permission, convPermissionMax: a.permissionMax });
|
|
53
|
+
}, !!a.unavailable)),
|
|
54
|
+
a.tasks.map(taskRow));
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
async function load() {
|
|
58
|
+
const current = ++generation;
|
|
59
|
+
try {
|
|
60
|
+
const { assistants } = await api("/api/assistants");
|
|
61
|
+
if (current !== generation || !body.isConnected) return;
|
|
62
|
+
const choices = expertChoices().filter((e) => !assistants.some((a) => a.expert.id === e.id));
|
|
63
|
+
const select = h("select", { "aria-label": "选择 bot 专家" }, choices.map((e) => h("option", { value: e.id }, e.name)));
|
|
64
|
+
if (!choices.length) select.append(h("option", {}, "没有更多可添加的专家"));
|
|
65
|
+
const add = button("添加 bot", async () => {
|
|
66
|
+
add.disabled = true;
|
|
67
|
+
try {
|
|
68
|
+
await api("/api/assistants", { method: "POST", body: { expert: select.value } });
|
|
69
|
+
await load();
|
|
70
|
+
} catch (err) { toast(err.message); add.disabled = false; }
|
|
71
|
+
}, !choices.length);
|
|
72
|
+
fill(body, h("div", { class: "assistant-row" }, select, add),
|
|
73
|
+
assistants.length ? assistants.map(contact) : h("p", {}, "选一个专家作为 bot,即可在这里找到它的对话和定时任务。"),
|
|
74
|
+
h("small", {}, "在已绑定账号的飞书私聊发送 /bot,可接着和 bot 聊。"));
|
|
75
|
+
} catch (err) {
|
|
76
|
+
if (body.isConnected && current === generation) fill(body, h("p", {}, err.message), button("重试", load));
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
for (const event of ["aim:tasks", "aim:experts"]) document.addEventListener(event, load, { signal: controller.signal });
|
|
81
|
+
void load();
|
|
82
|
+
}
|
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
import { api } from "../lib/api.js";
|
|
2
|
+
import { fill, h, toast } from "../lib/dom.js";
|
|
3
|
+
import { confirmDialog, modal } from "../lib/overlay.js";
|
|
4
|
+
import { openConversation } from "./messages.js";
|
|
5
|
+
|
|
6
|
+
const path = "/api/bot-events";
|
|
7
|
+
const state = { inbox: "已记入事件记录", pending: "等待投递", sent: "已投递", failed: "投递失败", cancelled: "已取消" };
|
|
8
|
+
const option = (value, label) => h("option", { value }, label);
|
|
9
|
+
const button = (label, onclick) => h("button", { class: "btn", type: "button", onclick }, label);
|
|
10
|
+
|
|
11
|
+
function credentials(token) {
|
|
12
|
+
const field = h("input", { "aria-label": "Webhook 令牌", type: "password", readonly: true, value: token, autocomplete: "off" });
|
|
13
|
+
const reveal = button("显示令牌", () => {
|
|
14
|
+
field.type = field.type === "password" ? "text" : "password";
|
|
15
|
+
reveal.textContent = field.type === "password" ? "显示令牌" : "隐藏令牌";
|
|
16
|
+
field.select();
|
|
17
|
+
});
|
|
18
|
+
modal({ title: "接入备份作业", body: h("div", { class: "modal-body assistant-list" },
|
|
19
|
+
h("label", {}, "上报地址", h("input", { readonly: true, value: location.origin + path + "/receive" })),
|
|
20
|
+
h("label", {}, "Webhook 令牌(仅本次可查看)", field), reveal,
|
|
21
|
+
h("small", {}, "作业结束时用 POST 提交 JSON,请求头使用 Authorization: Bearer <令牌>。同一次运行重试时沿用 runId。"),
|
|
22
|
+
h("code", {}, '{"runId":"backup-001","status":"failed","reason":"disk_full"}')) });
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
function addForm(settings, reload) {
|
|
26
|
+
const name = h("input", { required: true, maxlength: 60, placeholder: "例如:NAS 夜间备份" });
|
|
27
|
+
const source = h("select", {}, option("webhook", "外部备份 Webhook"), settings.admin ? option("backup", "本机数据库备份") : null);
|
|
28
|
+
const destination = h("select", {}, option("inbox", "只写入事件记录"), option("web", "Web 系统推送"),
|
|
29
|
+
settings.feishu.map((b) => option("feishu:" + b.id, "飞书 · " + b.name)));
|
|
30
|
+
const analyze = h("input", { type: "checkbox" });
|
|
31
|
+
const save = h("button", { class: "btn primary", type: "submit" }, "创建监听");
|
|
32
|
+
const form = h("form", { class: "modal-body assistant-list" },
|
|
33
|
+
h("label", {}, "名称", name), h("label", {}, "来源", source), h("label", {}, "发现新失败时", destination),
|
|
34
|
+
h("label", {}, analyze, " 同时让 bot 分析故障"), save);
|
|
35
|
+
const close = modal({ title: "新增事件监听", body: form });
|
|
36
|
+
form.addEventListener("submit", async (e) => {
|
|
37
|
+
e.preventDefault();
|
|
38
|
+
if (save.disabled) return;
|
|
39
|
+
save.disabled = true;
|
|
40
|
+
try {
|
|
41
|
+
const { token } = await api(path, { method: "POST", body: { key: settings.key, name: name.value, source: source.value, destination: destination.value, analyze: analyze.checked } });
|
|
42
|
+
close();
|
|
43
|
+
if (token) credentials(token);
|
|
44
|
+
void reload();
|
|
45
|
+
} catch (err) { toast(err.message); save.disabled = false; }
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
export function openBotEvents(query) {
|
|
50
|
+
const body = h("div", { class: "modal-body assistant-list", "aria-live": "polite" }, "正在读取事件…");
|
|
51
|
+
const controller = new AbortController();
|
|
52
|
+
const dismiss = modal({ title: "bot 事件监听", body, beforeClose: () => controller.abort() });
|
|
53
|
+
let generation = 0;
|
|
54
|
+
async function retry(w, e) {
|
|
55
|
+
try { await api(path + "/" + w.id + "/retry/" + e.id, { method: "POST" }); await load(); }
|
|
56
|
+
catch (err) { toast(err.message); }
|
|
57
|
+
}
|
|
58
|
+
function incident(w, e) {
|
|
59
|
+
return h("div", { class: "assistant-task" }, h("div", { class: "grow" },
|
|
60
|
+
h("strong", {}, e.reason), h("small", {}, new Date(e.at).toLocaleString() + " · " + e.run),
|
|
61
|
+
h("small", {}, [state[e.delivery], e.error, e.analysis === "error" ? "分析启动失败" : null].filter(Boolean).join(" · "))),
|
|
62
|
+
e.analysisKey ? button("查看分析", () => { controller.abort(); dismiss(); void openConversation(e.analysisKey); }) : null,
|
|
63
|
+
e.delivery === "failed" ? button("重试投递", () => void retry(w, e)) : null);
|
|
64
|
+
}
|
|
65
|
+
async function remove(w, key) {
|
|
66
|
+
if (!await confirmDialog({ title: "删除监听?", message: "会停止接收这项作业的结果,并清除该监听的事件记录。", confirmText: "删除" })) return;
|
|
67
|
+
try {
|
|
68
|
+
await api(path + "/" + w.id, { method: "DELETE" });
|
|
69
|
+
query = { key };
|
|
70
|
+
await load();
|
|
71
|
+
} catch (err) { toast(err.message); }
|
|
72
|
+
}
|
|
73
|
+
async function load() {
|
|
74
|
+
const current = ++generation;
|
|
75
|
+
try {
|
|
76
|
+
const data = await api(path + "?" + new URLSearchParams(query));
|
|
77
|
+
if (current !== generation || !body.isConnected) return;
|
|
78
|
+
const watches = data.watches.slice().sort((a, b) => Number(b.id === query.watch) - Number(a.id === query.watch));
|
|
79
|
+
fill(body, data.unavailable ? h("p", {}, data.unavailable) : button("新增监听", () => addForm(data, load)),
|
|
80
|
+
watches.length ? watches.map((w) => {
|
|
81
|
+
const dest = w.destination === "web" ? "Web 系统推送" : w.destination === "inbox" ? "只记入事件记录" :
|
|
82
|
+
"飞书 · " + (data.feishu.find((b) => "feishu:" + b.id === w.destination)?.name || "绑定不可用");
|
|
83
|
+
const latest = w.lastSeen ? "最近上报" + (w.lastStatus === "ok" ? "成功" : "失败") + " · " + new Date(w.lastSeen).toLocaleString() : "尚未收到上报";
|
|
84
|
+
return h("section", { class: "assistant-card" }, h("div", { class: "assistant-row" },
|
|
85
|
+
h("strong", { class: "grow" }, w.name), button("删除监听", () => void remove(w, data.key))),
|
|
86
|
+
h("small", {}, [w.source === "backup" ? "本机数据库备份" : "外部备份 Webhook", dest, w.analyze ? "自动分析" : null].filter(Boolean).join(" · ")),
|
|
87
|
+
h("small", {}, latest), w.events.map((e) => incident(w, e)));
|
|
88
|
+
}) : h("p", {}, "暂无监听。添加备份作业后,可以在这里查看最近的失败记录。"),
|
|
89
|
+
button("刷新记录", load));
|
|
90
|
+
} catch (err) {
|
|
91
|
+
if (body.isConnected && current === generation) fill(body, h("p", {}, err.message), button("重新加载", load));
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
document.addEventListener("aim:bot-events", load, { signal: controller.signal });
|
|
95
|
+
void load();
|
|
96
|
+
}
|
package/web/views/layout.js
CHANGED
|
@@ -100,11 +100,17 @@ window.addEventListener("keydown", (e) => {
|
|
|
100
100
|
|
|
101
101
|
// 多服务器(lib/shell.js):外壳让打开某条对话(点了这台的通知)、点了「管理服务器…」、切到别的服务器
|
|
102
102
|
document.addEventListener("aim:shell-open", (e) => {
|
|
103
|
-
|
|
103
|
+
openNoticeTarget(e.detail);
|
|
104
104
|
});
|
|
105
105
|
document.addEventListener("aim:open-settings", (e) => openSettings(e.detail));
|
|
106
106
|
document.addEventListener("aim:server-leave", () => closeSide());
|
|
107
107
|
|
|
108
|
+
function openNoticeTarget(key) {
|
|
109
|
+
if (key?.startsWith("bot-events/")) {
|
|
110
|
+
import("./bot-events.js").then((m) => m.openBotEvents({ watch: key.slice("bot-events/".length) })).catch((err) => toast(err.message));
|
|
111
|
+
} else if (key && key !== S.current) void openConversation(key);
|
|
112
|
+
}
|
|
113
|
+
|
|
108
114
|
/**
|
|
109
115
|
* 通知点开的地址:别的服务器的带着 srv=那台的 id(服务端 push.ts 的 relay),交给外壳切过去。
|
|
110
116
|
* 返回 true 表示已经交出去了
|
|
@@ -182,11 +188,12 @@ export async function boot() {
|
|
|
182
188
|
else newDraft();
|
|
183
189
|
preloadCommands();
|
|
184
190
|
// 以前的技能页地址:技能现在在设置里
|
|
191
|
+
if (fromHash.startsWith("bot-events/")) openNoticeTarget(fromHash);
|
|
185
192
|
if (fromHash === "skills") openSettings("技能");
|
|
186
193
|
// 点了桌面端的系统通知 / 菜单栏里的待处理项:跳到对应会话
|
|
187
194
|
desktop?.onOpen((key) => {
|
|
188
195
|
// 不要求在 S.convs 里:侧栏分页,那条可能还没拉到;openConversation 会去服务端拿
|
|
189
|
-
|
|
196
|
+
openNoticeTarget(key);
|
|
190
197
|
});
|
|
191
198
|
// 页面的「更多」菜单在桌面端顶栏的「更多」里:点了哪项
|
|
192
199
|
if (desktopMenu) desktop.onMenu(runDesktopMenu);
|
|
@@ -211,7 +218,7 @@ export async function boot() {
|
|
|
211
218
|
// 这台自己的通知:外壳正显示着别的服务器的话切回来
|
|
212
219
|
switchServer(HOME);
|
|
213
220
|
const key = decodeURIComponent(url.hash.slice(1));
|
|
214
|
-
|
|
221
|
+
openNoticeTarget(key);
|
|
215
222
|
});
|
|
216
223
|
}
|
|
217
224
|
shellBooted();
|
|
@@ -276,7 +283,7 @@ function renderLayout() {
|
|
|
276
283
|
{ class: "side-top" },
|
|
277
284
|
h("button", { class: "btn new-chat", onclick: () => (newDraft({ inheritLatest: true }), closeSide()) }, icon("plus"), "新建"),
|
|
278
285
|
),
|
|
279
|
-
createSidebarNav({ search: openSearch, tasks: openTasksView, library: openLibraryView, remote: openRemoteView, settings: openSettings }),
|
|
286
|
+
createSidebarNav({ assistants: () => import("./assistants.js").then((m) => m.openAssistants()).catch((err) => toast(err.message)), search: openSearch, tasks: openTasksView, library: openLibraryView, remote: openRemoteView, settings: openSettings }),
|
|
280
287
|
ui.convList,
|
|
281
288
|
// 底部只有额度:没有额度可显示(关了查询、还没查到)时整块藏起来,连分隔线一起
|
|
282
289
|
(ui.sideBottom = h(
|
package/web/views/sidebar-nav.js
CHANGED
|
@@ -6,6 +6,7 @@ import { remoteTabs, S, ui } from "../state.js";
|
|
|
6
6
|
const ITEMS = [
|
|
7
7
|
{ id: "search", label: "搜索", icon: "search" },
|
|
8
8
|
{ id: "tasks", label: "定时任务", icon: "clock" },
|
|
9
|
+
{ id: "assistants", label: "bot", icon: "chat" },
|
|
9
10
|
{ id: "library", label: "资料库", icon: "library" },
|
|
10
11
|
{ id: "remote", label: "远程控制", icon: "monitor" },
|
|
11
12
|
{ id: "settings", label: "设置", icon: "gear" },
|
package/web/views/tasks.js
CHANGED
|
@@ -36,6 +36,8 @@ const STATUS = {
|
|
|
36
36
|
interrupted: { text: "中断", cls: "bad" },
|
|
37
37
|
};
|
|
38
38
|
|
|
39
|
+
export const runStatusText = (status) => STATUS[status]?.text ?? status;
|
|
40
|
+
|
|
39
41
|
const FREQS = [
|
|
40
42
|
["once", "一次"],
|
|
41
43
|
["daily", "每天"],
|
|
@@ -464,12 +466,12 @@ export function openTaskForm(task, preset) {
|
|
|
464
466
|
if (!T.channels) void api("/api/tasks").then((d) => ((T.channels = d.channels ?? null), renderPush()), () => {});
|
|
465
467
|
|
|
466
468
|
// ---- 结果发到哪 ----
|
|
467
|
-
const currentTarget =
|
|
469
|
+
const currentTarget = src.target?.kind === "conv" ? src.target.key : "dedicated";
|
|
468
470
|
const target = h(
|
|
469
471
|
"select",
|
|
470
472
|
{ class: "task-target" },
|
|
471
473
|
h("option", { value: "dedicated", selected: currentTarget === "dedicated" }, task?.target?.kind === "dedicated" && task.convKey ? `专用对话「${task.convTitle || "对话"}」` : "专用对话(第一次运行时新建,之后都发到这条)"),
|
|
472
|
-
currentTarget !== "dedicated" ? h("option", { value: currentTarget, selected: true }, `对话「${convTargetInfo(currentTarget,
|
|
474
|
+
currentTarget !== "dedicated" ? h("option", { value: currentTarget, selected: true }, `对话「${convTargetInfo(currentTarget, src)?.title || "对话"}」`) : null,
|
|
473
475
|
targetChoices(currentTarget).map((c) => h("option", { value: c.key }, `对话「${c.title || "未命名"}」`)),
|
|
474
476
|
);
|
|
475
477
|
const picked = src.expert ?? src.agent ?? S.draftExpert;
|
|
@@ -538,7 +540,7 @@ export function openTaskForm(task, preset) {
|
|
|
538
540
|
let convPermission = null;
|
|
539
541
|
const syncConvBox = () => {
|
|
540
542
|
convPermission = null;
|
|
541
|
-
const info = target.value === "dedicated" ? null : convTargetInfo(target.value,
|
|
543
|
+
const info = target.value === "dedicated" ? null : convTargetInfo(target.value, src);
|
|
542
544
|
if (!info) return fill(convBox);
|
|
543
545
|
const label = PERMISSIONS[info.permission]?.label ?? "默认";
|
|
544
546
|
const levels = info.max ? permissionsUpTo(info.max, info.expert?.engine) : [];
|
|
@@ -622,7 +624,7 @@ export function openTaskForm(task, preset) {
|
|
|
622
624
|
return;
|
|
623
625
|
}
|
|
624
626
|
const convLevel = convPermission?.value;
|
|
625
|
-
const convInfo = dedicated ? null : convTargetInfo(target.value,
|
|
627
|
+
const convInfo = dedicated ? null : convTargetInfo(target.value, src);
|
|
626
628
|
const convLevelChanged = !!convLevel && convLevel !== convInfo?.permission;
|
|
627
629
|
if (convLevelChanged && convLevel === "full" && !(await confirmDialog(FULL_WARNING))) return;
|
|
628
630
|
const fresh = context.value === "fresh";
|
|
@@ -639,6 +641,7 @@ export function openTaskForm(task, preset) {
|
|
|
639
641
|
return;
|
|
640
642
|
}
|
|
641
643
|
const payload = {
|
|
644
|
+
...(!task && preset?.assistantKey ? { assistantKey: preset.assistantKey } : {}),
|
|
642
645
|
title: title.value,
|
|
643
646
|
prompt: prompt.value,
|
|
644
647
|
schedule,
|