agent-loft 0.2.97 → 0.2.99
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 +6 -6
- package/package.json +1 -1
- package/src/agents/claude/session.ts +57 -5
- package/src/agents/codex/app-server.ts +2 -1
- package/src/agents/codex/protocol.ts +2 -1
- package/src/agents/codex/session.ts +65 -1
- package/src/channels/feishu/cards.ts +9 -4
- package/src/channels/web/api.ts +8 -0
- package/src/channels/web/experts-api.ts +32 -5
- package/src/channels/web/skills-api.ts +42 -27
- package/src/channels/weixin/bot.ts +2 -1
- package/src/channels/weixin/format.ts +5 -5
- package/src/core/builtin-agents.ts +49 -8
- package/src/core/command-catalog.ts +2 -1
- package/src/core/commands.ts +11 -0
- package/src/core/experts.ts +18 -9
- package/src/core/hub.ts +62 -12
- package/src/core/interactions.ts +1 -1
- package/src/core/mcp.ts +121 -18
- package/src/core/permission.ts +20 -2
- package/src/core/skill-runtime.ts +5 -4
- package/src/core/skills-bridge.ts +95 -24
- package/src/core/skills.ts +184 -37
- package/src/core/store.ts +5 -0
- package/src/core/types.ts +14 -0
- package/src/mcp/tasks-server.ts +1 -1
- package/web/css/composer.css +15 -0
- package/web/lib/permission.js +23 -4
- package/web/settings/agents.js +15 -5
- package/web/settings/commands.js +1 -1
- package/web/settings/experts.js +63 -10
- package/web/settings/skills.js +38 -13
- package/web/state.js +4 -0
- package/web/views/composer.js +4 -3
- package/web/views/conv-actions.js +24 -4
- package/web/views/interaction.js +9 -5
- package/web/views/sidebar.js +1 -0
- package/web/views/tasks.js +2 -2
- package/web/views/topbar.js +15 -10
package/web/settings/experts.js
CHANGED
|
@@ -522,7 +522,11 @@ export async function mcpTab(panel) {
|
|
|
522
522
|
await load();
|
|
523
523
|
}
|
|
524
524
|
|
|
525
|
+
/** 这个账号能不能添加本机进程(stdio)MCP:只有管理员 */
|
|
526
|
+
let canStdio = true;
|
|
527
|
+
|
|
525
528
|
function renderMcp(box, data, reload) {
|
|
529
|
+
canStdio = data.stdio !== false;
|
|
526
530
|
fill(
|
|
527
531
|
box,
|
|
528
532
|
h(
|
|
@@ -531,7 +535,8 @@ function renderMcp(box, data, reload) {
|
|
|
531
535
|
h(
|
|
532
536
|
"p",
|
|
533
537
|
{ class: "skill-note" },
|
|
534
|
-
"MCP
|
|
538
|
+
"MCP 服务提供查数据、调接口等工具。这里加好后,自定义专家在「专家」里勾选;内置的 Claude Code / Codex 在「Agent」各自卡片的「默认加载」中选择。可以把自己的 MCP 共享给所有账号:别人拿到的是地址、命令这些设置,标成密钥的项各自填自己的值,你的密钥不会给出去;别人用共享的 MCP 时,调用工具前都会先询问。" +
|
|
539
|
+
(canStdio ? "" : "本机进程(stdio)会在服务器上直接执行命令,只有管理员能添加。"),
|
|
535
540
|
),
|
|
536
541
|
h("div", { class: "skill-head-btns" }, h("button", { class: "btn primary", onclick: () => openMcpEditor(null, reload) }, icon("plus"), "添加")),
|
|
537
542
|
),
|
|
@@ -540,23 +545,30 @@ function renderMcp(box, data, reload) {
|
|
|
540
545
|
"div",
|
|
541
546
|
{ class: "task-list" },
|
|
542
547
|
data.servers.map((s) => {
|
|
548
|
+
const secrets = [...(s.env ?? []), ...(s.headers ?? [])].filter((p) => p.secret);
|
|
549
|
+
const open = () => (s.mine ? openMcpEditor(s, reload) : secrets.length ? openMcpValues(s, secrets, reload) : null);
|
|
543
550
|
const more = h("button", { class: "icon-btn", title: "更多" }, icon("more"));
|
|
544
551
|
more.onclick = () =>
|
|
545
|
-
showMenu(
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
552
|
+
showMenu(
|
|
553
|
+
more,
|
|
554
|
+
s.mine
|
|
555
|
+
? [{ label: "编辑…", onclick: () => openMcpEditor(s, reload) }, "sep", { label: "删除", danger: true, onclick: () => removeMcp(s, reload) }]
|
|
556
|
+
: [{ label: secrets.length ? "填写我的密钥…" : "不需要填写密钥", onclick: () => secrets.length && openMcpValues(s, secrets, reload) }],
|
|
557
|
+
);
|
|
558
|
+
const missing = !s.mine && secrets.some((p) => !p.set);
|
|
550
559
|
return h(
|
|
551
560
|
"div",
|
|
552
561
|
{ class: "task-card skill-card" },
|
|
553
|
-
h("div", { class: "task-top" }, h("button", { class: "task-title skill-name", onclick:
|
|
562
|
+
h("div", { class: "task-top" }, h("button", { class: "task-title skill-name", onclick: open }, s.name), more),
|
|
554
563
|
h(
|
|
555
564
|
"div",
|
|
556
565
|
{ class: "task-meta" },
|
|
566
|
+
s.mine ? (s.shared ? h("span", {}, "已共享给所有人") : null) : h("span", {}, `${s.ownerName} 共享`),
|
|
557
567
|
h("span", {}, s.type === "http" ? "HTTP" : "本机进程"),
|
|
558
568
|
h("span", { class: "mono" }, s.type === "http" ? s.url : [s.command, ...s.args].join(" ")),
|
|
559
|
-
s.
|
|
569
|
+
!s.runnable ? h("span", { class: "skill-warn" }, "已停用:本机进程只有管理员能用,请改用 HTTP 或删除") : null,
|
|
570
|
+
missing ? h("span", { class: "skill-warn" }, "密钥没填") : null,
|
|
571
|
+
s.ask || !s.mine ? h("span", {}, "调用前询问") : null,
|
|
560
572
|
h("span", {}, s.usedBy.length ? `${s.usedBy.join("、")} 在用` : "还没有专家用它"),
|
|
561
573
|
),
|
|
562
574
|
s.description ? h("div", { class: "task-prompt" }, s.description) : null,
|
|
@@ -567,6 +579,40 @@ function renderMcp(box, data, reload) {
|
|
|
567
579
|
);
|
|
568
580
|
}
|
|
569
581
|
|
|
582
|
+
/** 别人共享的 MCP:填自己的密钥(作者的不会给你) */
|
|
583
|
+
function openMcpValues(s, secrets, reload) {
|
|
584
|
+
const rows = secrets.map((p) => {
|
|
585
|
+
const input = h("input", { type: "password", autocomplete: "off", spellcheck: "false", placeholder: p.set ? "已填写(不显示),留空不改" : "填你自己的值" });
|
|
586
|
+
const clear = p.set ? h("button", { type: "button", class: "btn ghost", onclick: () => ((input.dataset.clear = "1"), (input.value = ""), (clear.hidden = true)) }, "清除") : null;
|
|
587
|
+
return { p, input, el: h("div", { class: "field" }, h("span", {}, h("code", {}, p.name)), h("div", { class: "skill-var-row" }, input, clear)) };
|
|
588
|
+
});
|
|
589
|
+
const save = h("button", { class: "btn primary" }, "保存");
|
|
590
|
+
const close = modal({
|
|
591
|
+
title: `${s.name} 的密钥`,
|
|
592
|
+
body: h("div", { class: "modal-body task-form" }, h("p", { class: "skill-note" }, `${s.ownerName} 共享的 MCP。这些值只给你自己的会话用,作者看不到;不填就不带这一项。`), rows.map((r) => r.el)),
|
|
593
|
+
foot: h("div", { class: "modal-foot" }, save),
|
|
594
|
+
});
|
|
595
|
+
rows[0]?.input.focus();
|
|
596
|
+
save.onclick = async () => {
|
|
597
|
+
const values = {};
|
|
598
|
+
for (const r of rows) {
|
|
599
|
+
if (r.input.value) values[r.p.name] = r.input.value;
|
|
600
|
+
else if (r.input.dataset.clear === "1") values[r.p.name] = null;
|
|
601
|
+
}
|
|
602
|
+
if (!Object.keys(values).length) return close();
|
|
603
|
+
save.disabled = true;
|
|
604
|
+
try {
|
|
605
|
+
await api(`/api/mcp/${s.id}/values`, { method: "PUT", body: { values } });
|
|
606
|
+
close();
|
|
607
|
+
toast("已保存,新消息起生效");
|
|
608
|
+
void reload();
|
|
609
|
+
} catch (err) {
|
|
610
|
+
save.disabled = false;
|
|
611
|
+
toast(err.message);
|
|
612
|
+
}
|
|
613
|
+
};
|
|
614
|
+
}
|
|
615
|
+
|
|
570
616
|
async function removeMcp(s, reload) {
|
|
571
617
|
const sure = await confirmDialog({
|
|
572
618
|
title: `删除 MCP「${s.name}」?`,
|
|
@@ -611,8 +657,8 @@ function openMcpEditor(s, reload) {
|
|
|
611
657
|
const type = h(
|
|
612
658
|
"select",
|
|
613
659
|
{ disabled: !!s },
|
|
614
|
-
h("option", { value: "stdio", selected: (s?.type ?? "stdio") === "stdio" }, "本机进程(stdio)"),
|
|
615
|
-
h("option", { value: "http", selected: s?.type === "http" }, "HTTP 地址"),
|
|
660
|
+
canStdio || s?.type === "stdio" ? h("option", { value: "stdio", selected: (s?.type ?? (canStdio ? "stdio" : "http")) === "stdio" }, "本机进程(stdio)") : null,
|
|
661
|
+
h("option", { value: "http", selected: (s?.type ?? (canStdio ? "stdio" : "http")) === "http" }, "HTTP 地址"),
|
|
616
662
|
);
|
|
617
663
|
const command = h("input", { value: s?.command ?? "", placeholder: "比如 npx、python、/usr/local/bin/xxx-mcp", spellcheck: "false" });
|
|
618
664
|
const args = h("textarea", { rows: 3, placeholder: "一行一个参数,比如:\n-y\n@modelcontextprotocol/server-fetch", spellcheck: "false" });
|
|
@@ -621,6 +667,7 @@ function openMcpEditor(s, reload) {
|
|
|
621
667
|
const env = pairsEditor(s?.env, "env");
|
|
622
668
|
const headers = pairsEditor(s?.headers, "header");
|
|
623
669
|
const ask = h("input", { type: "checkbox", checked: !!s?.ask });
|
|
670
|
+
const shared = h("input", { type: "checkbox", checked: !!s?.shared });
|
|
624
671
|
const stdioPart = h("div", { class: "field-group" }, field("命令", command), field("参数", args), field("环境变量", env.el, "比如 API 密钥。标成密钥的网页上不回显,只交给这个 MCP 进程,agent 看不到"));
|
|
625
672
|
const httpPart = h("div", { class: "field-group" }, field("地址", url), field("请求头", headers.el, "比如 Authorization: Bearer xxx。标成密钥的网页上不回显"));
|
|
626
673
|
const sync = () => {
|
|
@@ -638,6 +685,11 @@ function openMcpEditor(s, reload) {
|
|
|
638
685
|
stdioPart,
|
|
639
686
|
httpPart,
|
|
640
687
|
field("授权", h("label", { class: "check-item" }, ask, h("span", {}, "调用它的工具前先问我(不勾就直接用:这是你自己给专家挂的)"))),
|
|
688
|
+
field(
|
|
689
|
+
"共享",
|
|
690
|
+
h("label", { class: "check-item" }, shared, h("span", {}, "共享给所有账号")),
|
|
691
|
+
"别人拿到命令、地址和普通的环境变量 / 请求头;标成「密钥」的项各自填自己的值,你填的不会给出去。取消共享后别人填的值一起删掉",
|
|
692
|
+
),
|
|
641
693
|
);
|
|
642
694
|
const save = h("button", { class: "btn primary" }, s ? "保存" : "添加");
|
|
643
695
|
const close = modal({ title: s ? `编辑 ${s.name}` : "添加 MCP", wide: true, body, foot: h("div", { class: "modal-foot" }, save) });
|
|
@@ -646,6 +698,7 @@ function openMcpEditor(s, reload) {
|
|
|
646
698
|
const payload = {
|
|
647
699
|
description: desc.value,
|
|
648
700
|
ask: ask.checked,
|
|
701
|
+
shared: shared.checked,
|
|
649
702
|
...(type.value === "stdio"
|
|
650
703
|
? {
|
|
651
704
|
command: command.value,
|
package/web/settings/skills.js
CHANGED
|
@@ -121,7 +121,7 @@ function renderList() {
|
|
|
121
121
|
if (K.tab === "shared") {
|
|
122
122
|
const list = shared().filter(matches);
|
|
123
123
|
return [
|
|
124
|
-
h("p", { class: "skill-note" }, "
|
|
124
|
+
h("p", { class: "skill-note" }, "这里是其他用户共享给你的技能。安装前可点开查看说明和附带文件;作者改了内容后,要你看过并确认新版才会继续加载,撤回共享后将无法再用。变量和密钥使用你自己填写的值。"),
|
|
125
125
|
list.length ? h("div", { class: "task-list" }, list.map(sharedCard)) : h("div", { class: "skill-empty" }, K.query ? "没有找到" : "还没有别人共享给你的技能"),
|
|
126
126
|
];
|
|
127
127
|
}
|
|
@@ -142,7 +142,7 @@ function renderList() {
|
|
|
142
142
|
function varsState(s) {
|
|
143
143
|
if (!s.vars.length) return null;
|
|
144
144
|
const missing = s.vars.filter((v) => v.required && !K.data.vars[v.name]?.set);
|
|
145
|
-
const pending = s.vars.filter((v) =>
|
|
145
|
+
const pending = s.vars.filter((v) => s.hosts?.[v.name]?.pending?.length);
|
|
146
146
|
if (missing.length) return h("span", { class: "skill-warn" }, `${missing.length} 个变量没填`);
|
|
147
147
|
if (pending.length) return h("span", { class: "skill-warn" }, "密钥的发送地址待确认");
|
|
148
148
|
return h("span", {}, `${s.vars.length} 个变量`);
|
|
@@ -150,7 +150,7 @@ function varsState(s) {
|
|
|
150
150
|
|
|
151
151
|
/** 要去「填写变量」处理的:必填的没填,或者受保护密钥的地址待确认 */
|
|
152
152
|
function varsNeedAttention(s) {
|
|
153
|
-
return s.vars.some((v) => (v.required && !K.data.vars[v.name]?.set) ||
|
|
153
|
+
return s.vars.some((v) => (v.required && !K.data.vars[v.name]?.set) || s.hosts?.[v.name]?.pending?.length);
|
|
154
154
|
}
|
|
155
155
|
|
|
156
156
|
function mineCard(s) {
|
|
@@ -199,26 +199,29 @@ function mineCard(s) {
|
|
|
199
199
|
s.mine && SHARED[s.visibility] ? h("span", {}, SHARED[s.visibility]) : null,
|
|
200
200
|
s.mine && s.installs ? h("span", {}, `${s.installs} 人安装`) : null,
|
|
201
201
|
s.source === "agent" ? h("span", {}, "agent 生成") : null,
|
|
202
|
+
s.updatePending ? h("span", { class: "skill-warn" }, "作者已更新,待确认") : null,
|
|
202
203
|
varsState(s),
|
|
203
204
|
),
|
|
204
205
|
h("div", { class: "task-prompt" }, s.description),
|
|
205
|
-
|
|
206
|
+
s.updatePending
|
|
207
|
+
? h("button", { class: "task-run", onclick: () => openDetail(s) }, "作者更新了内容,查看并确认后才会继续加载 →")
|
|
208
|
+
: varsNeedAttention(s)
|
|
206
209
|
? h("button", { class: "task-run", onclick: () => openVars(s) }, s.vars.some((v) => v.required && !K.data.vars[v.name]?.set) ? "填写变量后才能正常使用 →" : "确认密钥的发送地址 →")
|
|
207
210
|
: null,
|
|
208
211
|
);
|
|
209
212
|
}
|
|
210
213
|
|
|
211
214
|
function sharedCard(s) {
|
|
212
|
-
const install = h("button", { class: "btn primary", onclick: () => installShared(s, install) }, "安装");
|
|
215
|
+
const install = s.canInstall ? h("button", { class: "btn primary", onclick: () => installShared(s, install) }, "安装") : null;
|
|
213
216
|
return h(
|
|
214
217
|
"div",
|
|
215
218
|
{ class: "task-card skill-card" },
|
|
216
219
|
h("div", { class: "task-top" },
|
|
217
220
|
h("button", { class: "task-title skill-name", title: "查看", onclick: () => openDetail(s) }, s.name),
|
|
218
|
-
s.installed ? h("span", { class: "badge" }, s.enabled ? "已安装" : "已安装 · 已停用") : install,
|
|
221
|
+
s.installed ? h("span", { class: "badge" }, s.updatePending ? "已安装 · 有更新待确认" : s.enabled ? "已安装" : "已安装 · 已停用") : install,
|
|
219
222
|
s.canDelete ? h("button", { class: "btn", onclick: () => removeSkill(s) }, "下架") : null,
|
|
220
223
|
),
|
|
221
|
-
h("div", { class: "task-meta" }, h("span", {}, `${s.ownerName} 建的`), h("span", {}, SHARED[s.visibility]), s.vars.length ? h("span", {}, `${s.vars.length} 个变量`) : null),
|
|
224
|
+
h("div", { class: "task-meta" }, h("span", {}, `${s.ownerName} 建的`), h("span", {}, s.canInstall ? SHARED[s.visibility] : "分享给了别人(管理员可查看、下架)"), s.vars.length ? h("span", {}, `${s.vars.length} 个变量`) : null),
|
|
222
225
|
h("div", { class: "task-prompt" }, s.description),
|
|
223
226
|
);
|
|
224
227
|
}
|
|
@@ -298,7 +301,23 @@ async function openDetail(s) {
|
|
|
298
301
|
return;
|
|
299
302
|
}
|
|
300
303
|
if (d.mine) foot.append(h("button", { class: "btn", onclick: () => (close(), openSharing(d)) }, "共享…"));
|
|
301
|
-
else if (
|
|
304
|
+
else if (d.updatePending) {
|
|
305
|
+
const accept = h("button", { class: "btn primary" }, "确认使用新版");
|
|
306
|
+
accept.onclick = async () => {
|
|
307
|
+
accept.disabled = true;
|
|
308
|
+
try {
|
|
309
|
+
const next = await api(`/api/skills/${d.id}/accept`, { method: "POST", body: {} });
|
|
310
|
+
toast("已确认,新消息起加载新版");
|
|
311
|
+
close();
|
|
312
|
+
await reload();
|
|
313
|
+
if (varsNeedAttention(next)) openVars(next);
|
|
314
|
+
} catch (err) {
|
|
315
|
+
accept.disabled = false;
|
|
316
|
+
toast(err.message);
|
|
317
|
+
}
|
|
318
|
+
};
|
|
319
|
+
foot.append(accept);
|
|
320
|
+
} else if (!d.installed && d.canInstall) {
|
|
302
321
|
const install = h("button", { class: "btn primary", onclick: async () => { if (await installShared(d, install)) close(); } }, "安装");
|
|
303
322
|
foot.append(install);
|
|
304
323
|
}
|
|
@@ -312,6 +331,9 @@ async function openDetail(s) {
|
|
|
312
331
|
h("span", {}, SHARED[d.visibility]),
|
|
313
332
|
h("span", {}, `更新于 ${new Date(d.updatedAt).toLocaleString()}`),
|
|
314
333
|
),
|
|
334
|
+
d.updatePending
|
|
335
|
+
? h("p", { class: "skill-pending" }, "作者在你安装之后改过这个技能(说明、附带文件或变量)。下面是现在的内容,看过没问题再点「确认使用新版」;确认之前你的会话不会加载它。")
|
|
336
|
+
: null,
|
|
315
337
|
h("p", { class: "skill-desc" }, d.description),
|
|
316
338
|
d.vars.length
|
|
317
339
|
? h(
|
|
@@ -400,15 +422,18 @@ function openVars(s) {
|
|
|
400
422
|
});
|
|
401
423
|
const clear = cur?.set ? h("button", { type: "button", class: "btn ghost", onclick: () => ((input.value = ""), (input.dataset.clear = "1"), (clear.hidden = true)) }, "清除") : null;
|
|
402
424
|
// 受保护的密钥:agent 看不到值,只能经 agent-loft 发往这些地址;作者改了地址要这里再确认
|
|
425
|
+
const hosts = s.hosts?.[v.name];
|
|
403
426
|
const guard = v.secret && v.hosts?.length
|
|
404
|
-
? h("small", { class: "skill-guard" }, `受保护:agent 看不到这个值,只能通过 agent-loft
|
|
405
|
-
:
|
|
427
|
+
? h("small", { class: "skill-guard" }, `受保护:agent 看不到这个值,只能通过 agent-loft 代发请求。${cur?.set && hosts?.allowed?.length ? `这个技能可以发往 ${hosts.allowed.join("、")}。` : `填写即表示同意这个技能发往 ${v.hosts.join("、")}(别的技能声明的地址要在各自的变量页里另外确认)。`}`)
|
|
428
|
+
: cur?.guarded
|
|
429
|
+
? h("small", { class: "skill-guard" }, "这个值是按受保护的密钥填的,不会作为环境变量交给 agent。要当普通变量用,请在这里重新填写。")
|
|
430
|
+
: null;
|
|
406
431
|
const r = { v, input, approve: false };
|
|
407
|
-
const pending =
|
|
432
|
+
const pending = hosts?.pending?.length
|
|
408
433
|
? h(
|
|
409
434
|
"div",
|
|
410
435
|
{ class: "skill-pending" },
|
|
411
|
-
|
|
436
|
+
`这个技能要把 ${v.name} 发往还没确认过的地址:${hosts.pending.join("、")}。确认之前,不会发往这些地址。`,
|
|
412
437
|
h("button", { type: "button", class: "btn small", onclick: (e) => ((r.approve = true), (e.currentTarget.textContent = "保存后生效"), (e.currentTarget.disabled = true)) }, "确认"),
|
|
413
438
|
)
|
|
414
439
|
: null;
|
|
@@ -446,7 +471,7 @@ function openVars(s) {
|
|
|
446
471
|
if (!Object.keys(values).length && !approve.length) return close();
|
|
447
472
|
save.disabled = true;
|
|
448
473
|
try {
|
|
449
|
-
await api("/api/skills/vars", { method: "PUT", body: { values, approve } });
|
|
474
|
+
await api("/api/skills/vars", { method: "PUT", body: { values, approve, skill: s.id } });
|
|
450
475
|
close();
|
|
451
476
|
toast("已保存,新消息起生效");
|
|
452
477
|
void reload();
|
package/web/state.js
CHANGED
|
@@ -7,6 +7,10 @@ export const S = {
|
|
|
7
7
|
pending: new Map(),
|
|
8
8
|
/** 侧栏菜单的显示和顺序,随账号保存;null 使用默认配置。 */
|
|
9
9
|
sidebarNav: null,
|
|
10
|
+
/** 设置 → Agent 里定的默认权限,按引擎:{ claude: "edit", codex: null } */
|
|
11
|
+
defaultPermission: null,
|
|
12
|
+
/** 新对话里打开的计划模式(和 draftPermission 一样,建好对话后带过去) */
|
|
13
|
+
draftPlan: false,
|
|
10
14
|
current: null,
|
|
11
15
|
/** 新对话的引擎(claude / codex),跟着选的专家走 */
|
|
12
16
|
draftAgent: localStorage.getItem("aim.agent") || null,
|
package/web/views/composer.js
CHANGED
|
@@ -226,10 +226,11 @@ export async function ensureConversation() {
|
|
|
226
226
|
S.draftCwdPicked = false;
|
|
227
227
|
// 新对话里选过模型 / 思考程度:建好会话后先切过去再发消息
|
|
228
228
|
// 权限只对这一条新对话有效,不留给下一条(不放进按专家记住的 draftPick)
|
|
229
|
-
const pick = { ...draftPick(), permission: S.draftPermission };
|
|
229
|
+
const pick = { ...draftPick(), permission: S.draftPermission, plan: S.draftPlan ? "on" : null };
|
|
230
230
|
S.draftPermission = null;
|
|
231
|
-
|
|
232
|
-
|
|
231
|
+
S.draftPlan = false;
|
|
232
|
+
const FAILED = { model: "切换模型", effort: "切换思考程度", permission: "设置权限", plan: "打开计划模式" };
|
|
233
|
+
for (const [action, value] of [["model", pick.model], ["effort", pick.effort], ["permission", pick.permission], ["plan", pick.plan]]) {
|
|
233
234
|
if (!value) continue;
|
|
234
235
|
try {
|
|
235
236
|
const res = await api(`/api/conversations/${encodeURIComponent(info.key)}/action`, { method: "POST", body: { action, value } });
|
|
@@ -8,7 +8,7 @@ import { closeMenu, confirmDialog, modal, placePopover, showPopover } from "../l
|
|
|
8
8
|
import { newDraft, openConversation, renderEmpty } from "./messages.js";
|
|
9
9
|
import { setDraftExpert } from "./experts.js";
|
|
10
10
|
import { preloadCommands } from "./slash.js";
|
|
11
|
-
import { FULL_WARNING, PERMISSIONS, permissionsUpTo } from "../lib/permission.js";
|
|
11
|
+
import { FULL_WARNING, PERMISSIONS, permissionsUpTo, PLAN_INFO } from "../lib/permission.js";
|
|
12
12
|
|
|
13
13
|
// ---------- 会话操作 ----------
|
|
14
14
|
|
|
@@ -169,8 +169,11 @@ export async function openModelPicker(anchor = ui.modelSlot) {
|
|
|
169
169
|
render();
|
|
170
170
|
}
|
|
171
171
|
|
|
172
|
-
/**
|
|
173
|
-
|
|
172
|
+
/**
|
|
173
|
+
* 权限级别 + 计划模式开关:已有对话直接切,新对话先记下,建好对话后带过去。
|
|
174
|
+
* max、current、agent、plan 由输入框上的按钮算好传进来(自动判断只有 Claude 有)
|
|
175
|
+
*/
|
|
176
|
+
export function openPermissionPicker(anchor, { current, max, agent, plan }) {
|
|
174
177
|
if (ui.menu?.dataset.for === "permission") return closeMenu();
|
|
175
178
|
const pop = showPopover(anchor, { align: "left" });
|
|
176
179
|
pop.dataset.for = "permission";
|
|
@@ -186,10 +189,19 @@ export function openPermissionPicker(anchor, { current, max }) {
|
|
|
186
189
|
renderContext();
|
|
187
190
|
}
|
|
188
191
|
};
|
|
192
|
+
const togglePlan = async (on) => {
|
|
193
|
+
closeMenu();
|
|
194
|
+
if (S.current) {
|
|
195
|
+
await doAction("plan", on ? "on" : "off");
|
|
196
|
+
} else {
|
|
197
|
+
S.draftPlan = on;
|
|
198
|
+
renderContext();
|
|
199
|
+
}
|
|
200
|
+
};
|
|
189
201
|
fill(
|
|
190
202
|
pop,
|
|
191
203
|
h("div", { class: "pop-head" }, "权限"),
|
|
192
|
-
permissionsUpTo(max).map((level) =>
|
|
204
|
+
permissionsUpTo(max, agent).map((level) =>
|
|
193
205
|
h(
|
|
194
206
|
"button",
|
|
195
207
|
{ class: `pop-item${level === current ? " on" : ""}`, onclick: () => void choose(level) },
|
|
@@ -197,6 +209,14 @@ export function openPermissionPicker(anchor, { current, max }) {
|
|
|
197
209
|
level === current ? h("span", { class: "check" }, "✓") : null,
|
|
198
210
|
),
|
|
199
211
|
),
|
|
212
|
+
h("div", { class: "sep" }),
|
|
213
|
+
// 整行是一个按钮,开关只是显示状态
|
|
214
|
+
h(
|
|
215
|
+
"button",
|
|
216
|
+
{ class: "pop-item perm-plan", role: "switch", "aria-checked": String(!!plan), onclick: () => void togglePlan(!plan) },
|
|
217
|
+
h("span", { class: "grow" }, h("span", { class: "t" }, PLAN_INFO.label), h("span", { class: "s" }, PLAN_INFO.desc)),
|
|
218
|
+
h("span", { class: "switch", "aria-hidden": "true" }, h("input", { type: "checkbox", checked: !!plan, tabindex: -1 }), h("span", { class: "slider" })),
|
|
219
|
+
),
|
|
200
220
|
);
|
|
201
221
|
placePopover(pop, anchor);
|
|
202
222
|
}
|
package/web/views/interaction.js
CHANGED
|
@@ -45,7 +45,11 @@ export function insertCard(ix) {
|
|
|
45
45
|
}
|
|
46
46
|
|
|
47
47
|
/** 已处理:「已回答 · 已在 Web 处理」。从会话记录里还原的不知道是谁处理的,只写结果 */
|
|
48
|
-
const settledText = (s
|
|
48
|
+
const settledText = (s, spec) => {
|
|
49
|
+
// 换过按钮文字的卡(批准方案)按按钮上的说法回显
|
|
50
|
+
const custom = s.settlement === "allow-once" ? spec?.allowLabel : s.settlement === "deny" ? spec?.denyLabel : undefined;
|
|
51
|
+
return [custom ? `已选「${custom}」` : (SETTLE_LABEL[s.settlement] ?? s.settlement), s.by].filter(Boolean).join(" · ");
|
|
52
|
+
};
|
|
49
53
|
|
|
50
54
|
function notifyIfHidden(ix) {
|
|
51
55
|
// 桌面端由服务端的 notice 统一弹,这里再弹就重复了
|
|
@@ -87,22 +91,22 @@ export function renderInteraction(item) {
|
|
|
87
91
|
return h(
|
|
88
92
|
"div",
|
|
89
93
|
{ class: `ix-card${settled ? " settled" : ""}` },
|
|
90
|
-
h("div", { class: "ix-title" }, settled ? "" : "⚠️", spec.title),
|
|
94
|
+
h("div", { class: "ix-title" }, settled ? "" : spec.allowLabel ? "📋" : "⚠️", spec.title),
|
|
91
95
|
h("div", { class: "ix-detail" }, renderMarkdown(spec.detail)),
|
|
92
96
|
settled
|
|
93
|
-
? h("div", { class: "ix-meta" }, settledText(settled))
|
|
97
|
+
? h("div", { class: "ix-meta" }, settledText(settled, spec))
|
|
94
98
|
: h(
|
|
95
99
|
"div",
|
|
96
100
|
{ class: "ix-buttons" },
|
|
97
101
|
spec.allowSession
|
|
98
102
|
? h("button", { class: "btn primary", onclick: () => ixOp(ix.id, "decide", { decision: "allow-session" }) }, "本会话全部允许")
|
|
99
103
|
: null,
|
|
100
|
-
h("button", { class: `btn${spec.allowSession ? "" : " accent"}`, onclick: () => ixOp(ix.id, "decide", { decision: "allow-once" }) }, "允许一次"),
|
|
104
|
+
h("button", { class: `btn${spec.allowSession ? "" : " accent"}`, onclick: () => ixOp(ix.id, "decide", { decision: "allow-once" }) }, spec.allowLabel ?? "允许一次"),
|
|
101
105
|
// 会落盘、对所有人生效的「总是允许」只给管理员
|
|
102
106
|
spec.alwaysLabel && (!spec.alwaysGlobal || isAdmin())
|
|
103
107
|
? h("button", { class: "btn", onclick: () => ixOp(ix.id, "decide", { decision: "allow-always" }) }, spec.alwaysLabel)
|
|
104
108
|
: null,
|
|
105
|
-
h("button", { class:
|
|
109
|
+
h("button", { class: `btn${spec.denyLabel ? "" : " danger"}`, onclick: () => ixOp(ix.id, "decide", { decision: "deny" }) }, spec.denyLabel ?? "拒绝"),
|
|
106
110
|
),
|
|
107
111
|
);
|
|
108
112
|
}
|
package/web/views/sidebar.js
CHANGED
|
@@ -446,6 +446,7 @@ export function bootstrapQuery() {
|
|
|
446
446
|
|
|
447
447
|
export function applyBootstrap(data) {
|
|
448
448
|
S.sidebarNav = data.sidebarNav ?? null;
|
|
449
|
+
S.defaultPermission = data.defaultPermission ?? null;
|
|
449
450
|
S.convs = new Map(data.conversations.map((c) => [c.key, c]));
|
|
450
451
|
pages.full = !data.sidebar;
|
|
451
452
|
// bootstrap 只带 IM 分组最近/当前的一条;展开的列表需要重新补齐。
|
package/web/views/tasks.js
CHANGED
|
@@ -456,7 +456,7 @@ export function openTaskForm(task, preset) {
|
|
|
456
456
|
let permissionValue = src.permission ?? "";
|
|
457
457
|
const syncPermission = () => {
|
|
458
458
|
const max = minPermission(isAdmin() ? "full" : "edit", capOfAccess(findExpert(expert.value)?.access));
|
|
459
|
-
const levels = permissionsUpTo(max);
|
|
459
|
+
const levels = permissionsUpTo(max, findExpert(expert.value)?.engine);
|
|
460
460
|
// 已经存着的级别高过现在的上限(被降级了、换了专家):不留着,免得显示的和实际跑的不一样
|
|
461
461
|
if (permissionValue && !levels.includes(permissionValue)) permissionValue = "";
|
|
462
462
|
fill(
|
|
@@ -486,7 +486,7 @@ export function openTaskForm(task, preset) {
|
|
|
486
486
|
const info = target.value === "dedicated" ? null : convTargetInfo(target.value, task);
|
|
487
487
|
if (!info) return fill(convBox);
|
|
488
488
|
const label = PERMISSIONS[info.permission]?.label ?? "默认";
|
|
489
|
-
const levels = info.max ? permissionsUpTo(info.max) : [];
|
|
489
|
+
const levels = info.max ? permissionsUpTo(info.max, info.expert?.engine) : [];
|
|
490
490
|
if (!info.locked && levels.length > 1) {
|
|
491
491
|
convPermission = h("select", { class: "task-conv-permission" }, levels.map((l) => h("option", { value: l, selected: l === info.permission }, `${PERMISSIONS[l].label}:${PERMISSIONS[l].desc}`)));
|
|
492
492
|
}
|
package/web/views/topbar.js
CHANGED
|
@@ -8,7 +8,7 @@ import { closeMenu, modal, placePopover, showMenu, showPopover, submenuButton }
|
|
|
8
8
|
import { openConversation } from "./messages.js";
|
|
9
9
|
import { openSchedule } from "./schedule.js";
|
|
10
10
|
import { changeCwd, deleteConv, doAction, forkConversation, handoffConversation, openModelPicker, openPermissionPicker, renameConv, switchAgent } from "./conv-actions.js";
|
|
11
|
-
import { capOfAccess, minPermission,
|
|
11
|
+
import { capOfAccess, defaultPermissionFor, minPermission, permissionsUpTo, PERMISSIONS } from "../lib/permission.js";
|
|
12
12
|
import { canSeeChanges, syncWorkspace, toggleWorkspace, workspaceButtons, workspaceStats } from "./workspace-entry.js";
|
|
13
13
|
|
|
14
14
|
// ---------- 顶栏 ----------
|
|
@@ -429,26 +429,31 @@ export function renderContext() {
|
|
|
429
429
|
);
|
|
430
430
|
}
|
|
431
431
|
|
|
432
|
-
/**
|
|
432
|
+
/** 输入框里的权限按钮(级别 + 计划模式)。只有一级可选(只能联网、只能读文件的专家)时不显示 */
|
|
433
433
|
function renderPermission(c, expert) {
|
|
434
434
|
if (!ui.permSlot) return;
|
|
435
|
+
const agent = c ? c.agent : S.draftAgent;
|
|
435
436
|
const max = c ? c.permissionMax : minPermission(isAdmin() ? "full" : "edit", capOfAccess(expert?.access));
|
|
436
|
-
//
|
|
437
|
-
if (!c && S.draftPermission &&
|
|
438
|
-
|
|
439
|
-
|
|
437
|
+
// 新对话选好后换了个权限低的专家、或换到了没有这一级的引擎:选的不再算数
|
|
438
|
+
if (!c && S.draftPermission && !permissionsUpTo(max, agent).includes(S.draftPermission)) S.draftPermission = null;
|
|
439
|
+
// 没选过就按设置里的默认权限(已有对话由服务端算好)
|
|
440
|
+
const current = c ? c.permission : (S.draftPermission ?? defaultPermissionFor(agent, max, S.defaultPermission));
|
|
441
|
+
const plan = c ? !!c.plan : !!S.draftPlan;
|
|
442
|
+
if (max === "ask" && (!current || current === "ask") && !plan) return fill(ui.permSlot);
|
|
440
443
|
const locked = !!c?.taskId;
|
|
444
|
+
const name = current ? PERMISSIONS[current].short : "默认权限";
|
|
441
445
|
fill(
|
|
442
446
|
ui.permSlot,
|
|
443
447
|
h(
|
|
444
448
|
"button",
|
|
445
449
|
{
|
|
446
|
-
class: `perm-pill${current === "full" ? " danger" : ""}`,
|
|
447
|
-
title: locked ? "定时任务的专用对话:权限在任务设置里改" : `权限:${current ? PERMISSIONS[current].label : "默认"},点击切换`,
|
|
448
|
-
onclick: (e) => (locked ? toast("这是定时任务的专用对话,权限在任务设置里改") : openPermissionPicker(e.currentTarget, { current, max })),
|
|
450
|
+
class: `perm-pill${current === "full" ? " danger" : ""}${plan ? " plan" : ""}`,
|
|
451
|
+
title: locked ? "定时任务的专用对话:权限在任务设置里改" : `权限:${current ? PERMISSIONS[current].label : "默认"}${plan ? ",计划模式开着" : ""},点击切换`,
|
|
452
|
+
onclick: (e) => (locked ? toast("这是定时任务的专用对话,权限在任务设置里改") : openPermissionPicker(e.currentTarget, { current, max, agent, plan })),
|
|
449
453
|
},
|
|
450
454
|
icon("shield"),
|
|
451
|
-
h("span", { class: "perm-name" },
|
|
455
|
+
h("span", { class: "perm-name" }, name),
|
|
456
|
+
plan ? h("span", { class: "perm-plan-tag" }, "计划") : null,
|
|
452
457
|
locked ? null : icon("down"),
|
|
453
458
|
),
|
|
454
459
|
);
|