Skip to content

🤖 Open-source, local-first alternative to Grok Bot, OpenAI dots and Claude Duet. Your own AI bots on any model: GPT, Claude, Gemini, Grok, DeepSeek, Kimi, GLM and 70+ more through one Modelflare key. Reach them in the app, WeChat or Feishu; they remember you, work in the background, run commands and use your computer. Pay per use.

feat(ui): usage requests and undelivered messages in the info panel; 谁能使用 in bot settings

Marla15bcdb9435cd
diff --git a/ui/components/ui.js b/ui/components/ui.js
index 39592fd..327220d 100644
--- a/ui/components/ui.js
+++ b/ui/components/ui.js
@@ -283,6 +283,7 @@ const STATE = {
failed: ["失败", "err"], stopped: ["已停止", "off"], wait: ["等待扫码", "warn"], scaned: ["已扫码", "warn"], need_verifycode: ["需验证码", "warn"],
confirmed: ["已确认", "ok"], already_bound: ["已绑定", "ok"], cancelled: ["已取消", "off"], idle: ["空闲", "off"], fetching: ["获取中", "warn"],
pending: ["待处理", "warn"], allowed: ["已批准", "ok"], rejected: ["已拒绝", "err"], answered: ["已回答", "ok"],
+ retrying: ["重试中", "warn"], denied: ["已拒绝", "err"],
};
export const Badge = ({ s }) => {
const [text, kind] = STATE[s] || [s, ""];
diff --git a/ui/lib/access.js b/ui/lib/access.js
new file mode 100644
index 0000000..defd037
--- /dev/null
+++ b/ui/lib/access.js
@@ -0,0 +1,11 @@
+// 谁能使用机器人:信息面板(使用请求、没发出去的消息)和机器人设置(主人、允许名单)共用的说法。
+export const CHANNEL_NAME = { web: "网页", feishu: "飞书", weixin: "微信" };
+
+/** 允许名单里每个人是怎么来的 */
+export const SOURCE_LABEL = {
+ request: "你允许的",
+ migration: "升级前已在使用",
+ "previous-owner": "之前扫码登录的微信",
+ app: "在应用里添加",
+ test: "测试",
+};
diff --git a/ui/screens/bot-settings.js b/ui/screens/bot-settings.js
index ce62789..3fcdfea 100644
--- a/ui/screens/bot-settings.js
+++ b/ui/screens/bot-settings.js
@@ -7,6 +7,8 @@ import { api } from "../lib/api.js";
import { confirmSheet, failed, saved } from "../lib/store.js";
import { usd } from "../lib/links.js";
import { PERMS, FULL_WARNING, confirmPermission } from "../lib/perms.js";
+import { CHANNEL_NAME, SOURCE_LABEL } from "../lib/access.js";
+import { fmtAgo } from "../lib/format.js";
function Row({ id, name, sub, title, children, off }) {
return html`<div class=${`row${off ? " off" : ""}`} id=${`bot-${id}`} title=${title}>
@@ -76,6 +78,75 @@ function BudgetRows({ bot, budget, account, onSaved, onOpenSettings }) {
<//>`;
}
+/**
+ * 谁能使用:只有主人和允许名单里的人。主人 = 扫码登录的微信 / 在应用里设的飞书主人;
+ * 允许名单和拒绝过的人可以移除(移除后他再发消息会重新申请)。
+ */
+function AccessRows({ botId }) {
+ const [d, setD] = useState(null);
+ const load = () => api(`/bots/${botId}/access`).then(setD).catch(failed);
+ useEffect(() => {
+ load();
+ }, [botId]);
+ const call = async (path, method) => {
+ try {
+ await api(`/bots/${botId}/access/${path}`, method === "DELETE" ? { method } : { method, body: {} });
+ saved();
+ load();
+ } catch (e) {
+ failed(e);
+ }
+ };
+ const remove = async (e) => {
+ const denied = e.status === "denied";
+ if (!(await confirmSheet({
+ title: denied ? `移除「${e.who}」?` : `不再允许「${e.who}」使用?`,
+ body: denied ? "移除后他再发消息,会重新出现在信息面板的使用请求里。" : "他再发消息时只会收到一句提示,需要你重新允许。",
+ confirmLabel: "移除",
+ danger: !denied,
+ }))) return;
+ call(encodeURIComponent(e.id), "DELETE");
+ };
+ const clearOwner = async (ch, o) => {
+ if (!(await confirmSheet({ title: `取消${CHANNEL_NAME[ch]}主人?`, body: `「${o.who}」之后发消息需要重新被允许;下一个发消息的人可以在信息面板里设为主人。`, confirmLabel: "取消主人", danger: true }))) return;
+ call(encodeURIComponent(o.entryId), "DELETE");
+ };
+ if (!d) return html`<div class="list-head">谁能使用</div><div class="list"><div class="row"><${Skeleton} w="45%" /></div></div>`;
+ const allowed = d.entries.filter((e) => e.status === "allowed");
+ const denied = d.entries.filter((e) => e.status === "denied");
+ const owner = (ch) => {
+ const o = d.owners[ch];
+ const sub = o
+ ? `${o.who} · ${o.via === "login" ? "扫码登录的微信" : "在应用里设的"}`
+ : ch === "weixin"
+ ? "扫码登录后,扫码的那个微信就是主人"
+ : "还没有:第一个给机器人发消息的人会出现在信息面板,点「设为主人」";
+ return html`<${Row} id=${`access-${ch}`} name=${`${CHANNEL_NAME[ch]}主人`} sub=${sub}>
+ ${o && o.via === "app" && html`<button type="button" class="text" onClick=${() => clearOwner(ch, o)}>取消</button>`}
+ <//>`;
+ };
+ return html`<div class="list-head">谁能使用</div>
+ <div class="list">
+ <${Row} id="access" name="只有主人和你允许的人" sub="其他人发消息只会收到一句提示,不会调用模型;请求出现在信息面板,也会带配对码发给主人" />
+ ${owner("weixin")}
+ ${owner("feishu")}
+ </div>
+ <div class="list-head">允许名单${allowed.length > 0 && html`<span class="badge count">${allowed.length}</span>`}</div>
+ <div class="list">
+ ${!allowed.length && html`<div class="row"><span class="hint">还没有允许别人。有人给机器人发消息后,会出现在信息面板的「使用请求」里。</span></div>`}
+ ${allowed.map((e) => html`<${Row} key=${e.id} id=${`access-${e.id}`} name=${e.who} sub=${[SOURCE_LABEL[e.source] || e.source, e.decidedAt ? fmtAgo(e.decidedAt) : ""].filter(Boolean).join(" · ")}>
+ <button type="button" class="text danger" onClick=${() => remove(e)}>移除</button>
+ <//>`)}
+ </div>
+ ${denied.length > 0 && html`<div class="list-head">拒绝过的人</div>
+ <div class="list">
+ ${denied.map((e) => html`<${Row} key=${e.id} id=${`access-${e.id}`} name=${e.who} sub=${`${fmtAgo(e.decidedAt)}拒绝 · 他再发消息不会收到任何回复`}>
+ <button type="button" class="text accent" onClick=${() => call(`${encodeURIComponent(e.id)}/approve`, "POST")}>允许</button>
+ <button type="button" class="text" onClick=${() => remove(e)}>移除</button>
+ <//>`)}
+ </div>`}`;
+}
+
export function BotSettingsScreen({ bot, section, models, modelsError, reloadModels, defaultModel, account, onOpenSettings, onBack, onBotUpdated, onDeleted }) {
const [d, setD] = useState(null);
const [name, setName] = useState(bot.name);
@@ -183,6 +254,8 @@ export function BotSettingsScreen({ bot, section, models, modelsError, reloadMod
</div>
${s.permission === "full" && html`<${Notice} tone="red">${FULL_WARNING}<//>`}
+ <${AccessRows} botId=${bot.id} />
+
<div class="list-head">记忆</div>
<div class="list">
<${Row} id="memory" name="长期记忆" sub="remember / forget / recall">
diff --git a/ui/screens/info-panel.js b/ui/screens/info-panel.js
index b128832..268f662 100644
--- a/ui/screens/info-panel.js
+++ b/ui/screens/info-panel.js
@@ -6,6 +6,7 @@ import { PromptCard } from "./chat.js";
import { api } from "../lib/api.js";
import { confirmSheet, failed, saved, toast } from "../lib/store.js";
import { fmtAgo, fmtDur, fmtTime } from "../lib/format.js";
+import { CHANNEL_NAME } from "../lib/access.js";
export function usePoll(fn, ms, deps = []) {
const [data, setData] = useState(null);
@@ -20,8 +21,6 @@ export function usePoll(fn, ms, deps = []) {
return [data, err, load];
}
-const CHANNEL_NAME = { web: "网页", feishu: "飞书", weixin: "微信" };
-
function FeishuRow({ bot, st, reload }) {
const [open, setOpen] = useState(false);
const [appId, setAppId] = useState(bot.feishuAppId);
@@ -103,6 +102,79 @@ function WeixinRow({ bot, st, reload }) {
</div>`}`;
}
+/**
+ * 使用请求:不在允许名单里的人给机器人发了消息(他只收到一句"还没被允许",没有调用模型)。
+ * 允许 / 拒绝;这个渠道还没有主人时,可以把他设为主人(多半就是你自己)。
+ */
+function AccessRequests({ botId, data, reload }) {
+ const [busy, setBusy] = useState("");
+ if (!data || !data.requests.length) return null;
+ const act = async (r, what) => {
+ setBusy(r.id + what);
+ try {
+ await api(`/bots/${botId}/access/${encodeURIComponent(r.id)}/${what}`, { method: "POST", body: {} });
+ toast(what === "approve" ? `已允许「${r.who}」` : what === "deny" ? `已拒绝「${r.who}」` : `已设为${CHANNEL_NAME[r.channel]}主人`);
+ } catch (e) {
+ failed(e);
+ }
+ setBusy("");
+ reload();
+ };
+ return html`<div class="list-head">使用请求<span class="badge count warn">${data.requests.length}</span></div>
+ <div class="stack">${data.requests.map((r) => {
+ const noOwner = !data.owners[r.channel];
+ return html`<div key=${r.id} class="stack approval" style="--gap: var(--space-1)">
+ <span class="hint">${CHANNEL_NAME[r.channel] || r.channel} · ${fmtAgo(r.createdAt)}${r.requests > 1 ? ` · 发了 ${r.requests} 条消息` : ""}</span>
+ <div class="card">
+ <div class="meta"><span>想使用这个机器人 · 配对码 <span class="num">${r.code}</span></span></div>
+ <div class="q">${r.who}</div>
+ ${r.text && html`<div class="q-detail selectable">「${r.text}」</div>`}
+ <div class="actions">
+ <${Button} variant="primary" loading=${busy === r.id + "approve"} disabled=${!!busy} onClick=${() => act(r, "approve")}>允许</${Button}>
+ <${Button} loading=${busy === r.id + "deny"} disabled=${!!busy} onClick=${() => act(r, "deny")}>拒绝</${Button}>
+ ${noOwner && html`<${Button} variant="ghost" loading=${busy === r.id + "owner"} disabled=${!!busy} onClick=${() => act(r, "owner")}>设为主人</${Button}>`}
+ </div>
+ <span class="hint">${noOwner
+ ? `${CHANNEL_NAME[r.channel]}还没有主人。如果这是你自己,点「设为主人」,以后的请求也会发给你。`
+ : `他只收到一句提示,没有调用模型。主人在聊天里回复「同意 ${r.code}」也可以。`}</span>
+ </div>
+ </div>`;
+ })}</div>`;
+}
+
+/** 没发出去的消息:出站队列还在重试的,和发不出去、已经放弃的(附原因,可以"知道了") */
+function Undelivered({ botId }) {
+ const [d, , reload] = usePoll(() => api(`/bots/${botId}/outbox`), 8000, [botId]);
+ if (!d || (!d.failed.length && !d.waiting.length)) return null;
+ const dismiss = async (f) => {
+ try {
+ await api(`/bots/${botId}/outbox/${encodeURIComponent(f.id)}/dismiss`, { method: "POST", body: {} });
+ reload();
+ } catch (e) {
+ failed(e);
+ }
+ };
+ return html`<div class="list-head">没发出去的消息${d.failed.length > 0 && html`<span class="badge count warn">${d.failed.length}</span>`}</div>
+ <div class="list">
+ ${d.waiting.map((w) => html`<div key=${w.id} class="row compact">
+ <div class="who">
+ <div class="name">发给${w.to}</div>
+ <div class="sub">${w.preview || "(空)"}</div>
+ <div class="sub wrap">${w.attempts ? `第 ${w.attempts} 次没发出去,稍后自动重试` : "等渠道连上后发送"}${w.error ? `:${w.error}` : ""}</div>
+ </div>
+ <${Badge} s="retrying" />
+ </div>`)}
+ ${d.failed.map((f) => html`<div key=${f.id} class="row compact">
+ <div class="who">
+ <div class="name">发给${f.to} · ${fmtAgo(f.updatedAt)}</div>
+ <div class="sub">${f.preview || "(空)"}</div>
+ <div class="sub wrap">${f.error}</div>
+ </div>
+ <button type="button" class="text" onClick=${() => dismiss(f)}>知道了</button>
+ </div>`)}
+ </div>`;
+}
+
function MemorySection({ botId }) {
const [d, err, reload] = usePoll(() => api(`/bots/${botId}/memory`), 0, [botId]);
const forget = async (sc, text, topic) => {
@@ -183,6 +255,7 @@ export function InfoPanel({ bot, onClose, onOpenBotSettings, onOpenChat }) {
const [detail, , reloadDetail] = usePoll(() => api(`/bots/${bot.id}`), 5000, [bot.id]);
const [appr, , reloadAppr] = usePoll(() => api(`/approvals?status=pending&bot=${encodeURIComponent(bot.id)}`), 4000, [bot.id]);
const [convs] = usePoll(() => api(`/conversations?bot=${encodeURIComponent(bot.id)}`), 8000, [bot.id]);
+ const [access, , reloadAccess] = usePoll(() => api(`/bots/${encodeURIComponent(bot.id)}/access`), 4000, [bot.id]);
const [viewing, setViewing] = useState(null);
const pending = (appr && appr.approvals) || [];
return html`<aside class="panel" aria-label="信息面板">
@@ -199,6 +272,8 @@ export function InfoPanel({ bot, onClose, onOpenBotSettings, onOpenChat }) {
: html`<div class="row"><${Skeleton} w="50%" /></div><div class="row"><${Skeleton} w="40%" /></div>`}
</div>
+ <${AccessRequests} botId=${bot.id} data=${access} reload=${reloadAccess} />
+
<div class="list-head">待审批${pending.length > 0 && html`<span class="badge count warn">${pending.length}</span>`}</div>
${pending.length
? html`<div class="stack">${pending.map((a) => html`<div key=${a.id} class="stack approval" style="--gap: var(--space-1)">
@@ -208,6 +283,8 @@ export function InfoPanel({ bot, onClose, onOpenBotSettings, onOpenChat }) {
<button type="button" class="text" style="justify-self:start" onClick=${reloadAppr}>刷新</button></div>`
: html`<div class="list"><div class="row"><span class="hint">没有待处理的审批</span></div></div>`}
+ <${Undelivered} botId=${bot.id} />
+
<${MemorySection} botId=${bot.id} />
<div class="list-head">最近会话</div>