🤖 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.
Python ai-agentai-assistantchatbotclaudecomputer-usedeepseekdesktop-appdshelectronfeishugeminigptgrokllmlocal-firstmodelflaremulti-modelopenai-compatiblepersonal-ai-agentwechat
fix(chat): pending message survives bot switches and reloads; stop always stops
Marla9760a34e2716
diff --git a/README.md b/README.mdindex bd4cf4c..a0116bf 100644--- a/README.md+++ b/README.md@@ -89,7 +89,7 @@ docker exec amb cat /data/ui-token # 打开 http://<主机>:3600/?token=<令- 设置 → Modelflare:账户、余额与充值、余额提醒、用量、通知、邀请;连接状态(只显示 Key 尾号);未登录时可更换密钥或断开(机器人与会话保留,断开后回到首次连接页);默认模型、刷新模型列表。- 对话中输入框右侧的模型按钮可为当前会话切换模型(也可设为机器人默认);`/model`、`/reset`、`/new`、`/status`、`/stop`、`/help` 照常可用。- 处理过程:代理回合的每一步(模型请求及用时与 tokens、工具调用及参数与输出、重试、子代理)折叠在回复上方的"用时"一行里,点开查看;微信 / 飞书会话在信息面板 → 最近会话里看,正在处理的那一轮实时显示并可中止。-- 卡住的消息:`/stop`(任何渠道)或信息面板里的「中止」立即结束正在处理的回合;代理 10 分钟没有任何进展(模型不回、工具不动、只在重试;等你批准或回答不算)会自动中止,单回合最长 30 分钟(`AMB_AGENT_IDLE_TIMEOUT_MS`、`AMB_AGENT_TURN_TIMEOUT_MS` 可调)。DSH 没有中断单个回合的接口,中止时会重启该机器人的代理进程。前一条还在处理时发来的新消息会先收到一句提示;`/status` 显示它走到了哪一步、多久没有进展。+- 卡住的消息:`/stop`(任何渠道)或信息面板里的「中止」立即结束正在处理的回合;代理 10 分钟没有任何进展(模型不回、工具不动、只在重试;等你批准或回答不算)会自动中止,单回合最长 30 分钟(`AMB_AGENT_IDLE_TIMEOUT_MS`、`AMB_AGENT_TURN_TIMEOUT_MS` 可调)。DSH 没有中断单个回合的接口,中止时会重启该机器人的代理进程。前一条还在处理时发来的新消息会先收到一句提示;`/status` 显示它走到了哪一步、多久没有进展。网页对话里切到别的机器人或刷新窗口不会打断正在处理的消息,回来时接着显示(你的消息、到目前为止的回复和处理过程);停止按钮在排队、代理启动中、等你批准时也能用,纯对话也一样。- 代理的对话接口:代理按 Modelflare 公开目录里该模型支持的接口选——有 Responses API 的(GPT-5.4 及以后、Grok 4.5 及以后、DeepSeek V4、GLM-5、Kimi K3 等)走 `/v1/responses`(推理模型默认推理强度 medium,加密推理随历史回放);没有 Responses、有 Anthropic Messages 的(Claude)走 `/v1/messages`;其余模型、拿不到目录时(离线、中国大陆线路)以及外部端点走 Chat Completions。接口在拉起代理进程时选定(故障排查的代理状态里显示 `api`);`AMB_AGENT_API=chat` 强制全部走 Chat Completions(排查用)。纯对话(非代理)仍走 Chat Completions。安全网:某个模型在 Responses / Messages 上的请求被上游拒绝(HTTP 400/404/405/415/422 或“不支持的参数 / 接口”,限流、余额、权限、上游故障、上下文过长不算)时,这个模型 24 小时内改走 Chat Completions(记在数据目录的 `dsh/api-fallback.json`,日志有警告,代理状态显示 `openai-completions (fallback: 原因)`);这一轮如果还没调用过工具,代理换到 Chat 上自动重做一遍,用户照常收到回复,已经调用过工具的则照常报错、下一轮起走 Chat。- 内置网关:magpie 以 `--gateway` 模式运行,使用本程序数据目录内独立的 HOME/配置目录;**不读取**你电脑上已有的 Claude/Codex 等订阅凭据,**不改写**任何 agent 配置,关闭自动更新与账户发现。它只供本进程内部调用,界面不再反代它的页面或 `/v1`。- API Key 只保存在内置网关的隔离配置中,不经过命令行参数、不写日志,前端只拿到尾号。diff --git a/src/core/runtime.ts b/src/core/runtime.tsindex c5cc107..d1a6808 100644--- a/src/core/runtime.ts+++ b/src/core/runtime.ts@@ -85,11 +85,45 @@ const HELP = ["/help — 显示本帮助",].join("\n");+/** 一条正在处理的消息(各渠道都有):/stop、网页的停止按钮经 abort 中止它 */+interface Inflight {+ botId: string;+ since: number;+ abort: AbortController;+}++/** 回合还没交给代理(或纯对话还没出字)就被停止时的回复 */+export const stoppedText = (ms: number) => `已中止(处理了 ${fmtSecs(ms)})。`;+/** 渠道无关的对话运行时:命令处理、上下文拼装、流式调用模型、持久化。 */export class BotRuntime {private modelCache: { at: number; list: string[] } | undefined;+ /** 会话 → 正在处理的消息 */+ private inflight = new Map<string, Set<Inflight>>();constructor(private opts: RuntimeOptions) {}+ /**+ * 中止会话里正在处理的消息:纯对话中止模型请求(已生成的部分保留),代理回合交给代理之前直接收尾、之后在服务端中止+ * (会重启代理进程)。返回有没有正在处理的消息。+ */+ stop(conversationId: string): boolean {+ const set = this.inflight.get(conversationId);+ for (const t of set ?? []) t.abort.abort();+ const agentTurn = this.opts.agent?.stopTurn(conversationId) ?? false;+ return !!set?.size || agentTurn;+ }++ /** 会话里最早那条还在处理的消息是什么时候收到的 */+ busySince(conversationId: string): number | undefined {+ const set = this.inflight.get(conversationId);+ return set?.size ? Math.min(...[...set].map((t) => t.since)) : undefined;+ }++ /** 有消息正在处理的机器人(侧栏"正在工作") */+ busyBots(): string[] {+ return [...new Set([...this.inflight.values()].flatMap((s) => [...s].map((t) => t.botId)))];+ }+async listModels(force = false): Promise<string[]> {if (!force && this.modelCache && Date.now() - this.modelCache.at < 30_000) return this.modelCache.list;// 机器人预算 Key 的 provider 列出同一批模型,只展示共用连接的那份@@ -106,12 +140,35 @@ export class BotRuntime {return list[0];}- /** signal:网页"停止"按钮;纯对话路径会中止模型请求并保留已生成的部分(代理回合无法中途打断,会在后台跑完) */+ /**+ * signal:网页的停止按钮(排队时就停了也算);/stop 经 stop() 走同一条路。纯对话中止模型请求并保留已生成的部分,+ * 代理回合交给代理之前直接收尾,之后由代理中止。+ */async handle(ev: InboundEvent, out: ReplySession, opts: { signal?: AbortSignal } = {}): Promise<void> {const { store } = this.opts;const bot = store.getBot(ev.botId);if (!bot) throw new Error(`unknown bot ${ev.botId}`);const conv = store.ensureConversation(bot.id, ev.channel, ev.conversation.id, ev.sender.name || ev.sender.id, ev.conversation.kind === "group" ? "group" : "dm");+ const t: Inflight = { botId: bot.id, since: Date.now(), abort: new AbortController() };+ const link = () => t.abort.abort();+ if (opts.signal?.aborted) link();+ else opts.signal?.addEventListener("abort", link, { once: true });+ const set = this.inflight.get(conv.id) ?? new Set<Inflight>();+ this.inflight.set(conv.id, set);+ set.add(t);+ try {+ await this.handleMessage(ev, out, bot, conv.id, conv.model, t);+ } finally {+ opts.signal?.removeEventListener("abort", link);+ set.delete(t);+ if (!set.size && this.inflight.get(conv.id) === set) this.inflight.delete(conv.id);+ }+ }++ private async handleMessage(ev: InboundEvent, out: ReplySession, bot: NonNullable<ReturnType<Store["getBot"]>>, convId: string, convModel: string, t: Inflight): Promise<void> {+ const { store } = this.opts;+ const conv = { id: convId, model: convModel };+ const signal = t.abort.signal;const agent = this.opts.agent;// 代理模式:收到的图片/文件先进工作区,消息里写路径if (agent?.available) storeInbound(agent.host(bot.id).workspace, ev);@@ -119,6 +176,17 @@ export class BotRuntime {if (!text) return;const images = inboundImages(ev);+ // 排队时就被停止了:不再处理(命令也不执行),留一句"已中止"+ if (signal.aborted) {+ const msg = stoppedText(Date.now() - t.since);+ if (!text.startsWith("/")) {+ store.addMessage(conv.id, "user", text);+ store.addMessage(conv.id, "assistant", msg);+ }+ await out.apply({ type: "text", text: msg });+ return;+ }+if (text.startsWith("/")) {const reply = await this.command(text, conv.id, conv.model, bot.defaultModel, bot.id);if (reply !== null) {@@ -138,7 +206,7 @@ export class BotRuntime {let note = "";if (agent?.available) {- const handled = await this.handleAgent(agent, bot.id, conv.id, text, routed, bot.systemPrompt, out, seen);+ const handled = await this.handleAgent(agent, bot.id, conv.id, text, routed, bot.systemPrompt, out, seen, t);if (handled === true) return;// 代理进程还在启动(第一次可能要几分钟):这条消息先由模型直接回答,不让用户干等if (handled === "starting") note = "(代理还在启动,这条消息先由模型直接回答;启动完成后会自动用回代理。)";@@ -158,7 +226,7 @@ export class BotRuntime {await out.apply({ type: "stream.start" });let acc = "";try {- const full = await this.opts.models.streamChat({ model: routed, messages, signal: opts.signal }, (delta) => {+ const full = await this.opts.models.streamChat({ model: routed, messages, signal }, (delta) => {acc += delta;void out.apply({ type: "stream.update", text: acc });});@@ -167,9 +235,11 @@ export class BotRuntime {await out.apply({ type: "stream.finish", text: note ? `${note}\n\n${finalText}` : finalText });} catch (e) {const err = e as Error & { status?: number };- if (opts.signal?.aborted) {- if (acc) store.addMessage(conv.id, "assistant", acc);- await out.apply({ type: "stream.finish", text: acc });+ if (signal.aborted) {+ // 停止:已生成的部分保留,末尾注明;还没出字就只说已中止+ const msg = acc ? `${acc}\n\n(已中止)` : stoppedText(Date.now() - t.since);+ store.addMessage(conv.id, "assistant", msg);+ await out.apply({ type: "stream.finish", text: msg });return;}log.warn("model call failed", { model, status: err.status, message: err.message });@@ -194,11 +264,11 @@ export class BotRuntime {if (bot) return { handled: true, ack: cmd === "/help" ? HELP : this.statusText(bot.id, convId, this.opts.store.getConversation(convId)?.model ?? "", bot.defaultModel) };}const agent = this.opts.agent;- // /stop 必须插队:它要停的正是排在前面、卡住的那个回合+ // /stop 必须插队:它要停的正是排在前面、卡住的那个回合(纯对话、代理还在启动时也算)if (cmd === "/stop") {- const t = agent?.turnsInProgress.get(convId);- if (!t || !agent?.stopTurn(convId)) return { handled: true, ack: "当前没有正在处理的消息。" };- return { handled: true, ack: `正在中止上一条消息(已处理 ${fmtSecs(Date.now() - t.since)})…` };+ const since = this.busySince(convId) ?? agent?.turnsInProgress.get(convId)?.since;+ if (since === undefined || !this.stop(convId)) return { handled: true, ack: "当前没有正在处理的消息。" };+ return { handled: true, ack: `正在中止上一条消息(已处理 ${fmtSecs(Date.now() - since)})…` };}if (!agent) return { handled: false };const r = agent.approvals.handleReply(convId, text, `${ev.channel}:${ev.sender.id}`);@@ -253,8 +323,19 @@ export class BotRuntime {* 代理回合;返回 false 表示宿主不可用且尚无任何输出(调用方回退到纯对话),* "starting" 表示代理进程在等待时限内没有启动好(同样回退,启动在后台继续)。*/- private async handleAgent(agent: AgentManager, botId: string, convId: string, text: string, model: string, systemPrompt: string, out: ReplySession, images: TurnImage[] = []): Promise<boolean | "starting"> {+ private async handleAgent(+ agent: AgentManager,+ botId: string,+ convId: string,+ text: string,+ model: string,+ systemPrompt: string,+ out: ReplySession,+ images: TurnImage[],+ inflight: Inflight,+ ): Promise<boolean | "starting"> {const { store } = this.opts;+ const signal = inflight.abort.signal;let visible = false;// 活动记录:网页对话实时显示(其它渠道忽略这个操作),回合结束后随回复存下来,信息面板里能看const steps = new Map<string, ActivityStep>();@@ -285,6 +366,17 @@ export class BotRuntime {show();startup = setInterval(show, 5000);}+ // 交给代理之前就被停止:不用动代理进程(启动在后台继续),直接收尾+ const stoppedEarly = async () => {+ clearInterval(startup);+ log.info("message stopped before the agent took it", { bot: botId, conversationId: convId });+ const msg = stoppedText(Date.now() - inflight.since);+ store.addMessage(convId, "user", text);+ store.addMessage(convId, "assistant", msg);+ await out.apply({ type: "stream.finish", text: msg });+ return true;+ };+ const stopped = new Promise<"stopped">((r) => (signal.aborted ? r("stopped") : signal.addEventListener("abort", () => r("stopped"), { once: true })));try {if (host.state !== "running") {const waitMs = Number(process.env.AMB_AGENT_START_WAIT_MS) || 90_000;@@ -295,14 +387,18 @@ export class BotRuntime {() => false,),new Promise<boolean>((r) => (timer = setTimeout(() => r(false), waitMs))),+ stopped,]).finally(() => clearTimeout(timer));+ if (ready === "stopped") return await stoppedEarly();if (!ready && (host.state as string) !== "running") {log.warn("agent host not ready, answering with plain chat", { bot: botId, state: host.state, waitedMs: waitMs });return host.state === "starting" ? "starting" : false;}}+ if (signal.aborted) return await stoppedEarly();const input = store.getAgentSession(convId) ? text : firstInput(agent, botId, convId, systemPrompt, text);- const r = await agent.runTurn(botId, {+ // runTurn 同步登记回合,之后的停止交给代理(TurnStopped,会重启代理进程)+ const turn = agent.runTurn(botId, {conversationId: convId,text: input,model,@@ -314,7 +410,13 @@ export class BotRuntime {visible = true;},},- }).finally(() => clearInterval(startup));+ });+ const halt = () => agent.stopTurn(convId);+ signal.addEventListener("abort", halt, { once: true });+ const r = await turn.finally(() => {+ clearInterval(startup);+ signal.removeEventListener("abort", halt);+ });store.addMessage(convId, "user", text);const finalText = r.text.trim() || "(已完成,没有文字回复)";store.addMessage(convId, "assistant", finalText, [...steps.values()]);diff --git a/src/web/live.ts b/src/web/live.tsnew file mode 100644index 0000000..1ba63da--- /dev/null+++ b/src/web/live.ts@@ -0,0 +1,151 @@+import crypto from "node:crypto";+import type { ActivityStep } from "../agent/activity.js";+import type { OutboundOp, ReplySession } from "../core/types.js";+import { opEvent } from "./sse-reply.js";++export interface LivePrompt {+ kind: string;+ prompt: string;+ requestId?: string;+ code?: string;+}++/** 进行中的一条消息到目前为止的样子:GET /chat 的 live,接上时的第一个 snapshot 事件 */+export interface LiveSnapshot {+ id: string;+ startedAt: number;+ userText: string;+ text: string;+ steps: ActivityStep[];+ prompts: LivePrompt[];+ files: string[];+ /** 已经按了停止,正在收尾 */+ stopping: boolean;+}++type Listener = (event: string, data: unknown) => void;++/**+ * 网页控制台的一条消息,从收到到回复结束(排队、等代理启动、流式回复都算)。+ * 运行时把 OutboundOp 写进来:这里记下到目前为止的状态,再原样转给订阅者——发消息的那个请求,+ * 以及切走再切回、刷新之后接上来的界面。+ */+export class LiveTurn implements ReplySession {+ readonly id = crypto.randomUUID();+ readonly startedAt = Date.now();+ text = "";+ readonly steps = new Map<string, ActivityStep>();+ readonly prompts: LivePrompt[] = [];+ readonly files: string[] = [];+ stopping = false;+ done = false;+ /** 停止按钮:交给 runtime.handle 的 signal(排队中的也能停) */+ readonly abort = new AbortController();+ private subs = new Set<Listener>();++ constructor(+ readonly conversationId: string,+ readonly botId: string,+ readonly userText: string,+ /** 收到时会话里最后一条消息的 id:之后存下的消息属于进行中的回合,由 live 代替显示 */+ readonly afterMessageId: number,+ ) {}++ async apply(op: OutboundOp): Promise<void> {+ if (this.done) return;+ if (op.type === "stream.update" || op.type === "stream.finish" || op.type === "text") this.text = op.text;+ else if (op.type === "activity") this.steps.set(op.step.id, op.step);+ else if (op.type === "file") this.files.push(op.name);+ else if (op.type === "interactive" && !this.prompts.some((p) => p.requestId && p.requestId === op.requestId)) {+ this.prompts.push({ kind: op.kind, prompt: op.prompt, requestId: op.requestId, code: op.code });+ }+ const ev = opEvent(op);+ if (ev) this.emit(ev[0], ev[1]);+ }++ snapshot(): LiveSnapshot {+ return {+ id: this.id,+ startedAt: this.startedAt,+ userText: this.userText,+ text: this.text,+ steps: [...this.steps.values()],+ prompts: [...this.prompts],+ files: [...this.files],+ stopping: this.stopping,+ };+ }++ /** 订阅之后的事件(含最后的 done / error);返回取消函数 */+ subscribe(fn: Listener): () => void {+ this.subs.add(fn);+ return () => this.subs.delete(fn);+ }++ emit(event: string, data: unknown): void {+ for (const fn of [...this.subs]) {+ try {+ fn(event, data);+ } catch {+ /* 某个连接写失败不影响其它订阅者 */+ }+ }+ }++ stop(): void {+ if (this.done) return;+ if (!this.stopping) {+ this.stopping = true;+ this.emit("stopping", {});+ }+ this.abort.abort();+ }++ finish(event: "done" | "error", data: unknown): void {+ if (this.done) return;+ this.done = true;+ this.emit(event, data);+ this.subs.clear();+ }+}++/** 会话 → 进行中的网页消息(按收到的顺序;同一会话串行处理,第一条是正在处理的,后面的在排队) */+export class LiveTurns {+ private byConv = new Map<string, LiveTurn[]>();++ start(conversationId: string, botId: string, userText: string, afterMessageId: number): LiveTurn {+ const t = new LiveTurn(conversationId, botId, userText, afterMessageId);+ this.byConv.set(conversationId, [...(this.byConv.get(conversationId) ?? []), t]);+ return t;+ }++ list(conversationId: string): LiveTurn[] {+ return this.byConv.get(conversationId) ?? [];+ }++ /** 指定 id 的那条;不给 id 就是正在处理的那条 */+ get(conversationId: string, id?: string | null): LiveTurn | undefined {+ const l = this.list(conversationId);+ return id ? l.find((t) => t.id === id) : l[0];+ }++ /** 回合结束:先移出登记(界面收到 done 后重新读历史时,它已经不算进行中),再通知订阅者 */+ end(t: LiveTurn, event: "done" | "error", data: unknown): void {+ const rest = this.list(t.conversationId).filter((x) => x !== t);+ if (rest.length) this.byConv.set(t.conversationId, rest);+ else this.byConv.delete(t.conversationId);+ t.finish(event, data);+ }++ /** 停止会话里所有进行中的网页消息(正在处理的和排队的);返回停了几条 */+ stop(conversationId: string): number {+ const l = this.list(conversationId);+ for (const t of l) t.stop();+ return l.length;+ }++ /** 有网页消息在处理的机器人 */+ bots(): string[] {+ return [...new Set([...this.byConv.values()].flat().map((t) => t.botId))];+ }+}diff --git a/src/web/server.ts b/src/web/server.tsindex b7fe14d..b964eb9 100644--- a/src/web/server.ts+++ b/src/web/server.ts@@ -5,6 +5,7 @@ import crypto from "node:crypto";import { createRequire } from "node:module";import { appVersion, type App } from "../app.js";import type { InboundEvent, OutboundOp, ReplySession } from "../core/types.js";+import { eventText } from "../core/types.js";import { findAppRoot } from "../magpie/supervisor.js";import { logFilePath, logger, mask, readLogTail, registerSecret } from "../log.js";import { diagnosticsReport, safeStatus, testAgent, testModel } from "../diagnostics.js";@@ -13,6 +14,7 @@ import { ApiError } from "../account/client.js";import { OAuthError } from "../account/oauth.js";import { normalizeLine } from "../modelflare.js";import { SseReply } from "./sse-reply.js";+import { LiveTurns, type LiveTurn } from "./live.js";import { connectionFromPids } from "../agent/peer-guard.js";import type { ApprovalRow } from "../store/db.js";import { normalizeSettings } from "../agent/settings.js";@@ -171,6 +173,40 @@ export async function startWebServer(app: App, opts: { port?: number; host?: strlet boundPort = 0;const allowedHosts = () => new Set([`127.0.0.1:${boundPort}`, `localhost:${boundPort}`, `[::1]:${boundPort}`]);+ // —— 网页控制台进行中的消息:切走再切回、刷新后能接上,停止按钮不依赖发消息的那个请求 ——+ const live = new LiveTurns();+ function startLive(botId: string, text: string): LiveTurn {+ const convId = consoleConvId(botId);+ const last = app.store.getConversation(convId) ? (app.store.listMessages(convId, 1).at(-1)?.id ?? 0) : 0;+ return live.start(convId, botId, text, last);+ }+ /** 排进会话队列交给运行时;结束时先移出登记,再通知发消息的请求和所有接上的界面。不抛错 */+ async function runLive(t: LiveTurn, ev: InboundEvent, out: ReplySession = t): Promise<void> {+ let err: Error | undefined;+ await app.queue.run(`web:${t.botId}:console`, async () => {+ try {+ await app.runtime.handle(ev, out, { signal: t.abort.signal });+ } catch (e) {+ err = e as Error;+ }+ });+ if (err) {+ log.warn("web chat failed", { message: err.message.slice(0, 300) });+ live.end(t, "error", { message: err.message });+ } else live.end(t, "done", { conversationId: t.conversationId });+ }++ /** 停止会话里在处理的消息:网页的(含排队的)和其它渠道的都停 */+ function stopConversation(convId: string): boolean {+ const n = live.stop(convId);+ return app.runtime.stop(convId) || n > 0;+ }+ /** 网页里发的 /stop 连排在后面的网页消息一起停;其余同 interceptReply */+ function interceptWeb(ev: InboundEvent): { handled: boolean; ack?: string } {+ if (eventText(ev).trim().toLowerCase() === "/stop") live.stop(consoleConvId(ev.botId));+ return app.runtime.interceptReply(ev);+ }+function authorized(req: http.IncomingMessage, url: URL, res: http.ServerResponse): boolean {// 代理沙箱可访问回环网络:拒绝一切来自 DSH 子进程及其工具进程的请求(防止自行批准/读取配置)const pids = app.agent.childPids();@@ -363,7 +399,8 @@ export async function startWebServer(app: App, opts: { port?: number; host?: strapp.desktop.openInBrowser();return send(res, 200, { ok: true });}- if (p === "/agent" && m === "GET") return send(res, 200, app.agent.status());+ // busy:有消息在处理的机器人(纯对话、排队、代理还在启动都算),侧栏的"正在工作"+ if (p === "/agent" && m === "GET") return send(res, 200, { ...app.agent.status(), busy: [...new Set([...live.bots(), ...app.runtime.busyBots()])] });// —— Windows:没有 PowerShell 7 时建议安装(对话空状态、设置 → 常规、故障排查)——if (seg[0] === "pwsh") {const view = (st: PwshStatus) => ({ ...st, dismissed: cfg.ui.pwshHintDismissed });@@ -454,8 +491,9 @@ export async function startWebServer(app: App, opts: { port?: number; host?: strconst t = app.agent.turnsInProgress.get(decodeURIComponent(seg[1]));return send(res, 200, { turn: t ? { since: t.since, lastProgress: t.lastProgress, steps: t.activity.steps } : null });}+ // 停止:网页消息(排队的也算)、纯对话、还在等代理启动的、代理回合,都在这里停if (seg.length === 3 && seg[2] === "stop" && m === "POST") {- return send(res, 200, { stopped: app.agent.stopTurn(decodeURIComponent(seg[1])) });+ return send(res, 200, { stopped: stopConversation(decodeURIComponent(seg[1])) });}}if (seg[0] === "bots") {@@ -597,13 +635,28 @@ export async function startWebServer(app: App, opts: { port?: number; host?: str}if (sub === "chat" && m === "GET") {const conv = app.store.getConversation(consoleConvId(id));+ // 进行中的消息由 live 显示(用户消息、到目前为止的回复与步骤);它开始之后存下的消息先不列,免得重复+ const turns = live.list(consoleConvId(id));+ const cut = turns[0]?.afterMessageId ?? Infinity;return send(res, 200, {conversationId: consoleConvId(id),model: conv?.model ?? "",- messages: conv ? app.store.listMessages(conv.id, 200) : [],+ messages: conv ? app.store.listMessages(conv.id, 200).filter((x) => x.id <= cut) : [],pending: app.store.listApprovals({ status: "pending", conversationId: consoleConvId(id), limit: 50 }).map(publicApproval),+ live: turns.map((t) => t.snapshot()),});}+ // 接上进行中的消息(切走再切回、刷新后):先发 snapshot,再转发之后的事件(同 chat/stream),最后 done / error。+ // turn 不给就接正在处理的那条;已经结束了直接 done+ if (sub === "chat/live" && m === "GET") {+ const t = live.get(consoleConvId(id), url.searchParams.get("turn"));+ const out = new SseReply(res);+ if (!t) return out.end("done", { conversationId: consoleConvId(id), ended: true });+ out.send("snapshot", t.snapshot());+ const off = t.subscribe((e, d) => (e === "done" || e === "error" ? out.end(e, d) : out.send(e, d)));+ res.on("close", off);+ return;+ }if (sub === "chat/model" && m === "PUT") {const b = await readJson(req);const conv = app.store.ensureConversation(id, "web", "console", "控制台");@@ -615,36 +668,33 @@ export async function startWebServer(app: App, opts: { port?: number; host?: strconst text = String(b.text ?? "").trim();if (!text) throw new HttpError(400, "内容为空");const ev = webEvent(id, text);- const intercepted = app.runtime.interceptReply(ev);+ const intercepted = interceptWeb(ev);if (intercepted.handled) return send(res, 200, { reply: intercepted.ack ?? "", prompts: [] });const out = new CollectReply();- await app.queue.run(`web:${id}:console`, () => app.runtime.handle(ev, out));+ const t = startLive(id, text);+ await runLive(t, ev, { apply: async (op) => (await t.apply(op), await out.apply(op)) });return send(res, 200, { reply: out.text, prompts: out.prompts, files: out.files, conversationId: consoleConvId(id) });}+ // 断开连接(切走、刷新、关窗口)不再中止这条消息:回合照常跑完,界面回来时经 chat/live 接上;停止走 /conversations/:id/stopif (sub === "chat/stream" && m === "POST") {const b = await readJson(req);const text = String(b.text ?? "").trim();if (!text) throw new HttpError(400, "内容为空");const ev = webEvent(id, text);const out = new SseReply(res);- const ac = new AbortController();- res.on("close", () => {- if (!res.writableEnded) ac.abort();- });try {- const intercepted = app.runtime.interceptReply(ev);+ const intercepted = interceptWeb(ev);if (intercepted.handled) {if (intercepted.ack) out.send("text", { text: intercepted.ack, final: true, ack: true });return out.end("done", { conversationId: consoleConvId(id) });}- await app.queue.run(`web:${id}:console`, async () => {- if (!ac.signal.aborted) await app.runtime.handle(ev, out, { signal: ac.signal });- });- out.end("done", { conversationId: consoleConvId(id) });} catch (e) {- log.warn("web chat failed", { message: (e as Error).message.slice(0, 300) });- out.end("error", { message: (e as Error).message });+ return out.end("error", { message: (e as Error).message });}+ const t = startLive(id, text);+ const off = t.subscribe((e, d) => (e === "done" || e === "error" ? out.end(e, d) : out.send(e, d)));+ res.on("close", off);+ await runLive(t, ev);return;}}diff --git a/src/web/sse-reply.ts b/src/web/sse-reply.tsindex 9116ac8..e97809e 100644--- a/src/web/sse-reply.ts+++ b/src/web/sse-reply.ts@@ -2,8 +2,32 @@ import type http from "node:http";import type { OutboundOp, ReplySession } from "../core/types.js";/**- * 网页对话渠道:把运行时的 OutboundOp 写成 text/event-stream。- * 事件:text(到目前为止的完整回复,覆盖式)、typing、prompt(审批/提问)、file、activity(代理的一步,按 id 覆盖)、done、error。+ * 运行时的 OutboundOp → 网页对话的 SSE 事件:text(到目前为止的完整回复,覆盖式)、typing、prompt(审批/提问)、+ * file、activity(代理的一步,按 id 覆盖)。stream.start 不发。+ */+export function opEvent(op: OutboundOp): [string, unknown] | undefined {+ switch (op.type) {+ case "typing":+ return ["typing", { on: op.on }];+ case "stream.start":+ return undefined;+ case "stream.update":+ return ["text", { text: op.text }];+ case "stream.finish":+ case "text":+ return ["text", { text: op.text, final: true }];+ case "file":+ return ["file", { name: op.name }];+ case "interactive":+ return ["prompt", { kind: op.kind, prompt: op.prompt, requestId: op.requestId, code: op.code }];+ case "activity":+ return ["activity", op.step];+ }+}++/**+ * 网页对话渠道:把事件写成 text/event-stream。+ * 事件见 opEvent,另有 snapshot(接上进行中的回合时先发一次)、stopping、done、error。* 运行时的 stream.update 本身就是累计文本,所以前端只需整体替换,不用拼接增量。*/export class SseReply implements ReplySession {@@ -37,25 +61,9 @@ export class SseReply implements ReplySession {}async apply(op: OutboundOp): Promise<void> {- switch (op.type) {- case "typing":- return this.send("typing", { on: op.on });- case "stream.start":- return;- case "stream.update":- this.text = op.text;- return this.send("text", { text: op.text });- case "stream.finish":- case "text":- this.text = op.text;- return this.send("text", { text: op.text, final: true });- case "file":- return this.send("file", { name: op.name });- case "interactive":- return this.send("prompt", { kind: op.kind, prompt: op.prompt, requestId: op.requestId, code: op.code });- case "activity":- return this.send("activity", op.step);- }+ if (op.type === "stream.update" || op.type === "stream.finish" || op.type === "text") this.text = op.text;+ const ev = opEvent(op);+ if (ev) this.send(ev[0], ev[1]);}end(event: "done" | "error", data: unknown): void {diff --git a/test/agent.integration.test.ts b/test/agent.integration.test.tsindex c863f05..b3914aa 100644--- a/test/agent.integration.test.ts+++ b/test/agent.integration.test.ts@@ -481,6 +481,118 @@ describe.skipIf(!runtime || !hasBwrap || process.platform !== "linux")("agent hoexpect((await chat("hello once more")).reply).toBe("好的");}, 120_000);+ // —— 网页对话:切走再切回接上进行中的回合;停止按钮在各种状态下都停得下来 ——+ const stream = (p: string, text?: string) => {+ const ac = new AbortController();+ const events: Array<[string, any]> = [];+ const done = (async () => {+ const res = await fetch(`${base}/amb/api${p}`, text === undefined ? { signal: ac.signal } : { method: "POST", headers: { "content-type": "application/json" }, body: JSON.stringify({ text }), signal: ac.signal });+ let buf = "";+ const dec = new TextDecoder();+ try {+ for await (const chunk of res.body as unknown as AsyncIterable<Uint8Array>) {+ buf += dec.decode(chunk, { stream: true });+ let i: number;+ while ((i = buf.indexOf("\n\n")) >= 0) {+ const block = buf.slice(0, i);+ buf = buf.slice(i + 2);+ const ev = /^event: (.*)$/m.exec(block)?.[1];+ const data = /^data: (.*)$/m.exec(block)?.[1];+ if (ev && data) events.push([ev, JSON.parse(data)]);+ }+ }+ } catch (e) {+ if ((e as Error).name !== "AbortError") throw e;+ }+ })();+ const texts = () => events.filter(([e]) => e === "text").map(([, d]) => d.text as string);+ return { events, done, abort: () => ac.abort(), texts };+ };+ const stopWeb = async () => api(`/conversations/${encodeURIComponent("default:web:console")}/stop`, { method: "POST", headers: { "content-type": "application/json" }, body: "{}" });+ const waitFor = async (fn: () => boolean | Promise<boolean>, ms = 30_000) => {+ for (const end = Date.now() + ms; Date.now() < end; await new Promise((r) => setTimeout(r, 100))) if (await fn()) return;+ throw new Error("waitFor: timeout");+ };++ it("web chat: a running agent turn is shown again after switching back (question + steps), re-attaches, and the stop button ends it", async () => {+ const s = stream("/bots/default/chat/stream", "HANG 网页里的这条");+ let d: any;+ await waitFor(async () => !!(d = await api("/bots/default/chat")).live?.[0]?.steps?.length);+ expect(d.live[0]).toMatchObject({ userText: "HANG 网页里的这条", stopping: false });+ expect(d.live[0].steps.at(-1)).toMatchObject({ kind: "model", title: "mock-agent", status: "running" });+ // 代理路径回合结束才存用户消息:进行中时由 live 显示+ expect(d.messages.map((m: any) => m.content)).not.toContain("HANG 网页里的这条");+ expect((await api("/agent")).busy).toEqual(["default"]);+ // 切走:断开发消息的请求,回合照常进行+ s.abort();+ await new Promise((r) => setTimeout(r, 300));+ expect((await api(`/conversations/${encodeURIComponent(d.conversationId)}/turn`)).turn).not.toBeNull();+ // 切回:接上,先 snapshot(步骤还在),再停止+ const a = stream("/bots/default/chat/live");+ await waitFor(() => a.events.length > 0);+ expect(a.events[0][0]).toBe("snapshot");+ expect(a.events[0][1]).toMatchObject({ id: d.live[0].id, userText: "HANG 网页里的这条", startedAt: d.live[0].startedAt });+ expect(a.events[0][1].steps.length).toBeGreaterThan(0);+ const t0 = Date.now();+ expect(await stopWeb()).toEqual({ stopped: true });+ await a.done;+ expect(Date.now() - t0).toBeLessThan(15_000);+ expect(a.events.map(([e]) => e)).toContain("stopping");+ const final = a.texts().at(-1)!;+ expect(final).toMatch(/^已中止(处理了 \d+ 秒)。代理进程已重启,可以继续发消息。$/);+ expect(a.events.at(-1)![0]).toBe("done");+ const after = await api("/bots/default/chat");+ expect(after.live).toEqual([]);+ expect(after.messages.filter((m: any) => m.content === "HANG 网页里的这条")).toHaveLength(1);+ expect(after.messages.slice(-2).map((m: any) => [m.role, m.content])).toEqual([+ ["user", "HANG 网页里的这条"],+ ["assistant", final],+ ]);+ expect((await api("/agent")).busy).toEqual([]);+ expect((await chat("/reset")).reply).toMatch(/已清空/);+ }, 120_000);++ it("web chat: stop while the agent is still starting ends the message at once; the agent never gets it", async () => {+ const h = app.agent.host("default");+ await h.restart();+ expect(h.state).toBe("stopped");+ // 启动慢一点(真实冷启动可能要几分钟)+ const ensure = h.ensure.bind(h);+ (h as any).ensure = async (m: string) => (await new Promise((r) => setTimeout(r, 5000)), ensure(m));+ const before = calls.length;+ try {+ const s = stream("/bots/default/chat/stream", "hello while starting");+ await waitFor(() => s.texts().some((t) => t.startsWith("代理正在启动")));+ expect((await api("/bots/default/chat")).live[0].text).toMatch(/^代理正在启动/);+ const t0 = Date.now();+ expect(await stopWeb()).toEqual({ stopped: true });+ await s.done;+ expect(Date.now() - t0).toBeLessThan(2000);+ expect(s.texts().at(-1)).toMatch(/^已中止(处理了 \d+ 秒)。$/);+ expect(s.events.at(-1)![0]).toBe("done");+ expect(app.agent.turnsInProgress.size).toBe(0);+ } finally {+ delete (h as any).ensure;+ }+ await new Promise((r) => setTimeout(r, 5500));+ expect(calls.slice(before).some((c) => JSON.stringify(c.body).includes("hello while starting"))).toBe(false);+ expect((await chat("/reset")).reply).toMatch(/已清空/);+ expect((await chat("hello after the stop")).reply).toBe("好的");+ }, 120_000);++ it("web chat: stop while a question card waits cancels the card and ends the turn", async () => {+ const s = stream("/bots/default/chat/stream", "ASKQ 然后停下");+ await waitFor(() => s.events.some(([e]) => e === "prompt"), 60_000);+ const id = s.events.find(([e]) => e === "prompt")![1].requestId;+ expect((await api(`/bots/default/chat`)).live[0].prompts.map((p: any) => p.requestId)).toEqual([id]);+ expect(await stopWeb()).toEqual({ stopped: true });+ await s.done;+ expect(s.texts().at(-1)).toMatch(/^已中止(处理了 \d+ 秒)。代理进程已重启,可以继续发消息。$/);+ expect((await api(`/approvals/${id}`)).approval.status).toBe("cancelled");+ expect((await chat("/reset")).reply).toMatch(/已清空/);+ expect((await chat("hello once again")).reply).toBe("好的");+ }, 120_000);+it("a normal agent reply records its model and tool steps", async () => {const r = await chat("QUICKSORT again");expect(r.reply).toContain("[1, 2, 3, 5, 7, 9]");diff --git a/test/e2e.test.ts b/test/e2e.test.tsindex b991a78..f6ec9af 100644--- a/test/e2e.test.ts+++ b/test/e2e.test.ts@@ -330,23 +330,40 @@ describe("网页对话(流式)", () => {const ev = await sse("/bots/default/chat/stream", { text: "/status" });expect(ev.find(([e, d]) => e === "text" && d.final)?.[1].text).toContain("当前模型");});- it("停止:客户端断开 → 上游请求被中止,已生成的部分保留为助手消息", async () => {+ it("客户端断开(切走、刷新)不中止:回复照常生成并存下", async () => {const before = llm.calls.length;+ const aborted = llm.aborted;const ac = new AbortController();let got = 0;await sse("/bots/default/chat/stream", { text: "长".repeat(400) }, ac.signal, (e) => {if (e === "text" && ++got === 3) ac.abort();});expect(llm.calls.length).toBe(before + 1);- await until(() => llm.aborted > 0, 3000, 20);+ await until(async () => (await api("/bots/default/chat")).json.live.length === 0, 5000, 20);+ expect(llm.aborted).toBe(aborted);+ const last = (await api("/bots/default/chat")).json.messages.at(-1);+ expect(last.role).toBe("assistant");+ expect(last.content).toMatch(/你说:长{400}$/);+ });+ it("停止:经 /conversations/:id/stop 中止上游请求,已生成的部分保留为助手消息", async () => {+ const before = llm.calls.length;+ const aborted = llm.aborted;+ let got = 0;+ const ev = await sse("/bots/default/chat/stream", { text: "长".repeat(4000) }, undefined, (e) => {+ if (e === "text" && ++got === 3) void api(`/conversations/${encodeURIComponent("default:web:console")}/stop`, { method: "POST", body: {} });+ });+ expect(llm.calls.length).toBe(before + 1);+ await until(() => llm.aborted > aborted, 3000, 20);+ expect(ev.map(([e]) => e)).toContain("stopping");+ expect(ev.at(-1)![0]).toBe("done");const msgs = (await api("/bots/default/chat")).json.messages;const last = msgs.at(-1);expect(last.role).toBe("assistant");- expect(last.content.length).toBeGreaterThan(0);- expect(last.content.length).toBeLessThan(400);+ expect(last.content).toMatch(/\n\n(已中止)$/);+ expect(last.content.length).toBeLessThan(4000);// 中止后同一会话还能继续对话(队列没被卡住)- const ev = await sse("/bots/default/chat/stream", { text: "还在吗" });- expect(ev.at(-1)![0]).toBe("done");+ const next = await sse("/bots/default/chat/stream", { text: "还在吗" });+ expect(next.at(-1)![0]).toBe("done");});it("日志与数据库外文件中不含明文密钥", () => {const files = fs.readdirSync(dataDir, { recursive: true }).map(String).filter((f) => !f.endsWith(".db") && !f.includes(".db-") && !f.endsWith(".png"));diff --git a/test/live-chat.test.ts b/test/live-chat.test.tsnew file mode 100644index 0000000..4bc307f--- /dev/null+++ b/test/live-chat.test.ts@@ -0,0 +1,349 @@+/**+ * 网页对话进行中的消息:切走 / 刷新后接上(GET /chat 的 live、GET /chat/live),以及停止在各种状态下都真的停下来。+ * 真实 App + Web 服务(外部模型端点、纯对话模式)+ 能"卡住"的模拟模型;代理路径用假的 AgentManager 测运行时。+ */+import { afterAll, beforeAll, describe, expect, it } from "vitest";+import fs from "node:fs";+import os from "node:os";+import path from "node:path";+import { App } from "../src/app.js";+import { loadConfig } from "../src/config.js";+import { BotRuntime } from "../src/core/runtime.js";+import { Store } from "../src/store/db.js";+import { TurnStopped } from "../src/agent/host.js";+import { DEFAULT_SETTINGS } from "../src/agent/settings.js";+import type { AgentManager } from "../src/agent/manager.js";+import type { InboundEvent, OutboundOp } from "../src/core/types.js";+import { listen, until } from "./helpers.js";++/** 读 SSE:事件陆续进 events,done 在流结束时 resolve;abort 模拟切走(断开连接) */+function sseStream(url: string, init: RequestInit = {}) {+ const ac = new AbortController();+ const events: Array<[string, any]> = [];+ const done = (async () => {+ const res = await fetch(url, { ...init, signal: ac.signal });+ expect(res.headers.get("content-type")).toContain("text/event-stream");+ let buf = "";+ const dec = new TextDecoder();+ try {+ for await (const chunk of res.body as unknown as AsyncIterable<Uint8Array>) {+ buf += dec.decode(chunk, { stream: true });+ let i: number;+ while ((i = buf.indexOf("\n\n")) >= 0) {+ const block = buf.slice(0, i);+ buf = buf.slice(i + 2);+ const ev = /^event: (.*)$/m.exec(block)?.[1];+ const data = /^data: (.*)$/m.exec(block)?.[1];+ if (ev && data) events.push([ev, JSON.parse(data)]);+ }+ }+ } catch (e) {+ if ((e as Error).name !== "AbortError") throw e;+ }+ })();+ return {+ events,+ done,+ abort: () => ac.abort(),+ texts: () => events.filter(([e]) => e === "text").map(([, d]) => d.text as string),+ names: () => events.map(([e]) => e),+ };+}++describe("网页对话:进行中的消息(纯对话)", () => {+ let app: App;+ let base: string;+ let llm: Awaited<ReturnType<typeof listen>>;+ /** 收到的每个模型请求:最后一条用户消息、是否被中途断开 */+ const calls: Array<{ user: string; aborted: boolean; released: boolean }> = [];+ /** HOLD 开头的消息一直慢慢出字,直到 release() */+ const release = () => calls.forEach((c) => (c.released = true));+ const conv = encodeURIComponent("default:web:console");++ beforeAll(async () => {+ llm = await listen(async (req, res) => {+ if (req.url?.endsWith("/models")) return void res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify({ object: "list", data: [{ id: "mock-slow", object: "model" }] }));+ const chunks: Buffer[] = [];+ for await (const c of req) chunks.push(c as Buffer);+ const b = JSON.parse(Buffer.concat(chunks).toString() || "{}");+ const user = String(b.messages?.at(-1)?.content ?? "");+ const call = { user, aborted: false, released: false };+ calls.push(call);+ res.writeHead(200, { "content-type": "text/event-stream" });+ res.on("close", () => {+ if (!res.writableEnded) call.aborted = true;+ });+ const send = (t: string) => res.write(`data: ${JSON.stringify({ choices: [{ delta: { content: t } }] })}\n\n`);+ if (user.startsWith("HOLD")) {+ for (let n = 1; !call.released && !call.aborted; n++) {+ send(`第${n}段。`);+ await new Promise((r) => setTimeout(r, 40));+ }+ if (call.aborted) return;+ send("完。");+ } else send(`好的:${user}`);+ res.end("data: [DONE]\n\n");+ });+ const dataDir = fs.mkdtempSync(path.join(os.tmpdir(), "amb-live-"));+ app = new App(loadConfig({ dataDir, env: { AMB_MAGPIE_BASE_URL: llm.url + "/v1", AMB_MAGPIE_API_KEY: "k", AMB_UI_PORT: "0", AMB_AGENT: "off", AMB_WEIXIN_API_BASE: "http://127.0.0.1:9" } }), {+ printQrToTerminal: false,+ });+ await app.start();+ base = app.web!.url.replace(/\/$/, "") + "/amb/api";+ });+ afterAll(async () => {+ release();+ await app?.stop();+ await llm?.close();+ });++ const api = async (p: string, init: { method?: string; body?: unknown } = {}) => {+ const res = await fetch(base + p, {+ method: init.method ?? "GET",+ headers: init.body !== undefined ? { "content-type": "application/json" } : {},+ body: init.body !== undefined ? JSON.stringify(init.body) : undefined,+ });+ return { status: res.status, json: (await res.json().catch(() => ({}))) as any };+ };+ const post = (text: string) => sseStream(base + "/bots/default/chat/stream", { method: "POST", headers: { "content-type": "application/json" }, body: JSON.stringify({ text }) });+ const attach = (turn = "") => sseStream(base + `/bots/default/chat/live${turn ? `?turn=${turn}` : ""}`);+ const stop = () => api(`/conversations/${conv}/stop`, { method: "POST", body: {} });+ const history = async () => ((await api("/bots/default/chat")).json.messages as any[]).map((m) => [m.role, m.content]);++ it("切走再切回:GET /chat 的 live 有用户消息和到目前为止的回复;接上后先 snapshot、再更新、最后 done;历史里各一次", async () => {+ const s = post("HOLD 第一条");+ await until(() => s.texts().length >= 2);+ const d = (await api("/bots/default/chat")).json;+ expect(d.live).toHaveLength(1);+ const t = d.live[0];+ expect(t).toMatchObject({ userText: "HOLD 第一条", stopping: false, steps: [], prompts: [], files: [] });+ expect(t.text).toMatch(/^第1段。/);+ expect(Date.now() - t.startedAt).toBeLessThan(10_000);+ // 纯对话路径先存了用户消息:进行中时由 live 显示,历史里不重复+ expect(d.messages.map((m: any) => m.content)).not.toContain("HOLD 第一条");+ // 侧栏"正在工作"+ expect((await api("/agent")).json.busy).toEqual(["default"]);++ // 切走:断开发消息的请求,消息照常处理(不中止模型请求)+ s.abort();+ await new Promise((r) => setTimeout(r, 200));+ expect(calls.at(-1)!.aborted).toBe(false);++ const a = attach(t.id);+ await until(() => a.events.length >= 1);+ expect(a.events[0][0]).toBe("snapshot");+ expect(a.events[0][1]).toMatchObject({ id: t.id, userText: "HOLD 第一条", startedAt: t.startedAt });+ expect(a.events[0][1].text.length).toBeGreaterThan(t.text.length);+ const n = a.texts().length;+ await until(() => a.texts().length >= n + 2);+ release();+ await a.done;+ expect(a.events.at(-1)).toEqual(["done", { conversationId: "default:web:console" }]);+ const final = a.texts().at(-1)!;+ expect(final).toMatch(/完。$/);+ expect(calls.at(-1)!.aborted).toBe(false);++ const after = (await api("/bots/default/chat")).json;+ expect(after.live).toEqual([]);+ const h = after.messages.map((m: any) => [m.role, m.content]);+ expect(h.filter(([, c]: string[]) => c === "HOLD 第一条")).toHaveLength(1);+ expect(h.slice(-2)).toEqual([+ ["user", "HOLD 第一条"],+ ["assistant", final],+ ]);+ expect((await api("/agent")).json.busy).toEqual([]);+ });++ it("接上一条已经结束的:直接 done", async () => {+ const a = attach("no-such-turn");+ await a.done;+ expect(a.events).toEqual([["done", { conversationId: "default:web:console", ended: true }]]);+ });++ it("停止:发消息的请求已经断开(切走、刷新)也能中止模型请求;已生成的部分保留并注明已中止", async () => {+ const before = calls.length;+ const s = post("HOLD 停下");+ await until(() => s.texts().length >= 2);+ s.abort();+ const a = attach();+ await until(() => a.events.length >= 1);+ const r = await stop();+ expect(r).toEqual({ status: 200, json: { stopped: true } });+ await a.done;+ expect(a.names()).toContain("stopping");+ expect(a.events.at(-1)![0]).toBe("done");+ const final = a.texts().at(-1)!;+ expect(final).toMatch(/^第1段。.*\n\n(已中止)$/s);+ await until(() => calls[before].aborted, 3000);+ expect(calls).toHaveLength(before + 1);+ const h = await history();+ expect(h.slice(-2)).toEqual([+ ["user", "HOLD 停下"],+ ["assistant", final],+ ]);+ expect((await stop()).json.stopped).toBe(false);+ // 停止要 JSON 请求体(界面以前不带,一直 415)+ expect((await fetch(base + `/conversations/${conv}/stop`, { method: "POST" })).status).toBe(415);+ });++ it("停止:还没出字就停,回复是一句已中止", async () => {+ const s = post("HOLD 马上停");+ await until(async () => (await api("/bots/default/chat")).json.live.length === 1);+ await stop();+ await s.done;+ expect(s.texts().at(-1)).toMatch(/^(已中止(处理了 \d+ 秒)。|第1段。\n\n(已中止))$/);+ expect(s.events.at(-1)![0]).toBe("done");+ });++ it("停止:排在后面的消息一起停,它不会再发给模型", async () => {+ const before = calls.length;+ const a = post("HOLD 前一条");+ await until(() => a.texts().length >= 1);+ const b = post("排队的那条");+ await until(async () => (await api("/bots/default/chat")).json.live.length === 2);+ const live = (await api("/bots/default/chat")).json.live;+ expect(live.map((t: any) => t.userText)).toEqual(["HOLD 前一条", "排队的那条"]);+ expect((await stop()).json.stopped).toBe(true);+ await Promise.all([a.done, b.done]);+ expect(a.texts().at(-1)).toMatch(/(已中止)$/);+ expect(b.texts().at(-1)).toMatch(/^已中止(处理了 \d+ 秒)。$/);+ expect(b.names()).toContain("stopping");+ expect(calls).toHaveLength(before + 1);+ const h = await history();+ expect(h.slice(-4).map(([r, c]: string[]) => [r, c.replace(/\d+ 秒/, "N 秒")])).toEqual([+ ["user", "HOLD 前一条"],+ ["assistant", a.texts().at(-1)!],+ ["user", "排队的那条"],+ ["assistant", "已中止(处理了 N 秒)。"],+ ]);+ // 停完会话照常能用+ const c = post("还在吗");+ await c.done;+ expect(c.texts().at(-1)).toBe("好的:还在吗");+ });++ it("/stop:微信等渠道的纯对话也能停(以前只停代理回合)", async () => {+ const ev = (id: string, text: string): InboundEvent => ({ id, channel: "weixin", botId: "default", conversation: { kind: "dm", id: "wx-1" }, sender: { id: "wx-1" }, parts: [{ type: "text", text }], replyHandle: {}, receivedAt: Date.now() });+ const out: string[] = [];+ const before = calls.length;+ const p = app.runtime.handle(ev("w1", "HOLD 微信"), { apply: async (op: OutboundOp) => void (op.type === "stream.finish" && out.push(op.text)) });+ await until(() => calls.length === before + 1);+ expect(app.runtime.busyBots()).toEqual(["default"]);+ expect(app.runtime.interceptReply(ev("w2", "/stop")).ack).toMatch(/^正在中止上一条消息(已处理 \d+ 秒)…$/);+ await p;+ expect(out.at(-1)).toMatch(/(已中止)$|^已中止/);+ await until(() => calls[before].aborted, 3000);+ expect(app.runtime.interceptReply(ev("w3", "/stop")).ack).toBe("当前没有正在处理的消息。");+ });++ it("网页里的 /stop 同样停下进行中的消息", async () => {+ const s = post("HOLD 用命令停");+ await until(() => s.texts().length >= 1);+ const r = await api("/bots/default/chat", { method: "POST", body: { text: "/stop" } });+ expect(r.json.reply).toMatch(/^正在中止上一条消息/);+ await s.done;+ expect(s.texts().at(-1)).toMatch(/(已中止)$/);+ });+});++// —— 代理路径:用假的 AgentManager,覆盖"代理还在启动""排队时就停了""回合进行中"三种状态 ——+describe("运行时的停止(代理路径)", () => {+ const dir = fs.mkdtempSync(path.join(os.tmpdir(), "amb-stop-"));+ const ev = (text: string): InboundEvent => ({ id: Math.random().toString(36), channel: "web", botId: "b1", conversation: { kind: "dm", id: "console" }, sender: { id: "owner" }, parts: [{ type: "text", text }], replyHandle: {}, receivedAt: Date.now() });++ function setup(hostState: "running" | "starting") {+ const store = new Store(path.join(dir, `${Math.random().toString(36).slice(2)}.db`));+ store.createBot({ id: "b1", name: "测试" });+ const turns = new Map<string, any>();+ const seen = { runTurn: 0, stopTurn: 0 };+ let halt: ((e: Error) => void) | undefined;+ const host = { state: hostState as string, workspace: dir, diagnostics: () => ({}), ensure: () => new Promise<void>(() => {}) };+ const agent = {+ available: true,+ host: () => host,+ approvals: { bindSink: () => () => {}, handleReply: () => ({ handled: false }), pending: () => [] },+ turnsInProgress: turns,+ settings: () => DEFAULT_SETTINGS,+ memoryPrefix: () => "",+ takeSeed: () => "",+ runTurn: (_bot: string, input: any) => {+ seen.runTurn++;+ const t = { since: Date.now(), activity: { steps: [] } };+ turns.set(input.conversationId, t);+ return new Promise((_, rej) => (halt = rej)).finally(() => turns.delete(input.conversationId));+ },+ stopTurn: (conv: string) => {+ seen.stopTurn++;+ const t = turns.get(conv);+ if (!t) return false;+ halt?.(new TurnStopped("user", Date.now() - t.since));+ return true;+ },+ } as unknown as AgentManager;+ const models = { listModels: async () => ["m1"], streamChat: async () => "纯对话" };+ const rt = new BotRuntime({ store, models: models as any, defaultModel: () => "m1", contextMessages: 20, contextChars: 20_000, agent });+ const ops: OutboundOp[] = [];+ const out = { apply: async (op: OutboundOp) => void ops.push(op) };+ const texts = () => ops.filter((o): o is Extract<OutboundOp, { text: string }> => "text" in o).map((o) => o.text);+ const history = () => store.listMessages("b1:web:console").map((m) => [m.role, m.content.replace(/\d+ 秒/, "N 秒")]);+ return { rt, store, seen, out, texts, history, turns };+ }++ it("代理还在启动:停止立刻收尾,消息不交给代理(以前要等满 90 秒,期间 stop 返回 false)", async () => {+ const { rt, seen, out, texts, history } = setup("starting");+ const ac = new AbortController();+ const p = rt.handle(ev("你好"), out, { signal: ac.signal });+ await until(() => texts().some((t) => t.startsWith("代理正在启动")));+ const t0 = Date.now();+ ac.abort();+ await p;+ expect(Date.now() - t0).toBeLessThan(1000);+ expect(texts().at(-1)).toMatch(/^已中止(处理了 \d+ 秒)。$/);+ expect(seen.runTurn).toBe(0);+ expect(history()).toEqual([+ ["user", "你好"],+ ["assistant", "已中止(处理了 N 秒)。"],+ ]);+ });++ it("代理还在启动:/stop 也能停", async () => {+ const { rt, seen, out, texts } = setup("starting");+ const p = rt.handle(ev("你好"), out);+ await until(() => texts().some((t) => t.startsWith("代理正在启动")));+ expect(rt.busyBots()).toEqual(["b1"]);+ expect(rt.interceptReply(ev("/stop")).ack).toMatch(/^正在中止上一条消息(已处理 \d+ 秒)…$/);+ await p;+ expect(texts().at(-1)).toMatch(/^已中止/);+ expect(seen.runTurn).toBe(0);+ expect(rt.busyBots()).toEqual([]);+ });++ it("回合进行中:停止交给代理中止(stopTurn),回复是已中止", async () => {+ const { rt, seen, out, texts, turns } = setup("running");+ const ac = new AbortController();+ const p = rt.handle(ev("干活"), out, { signal: ac.signal });+ await until(() => turns.size === 1);+ ac.abort();+ await p;+ expect(seen.stopTurn).toBe(1);+ expect(texts().at(-1)).toMatch(/^已中止(处理了 \d+ 秒)。代理进程已重启,可以继续发消息。$/);+ });++ it("排队时就停了:不处理、命令也不执行,消息记成已中止", async () => {+ const { rt, seen, out, texts, history, store } = setup("running");+ store.ensureConversation("b1", "web", "console", "x");+ store.addMessage("b1:web:console", "user", "旧消息");+ const ac = new AbortController();+ ac.abort();+ await rt.handle(ev("/reset"), out, { signal: ac.signal });+ expect(history()).toEqual([["user", "旧消息"]]);+ await rt.handle(ev("新消息"), out, { signal: ac.signal });+ expect(seen.runTurn).toBe(0);+ expect(texts()).toEqual([expect.stringMatching(/^已中止/), expect.stringMatching(/^已中止/)]);+ expect(history()).toEqual([+ ["user", "旧消息"],+ ["user", "新消息"],+ ["assistant", "已中止(处理了 N 秒)。"],+ ]);+ });+});diff --git a/ui/css/chat.css b/ui/css/chat.cssindex da5950c..6d32d10 100644--- a/ui/css/chat.css+++ b/ui/css/chat.css@@ -299,6 +299,9 @@ button.act-head:active { background: var(--pill-hover); }.send:hover:not(:disabled) { background: var(--primary-hover); }.send:hover:not(:disabled):not(.stop) .ic { transform: translateY(-1px); }.send:active:not(:disabled) { background: var(--primary-press); transform: scale(var(--press-strong)); }-.send:disabled { background: var(--pill); color: var(--faint); box-shadow: none; }+.send:disabled:not([aria-busy="true"]) { background: var(--pill); color: var(--faint); box-shadow: none; }+/* 正在停止:保持本色转圈,只是不可点(同 Button 的 loading) */+.send[aria-busy="true"] { cursor: progress; }+.send .spinner { width: 12px; height: 12px; }.composer-disabled { pointer-events: auto; width: var(--col); margin: 0 auto var(--space-2); }}diff --git a/ui/lib/api.js b/ui/lib/api.jsindex 68f4528..4fd8cdc 100644--- a/ui/lib/api.js+++ b/ui/lib/api.js@@ -61,14 +61,15 @@ export function sseParser(onEvent) {};}-/** 流式对话。返回 Promise(结束或中止时 resolve)。handlers: text/typing/prompt/file/done/error */-export async function streamChat(botId, text, handlers, signal) {- const res = await fetch(`/amb/api/bots/${encodeURIComponent(botId)}/chat/stream`, {- method: "POST",- headers: { "content-type": "application/json" },- body: JSON.stringify({ text }),- signal,- });+/** 读完一个 text/event-stream 响应;中止时安静地返回 */+async function readEvents(req, handlers) {+ let res;+ try {+ res = await req;+ } catch (e) {+ if (e.name === "AbortError") return;+ throw e;+ }if (!res.ok || !res.body) {const data = await res.json().catch(() => ({}));throw new ApiError(data.error || `HTTP ${res.status}`, res.status, data);@@ -89,3 +90,24 @@ export async function streamChat(botId, text, handlers, signal) {throw e;}}++/**+ * 流式对话。返回 Promise(结束或中止时 resolve)。handlers: text/typing/activity/prompt/file/stopping/done/error。+ * 中止只是不再接收:消息在服务端照常处理(停止要调 /conversations/:id/stop),回来时用 attachChat 接上。+ */+export function streamChat(botId, text, handlers, signal) {+ return readEvents(+ fetch(`/amb/api/bots/${encodeURIComponent(botId)}/chat/stream`, {+ method: "POST",+ headers: { "content-type": "application/json" },+ body: JSON.stringify({ text }),+ signal,+ }),+ handlers,+ );+}++/** 接上进行中的那条消息(切走再切回、刷新后):先 snapshot(到目前为止的样子),之后的事件同 streamChat,最后 done */+export function attachChat(botId, turnId, handlers, signal) {+ return readEvents(fetch(`/amb/api/bots/${encodeURIComponent(botId)}/chat/live?turn=${encodeURIComponent(turnId)}`, { signal }), handlers);+}diff --git a/ui/main.js b/ui/main.jsindex d93eb1a..06479f6 100644--- a/ui/main.js+++ b/ui/main.js@@ -203,27 +203,33 @@ function App() {}, [connected]);useEffect(pollSide, [pollSide]);useInterval(pollSide, 6000, connected);- useInterval(+ // 服务端的"正在工作":代理回合,以及任何渠道正在处理(含排队、等代理启动、纯对话)的消息+ const pollWorking = useCallback(() =>api("/agent").then((a) => {const map = {};for (const [id, h] of Object.entries(a.hosts || {})) map[id] = Number(h.activeTurns || 0) > 0;+ for (const id of a.busy || []) map[id] = true;setAgentWorking(map);}).catch(() => {}),- 3000,- connected,+ [],);+ useInterval(pollWorking, 3000, connected);const working = useMemo(() => {const m = { ...agentWorking };for (const [k, v] of Object.entries(localWorking)) if (v) m[k] = true;return m;}, [agentWorking, localWorking]);+ const wantWorking = useRef({});const onWorking = useCallback((id, on) => {- setLocalWorking((w) => (w[id] === on ? w : { ...w, [id]: on }));- if (!on) setTimeout(pollSide, 300);- }, [pollSide]);+ wantWorking.current[id] = on;+ if (on) return setLocalWorking((w) => (w[id] ? w : { ...w, [id]: true }));+ // 切走时消息可能还在服务端处理:先问一次服务端,再去掉本页的标记,侧栏不闪(期间又开始了就不去掉)+ pollWorking().finally(() => !wantWorking.current[id] && setLocalWorking((w) => (w[id] ? { ...w, [id]: false } : w)));+ setTimeout(pollSide, 300);+ }, [pollSide, pollWorking]);const openSettings = (tab = route.view === "settings" ? route.tab : "general", row = "") => {reloadStatus();diff --git a/ui/screens/chat.js b/ui/screens/chat.jsindex 9c67f4b..aac3255 100644--- a/ui/screens/chat.js+++ b/ui/screens/chat.js@@ -1,13 +1,13 @@// 对话页(参考 Grok Bot 的顶栏、Codex 的对话与输入框):顶栏左侧头像 + 名称,右侧新对话 / 信息面板;// 760 阅读列,用户消息是浅灰气泡,机器人回复是整列正文,上方一行"思考中 / 正在回复 / 用时";底部两行输入框。import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "preact/hooks";-import { html, Icon, IconButton, CopyButton, Menu, Popover, Badge, Notice, Skeleton, autoGrow } from "../components/ui.js";+import { html, Icon, IconButton, CopyButton, Menu, Popover, Badge, Notice, Skeleton, Spinner, autoGrow } from "../components/ui.js";import { BotAvatar } from "../components/avatar.js";import { Markdown, Linkified } from "../components/markdown.js";import { ModelPicker, shortModel, sameModel } from "../components/model-picker.js";import { PwshHint } from "../components/pwsh-hint.js";import { ActivityLine, currentStep, upsertStep } from "../components/activity.js";-import { api, streamChat } from "../lib/api.js";+import { api, attachChat, streamChat } from "../lib/api.js";import { confirmSheet, failed, saved } from "../lib/store.js";import { fmtSep, fmtClock, fmtDur } from "../lib/format.js";import { PERMS, confirmPermission } from "../lib/perms.js";@@ -39,6 +39,16 @@ function toItems(messages) {);}+// 进行中的一条消息(服务端的 live 快照):用户消息 + 到目前为止的回复;turn 标记这些项属于哪条进行中的消息+function liveItems(t, cards = []) {+ return [+ { kind: "msg", id: "u" + t.id, role: "user", text: t.userText, at: t.startedAt, turn: t.id },+ ...cards.map((c) => ({ ...c, turn: t.id })),+ { kind: "msg", id: "a" + t.id, role: "assistant", text: t.text, at: t.startedAt, live: true, startedAt: t.startedAt, activity: t.steps, turn: t.id },+ ...t.files.map((name, i) => ({ kind: "file", id: `f${t.id}-${i}`, name, turn: t.id })),+ ];+}+// —— 审批 / 提问卡片 ——const LETTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";export function PromptCard({ requestId, fallback }) {@@ -148,7 +158,7 @@ function FileCard({ name }) {* 回复上方的工作状态:没出字时"思考中 · 正在做的那一步",出字后"正在回复 N 秒",结束后"用时 N 秒"(短于 3 秒且没有步骤时不显示)。* 代理回合有步骤时这一行可以展开成处理过程(默认折叠);历史消息只知道步数,展开时用 load 取。*/-function WorkLine({ live, text, startedAt, workedMs, steps, count, load }) {+function WorkLine({ live, stopping, text, startedAt, workedMs, steps, count, load }) {const [, tick] = useState(0);useEffect(() => {if (!live) return;@@ -158,8 +168,11 @@ function WorkLine({ live, text, startedAt, workedMs, steps, count, load }) {const ms = live ? Date.now() - startedAt : workedMs;if (!live && !(ms >= 3000) && !steps?.length && !count) return null;const cur = live && !text ? currentStep(steps) : "";+ // 按了停止:代理要重启进程,可能要几秒,先说清楚在停const label = live- ? `${text ? `正在回复 ${fmtDur(ms)}` : ms >= 3000 ? `思考中 ${fmtDur(ms)}` : "思考中"}${cur ? ` · ${cur}` : ""}`+ ? stopping+ ? `正在停止…${ms >= 3000 ? ` 已处理 ${fmtDur(ms)}` : ""}`+ : `${text ? `正在回复 ${fmtDur(ms)}` : ms >= 3000 ? `思考中 ${fmtDur(ms)}` : "思考中"}${cur ? ` · ${cur}` : ""}`: ms >= 3000 ? `用时 ${fmtDur(ms)}` : "处理过程";return html`<${ActivityLine} label=${label} live=${live} steps=${steps} count=${count} load=${load} />`;}@@ -179,7 +192,9 @@ export function ChatScreen({ bot, models, modelsError, reloadModels, defaultModeconst [items, setItems] = useState(null);const [convModel, setConvModel] = useState("");const [text, setText] = useState("");+ // generating:正在跟着一条消息(本页发出的,或切回 / 刷新后接上的);stopping:按了停止,等服务端收尾const [generating, setGenerating] = useState(false);+ const [stopping, setStopping] = useState(false);const [atBottom, setAtBottom] = useState(true);const [scrolled, setScrolled] = useState(false); // 内容滚到顶栏底下了:顶栏出现细线const [unseen, setUnseen] = useState(false);@@ -195,21 +210,32 @@ export function ChatScreen({ bot, models, modelsError, reloadModels, defaultModeconst plusRef = useRef(null);const modelRef = useRef(null);const permRef = useRef(null);- const ctrl = useRef(null);+ // 正在跟的那条消息的事件流 { ac, local }:同一时刻只跟一条,切走时断开(消息在服务端照常处理)+ const following = useRef(null);const mounted = useRef(true);const lastUser = useRef("");const convId = useRef("");+ const attachRef = useRef(null);- const load = useCallback(async () => {+ // ended:刚接着的那条消息结束了 { since, ms },存下的回复照样显示"用时"(和一直停在这页时一样)+ const load = useCallback(async (ended) => {try {const d = await api(`/bots/${encodeURIComponent(bot.id)}/chat`);if (!mounted.current) return;convId.current = d.conversationId || "";setConvModel(d.model || "");const list = toItems(d.messages || []);- for (const a of d.pending || []) list.push({ kind: "prompt", id: "p" + a.id, requestId: a.id, prompt: "" });- setItems(list);+ const reply = ended && list.findLast((x) => x.role !== "user");+ if (reply && reply.at >= ended.since) reply.workedMs = ended.ms;+ const cards = (d.pending || []).map((a) => ({ kind: "prompt", id: "p" + a.id, requestId: a.id, prompt: "" }));+ // 进行中的消息(切走前、刷新前或别的窗口发的):显示用户消息和到目前为止的回复,再接上它继续更新。+ // 已经在跟一条了(本页刚发的)就保留本页的那几项,不重复接+ const turns = following.current ? [] : d.live || [];+ turns.forEach((t, i) => list.push(...liveItems(t, i === 0 ? cards : [])));+ if (!turns.length && !following.current) list.push(...cards);+ setItems((prev) => (following.current ? [...list, ...(prev || []).filter((x) => x.turn)] : list));setLoadErr("");+ if (turns.length) attachRef.current(turns[0]);} catch (e) {if (mounted.current) {setItems((v) => v || []);@@ -224,6 +250,7 @@ export function ChatScreen({ bot, models, modelsError, reloadModels, defaultModerequestAnimationFrame(() => ta.current?.focus());return () => {mounted.current = false;+ following.current?.ac.abort();};}, [load]);useEffect(() => {@@ -255,55 +282,93 @@ export function ChatScreen({ bot, models, modelsError, reloadModels, defaultModeconst patchLive = (id, fn) => mounted.current && setItems((l) => (l || []).map((it) => (it.id === id ? fn(it) : it)));- const send = async (raw) => {- const t = (raw ?? text).trim();- if (!t || generating) return;- if (raw === undefined) {- setText("");- requestAnimationFrame(() => autoGrow(ta.current, LINE_PX * 8 + 8));- }- if (!t.startsWith("/")) lastUser.current = t;- stick.current = true;- const liveId = uid();- const isReset = /^\/reset\b/i.test(t);- setItems((l) => [...(l || []), { kind: "msg", id: uid(), role: "user", text: t, at: Date.now(), enter: true }, { kind: "msg", id: liveId, role: "assistant", text: "", at: Date.now(), live: true, startedAt: Date.now() }]);- const ac = new AbortController();- ctrl.current = ac;+ /**+ * 跟着一条消息走到结束:本页发出的(chat/stream)和接上的(chat/live)事件一样。返回最后的回复文字;+ * 切走了(组件卸载、事件流被断开)返回 null。liveId 是回复那一项,turn 是这条消息的几项共用的标记。+ */+ const follow = async (liveId, turn, open) => {+ const f = { ac: new AbortController(), local: false };+ following.current = f;setGenerating(true);let finalText = "";+ const card = (d) =>+ mounted.current &&+ setItems((l) => {+ if (d.requestId && l.some((x) => x.kind === "prompt" && x.requestId === d.requestId)) return l;+ const i = l.findIndex((x) => x.id === liveId);+ const c = { kind: "prompt", id: uid(), requestId: d.requestId, prompt: d.prompt, turn };+ return i < 0 ? [...l, c] : [...l.slice(0, i), c, ...l.slice(i)];+ });try {- await streamChat(- bot.id,- t,+ await open({+ snapshot: (d) => {+ finalText = d.text;+ patchLive(liveId, (it) => ({ ...it, text: d.text, activity: d.steps, startedAt: d.startedAt }));+ d.prompts.forEach(card);+ if (d.stopping && mounted.current) setStopping(true);+ },text: (d) => {finalText = d.text;patchLive(liveId, (it) => ({ ...it, text: d.text }));},activity: (d) => patchLive(liveId, (it) => ({ ...it, activity: upsertStep(it.activity, d) })),- prompt: (d) => mounted.current && setItems((l) => {- const i = l.findIndex((x) => x.id === liveId);- const card = { kind: "prompt", id: uid(), requestId: d.requestId, prompt: d.prompt };- return i < 0 ? [...l, card] : [...l.slice(0, i), card, ...l.slice(i)];- }),- file: (d) => mounted.current && setItems((l) => [...l, { kind: "file", id: uid(), name: d.name }]),+ prompt: card,+ file: (d) => mounted.current && setItems((l) => [...l, { kind: "file", id: uid(), name: d.name, turn }]),+ stopping: () => mounted.current && setStopping(true),error: (d) => {finalText = "⚠️ " + (d.message || "出错了");},},- ac.signal,+ f.ac.signal,);} catch (e) {- // 在收到第一个字节前就点了停止:不是错误if (e.name !== "AbortError") finalText = "⚠️ " + e.message;}- if (!mounted.current) return;- ctrl.current = null;+ if (following.current === f) following.current = null;+ if (!mounted.current || (f.ac.signal.aborted && !f.local)) return null;setGenerating(false);+ setStopping(false);+ return finalText;+ };++ // 接上进行中的消息;结束后重新读历史(存下的用户消息和回复替换掉这几项,不重复)+ const attach = async (t) => {+ if (following.current) return;+ stick.current = true;+ const finalText = await follow("a" + t.id, t.id, (h, signal) => attachChat(bot.id, t.id, h, signal));+ if (finalText === null) return;+ if (isError(finalText)) {+ setCue({ kind: "error", at: Date.now() });+ failed(errText(finalText));+ }+ load({ since: t.startedAt, ms: Date.now() - t.startedAt });+ };+ attachRef.current = attach;++ const send = async (raw) => {+ const t = (raw ?? text).trim();+ if (!t || generating || following.current) return;+ if (raw === undefined) {+ setText("");+ requestAnimationFrame(() => autoGrow(ta.current, LINE_PX * 8 + 8));+ }+ if (!t.startsWith("/")) lastUser.current = t;+ stick.current = true;+ const liveId = uid();+ const isReset = /^\/reset\b/i.test(t);+ setItems((l) => [...(l || []), { kind: "msg", id: uid(), role: "user", text: t, at: Date.now(), enter: true, turn: liveId }, { kind: "msg", id: liveId, role: "assistant", text: "", at: Date.now(), live: true, startedAt: Date.now(), turn: liveId }]);+ const finalText = await follow(liveId, liveId, (h, signal) => streamChat(bot.id, t, h, signal));+ if (finalText === null) return;if (isError(finalText)) setCue({ kind: "error", at: Date.now() });setItems((l) => {const out = [];- for (const it of l || []) {+ for (const item of l || []) {+ if (item.turn !== liveId) {+ out.push(item);+ continue;+ }+ const { turn, ...it } = item; // 结束了:不再属于进行中的消息if (it.id !== liveId) out.push(it);else if (isError(finalText)) out.push({ kind: "error", id: liveId, text: errText(finalText), retry: t.startsWith("/") ? undefined : t, at: it.at, activity: it.activity, workedMs: Date.now() - it.startedAt });else if (finalText || it.activity?.length) out.push({ ...it, text: finalText, live: false, workedMs: Date.now() - it.startedAt });@@ -313,11 +378,29 @@ export function ChatScreen({ bot, models, modelsError, reloadModels, defaultModeif (/^\/model\s+\S/i.test(t)) load();};- // 停止:代理回合在服务端中止(会重启代理进程),回复流照常收到"已中止"再结束;纯对话直接断开请求- const stop = () => {- const agentTurn = (items || []).some((x) => x.live && x.activity?.length);- if (convId.current) api(`/conversations/${encodeURIComponent(convId.current)}/stop`, { method: "POST" }).catch(() => {});- if (!agentTurn) ctrl.current?.abort();+ /**+ * 停止:交给服务端(/conversations/:id/stop),纯对话、排队中、等代理启动、代理回合、接上的消息都是这一条路;+ * 事件流照常收到"已中止"再结束。代理要重启进程,可能要几秒,这期间显示"正在停止…"。+ */+ const stop = async () => {+ if (stopping || !following.current) return;+ setStopping(true);+ try {+ const r = await api(`/conversations/${encodeURIComponent(convId.current || `${bot.id}:web:console`)}/stop`, { method: "POST", body: {} });+ // 服务端已经没有在处理的了(刚好结束):事件流马上会收尾;万一没有,几秒后在本页收尾+ if (!r.stopped) {+ const f = following.current;+ setTimeout(() => {+ if (f && following.current === f) {+ f.local = true;+ f.ac.abort();+ }+ }, 3000);+ }+ } catch (e) {+ if (mounted.current) setStopping(false);+ failed(`停止失败:${e.message}`);+ }};const loadActivity = (mid) => () => api(`/conversations/${encodeURIComponent(convId.current)}/messages/${mid}/activity`).then((d) => d.steps);@@ -429,7 +512,7 @@ export function ChatScreen({ bot, models, modelsError, reloadModels, defaultModeout.push(html`<div class=${`${cls}${it.id === lastAi ? " last" : ""}`} key=${it.id}>${it.role === "user"? html`<div class="msg"><${Linkified} text=${it.text} /></div><${MsgActions} text=${it.text} at=${it.at} />`- : html`${(it.live || it.workedMs || it.steps) && html`<${WorkLine} live=${it.live} text=${it.text} startedAt=${it.startedAt} workedMs=${it.workedMs}+ : html`${(it.live || it.workedMs || it.steps) && html`<${WorkLine} live=${it.live} stopping=${it.live && stopping} text=${it.text} startedAt=${it.startedAt} workedMs=${it.workedMs}steps=${it.activity} count=${it.steps} load=${it.mid ? loadActivity(it.mid) : undefined} />`}${it.text && html`<div class="msg"><${Markdown} text=${it.text} /></div>`}${!it.live && html`<${MsgActions} text=${it.text} at=${it.at} />`}`}@@ -447,7 +530,7 @@ export function ChatScreen({ bot, models, modelsError, reloadModels, defaultModeprev = it;}return out;- }, [items, generating]);+ }, [items, generating, stopping]);const empty = items && items.length === 0;// 头像跟着对话走:等你批准 > 还没出字(思考)/ 出字了(回复)> 你在输入(在听)@@ -465,7 +548,7 @@ export function ChatScreen({ bot, models, modelsError, reloadModels, defaultMode</header><div class="chat-scroll" ref=${scroller} onScroll=${onScroll}><div class="chat-col" role="log" aria-live="polite" aria-busy=${generating}>- ${loadErr && html`<${Notice} tone="red" action=${html`<button type="button" class="btn" onClick=${load}>重试</button>`}>读取历史消息失败:${loadErr}<//>`}+ ${loadErr && html`<${Notice} tone="red" action=${html`<button type="button" class="btn" onClick=${() => load()}>重试</button>`}>读取历史消息失败:${loadErr}<//>`}${items === null && html`<div class="chat-skel"><${Skeleton} w="40%" /><${Skeleton} w="28%" /></div>`}${empty && html`<div class="chat-empty"><${BotAvatar} bot=${bot} size=${88} state=${face} cue=${cue} lively pokeable greet />@@ -498,7 +581,8 @@ export function ChatScreen({ bot, models, modelsError, reloadModels, defaultMode<span class="v">${effective ? shortModel(effective) : "选择模型"}</span><${Icon} name="chevDown" /></button>${generating- ? html`<button type="button" class="send stop" aria-label="停止生成(Esc)" title="停止(Esc)" onClick=${stop}><${Icon} name="stop" size=${12} /></button>`+ ? html`<button type="button" class="send stop" aria-label=${stopping ? "正在停止…" : "停止生成(Esc)"} title=${stopping ? "正在停止…" : "停止(Esc)"}+ disabled=${stopping} aria-busy=${stopping} onClick=${stop}>${stopping ? html`<${Spinner} />` : html`<${Icon} name="stop" size=${12} />`}</button>`: html`<button type="button" class="send" aria-label="发送" title="发送(Enter)" disabled=${!text.trim()} onClick=${() => send()}><${Icon} name="up" size=${15} stroke=${2} /></button>`}</div></div>diff --git a/ui/screens/info-panel.js b/ui/screens/info-panel.jsindex 791c130..b128832 100644--- a/ui/screens/info-panel.js+++ b/ui/screens/info-panel.js@@ -134,7 +134,7 @@ function LiveTurn({ turn, convId }) {const stop = async () => {setStopping(true);try {- await api(`/conversations/${encodeURIComponent(convId)}/stop`, { method: "POST" });+ await api(`/conversations/${encodeURIComponent(convId)}/stop`, { method: "POST", body: {} });} catch (e) {failed(`中止失败:${e.message}`);setStopping(false);