@next-open-ai/openbot 0.6.6 → 0.6.16

package/dist/gateway/channel/run-agent.js

@@ -1,137 +1,25 @@
 /**
  * 通道用：跑 Agent 并收集完整回复文本（无 WebSocket 客户端）。
+ * 委托给 core/agent/proxy 统一入口，按 runnerType 分发到 local/coze/openclawx 等适配器。
  */
-import { agentManager } from "../../core/agent/agent-manager.js";
-import { getDesktopConfig, loadDesktopAgentConfig } from "../../core/config/desktop-config.js";
-import { getExperienceContextForUserMessage } from "../../core/memory/index.js";
+import { runForChannelStream, runForChannelCollect } from "../../core/agent/proxy/index.js";
 /**
- * 使用现有 agentManager 跑一轮对话，以流式回调方式推送助手回复（onChunk/onDone）。
- * onDone 在 agent_end 时调用，保证「对话真正结束」语义（多轮 tool+文本合并为一条回复）。
+ * 使用 AgentProxy 统一入口跑一轮对话，以流式回调方式推送助手回复（onChunk/onDone）。
  */
 export async function runAgentAndStreamReply(options, callbacks) {
-    const { sessionId, message, agentId: optionAgentId } = options;
-    const sessionAgentId = optionAgentId ?? "default";
-    let workspace = "default";
-    let provider;
-    let modelId;
-    let apiKey;
-    const agentConfig = await loadDesktopAgentConfig(sessionAgentId);
-    if (agentConfig) {
-        if (agentConfig.workspace)
-            workspace = agentConfig.workspace;
-        provider = agentConfig.provider;
-        modelId = agentConfig.model;
-        if (agentConfig.apiKey)
-            apiKey = agentConfig.apiKey;
-    }
-    const { maxAgentSessions } = getDesktopConfig();
-    const session = await agentManager.getOrCreateSession(sessionId, {
-        agentId: sessionAgentId,
-        workspace,
-        provider,
-        modelId,
-        apiKey,
-        maxSessions: maxAgentSessions,
-        targetAgentId: sessionAgentId,
-        mcpServers: agentConfig?.mcpServers,
-        systemPrompt: agentConfig?.systemPrompt,
-    });
-    let resolveDone;
-    const donePromise = new Promise((r) => {
-        resolveDone = r;
-    });
-    const unsubscribe = session.subscribe((event) => {
-        if (event.type === "message_update") {
-            const update = event;
-            if (update.assistantMessageEvent?.type === "text_delta" && update.assistantMessageEvent?.delta) {
-                callbacks.onChunk(update.assistantMessageEvent.delta);
-            }
-        }
-        else if (event.type === "turn_end") {
-            callbacks.onTurnEnd?.();
-        }
-        else if (event.type === "agent_end") {
-            callbacks.onDone();
-            resolveDone();
-        }
-    });
-    try {
-        const experienceBlock = await getExperienceContextForUserMessage();
-        const userMessageToSend = experienceBlock.trim().length > 0
-            ? `${experienceBlock}\n\n用户问题：\n${message}`
-            : message;
-        await session.sendUserMessage(userMessageToSend, { deliverAs: "followUp" });
-        await Promise.race([
-            donePromise,
-            new Promise((_, rej) => setTimeout(() => rej(new Error("Channel agent reply timeout")), 120_000)),
-        ]);
-    }
-    finally {
-        unsubscribe();
-    }
+    await runForChannelStream({
+        sessionId: options.sessionId,
+        message: options.message,
+        agentId: options.agentId ?? "default",
+    }, callbacks);
 }
 /**
- * 使用现有 agentManager 跑一轮对话，收集助手完整回复文本后返回。
- * 不依赖 WebSocket 客户端，供通道核心调用。
+ * 使用 AgentProxy 统一入口跑一轮对话，收集助手完整回复文本后返回。
  */
 export async function runAgentAndCollectReply(options) {
-    const { sessionId, message, agentId: optionAgentId } = options;
-    const sessionAgentId = optionAgentId ?? "default";
-    let workspace = "default";
-    let provider;
-    let modelId;
-    let apiKey;
-    const agentConfig = await loadDesktopAgentConfig(sessionAgentId);
-    if (agentConfig) {
-        if (agentConfig.workspace)
-            workspace = agentConfig.workspace;
-        provider = agentConfig.provider;
-        modelId = agentConfig.model;
-        if (agentConfig.apiKey)
-            apiKey = agentConfig.apiKey;
-    }
-    const { maxAgentSessions } = getDesktopConfig();
-    const session = await agentManager.getOrCreateSession(sessionId, {
-        agentId: sessionAgentId,
-        workspace,
-        provider,
-        modelId,
-        apiKey,
-        maxSessions: maxAgentSessions,
-        targetAgentId: sessionAgentId,
-        mcpServers: agentConfig?.mcpServers,
-        systemPrompt: agentConfig?.systemPrompt,
-    });
-    const chunks = [];
-    let resolveDone;
-    const donePromise = new Promise((r) => {
-        resolveDone = r;
-    });
-    const unsubscribe = session.subscribe((event) => {
-        if (event.type === "message_update") {
-            const update = event;
-            if (update.assistantMessageEvent?.type === "text_delta" && update.assistantMessageEvent?.delta) {
-                chunks.push(update.assistantMessageEvent.delta);
-            }
-        }
-        else if (event.type === "agent_end") {
-            resolveDone();
-        }
+    return runForChannelCollect({
+        sessionId: options.sessionId,
+        message: options.message,
+        agentId: options.agentId ?? "default",
     });
-    try {
-        const experienceBlock = await getExperienceContextForUserMessage();
-        const userMessageToSend = experienceBlock.trim().length > 0
-            ? `${experienceBlock}\n\n用户问题：\n${message}`
-            : message;
-        await session.sendUserMessage(userMessageToSend, { deliverAs: "followUp" });
-        // 等待 agent_end（整轮对话真正结束）或超时
-        await Promise.race([
-            donePromise,
-            new Promise((_, rej) => setTimeout(() => rej(new Error("Channel agent reply timeout")), 120_000)),
-        ]);
-    }
-    finally {
-        unsubscribe();
-    }
-    return chunks.join("").trim() || "(无文本回复)";
 }

package/dist/gateway/channel/types.d.ts

@@ -25,6 +25,8 @@ export interface UnifiedMessage {
     replyTarget?: string;
     /** 平台消息 ID（可选，用于回复引用等） */
     messageId?: string;
+    /** 通道可选：回复发送完成后调用的 ack（如钉钉 Stream 需回调响应防重试），参数为 send 返回值 */
+    ack?: (sendResult?: unknown) => void | Promise<void>;
 }
 /** 统一出站回复 */
 export interface UnifiedReply {
@@ -42,16 +44,18 @@ export interface IInboundTransport {
     /** 设置收到消息时的回调 */
     setMessageHandler(handler: (msg: UnifiedMessage) => void | Promise<void>): void;
 }
-/** 流式出站：先发一条占位消息，再由调用方按累积内容多次更新。返回的 sink 由 channel-core 在 onChunk/onDone 时调用。 */
+/** 流式出站：先发一条占位消息，再由调用方按累积内容多次更新。返回的 sink 由 channel-core 在 onChunk / onTurnEnd / onDone 时调用。 */
 export interface StreamSink {
-    /** 更新当前已累积的全文（节流后调用） */
+    /** 更新当前已累积的全文（节流后调用），通道可用来做占位或实时更新 */
     onChunk(accumulated: string): void | Promise<void>;
+    /** 可选：agent 每轮结束（turn_end）时调用，通道可在此发一条消息（如钉钉按轮发） */
+    onTurnEnd?(accumulated: string): void | Promise<void>;
     /** 流结束，做最终一次更新 */
     onDone(accumulated: string): void | Promise<void>;
 }
-/** 出站传输：将 UnifiedReply 发到外部 */
+/** 出站传输：将 UnifiedReply 发到外部；返回值可传给 UnifiedMessage.ack */
 export interface IOutboundTransport {
-    send(targetId: string, reply: UnifiedReply): Promise<void>;
+    send(targetId: string, reply: UnifiedReply): Promise<unknown>;
     /** 可选：该出站是否还能往 targetId 发（如连接是否有效） */
     canSend?(targetId: string): boolean;
     /** 可选：流式发送。先创建占位消息，返回 sink 供调用方按累积内容更新（如飞书 create + patch）。 */

package/dist/gateway/methods/agent-cancel.d.ts

@@ -1,10 +1,12 @@
 import type { GatewayClient } from "../types.js";
 /**
  * Handle agent.cancel: abort the current turn for the given session.
- * Uses pi-coding-agent's session.abort() to stop the running agent and wait until idle.
+ * - Proxy agents: abort in-flight run via registered AbortController.
+ * - Local agent: uses pi-coding-agent's session.abort().
  */
 export declare function handleAgentCancel(client: GatewayClient, params: {
     sessionId?: string;
+    agentId?: string;
 }): Promise<{
     status: string;
 }>;

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

@@ -1,14 +1,28 @@
 import { agentManager } from "../../core/agent/agent-manager.js";
+import { abortProxyRun } from "../proxy-run-abort.js";
+import { clearSessionStreamSubscription } from "./agent-chat.js";
+const COMPOSITE_KEY_SEP = "::";
 /**
  * Handle agent.cancel: abort the current turn for the given session.
- * Uses pi-coding-agent's session.abort() to stop the running agent and wait until idle.
+ * - Proxy agents: abort in-flight run via registered AbortController.
+ * - Local agent: uses pi-coding-agent's session.abort().
  */
 export async function handleAgentCancel(client, params) {
     const sessionId = params?.sessionId ?? client.sessionId;
     if (!sessionId) {
         throw new Error("No session ID available");
     }
-    const session = agentManager.getSession(sessionId);
+    const agentId = params?.agentId ?? client.agentId ?? "default";
+    if (abortProxyRun(sessionId, agentId)) {
+        clearSessionStreamSubscription(sessionId);
+        return { status: "aborted" };
+    }
+    clearSessionStreamSubscription(sessionId);
+    const compositeKey = sessionId + COMPOSITE_KEY_SEP + agentId;
+    let session = agentManager.getSession(compositeKey);
+    if (!session) {
+        session = agentManager.getSessionBySessionId(sessionId);
+    }
     if (!session) {
         return { status: "no_session" };
     }

package/dist/gateway/methods/agent-chat.d.ts

@@ -1,4 +1,8 @@
 import type { GatewayClient, AgentChatParams } from "../types.js";
+/**
+ * 移除某 session 的流式订阅（cancel 或新消息开始时调用，避免同一事件被多个回调处理导致界面重复）
+ */
+export declare function clearSessionStreamSubscription(sessionId: string): void;
 /**
  * Handle agent chat request with streaming support
  */