@next-open-ai/openclawx 0.8.32 → 0.8.36

package/dist/gateway/methods/agent-chat.js

@@ -7,9 +7,25 @@ import { connectedClients } from "../clients.js";
 import { getDesktopConfig, loadDesktopAgentConfig } from "../../core/config/desktop-config.js";
 import { consumePendingAgentReload } from "../../core/config/agent-reload-pending.js";
 import { registerProxyRunAbort } from "../proxy-run-abort.js";
+import { getSessionOutlet, sendSessionMessage } from "../../core/session-outlet/index.js";
 const COMPOSITE_KEY_SEP = "::";
+/** 当前每个 session 的流式订阅（用于在 cancel 或新 run 前移除旧订阅，避免重复广播） */
+const sessionSubscriptionBySessionId = new Map();
 /**
- * Broadcast message to all clients subscribed to a session
+ * 移除某 session 的流式订阅（cancel 或新消息开始时调用，避免同一事件被多个回调处理导致界面重复）
+ */
+export function clearSessionStreamSubscription(sessionId) {
+    const unsub = sessionSubscriptionBySessionId.get(sessionId);
+    if (unsub) {
+        try {
+            unsub();
+        }
+        catch (_) { }
+        sessionSubscriptionBySessionId.delete(sessionId);
+    }
+}
+/**
+ * Broadcast message to all clients subscribed to a session (used by Web consumer).
  */
 function broadcastToSession(sessionId, message) {
     for (const client of connectedClients) {
@@ -18,6 +34,58 @@ function broadcastToSession(sessionId, message) {
         }
     }
 }
+/** 系统消息前缀，与正常回复同路下发，仅用此前缀区分，前端无需额外逻辑 */
+const SYSTEM_MSG_PREFIX = "[System Message] ";
+/** 系统消息结尾换行，与当前轮次助手内容分行显示 */
+const SYSTEM_MSG_SUFFIX = "\n";
+/**
+ * 创建 Web 端会话消息消费者：将统一出口的 SessionMessage 转为 Gateway 事件并 broadcast。
+ * 系统消息以 agent.chunk 形式发送，正文带 [System Message] 前缀且结尾换行，与当轮回复分行。
+ */
+function createWebSessionConsumer(_sessionId) {
+    return {
+        send(msg) {
+            const sid = msg.sessionId;
+            if (msg.type === "system" && msg.code === "command.result") {
+                const raw = msg.payload?.text ?? "";
+                const text = raw ? SYSTEM_MSG_PREFIX + raw + SYSTEM_MSG_SUFFIX : "";
+                if (text)
+                    broadcastToSession(sid, createEvent("agent.chunk", { text, sessionId: sid }));
+                broadcastToSession(sid, createEvent("turn_end", { sessionId: sid, content: "" }));
+                broadcastToSession(sid, createEvent("message_complete", { sessionId: sid, content: "" }));
+                broadcastToSession(sid, createEvent("agent_end", { sessionId: sid }));
+                broadcastToSession(sid, createEvent("conversation_end", { sessionId: sid }));
+                return;
+            }
+            if (msg.type === "system" && msg.code === "mcp.progress") {
+                const raw = msg.payload?.message ?? msg.payload?.phase ?? "";
+                if (raw) {
+                    const text = SYSTEM_MSG_PREFIX + raw + SYSTEM_MSG_SUFFIX;
+                    broadcastToSession(sid, createEvent("agent.chunk", { text, sessionId: sid }));
+                }
+                return;
+            }
+            if (msg.type === "chat") {
+                if (msg.code === "agent.chunk") {
+                    broadcastToSession(sid, createEvent("agent.chunk", { ...msg.payload, sessionId: sid }));
+                }
+                else if (msg.code === "agent.tool") {
+                    broadcastToSession(sid, createEvent("agent.tool", { ...msg.payload }));
+                }
+                else if (msg.code === "turn_end") {
+                    broadcastToSession(sid, createEvent("turn_end", { sessionId: sid, ...msg.payload }));
+                    broadcastToSession(sid, createEvent("message_complete", { sessionId: sid, ...msg.payload }));
+                }
+                else if (msg.code === "message_complete") {
+                    broadcastToSession(sid, createEvent("message_complete", { sessionId: sid, ...msg.payload }));
+                }
+                else if (msg.code === "agent_end" || msg.code === "conversation_end") {
+                    broadcastToSession(sid, createEvent(msg.code === "agent_end" ? "agent_end" : "conversation_end", { sessionId: sid, ...msg.payload }));
+                }
+            }
+        },
+    };
+}
 /**
  * Handle agent chat request with streaming support
  */
@@ -35,271 +103,255 @@ export async function handleAgentChat(client, params) {
     return handleAgentChatInner(client, targetSessionId, message, params);
 }
 async function handleAgentChatInner(client, targetSessionId, message, params) {
-    const { targetAgentId } = params;
-    const sessionType = params.sessionType ?? client.sessionType ?? "chat";
-    const resolveCurrentAgent = getSessionCurrentAgentResolver();
-    const storedAgentId = resolveCurrentAgent?.(targetSessionId);
-    const clientAgentId = params.agentId ?? client.agentId ?? "default";
-    const initialAgentId = params.agentId ?? storedAgentId ?? clientAgentId ?? "default";
-    const { message: preprocessedMessage, agentId: preprocessedAgentId, directResponse } = await preprocessInboundMessage({
-        sessionId: targetSessionId,
-        message: message.trim(),
-        currentAgentId: initialAgentId,
-    });
-    getSessionCurrentAgentUpdater()?.(targetSessionId, preprocessedAgentId);
-    if (directResponse != null && directResponse !== "") {
-        broadcastToSession(targetSessionId, createEvent("agent.chunk", { text: directResponse, sessionId: targetSessionId }));
-        broadcastToSession(targetSessionId, createEvent("turn_end", { sessionId: targetSessionId, content: "" }));
-        broadcastToSession(targetSessionId, createEvent("message_complete", { sessionId: targetSessionId, content: "" }));
-        broadcastToSession(targetSessionId, createEvent("agent_end", { sessionId: targetSessionId }));
-        broadcastToSession(targetSessionId, createEvent("conversation_end", { sessionId: targetSessionId }));
-        return { status: "completed", sessionId: targetSessionId };
-    }
-    message = preprocessedMessage;
-    let currentAgentId = preprocessedAgentId;
-    console.log(`[agent.chat] session=${targetSessionId} resolved agentId=${currentAgentId} (params=${params.agentId ?? "—"}, stored=${storedAgentId ?? "—"}, client=${client.agentId ?? "—"})`);
-    let workspace = "default";
-    let provider;
-    let modelId;
-    let apiKey;
-    const agentConfig = await loadDesktopAgentConfig(currentAgentId);
-    if (agentConfig) {
-        if (agentConfig.workspace)
-            workspace = agentConfig.workspace;
-        provider = agentConfig.provider;
-        modelId = agentConfig.model;
-        if (agentConfig.apiKey)
-            apiKey = agentConfig.apiKey;
-    }
-    const runnerType = agentConfig?.runnerType ?? "local";
-    const isProxyAgent = runnerType === "coze" || runnerType === "openclawx" || runnerType === "opencode";
-    if (isProxyAgent) {
-        console.log(`[agent.chat] Using proxy agent (${runnerType}) for session=${targetSessionId}, agentId=${currentAgentId}`);
-    }
-    // 代理智能体（Coze / OpenClawX / OpenCode）：走 AgentProxy 统一入口，流式结果通过 WebSocket 推给客户端
-    if (isProxyAgent) {
-        const { signal, unregister } = registerProxyRunAbort(targetSessionId, currentAgentId);
-        const finishAndUnregister = () => {
-            unregister();
-            broadcastToSession(targetSessionId, createEvent("turn_end", { sessionId: targetSessionId, content: "" }));
-            broadcastToSession(targetSessionId, createEvent("message_complete", { sessionId: targetSessionId, content: "" }));
-            broadcastToSession(targetSessionId, createEvent("agent_end", { sessionId: targetSessionId }));
-            broadcastToSession(targetSessionId, createEvent("conversation_end", { sessionId: targetSessionId }));
-        };
-        try {
-            await runForChannelStream({
-                sessionId: targetSessionId,
-                message,
-                agentId: currentAgentId,
-                signal,
-            }, {
-                onChunk(delta) {
-                    broadcastToSession(targetSessionId, createEvent("agent.chunk", { text: delta, sessionId: targetSessionId }));
-                },
-                onTurnEnd() {
-                    broadcastToSession(targetSessionId, createEvent("turn_end", { sessionId: targetSessionId, content: "" }));
-                    broadcastToSession(targetSessionId, createEvent("message_complete", { sessionId: targetSessionId, content: "" }));
-                },
-                onDone() {
-                    finishAndUnregister();
-                },
+    const outlet = getSessionOutlet();
+    const unregisterConsumer = outlet
+        ? outlet.registerConsumer(targetSessionId, createWebSessionConsumer(targetSessionId))
+        : () => { };
+    try {
+        const { targetAgentId } = params;
+        const sessionType = params.sessionType ?? client.sessionType ?? "chat";
+        const resolveCurrentAgent = getSessionCurrentAgentResolver();
+        const storedAgentId = resolveCurrentAgent?.(targetSessionId);
+        const clientAgentId = params.agentId ?? client.agentId ?? "default";
+        const initialAgentId = params.agentId ?? storedAgentId ?? clientAgentId ?? "default";
+        const { message: preprocessedMessage, agentId: preprocessedAgentId, directResponse } = await preprocessInboundMessage({
+            sessionId: targetSessionId,
+            message: message.trim(),
+            currentAgentId: initialAgentId,
+        });
+        getSessionCurrentAgentUpdater()?.(targetSessionId, preprocessedAgentId);
+        if (directResponse != null && directResponse !== "") {
+            sendSessionMessage(targetSessionId, {
+                type: "system",
+                code: "command.result",
+                payload: { text: directResponse },
             });
             return { status: "completed", sessionId: targetSessionId };
         }
-        catch (error) {
-            const isAbort = error?.name === "AbortError" || (typeof error?.message === "string" && error.message.includes("abort"));
-            if (!isAbort)
-                console.error(`Error in agent chat (proxy ${runnerType}):`, error);
-            finishAndUnregister();
-            if (!isAbort) {
-                const errMsg = error?.message || String(error);
-                broadcastToSession(targetSessionId, createEvent("agent.chunk", { text: `请求失败：${errMsg}`, sessionId: targetSessionId }));
-            }
-            return { status: "completed", sessionId: targetSessionId };
+        message = preprocessedMessage;
+        let currentAgentId = preprocessedAgentId;
+        console.log(`[agent.chat] session=${targetSessionId} resolved agentId=${currentAgentId} (params=${params.agentId ?? "—"}, stored=${storedAgentId ?? "—"}, client=${client.agentId ?? "—"})`);
+        let workspace = "default";
+        let provider;
+        let modelId;
+        let apiKey;
+        const agentConfig = await loadDesktopAgentConfig(currentAgentId);
+        if (agentConfig) {
+            if (agentConfig.workspace)
+                workspace = agentConfig.workspace;
+            provider = agentConfig.provider;
+            modelId = agentConfig.model;
+            if (agentConfig.apiKey)
+                apiKey = agentConfig.apiKey;
         }
-    }
-    const isEphemeralSession = sessionType === "system" || sessionType === "scheduled";
-    if (isEphemeralSession) {
-        await agentManager.deleteSession(targetSessionId + COMPOSITE_KEY_SEP + currentAgentId);
-    }
-    const effectiveTargetAgentId = sessionType === "system" ? targetAgentId : currentAgentId;
-    const { maxAgentSessions } = getDesktopConfig();
-    if (await consumePendingAgentReload(currentAgentId)) {
-        await agentManager.deleteSessionsByAgentId(currentAgentId);
-    }
-    let session;
-    try {
-        session = await agentManager.getOrCreateSession(targetSessionId, {
-            agentId: currentAgentId,
-            workspace,
-            provider,
-            modelId,
-            apiKey,
-            maxSessions: maxAgentSessions,
-            targetAgentId: effectiveTargetAgentId,
-            mcpServers: agentConfig?.mcpServers,
-            systemPrompt: agentConfig?.systemPrompt,
-            useLongMemory: agentConfig?.useLongMemory,
-        });
-    }
-    catch (err) {
-        const msg = err?.message ?? String(err);
-        if (msg.includes("No API key") || msg.includes("API key")) {
-            const prov = provider ?? "deepseek";
-            throw new Error(`未配置 ${prov} 的 API Key。请在桌面端「设置」-「模型/API」中配置，或运行：openbot login ${prov} <你的API Key>`);
+        const runnerType = agentConfig?.runnerType ?? "local";
+        const isProxyAgent = runnerType === "coze" || runnerType === "openclawx" || runnerType === "opencode";
+        if (isProxyAgent) {
+            console.log(`[agent.chat] Using proxy agent (${runnerType}) for session=${targetSessionId}, agentId=${currentAgentId}`);
         }
-        throw err;
-    }
-    // 向各通道广播：turn_end（本小轮结束）、agent_end（整轮对话结束），并保留 message_complete / conversation_end 兼容。各端按需处理。
-    // 必须等 agent_end 后再 resolve 并 unsubscribe，否则 sendUserMessage 一 return 就 unsubscribe，流式 text_delta 会收不到，前端看不到回复。
-    let resolveAgentDone;
-    const agentDonePromise = new Promise((resolve) => {
-        resolveAgentDone = resolve;
-    });
-    let didUnsubscribe = false;
-    let unsubscribe;
-    const doUnsubscribe = () => {
-        if (didUnsubscribe)
-            return;
-        didUnsubscribe = true;
-        unsubscribe();
-    };
-    let hasReceivedAnyChunk = false;
-    unsubscribe = session.subscribe((event) => {
-        if (event.type !== "message_update") {
-            console.log(`[agent.chat] event: ${event.type}`);
-        }
-        let wsMessage = null;
-        if (event.type === "message_update") {
-            const update = event;
-            if (update.assistantMessageEvent && update.assistantMessageEvent.type === "text_delta") {
-                hasReceivedAnyChunk = true;
-                wsMessage = createEvent("agent.chunk", { text: update.assistantMessageEvent.delta });
-            }
-            else if (update.assistantMessageEvent && update.assistantMessageEvent.type === "thinking_delta") {
-                wsMessage = createEvent("agent.chunk", { text: update.assistantMessageEvent.delta, isThinking: true });
+        // 代理智能体（Coze / OpenClawX / OpenCode）：走 AgentProxy 统一入口，流式结果经统一出口推给客户端
+        if (isProxyAgent) {
+            const { signal, unregister } = registerProxyRunAbort(targetSessionId, currentAgentId);
+            const finishAndUnregister = () => {
+                unregister();
+                sendSessionMessage(targetSessionId, { type: "chat", code: "turn_end", payload: {} });
+                sendSessionMessage(targetSessionId, { type: "chat", code: "message_complete", payload: {} });
+                sendSessionMessage(targetSessionId, { type: "chat", code: "agent_end", payload: {} });
+                sendSessionMessage(targetSessionId, { type: "chat", code: "conversation_end", payload: {} });
+            };
+            try {
+                await runForChannelStream({
+                    sessionId: targetSessionId,
+                    message,
+                    agentId: currentAgentId,
+                    signal,
+                }, {
+                    onChunk(delta) {
+                        sendSessionMessage(targetSessionId, { type: "chat", code: "agent.chunk", payload: { text: delta } });
+                    },
+                    onTurnEnd() {
+                        sendSessionMessage(targetSessionId, { type: "chat", code: "turn_end", payload: {} });
+                        sendSessionMessage(targetSessionId, { type: "chat", code: "message_complete", payload: {} });
+                    },
+                    onDone() {
+                        finishAndUnregister();
+                    },
+                });
+                return { status: "completed", sessionId: targetSessionId };
             }
-            else if (update.assistantMessageEvent?.type === "error" && update.assistantMessageEvent?.error?.errorMessage) {
-                console.warn("[agent.chat] model error:", update.assistantMessageEvent.error.errorMessage);
+            catch (error) {
+                const isAbort = error?.name === "AbortError" || (typeof error?.message === "string" && error.message.includes("abort"));
+                if (!isAbort)
+                    console.error(`Error in agent chat (proxy ${runnerType}):`, error);
+                finishAndUnregister();
+                if (!isAbort) {
+                    const errMsg = error?.message || String(error);
+                    sendSessionMessage(targetSessionId, { type: "chat", code: "agent.chunk", payload: { text: `请求失败：${errMsg}` } });
+                }
+                return { status: "completed", sessionId: targetSessionId };
             }
         }
-        else if (event.type === "tool_execution_start") {
-            wsMessage = createEvent("agent.tool", {
-                type: "start",
-                toolCallId: event.toolCallId,
-                toolName: event.toolName,
-                args: event.args
-            });
+        const isEphemeralSession = sessionType === "system" || sessionType === "scheduled";
+        if (isEphemeralSession) {
+            await agentManager.deleteSession(targetSessionId + COMPOSITE_KEY_SEP + currentAgentId);
+        }
+        const effectiveTargetAgentId = sessionType === "system" ? targetAgentId : currentAgentId;
+        const { maxAgentSessions } = getDesktopConfig();
+        if (await consumePendingAgentReload(currentAgentId)) {
+            await agentManager.deleteSessionsByAgentId(currentAgentId);
         }
-        else if (event.type === "tool_execution_end") {
-            wsMessage = createEvent("agent.tool", {
-                type: "end",
-                toolCallId: event.toolCallId,
-                toolName: event.toolName,
-                result: event.result,
-                isError: event.isError
+        let session;
+        try {
+            session = await agentManager.getOrCreateSession(targetSessionId, {
+                agentId: currentAgentId,
+                workspace,
+                provider,
+                modelId,
+                apiKey,
+                maxSessions: maxAgentSessions,
+                targetAgentId: effectiveTargetAgentId,
+                mcpServers: agentConfig?.mcpServers,
+                systemPrompt: agentConfig?.systemPrompt,
+                useLongMemory: agentConfig?.useLongMemory,
             });
         }
-        else if (event.type === "message_end") {
-            const msg = event.message;
-            // 仅当未收到过任何 text_delta 时才发整段内容，避免与前面已推送的 delta 重复导致前端显示两遍
-            if (msg?.role === "assistant" && msg?.content && Array.isArray(msg.content)) {
-                const text = msg.content
-                    .filter((c) => c?.type === "text" && typeof c.text === "string")
-                    .map((c) => c.text)
-                    .join("");
-                if (text) {
-                    if (!hasReceivedAnyChunk) {
-                        broadcastToSession(targetSessionId, createEvent("agent.chunk", { text }));
-                    }
+        catch (err) {
+            const msg = err?.message ?? String(err);
+            if (msg.includes("No API key") || msg.includes("API key")) {
+                const prov = provider ?? "deepseek";
+                throw new Error(`未配置 ${prov} 的 API Key。请在桌面端「设置」-「模型/API」中配置，或运行：openbot login ${prov} <你的API Key>`);
+            }
+            throw err;
+        }
+        // 向各通道广播：turn_end（本小轮结束）、agent_end（整轮对话结束），经统一出口推送给已注册消费者
+        let resolveAgentDone;
+        const agentDonePromise = new Promise((resolve) => {
+            resolveAgentDone = resolve;
+        });
+        let didUnsubscribe = false;
+        let unsubscribe;
+        const doUnsubscribe = () => {
+            if (didUnsubscribe)
+                return;
+            didUnsubscribe = true;
+            sessionSubscriptionBySessionId.delete(targetSessionId);
+            unsubscribe();
+        };
+        clearSessionStreamSubscription(targetSessionId);
+        let hasReceivedAnyChunk = false;
+        unsubscribe = session.subscribe((event) => {
+            if (event.type !== "message_update") {
+                console.log(`[agent.chat] event: ${event.type}`);
+            }
+            let wsPayload = null;
+            if (event.type === "message_update") {
+                const update = event;
+                if (update.assistantMessageEvent && update.assistantMessageEvent.type === "text_delta") {
                     hasReceivedAnyChunk = true;
+                    wsPayload = { type: "chat", code: "agent.chunk", payload: { text: update.assistantMessageEvent.delta } };
+                }
+                else if (update.assistantMessageEvent && update.assistantMessageEvent.type === "thinking_delta") {
+                    wsPayload = { type: "chat", code: "agent.chunk", payload: { text: update.assistantMessageEvent.delta, isThinking: true } };
+                }
+                else if (update.assistantMessageEvent?.type === "error" && update.assistantMessageEvent?.error?.errorMessage) {
+                    console.warn("[agent.chat] model error:", update.assistantMessageEvent.error.errorMessage);
                 }
             }
-            if (msg?.errorMessage) {
-                console.warn("[agent.chat] message_end error:", msg.errorMessage);
-                const errText = msg.errorMessage.includes("402") || msg.errorMessage.includes("Insufficient Balance")
-                    ? "API 余额不足，请到「设置」检查并充值后重试。"
-                    : `请求失败：${msg.errorMessage}`;
-                broadcastToSession(targetSessionId, createEvent("agent.chunk", { text: errText }));
+            else if (event.type === "tool_execution_start") {
+                wsPayload = { type: "chat", code: "agent.tool", payload: { type: "start", toolCallId: event.toolCallId, toolName: event.toolName, args: event.args } };
             }
-            wsMessage = null;
-        }
-        else if (event.type === "turn_end") {
-            const msg = event.message;
-            if (!hasReceivedAnyChunk && msg?.content && Array.isArray(msg.content)) {
-                const fullText = msg.content
-                    .filter((c) => c?.type === "text" && typeof c.text === "string")
-                    .map((c) => c.text)
-                    .join("");
-                if (fullText) {
-                    broadcastToSession(targetSessionId, createEvent("agent.chunk", { text: fullText }));
+            else if (event.type === "tool_execution_end") {
+                wsPayload = { type: "chat", code: "agent.tool", payload: { type: "end", toolCallId: event.toolCallId, toolName: event.toolName, result: event.result, isError: event.isError } };
+            }
+            else if (event.type === "message_end") {
+                const msg = event.message;
+                if (msg?.role === "assistant" && msg?.content && Array.isArray(msg.content)) {
+                    const text = msg.content
+                        .filter((c) => c?.type === "text" && typeof c.text === "string")
+                        .map((c) => c.text)
+                        .join("");
+                    if (text && !hasReceivedAnyChunk) {
+                        sendSessionMessage(targetSessionId, { type: "chat", code: "agent.chunk", payload: { text } });
+                    }
                     hasReceivedAnyChunk = true;
                 }
+                if (msg?.errorMessage) {
+                    const errText = msg.errorMessage.includes("402") || msg.errorMessage.includes("Insufficient Balance")
+                        ? "API 余额不足，请到「设置」检查并充值后重试。"
+                        : `请求失败：${msg.errorMessage}`;
+                    sendSessionMessage(targetSessionId, { type: "chat", code: "agent.chunk", payload: { text: errText } });
+                }
+                wsPayload = null;
             }
-            if (msg?.errorMessage) {
-                console.warn("[agent.chat] turn message error:", msg.errorMessage);
-                const errText = msg.errorMessage.includes("402") || msg.errorMessage.includes("Insufficient Balance")
-                    ? "API 余额不足，请到「设置」检查并充值后重试。"
-                    : `请求失败：${msg.errorMessage}`;
-                broadcastToSession(targetSessionId, createEvent("agent.chunk", { text: errText }));
-                hasReceivedAnyChunk = true;
-            }
-            const usage = msg?.usage;
-            const promptTokens = Number(usage?.input ?? usage?.input_tokens ?? 0) || 0;
-            const completionTokens = Number(usage?.output ?? usage?.output_tokens ?? 0) || 0;
-            const usagePayload = promptTokens > 0 || completionTokens > 0
-                ? { promptTokens, completionTokens }
-                : undefined;
-            const turnPayload = {
-                sessionId: targetSessionId,
-                content: "",
-                ...(usagePayload && { usage: usagePayload }),
-            };
-            broadcastToSession(targetSessionId, createEvent("turn_end", turnPayload));
-            broadcastToSession(targetSessionId, createEvent("message_complete", turnPayload));
-            wsMessage = null;
-        }
-        else if (event.type === "agent_end") {
-            if (!hasReceivedAnyChunk && Array.isArray(event.messages)) {
-                const messages = event.messages;
-                const lastAssistant = [...messages].reverse().find((m) => m?.role === "assistant" && m?.content);
-                if (lastAssistant?.content) {
-                    const text = lastAssistant.content
+            else if (event.type === "turn_end") {
+                const msg = event.message;
+                if (!hasReceivedAnyChunk && msg?.content && Array.isArray(msg.content)) {
+                    const fullText = msg.content
                         .filter((c) => c?.type === "text" && typeof c.text === "string")
                         .map((c) => c.text)
                         .join("");
-                    if (text)
-                        broadcastToSession(targetSessionId, createEvent("agent.chunk", { text }));
+                    if (fullText) {
+                        sendSessionMessage(targetSessionId, { type: "chat", code: "agent.chunk", payload: { text: fullText } });
+                        hasReceivedAnyChunk = true;
+                    }
+                }
+                if (msg?.errorMessage) {
+                    const errText = msg.errorMessage.includes("402") || msg.errorMessage.includes("Insufficient Balance")
+                        ? "API 余额不足，请到「设置」检查并充值后重试。"
+                        : `请求失败：${msg.errorMessage}`;
+                    sendSessionMessage(targetSessionId, { type: "chat", code: "agent.chunk", payload: { text: errText } });
+                    hasReceivedAnyChunk = true;
                 }
+                const usage = msg?.usage;
+                const promptTokens = Number(usage?.input ?? usage?.input_tokens ?? 0) || 0;
+                const completionTokens = Number(usage?.output ?? usage?.output_tokens ?? 0) || 0;
+                const usagePayload = promptTokens > 0 || completionTokens > 0 ? { promptTokens, completionTokens } : undefined;
+                const turnPayload = { content: "", ...(usagePayload && { usage: usagePayload }) };
+                sendSessionMessage(targetSessionId, { type: "chat", code: "turn_end", payload: turnPayload });
+                sendSessionMessage(targetSessionId, { type: "chat", code: "message_complete", payload: turnPayload });
+                wsPayload = null;
             }
-            const agentPayload = { sessionId: targetSessionId };
-            broadcastToSession(targetSessionId, createEvent("agent_end", agentPayload));
-            broadcastToSession(targetSessionId, createEvent("conversation_end", agentPayload));
-            wsMessage = null;
-            resolveAgentDone();
-            doUnsubscribe();
-            if (isEphemeralSession) {
-                void agentManager.deleteSession(targetSessionId + COMPOSITE_KEY_SEP + currentAgentId).catch(() => { });
+            else if (event.type === "agent_end") {
+                if (!hasReceivedAnyChunk && Array.isArray(event.messages)) {
+                    const messages = event.messages;
+                    const lastAssistant = [...messages].reverse().find((m) => m?.role === "assistant" && m?.content);
+                    if (lastAssistant?.content) {
+                        const text = lastAssistant.content
+                            .filter((c) => c?.type === "text" && typeof c.text === "string")
+                            .map((c) => c.text)
+                            .join("");
+                        if (text)
+                            sendSessionMessage(targetSessionId, { type: "chat", code: "agent.chunk", payload: { text } });
+                    }
+                }
+                sendSessionMessage(targetSessionId, { type: "chat", code: "agent_end", payload: {} });
+                sendSessionMessage(targetSessionId, { type: "chat", code: "conversation_end", payload: {} });
+                wsPayload = null;
+                resolveAgentDone();
+                doUnsubscribe();
+                if (isEphemeralSession) {
+                    void agentManager.deleteSession(targetSessionId + COMPOSITE_KEY_SEP + currentAgentId).catch(() => { });
+                }
             }
+            if (wsPayload) {
+                sendSessionMessage(targetSessionId, wsPayload);
+            }
+        });
+        sessionSubscriptionBySessionId.set(targetSessionId, unsubscribe);
+        try {
+            await session.sendUserMessage(message, { deliverAs: "followUp" });
+            await agentDonePromise;
+            console.log(`Agent chat completed for session ${targetSessionId}`);
+            return { status: "completed", sessionId: targetSessionId };
         }
-        if (wsMessage) {
-            broadcastToSession(targetSessionId, wsMessage);
+        catch (error) {
+            console.error(`Error in agent chat:`, error);
+            resolveAgentDone();
+            doUnsubscribe();
+            throw error;
         }
-    });
-    try {
-        // 若 agent 正在流式输出，deliverAs: 'followUp' 将本条消息排队，避免抛出 "Agent is already processing"
-        await session.sendUserMessage(message, { deliverAs: "followUp" });
-        await agentDonePromise;
-        console.log(`Agent chat completed for session ${targetSessionId}`);
-        return {
-            status: "completed",
-            sessionId: targetSessionId,
-        };
     }
-    catch (error) {
-        console.error(`Error in agent chat:`, error);
-        resolveAgentDone();
-        doUnsubscribe();
-        throw error;
+    finally {
+        unregisterConsumer();
     }
 }

package/dist/gateway/server.js

@@ -53,6 +53,7 @@ import { createTelegramChannel } from "./channel/adapters/telegram.js";
 import { createWechatChannel, getWechatQrCode, getWechatStatus, refreshWechatQrCode } from "./channel/adapters/wechat.js";
 import { setChannelSessionPersistence } from "./channel/session-persistence.js";
 import { setSessionCurrentAgentResolver, setSessionCurrentAgentUpdater, setAgentListProvider, setCreateAgentProvider, } from "../core/session-current-agent.js";
+import { SessionOutlet, setSessionOutlet } from "../core/session-outlet/index.js";
 import { AgentsService } from "../server/agents/agents.service.js";
 import { AgentConfigService } from "../server/agent-config/agent-config.service.js";
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -101,6 +102,7 @@ export async function startGatewayServer(port = 38080) {
     catch (e) {
         console.warn("[Gateway] Channel session persistence / session-agent bridge unavailable:", e);
     }
+    setSessionOutlet(new SessionOutlet());
     const gatewayExpress = express();
     gatewayExpress.get(PATHS.HEALTH, (_req, res) => {
         res.status(200).json({ status: "ok", timestamp: Date.now() });

package/package.json

@@ -3,7 +3,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.8.32",
+    "version": "0.8.36",
     "description": "OpenClawX - A professional desktop application for managing and executing AI agents with real-time chat, session management, and skills browsing.",
     "type": "module",
     "main": "dist/index.js",