agent-loft 0.2.49 → 0.2.51
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 +19 -14
- package/package.json +1 -1
- package/src/agents/claude/driver.ts +11 -0
- package/src/agents/claude/session.ts +9 -0
- package/src/agents/codex/driver.ts +9 -0
- package/src/agents/codex/session.ts +10 -0
- package/src/channels/web/api.ts +96 -7
- package/src/channels/web/conv-pages.ts +37 -0
- package/src/channels/web/experts-api.ts +20 -2
- package/src/core/chat-history.ts +19 -0
- package/src/core/experts.ts +23 -1
- package/src/core/hub.ts +117 -4
- package/src/core/memory-curator.ts +7 -11
- package/src/core/types.ts +8 -2
- package/web/css/experts.css +121 -0
- package/web/css/messages.css +40 -2
- package/web/css/overlay.css +49 -11
- package/web/css/search.css +218 -0
- package/web/css/sidebar.css +100 -54
- package/web/css/topbar.css +131 -4
- package/web/index.html +1 -0
- package/web/lib/dom.js +7 -14
- package/web/lib/overlay.js +2 -2
- package/web/lib/time.js +6 -2
- package/web/settings/commands.js +5 -2
- package/web/settings/experts.js +222 -44
- package/web/settings/memory.js +2 -2
- package/web/state.js +2 -0
- package/web/views/composer.js +32 -13
- package/web/views/conv-actions.js +71 -7
- package/web/views/conv-search.js +206 -0
- package/web/views/experts.js +4 -3
- package/web/views/layout.js +9 -2
- package/web/views/messages.js +74 -7
- package/web/views/msg-nav.js +26 -3
- package/web/views/quota.js +13 -10
- package/web/views/sidebar.js +87 -49
- package/web/views/slash.js +63 -12
- package/web/views/topbar.js +106 -13
package/web/lib/time.js
CHANGED
|
@@ -33,9 +33,13 @@ setInterval(() => {
|
|
|
33
33
|
}
|
|
34
34
|
}, 1000);
|
|
35
35
|
|
|
36
|
-
|
|
36
|
+
const tokenCount = new Intl.NumberFormat("en-US", { notation: "compact", maximumFractionDigits: 1 });
|
|
37
|
+
|
|
38
|
+
/** 显示脚注时换算用时和 token 单位,历史回复也采用同样的格式 */
|
|
37
39
|
export function tidyFooter(footer) {
|
|
38
|
-
return footer
|
|
40
|
+
return footer
|
|
41
|
+
?.replace(/用时 ([\d.]+)s/, (_, s) => `用时 ${formatDuration(Number(s) * 1000)}`)
|
|
42
|
+
.replace(/\b(\d+) tokens\b/g, (_, n) => `${tokenCount.format(Number(n))} tokens`) ?? "";
|
|
39
43
|
}
|
|
40
44
|
|
|
41
45
|
/** 回复下面的时间:今天只显示时分,今年显示月日,再早带上年份 */
|
package/web/settings/commands.js
CHANGED
|
@@ -2,7 +2,7 @@ import { fill, h, icon } from "../lib/dom.js";
|
|
|
2
2
|
import { api } from "../lib/api.js";
|
|
3
3
|
import { agentLabel } from "../views/sidebar.js";
|
|
4
4
|
import { confirmDialog, modal } from "../lib/overlay.js";
|
|
5
|
-
import { commandUsage, currentAgentId, oneLine,
|
|
5
|
+
import { clearCommandCache, commandUsage, currentAgentId, oneLine, preloadCommands } from "../views/slash.js";
|
|
6
6
|
import { field, hasDirty, markClean, markDirty, saveButton, saveConfig } from "./common.js";
|
|
7
7
|
|
|
8
8
|
/**
|
|
@@ -239,7 +239,10 @@ export function commandsTab(cfg, page) {
|
|
|
239
239
|
|
|
240
240
|
const save = async (prefs) => {
|
|
241
241
|
const ok = await saveConfig(cfg, { commands: { [agent]: prefs } });
|
|
242
|
-
|
|
242
|
+
if (ok) {
|
|
243
|
+
clearCommandCache();
|
|
244
|
+
preloadCommands();
|
|
245
|
+
}
|
|
243
246
|
return ok;
|
|
244
247
|
};
|
|
245
248
|
const prefsOf = (rows) => ({
|
package/web/settings/experts.js
CHANGED
|
@@ -1,20 +1,24 @@
|
|
|
1
|
-
import { fill, h, icon, toast } from "../lib/dom.js";
|
|
1
|
+
import { agentIcon, fill, h, icon, toast } from "../lib/dom.js";
|
|
2
2
|
import { api } from "../lib/api.js";
|
|
3
3
|
import { confirmDialog, modal, showMenu } from "../lib/overlay.js";
|
|
4
4
|
import { S } from "../state.js";
|
|
5
|
-
import { reloadExperts } from "../views/experts.js";
|
|
5
|
+
import { expertIcon, reloadExperts } from "../views/experts.js";
|
|
6
|
+
import { agentCatalog } from "../views/topbar.js";
|
|
6
7
|
|
|
7
8
|
// ---------- 专家(设置里的一页) ----------
|
|
8
9
|
// 专家 = 一份配置:引擎、提示词、权限、技能、MCP、子智能体。新建对话、定时任务时选,对话中途不能换。
|
|
9
10
|
// 内置的 Claude Code / Codex 不在这里改(就是 agent 原装的样子)。
|
|
10
11
|
|
|
11
12
|
const ENGINE_LABEL = { claude: "Claude", codex: "Codex" };
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
}
|
|
13
|
+
/** 权限的几项勾选。读文件 → 改文件 → 跑命令一级包含一级(跑命令就等于能改任何文件) */
|
|
14
|
+
const PERMS = [
|
|
15
|
+
{ id: "webSearch", label: "联网搜索", hint: "用搜索引擎查资料" },
|
|
16
|
+
{ id: "webFetch", label: "读网页", hint: "打开网址读内容", claudeOnly: true },
|
|
17
|
+
{ id: "read", label: "读文件", hint: "读工作目录里的文件,不能改" },
|
|
18
|
+
{ id: "edit", label: "改文件", hint: "读写工作目录里的文件,不能跑命令(Codex 改文件也要跑命令,只能改工作目录里的)" },
|
|
19
|
+
{ id: "exec", label: "跑命令", hint: "执行命令,等于能改任何文件;需要授权时会弹卡" },
|
|
20
|
+
];
|
|
21
|
+
const FILE_LEVELS = ["read", "edit", "exec"];
|
|
18
22
|
|
|
19
23
|
export async function expertsTab(panel) {
|
|
20
24
|
const box = h("div", { class: "experts-page" }, h("span", { class: "spinner" }));
|
|
@@ -34,14 +38,7 @@ export async function expertsTab(panel) {
|
|
|
34
38
|
}
|
|
35
39
|
|
|
36
40
|
function render(box, data, reload) {
|
|
37
|
-
const add = h("button", { class: "btn primary" }, icon("plus"), "新建");
|
|
38
|
-
add.onclick = () =>
|
|
39
|
-
data.templates.length
|
|
40
|
-
? showMenu(add, [
|
|
41
|
-
{ label: "空白专家", onclick: () => openEditor(data, null, reload) },
|
|
42
|
-
...data.templates.map((t) => ({ label: `从模板:${t.label}`, onclick: () => openEditor(data, null, reload, t.expert) })),
|
|
43
|
-
])
|
|
44
|
-
: openEditor(data, null, reload);
|
|
41
|
+
const add = h("button", { class: "btn primary", onclick: () => openEditor(data, null, reload) }, icon("plus"), "新建");
|
|
45
42
|
fill(
|
|
46
43
|
box,
|
|
47
44
|
h(
|
|
@@ -61,13 +58,13 @@ function render(box, data, reload) {
|
|
|
61
58
|
h(
|
|
62
59
|
"div",
|
|
63
60
|
{ class: "task-card skill-card" },
|
|
64
|
-
h("div", { class: "task-top" }, h("span", { class: "task-title" }, b.name), h("span", { class: "badge" }, "内置")),
|
|
61
|
+
h("div", { class: "task-top" }, h("span", { class: "task-title" }, agentIcon(b.engine, "expert-card-icon"), b.name), h("span", { class: "badge" }, "内置")),
|
|
65
62
|
h("div", { class: "task-prompt" }, `${b.name} 原装的样子:原装提示词、机器上的技能和 MCP(成员只有自己的技能)、所有工具。`),
|
|
66
63
|
),
|
|
67
64
|
),
|
|
68
65
|
data.experts.map((e) => expertCard(data, e, reload)),
|
|
69
66
|
),
|
|
70
|
-
data.experts.length ? null : h("div", { class: "tasks-empty" }, h("div", { class: "t" }, "还没有自己的专家"), h("div", { class: "s" }, "
|
|
67
|
+
data.experts.length ? null : h("div", { class: "tasks-empty" }, h("div", { class: "t" }, "还没有自己的专家"), h("div", { class: "s" }, "点「新建」建一个。")),
|
|
71
68
|
);
|
|
72
69
|
}
|
|
73
70
|
|
|
@@ -93,7 +90,7 @@ function expertCard(data, e, reload) {
|
|
|
93
90
|
h(
|
|
94
91
|
"div",
|
|
95
92
|
{ class: "task-top" },
|
|
96
|
-
h("button", { class: "task-title skill-name", title: "编辑", onclick: () => openEditor(data, e, reload) }, e
|
|
93
|
+
h("button", { class: "task-title skill-name", title: "编辑", onclick: () => openEditor(data, e, reload) }, expertIcon(e, "expert-card-icon"), e.name),
|
|
97
94
|
more,
|
|
98
95
|
),
|
|
99
96
|
h("div", { class: "task-meta" }, h("span", {}, ENGINE_LABEL[e.engine]), h("span", {}, access), e.model ? h("span", {}, e.model) : null, extras.map((x) => h("span", {}, x))),
|
|
@@ -139,15 +136,14 @@ function checkList(items, picked, empty) {
|
|
|
139
136
|
function openEditor(data, e, reload, preset) {
|
|
140
137
|
const src = e ?? preset ?? {};
|
|
141
138
|
const name = h("input", { value: src.name ?? "", maxlength: "40", placeholder: "比如:证券观察员" });
|
|
142
|
-
const
|
|
139
|
+
const avatar = avatarPicker(src, () => engine.value, !e);
|
|
143
140
|
const desc = h("input", { value: src.description ?? "", maxlength: "500", placeholder: "一句话说它是干什么的(选专家时、当子智能体时都看这句)" });
|
|
144
141
|
const engine = h(
|
|
145
142
|
"select",
|
|
146
143
|
{ disabled: !!e },
|
|
147
144
|
data.engines.map((id) => h("option", { value: id, selected: id === (src.engine ?? data.engines[0]) }, ENGINE_LABEL[id] ?? id)),
|
|
148
145
|
);
|
|
149
|
-
const
|
|
150
|
-
const effort = h("input", { value: src.effort ?? "", placeholder: "留空用默认", class: "narrow", spellcheck: "false" });
|
|
146
|
+
const models = modelPicker(src);
|
|
151
147
|
const prompt = h("textarea", { rows: 10, class: "skill-body-input", maxlength: "20000", placeholder: "人设、规则、输出格式。比如:每个数字都必须来自实时查询,查不到就说查不到……" });
|
|
152
148
|
prompt.value = src.prompt ?? "";
|
|
153
149
|
const basePrompt = h(
|
|
@@ -156,11 +152,8 @@ function openEditor(data, e, reload, preset) {
|
|
|
156
152
|
h("option", { value: "lean", selected: (src.basePrompt ?? "lean") === "lean" }, "只用上面的提示词(省 token,推荐)"),
|
|
157
153
|
h("option", { value: "claude_code", selected: src.basePrompt === "claude_code" }, "追加在 Claude Code 原装提示词后面(写代码、干活更稳,每轮多约 1.6 万 token)"),
|
|
158
154
|
);
|
|
159
|
-
const
|
|
160
|
-
const accessHint = h("small", {});
|
|
155
|
+
const perms = permChecks(src);
|
|
161
156
|
const cwd = h("input", { value: src.cwd ?? "", placeholder: `留空就是工作区根目录(${S.workspaceRoot ?? ""})`, spellcheck: "false" });
|
|
162
|
-
const webSearch = h("input", { type: "checkbox", checked: src.webSearch !== false });
|
|
163
|
-
const webFetch = h("input", { type: "checkbox", checked: src.webFetch !== false });
|
|
164
157
|
const memory = h("input", { type: "checkbox", checked: src.memory !== false });
|
|
165
158
|
const welcome = h("input", { value: src.welcome ?? "", maxlength: "500", placeholder: "新对话页上的那句话,比如:想了解哪只股票?" });
|
|
166
159
|
const quick = h("textarea", { rows: 4, placeholder: "一行一个,新对话页上点一下就填进输入框。可以写成「标题|提示词」,提示词里的 ___ 是要用户填的空" });
|
|
@@ -188,37 +181,34 @@ function openEditor(data, e, reload, preset) {
|
|
|
188
181
|
const keepSubs = subs.value();
|
|
189
182
|
// 子智能体只有 Claude:自己的 Claude 专家,不能是自己
|
|
190
183
|
subs = checkList(
|
|
191
|
-
data.experts.filter((x) => x.engine === "claude" && x.id !== e?.id).map((x) => ({ id: x.id, label: x.icon ? `${x.icon} ${x.name}` : x.name, hint: x.description })),
|
|
184
|
+
data.experts.filter((x) => x.engine === "claude" && x.id !== e?.id).map((x) => ({ id: x.id, label: !x.avatar && x.icon ? `${x.icon} ${x.name}` : x.name, hint: x.description })),
|
|
192
185
|
keepSubs,
|
|
193
186
|
"还没有别的 Claude 专家可以当子智能体",
|
|
194
187
|
);
|
|
195
188
|
fill(subBox, subs.el);
|
|
196
189
|
subField.hidden = eng !== "claude";
|
|
197
190
|
baseField.hidden = eng !== "claude";
|
|
198
|
-
|
|
191
|
+
perms.setEngine(eng);
|
|
192
|
+
avatar.refresh();
|
|
193
|
+
void models.load(eng);
|
|
199
194
|
};
|
|
200
|
-
const sync = () =>
|
|
201
|
-
accessHint.textContent = ACCESS_HINT[access.value] ?? "";
|
|
202
|
-
cwdField.hidden = access.value === "web";
|
|
203
|
-
};
|
|
204
|
-
const fetchLabel = h("label", { class: "check-item" }, webFetch, h("span", {}, "读网页"));
|
|
195
|
+
const sync = () => (cwdField.hidden = perms.access() === "web");
|
|
205
196
|
const cwdField = field("默认工作目录", cwd, "新建对话、定时任务时默认在这个目录里(可以再改)。相对路径按工作区根目录算");
|
|
206
197
|
const baseField = field("基础提示词", basePrompt);
|
|
207
198
|
const subField = field("子智能体", subBox, "主专家可以把子任务派给它们(Agent 工具)。子智能体的权限不能超过主专家,只支持 Claude 专家");
|
|
208
199
|
engine.onchange = renderEngineParts;
|
|
209
|
-
|
|
200
|
+
perms.onchange = sync;
|
|
210
201
|
|
|
211
202
|
const body = h(
|
|
212
203
|
"div",
|
|
213
204
|
{ class: "modal-body task-form expert-form" },
|
|
214
|
-
h("div", { class: "row-fields" }, field("
|
|
205
|
+
h("div", { class: "row-fields avatar-row" }, field("头像", avatar.el), field("名字", name)),
|
|
215
206
|
field("说明", desc),
|
|
216
|
-
h("div", { class: "row-fields" }, field("引擎", engine, e ? "建好后不能换" : null), field("模型", model), field("思考程度", effort)),
|
|
207
|
+
h("div", { class: "row-fields" }, field("引擎", engine, e ? "建好后不能换" : null), field("模型", models.model), field("思考程度", models.effort)),
|
|
217
208
|
field("提示词", prompt, "agent-loft 会在后面自动补上:这个专家能做什么、不能做什么,今天的日期,记忆"),
|
|
218
209
|
baseField,
|
|
219
|
-
field("权限",
|
|
210
|
+
field("权限", perms.el, "改文件包含读文件,跑命令包含改文件。什么都不勾就是只能聊天"),
|
|
220
211
|
cwdField,
|
|
221
|
-
field("联网", h("div", { class: "check-list inline" }, h("label", { class: "check-item" }, webSearch, h("span", {}, "搜索")), fetchLabel)),
|
|
222
212
|
field("技能", skills.el, "只给选中的技能;没选就不挂技能(省 token)"),
|
|
223
213
|
field("MCP", mcpBox, "选中的 MCP 的工具直接可用(MCP 设了「调用前询问」的会弹授权)"),
|
|
224
214
|
subField,
|
|
@@ -242,17 +232,17 @@ function openEditor(data, e, reload, preset) {
|
|
|
242
232
|
});
|
|
243
233
|
const payload = {
|
|
244
234
|
name: name.value,
|
|
245
|
-
|
|
235
|
+
...avatar.payload(),
|
|
246
236
|
description: desc.value,
|
|
247
237
|
engine: engine.value,
|
|
248
|
-
model: model.value,
|
|
249
|
-
effort: effort.value,
|
|
238
|
+
model: models.model.value,
|
|
239
|
+
effort: models.effort.value,
|
|
250
240
|
prompt: prompt.value,
|
|
251
241
|
basePrompt: basePrompt.value,
|
|
252
|
-
access: access
|
|
242
|
+
access: perms.access(),
|
|
253
243
|
cwd: cwd.value,
|
|
254
|
-
webSearch:
|
|
255
|
-
webFetch:
|
|
244
|
+
webSearch: perms.checked("webSearch"),
|
|
245
|
+
webFetch: perms.checked("webFetch"),
|
|
256
246
|
skills: skills.value(),
|
|
257
247
|
mcp: mcp.value(),
|
|
258
248
|
subagents: engine.value === "claude" ? subs.value() : [],
|
|
@@ -275,6 +265,194 @@ function openEditor(data, e, reload, preset) {
|
|
|
275
265
|
};
|
|
276
266
|
}
|
|
277
267
|
|
|
268
|
+
/**
|
|
269
|
+
* 权限勾选:联网搜索、读网页、读文件、改文件、跑命令。
|
|
270
|
+
* 文件那三项一级包含一级:勾上高的,低的跟着勾上;取消低的,高的跟着取消。读网页只有 Claude 能单独开关
|
|
271
|
+
*/
|
|
272
|
+
function permChecks(src) {
|
|
273
|
+
const rank = FILE_LEVELS.indexOf(src.access ?? "web");
|
|
274
|
+
const boxes = new Map();
|
|
275
|
+
const api = { onchange: null };
|
|
276
|
+
const items = PERMS.map((p) => {
|
|
277
|
+
const checked = p.id === "webSearch" || p.id === "webFetch" ? src[p.id] !== false : FILE_LEVELS.indexOf(p.id) <= rank;
|
|
278
|
+
const box = h("input", { type: "checkbox", checked });
|
|
279
|
+
boxes.set(p.id, box);
|
|
280
|
+
box.onchange = () => {
|
|
281
|
+
const i = FILE_LEVELS.indexOf(p.id);
|
|
282
|
+
if (i >= 0) {
|
|
283
|
+
FILE_LEVELS.forEach((id, n) => {
|
|
284
|
+
if (box.checked && n < i) boxes.get(id).checked = true;
|
|
285
|
+
if (!box.checked && n > i) boxes.get(id).checked = false;
|
|
286
|
+
});
|
|
287
|
+
}
|
|
288
|
+
api.onchange?.();
|
|
289
|
+
};
|
|
290
|
+
const el = h("label", { class: "check-item" }, box, h("span", {}, p.label), h("small", {}, p.hint));
|
|
291
|
+
return { p, el };
|
|
292
|
+
});
|
|
293
|
+
return Object.assign(api, {
|
|
294
|
+
el: h("div", { class: "check-list perm-list" }, items.map((x) => x.el)),
|
|
295
|
+
// 藏起来的(Codex 的读网页)照旧按勾选状态存,和以前一样
|
|
296
|
+
checked: (id) => boxes.get(id).checked,
|
|
297
|
+
access: () => [...FILE_LEVELS].reverse().find((id) => boxes.get(id).checked) ?? "web",
|
|
298
|
+
setEngine: (engine) => {
|
|
299
|
+
for (const x of items) x.el.hidden = !!x.p.claudeOnly && engine !== "claude";
|
|
300
|
+
},
|
|
301
|
+
});
|
|
302
|
+
}
|
|
303
|
+
|
|
304
|
+
/** 头像图片缩成这么大的正方形(显示时最大 56px,留够高清屏的余量) */
|
|
305
|
+
const AVATAR_PX = 128;
|
|
306
|
+
|
|
307
|
+
/**
|
|
308
|
+
* 头像:点一下选图片,居中裁成正方形、缩到 128px 再上传。没传就用引擎的图标(以前设过 emoji 的还显示 emoji)。
|
|
309
|
+
* src.avatar 是已有头像的地址;isNew(复制一份)时把它读成 data URL 一起带上。
|
|
310
|
+
* payload():没动过就不带 avatar(服务端沿用),去掉了带空字符串
|
|
311
|
+
*/
|
|
312
|
+
function avatarPicker(src, engineOf, isNew) {
|
|
313
|
+
let value; // undefined = 没动过;"" = 去掉;data URL = 新的
|
|
314
|
+
let shown = src.avatar || "";
|
|
315
|
+
const preview = h("button", { type: "button", class: "avatar-preview", title: "上传头像" });
|
|
316
|
+
const file = h("input", { type: "file", accept: "image/*", hidden: true });
|
|
317
|
+
const remove = h("button", { type: "button", class: "btn small" }, "去掉");
|
|
318
|
+
const refresh = () => {
|
|
319
|
+
fill(preview, shown ? h("img", { src: shown, alt: "" }) : !value && value !== "" && src.icon ? h("span", { class: "avatar-emoji" }, src.icon) : agentIcon(engineOf()));
|
|
320
|
+
remove.hidden = !shown;
|
|
321
|
+
};
|
|
322
|
+
preview.onclick = () => file.click();
|
|
323
|
+
file.onchange = async () => {
|
|
324
|
+
const f = file.files?.[0];
|
|
325
|
+
file.value = "";
|
|
326
|
+
if (!f) return;
|
|
327
|
+
try {
|
|
328
|
+
value = shown = await squareImage(f, AVATAR_PX);
|
|
329
|
+
refresh();
|
|
330
|
+
} catch (err) {
|
|
331
|
+
toast(err.message);
|
|
332
|
+
}
|
|
333
|
+
};
|
|
334
|
+
remove.onclick = () => {
|
|
335
|
+
value = "";
|
|
336
|
+
shown = "";
|
|
337
|
+
refresh();
|
|
338
|
+
};
|
|
339
|
+
// 复制一份:头像也带过去(新专家还没有自己的头像地址)
|
|
340
|
+
if (src.avatar && isNew) {
|
|
341
|
+
void fetch(src.avatar)
|
|
342
|
+
.then((r) => (r.ok ? r.blob() : null))
|
|
343
|
+
.then((b) => b && readDataUrl(b))
|
|
344
|
+
.then((url) => {
|
|
345
|
+
if (url && value === undefined) value = shown = url;
|
|
346
|
+
refresh();
|
|
347
|
+
})
|
|
348
|
+
.catch(() => {});
|
|
349
|
+
}
|
|
350
|
+
return {
|
|
351
|
+
el: h("div", { class: "avatar-field" }, preview, h("div", { class: "avatar-btns" }, h("button", { type: "button", class: "btn small", onclick: () => file.click() }, "上传"), remove), file),
|
|
352
|
+
refresh,
|
|
353
|
+
payload: () => (value === undefined ? {} : { avatar: value }),
|
|
354
|
+
};
|
|
355
|
+
}
|
|
356
|
+
|
|
357
|
+
function readDataUrl(blob) {
|
|
358
|
+
return new Promise((resolve, reject) => {
|
|
359
|
+
const r = new FileReader();
|
|
360
|
+
r.onload = () => resolve(String(r.result));
|
|
361
|
+
r.onerror = () => reject(new Error("读不了这张图片"));
|
|
362
|
+
r.readAsDataURL(blob);
|
|
363
|
+
});
|
|
364
|
+
}
|
|
365
|
+
|
|
366
|
+
/** 图片居中裁成正方形、缩到 size,转成 data URL(优先 WebP,浏览器不支持就是 PNG) */
|
|
367
|
+
async function squareImage(f, size) {
|
|
368
|
+
if (!f.type.startsWith("image/")) throw new Error("请选一张图片");
|
|
369
|
+
const url = URL.createObjectURL(f);
|
|
370
|
+
try {
|
|
371
|
+
const img = await new Promise((resolve, reject) => {
|
|
372
|
+
const el = new Image();
|
|
373
|
+
el.onload = () => resolve(el);
|
|
374
|
+
el.onerror = () => reject(new Error("读不了这张图片"));
|
|
375
|
+
el.src = url;
|
|
376
|
+
});
|
|
377
|
+
const side = Math.min(img.naturalWidth, img.naturalHeight);
|
|
378
|
+
const canvas = document.createElement("canvas");
|
|
379
|
+
canvas.width = canvas.height = Math.min(size, side) || size;
|
|
380
|
+
canvas.getContext("2d").drawImage(img, (img.naturalWidth - side) / 2, (img.naturalHeight - side) / 2, side, side, 0, 0, canvas.width, canvas.height);
|
|
381
|
+
const webp = canvas.toDataURL("image/webp", 0.9);
|
|
382
|
+
return webp.startsWith("data:image/webp") ? webp : canvas.toDataURL("image/png");
|
|
383
|
+
} finally {
|
|
384
|
+
URL.revokeObjectURL(url);
|
|
385
|
+
}
|
|
386
|
+
}
|
|
387
|
+
|
|
388
|
+
/**
|
|
389
|
+
* 模型、思考程度:下拉选,选项是引擎的模型列表(和输入框里选模型的一样)。
|
|
390
|
+
* 第一项「默认」= 不指定;已经存的值不在列表里(模型下线、手写的)也留着一项,不会被悄悄改掉
|
|
391
|
+
*/
|
|
392
|
+
function modelPicker(src) {
|
|
393
|
+
const model = h("select", {});
|
|
394
|
+
const effort = h("select", {});
|
|
395
|
+
let modelVal = src.model ?? "";
|
|
396
|
+
let effortVal = src.effort ?? "";
|
|
397
|
+
let list = [];
|
|
398
|
+
let engineLoaded = null;
|
|
399
|
+
const opt = (value, label, selected) => h("option", { value, selected }, label);
|
|
400
|
+
const renderEffort = () => {
|
|
401
|
+
const picked = list.find((m) => m.id === modelVal) ?? list.find((m) => m.isDefault) ?? list.find((m) => m.efforts?.length);
|
|
402
|
+
const efforts = picked?.efforts ?? [];
|
|
403
|
+
const extra = effortVal && !efforts.includes(effortVal) ? effortVal : null;
|
|
404
|
+
fill(
|
|
405
|
+
effort,
|
|
406
|
+
opt("", "默认", !effortVal),
|
|
407
|
+
efforts.map((x) => opt(x, x, x === effortVal)),
|
|
408
|
+
extra ? opt(extra, list.length ? `${extra}(不在列表里)` : extra, true) : null,
|
|
409
|
+
);
|
|
410
|
+
effort.disabled = !efforts.length && !extra;
|
|
411
|
+
};
|
|
412
|
+
const render = () => {
|
|
413
|
+
const shown = list.filter((m) => m.id !== "default");
|
|
414
|
+
const def = list.find((m) => m.isDefault) ?? list.find((m) => m.id === "default");
|
|
415
|
+
const known = !modelVal || shown.some((m) => m.id === modelVal);
|
|
416
|
+
fill(
|
|
417
|
+
model,
|
|
418
|
+
opt("", def ? `默认(${def.label || def.id})` : "默认", !modelVal),
|
|
419
|
+
shown.map((m) => opt(m.id, m.label && m.label !== m.id ? `${m.label}(${m.id})` : m.id, m.id === modelVal)),
|
|
420
|
+
known ? null : opt(modelVal, `${modelVal}(不在列表里)`, true),
|
|
421
|
+
);
|
|
422
|
+
renderEffort();
|
|
423
|
+
};
|
|
424
|
+
model.onchange = () => {
|
|
425
|
+
modelVal = model.value;
|
|
426
|
+
// 换了模型:原来的思考程度这个模型不支持就回到默认
|
|
427
|
+
const picked = list.find((m) => m.id === modelVal) ?? list.find((m) => m.isDefault);
|
|
428
|
+
if (effortVal && !(picked?.efforts ?? []).includes(effortVal)) effortVal = "";
|
|
429
|
+
renderEffort();
|
|
430
|
+
};
|
|
431
|
+
effort.onchange = () => (effortVal = effort.value);
|
|
432
|
+
return {
|
|
433
|
+
model,
|
|
434
|
+
effort,
|
|
435
|
+
async load(engine) {
|
|
436
|
+
if (engine === engineLoaded) return;
|
|
437
|
+
// 换了引擎(只有新建时能换):原来选的对不上了
|
|
438
|
+
if (engineLoaded) modelVal = effortVal = "";
|
|
439
|
+
engineLoaded = engine;
|
|
440
|
+
list = [];
|
|
441
|
+
fill(model, opt(modelVal, "加载中…", true));
|
|
442
|
+
model.disabled = true;
|
|
443
|
+
renderEffort();
|
|
444
|
+
try {
|
|
445
|
+
list = await agentCatalog(engine);
|
|
446
|
+
} catch {
|
|
447
|
+
// 拿不到列表:只能选默认(已经存的值也留着)
|
|
448
|
+
}
|
|
449
|
+
if (engineLoaded !== engine) return;
|
|
450
|
+
model.disabled = false;
|
|
451
|
+
render();
|
|
452
|
+
},
|
|
453
|
+
};
|
|
454
|
+
}
|
|
455
|
+
|
|
278
456
|
// ---------- MCP(设置里的一页) ----------
|
|
279
457
|
|
|
280
458
|
export async function mcpTab(panel) {
|
package/web/settings/memory.js
CHANGED
|
@@ -59,7 +59,7 @@ export async function memoryTab(panel) {
|
|
|
59
59
|
clearHistory.onclick = run(clearHistory, async () => {
|
|
60
60
|
const sure = await confirmDialog({
|
|
61
61
|
title: "清空聊天记录索引?",
|
|
62
|
-
message: "agent
|
|
62
|
+
message: "侧栏的「搜索」和 agent 都将搜不到以前聊天的内容(按标题还能搜到;对话本身不删,侧栏里照样能打开)。之后的聊天还会继续记进来。",
|
|
63
63
|
confirmText: "清空",
|
|
64
64
|
danger: true,
|
|
65
65
|
});
|
|
@@ -142,7 +142,7 @@ export async function memoryTab(panel) {
|
|
|
142
142
|
h(
|
|
143
143
|
"div",
|
|
144
144
|
{ class: "muted" },
|
|
145
|
-
`agent
|
|
145
|
+
`agent 遇到「上次说的那个……」时,可以搜你以前的聊天(只有你自己的对话,被删掉的对话不算)。侧栏的「搜索」也用这份聊天记录索引,不开记忆也会记。${history ? `现在收录了 ${history.conversations} 段对话、${history.count} 句话。` : ""}`,
|
|
146
146
|
),
|
|
147
147
|
h("div", { class: "row" }, clearHistory),
|
|
148
148
|
),
|
package/web/state.js
CHANGED
package/web/views/composer.js
CHANGED
|
@@ -88,19 +88,7 @@ export function renderComposer() {
|
|
|
88
88
|
ui.slashMenu = h("div", { class: "slash-menu", hidden: true });
|
|
89
89
|
ui.composer = h(
|
|
90
90
|
"div",
|
|
91
|
-
{
|
|
92
|
-
class: "composer",
|
|
93
|
-
ondragover: (e) => {
|
|
94
|
-
e.preventDefault();
|
|
95
|
-
ui.composer.classList.add("drag");
|
|
96
|
-
},
|
|
97
|
-
ondragleave: () => ui.composer.classList.remove("drag"),
|
|
98
|
-
ondrop: (e) => {
|
|
99
|
-
e.preventDefault();
|
|
100
|
-
ui.composer.classList.remove("drag");
|
|
101
|
-
void addFiles([...(e.dataTransfer?.files ?? [])]);
|
|
102
|
-
},
|
|
103
|
-
},
|
|
91
|
+
{ class: "composer" },
|
|
104
92
|
ui.slashMenu,
|
|
105
93
|
ui.chips,
|
|
106
94
|
ui.input,
|
|
@@ -127,6 +115,31 @@ export function renderComposer() {
|
|
|
127
115
|
renderTodos();
|
|
128
116
|
}
|
|
129
117
|
|
|
118
|
+
/**
|
|
119
|
+
* 文件拖到聊天区域(el,整个 main)任何地方都能上传,输入框框线高亮提示。
|
|
120
|
+
* 只认拖进来的文件(页面里拖文字之类不管);定时任务、远程控制页、底部终端上不接
|
|
121
|
+
*/
|
|
122
|
+
export function bindFileDrop(el) {
|
|
123
|
+
const accepts = (e) =>
|
|
124
|
+
e.dataTransfer?.types.includes("Files") && !S.view && ui.composer?.isConnected && !ui.termDock?.contains(e.target);
|
|
125
|
+
const clear = () => ui.composer?.classList.remove("drag");
|
|
126
|
+
el.addEventListener("dragover", (e) => {
|
|
127
|
+
if (!accepts(e)) return clear();
|
|
128
|
+
e.preventDefault();
|
|
129
|
+
e.dataTransfer.dropEffect = "copy";
|
|
130
|
+
ui.composer.classList.add("drag");
|
|
131
|
+
});
|
|
132
|
+
el.addEventListener("dragleave", (e) => {
|
|
133
|
+
if (!el.contains(e.relatedTarget)) clear();
|
|
134
|
+
});
|
|
135
|
+
el.addEventListener("drop", (e) => {
|
|
136
|
+
if (!accepts(e)) return;
|
|
137
|
+
e.preventDefault();
|
|
138
|
+
clear();
|
|
139
|
+
void addFiles([...e.dataTransfer.files]);
|
|
140
|
+
});
|
|
141
|
+
}
|
|
142
|
+
|
|
130
143
|
export function autosize() {
|
|
131
144
|
ui.input.style.height = "auto";
|
|
132
145
|
ui.input.style.height = `${Math.min(ui.input.scrollHeight, innerHeight * 0.4)}px`;
|
|
@@ -138,6 +151,11 @@ function hasDraft() {
|
|
|
138
151
|
|
|
139
152
|
export function updateSendBtn() {
|
|
140
153
|
if (!ui.sendBtn) return;
|
|
154
|
+
if (S.editingMessage === S.current && S.current) {
|
|
155
|
+
ui.sendBtn.disabled = true;
|
|
156
|
+
ui.sendBtn.title = "正在恢复消息…";
|
|
157
|
+
return;
|
|
158
|
+
}
|
|
141
159
|
// 已经点了发送、还在等服务器确认:转圈,不能再点,避免以为没点上又点一次
|
|
142
160
|
if (S.sending) {
|
|
143
161
|
ui.sendBtn.innerHTML = '<span class="send-spinner"></span>';
|
|
@@ -203,6 +221,7 @@ export async function ensureConversation() {
|
|
|
203
221
|
}
|
|
204
222
|
throw err;
|
|
205
223
|
}
|
|
224
|
+
S.draftCwdPicked = false;
|
|
206
225
|
// 新对话里选过模型 / 思考程度:建好会话后先切过去再发消息
|
|
207
226
|
const pick = { ...draftPick() };
|
|
208
227
|
for (const [action, value] of [["model", pick.model], ["effort", pick.effort]]) {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { agentIcon, fill, h, toast } from "../lib/dom.js";
|
|
1
|
+
import { agentIcon, fill, h, icon, toast } from "../lib/dom.js";
|
|
2
2
|
import { api } from "../lib/api.js";
|
|
3
3
|
import { relTime } from "../lib/time.js";
|
|
4
4
|
import { S, ui } from "../state.js";
|
|
@@ -7,6 +7,7 @@ import { agentCatalog, baseName, catalogDefaults, draftPick, modelName, renderCo
|
|
|
7
7
|
import { closeMenu, confirmDialog, modal, placePopover, showPopover } from "../lib/overlay.js";
|
|
8
8
|
import { newDraft, openConversation, renderEmpty } from "./messages.js";
|
|
9
9
|
import { setDraftExpert } from "./experts.js";
|
|
10
|
+
import { preloadCommands } from "./slash.js";
|
|
10
11
|
|
|
11
12
|
// ---------- 会话操作 ----------
|
|
12
13
|
|
|
@@ -47,6 +48,7 @@ export async function forkConversation(anchor, key = S.current) {
|
|
|
47
48
|
export function switchAgent(id) {
|
|
48
49
|
if (S.current) return;
|
|
49
50
|
setDraftExpert(id);
|
|
51
|
+
preloadCommands();
|
|
50
52
|
renderTopbar();
|
|
51
53
|
renderEmpty();
|
|
52
54
|
}
|
|
@@ -209,6 +211,8 @@ export async function changeCwd(pick) {
|
|
|
209
211
|
let showHidden = localStorage.getItem("aim.cwdHidden") === "1";
|
|
210
212
|
let listing = null;
|
|
211
213
|
let seq = 0;
|
|
214
|
+
let loading = false;
|
|
215
|
+
let creating = false;
|
|
212
216
|
|
|
213
217
|
const crumbs = h("div", { class: "dir-crumbs" });
|
|
214
218
|
const list = h("div", { class: "dir-list" });
|
|
@@ -225,23 +229,44 @@ export async function changeCwd(pick) {
|
|
|
225
229
|
void load(manual.value.trim());
|
|
226
230
|
}
|
|
227
231
|
};
|
|
232
|
+
const folderName = h("input", { class: "dir-manual", placeholder: "文件夹名称", "aria-label": "文件夹名称", maxlength: "255", required: true, autocomplete: "off", spellcheck: "false" });
|
|
233
|
+
const create = h("button", { type: "submit", class: "btn primary small" }, "创建");
|
|
234
|
+
const cancelCreate = h("button", { type: "button", class: "btn small", onclick: () => (createForm.hidden = true) }, "取消");
|
|
235
|
+
const createForm = h("form", {
|
|
236
|
+
class: "dir-create", hidden: true,
|
|
237
|
+
onsubmit: (e) => {
|
|
238
|
+
e.preventDefault();
|
|
239
|
+
void createFolder();
|
|
240
|
+
},
|
|
241
|
+
}, folderName, create, cancelCreate);
|
|
242
|
+
const newFolder = h("button", {
|
|
243
|
+
type: "button", class: "btn small", disabled: true,
|
|
244
|
+
onclick: () => {
|
|
245
|
+
createForm.hidden = false;
|
|
246
|
+
folderName.value = "";
|
|
247
|
+
folderName.focus();
|
|
248
|
+
},
|
|
249
|
+
}, icon("plus"), "新建文件夹");
|
|
228
250
|
const body = h(
|
|
229
251
|
"div",
|
|
230
252
|
{ class: "modal-body" },
|
|
231
253
|
crumbs,
|
|
232
|
-
|
|
254
|
+
manual,
|
|
255
|
+
h("div", { class: "dir-actions" }, h("label", { class: "check" }, hiddenBox, "显示隐藏"), newFolder),
|
|
256
|
+
createForm,
|
|
233
257
|
list,
|
|
234
258
|
);
|
|
235
259
|
const go = h("button", { class: "btn primary", disabled: true }, goLabel);
|
|
236
260
|
const note = h("span", { class: "muted grow" }, pick ? "" : draft ? "发送第一条消息时在这个目录开会话" : "切换后开新会话");
|
|
237
261
|
const close = modal({
|
|
238
262
|
title: pick || draft ? "选择工作目录" : "切换工作目录",
|
|
263
|
+
className: "dir-picker",
|
|
239
264
|
body,
|
|
240
265
|
foot: h("div", { class: "modal-foot", style: { alignItems: "center" } }, note, go),
|
|
241
266
|
});
|
|
242
267
|
|
|
243
268
|
go.onclick = async () => {
|
|
244
|
-
if (!listing) return;
|
|
269
|
+
if (!listing || loading || creating) return;
|
|
245
270
|
close();
|
|
246
271
|
if (pick) {
|
|
247
272
|
pick.onPick(listing.path);
|
|
@@ -249,12 +274,47 @@ export async function changeCwd(pick) {
|
|
|
249
274
|
}
|
|
250
275
|
if (draft) {
|
|
251
276
|
S.draftCwd = listing.path === listing.root ? null : listing.path;
|
|
277
|
+
S.draftCwdPicked = true;
|
|
278
|
+
preloadCommands();
|
|
252
279
|
if (!S.current) renderEmpty();
|
|
253
280
|
return;
|
|
254
281
|
}
|
|
255
282
|
await doAction("cd", listing.path);
|
|
256
283
|
};
|
|
257
284
|
|
|
285
|
+
function syncActions() {
|
|
286
|
+
go.disabled = loading || creating || !listing || listing.path === current;
|
|
287
|
+
newFolder.disabled = loading || creating || !listing;
|
|
288
|
+
create.disabled = loading || creating;
|
|
289
|
+
cancelCreate.disabled = creating;
|
|
290
|
+
folderName.disabled = creating;
|
|
291
|
+
create.textContent = creating ? "创建中…" : "创建";
|
|
292
|
+
}
|
|
293
|
+
|
|
294
|
+
async function createFolder() {
|
|
295
|
+
const name = folderName.value.trim();
|
|
296
|
+
if (!listing || loading || creating || !name) return;
|
|
297
|
+
const my = seq;
|
|
298
|
+
const parent = listing.path;
|
|
299
|
+
creating = true;
|
|
300
|
+
syncActions();
|
|
301
|
+
try {
|
|
302
|
+
const data = await api("/api/dirs", { method: "POST", body: { path: parent, name } });
|
|
303
|
+
if (my !== seq || !body.isConnected) return;
|
|
304
|
+
createForm.hidden = true;
|
|
305
|
+
await load(data.path);
|
|
306
|
+
} catch (err) {
|
|
307
|
+
if (body.isConnected) {
|
|
308
|
+
toast(err.message);
|
|
309
|
+
folderName.disabled = false;
|
|
310
|
+
folderName.focus();
|
|
311
|
+
}
|
|
312
|
+
} finally {
|
|
313
|
+
creating = false;
|
|
314
|
+
syncActions();
|
|
315
|
+
}
|
|
316
|
+
}
|
|
317
|
+
|
|
258
318
|
function renderCrumbs() {
|
|
259
319
|
const parts = listing.rel ? listing.rel.split(/[\\/]/) : [];
|
|
260
320
|
const rootName = listing.root.split(/[\\/]/).filter(Boolean).pop() || listing.root;
|
|
@@ -301,16 +361,16 @@ export async function changeCwd(pick) {
|
|
|
301
361
|
|
|
302
362
|
async function load(rel) {
|
|
303
363
|
const my = ++seq;
|
|
304
|
-
|
|
364
|
+
loading = true;
|
|
365
|
+
createForm.hidden = true;
|
|
366
|
+
syncActions();
|
|
305
367
|
fill(list, h("span", { class: "spinner" }));
|
|
306
368
|
try {
|
|
307
369
|
const data = await api(`/api/dirs?path=${encodeURIComponent(rel)}`);
|
|
308
370
|
if (my !== seq) return;
|
|
309
371
|
listing = data;
|
|
310
372
|
manual.value = "";
|
|
311
|
-
go.disabled = false;
|
|
312
373
|
go.textContent = data.path === current ? "已是当前目录" : goLabel;
|
|
313
|
-
if (data.path === current) go.disabled = true;
|
|
314
374
|
renderCrumbs();
|
|
315
375
|
renderList();
|
|
316
376
|
} catch (err) {
|
|
@@ -321,8 +381,12 @@ export async function changeCwd(pick) {
|
|
|
321
381
|
}
|
|
322
382
|
// 进不去就留在原地
|
|
323
383
|
toast(err.message);
|
|
324
|
-
go.disabled = listing.path === current;
|
|
325
384
|
renderList();
|
|
385
|
+
} finally {
|
|
386
|
+
if (my === seq) {
|
|
387
|
+
loading = false;
|
|
388
|
+
syncActions();
|
|
389
|
+
}
|
|
326
390
|
}
|
|
327
391
|
}
|
|
328
392
|
|