@next-open-ai/openbot 0.3.2 → 0.6.8

package/dist/gateway/methods/run-scheduled-task.js

@@ -49,13 +49,16 @@ export async function handleRunScheduledTask(req, res) {
         if (agentConfig.apiKey)
             apiKey = agentConfig.apiKey;
     }
+    const COMPOSITE_KEY_SEP = "::";
     try {
         const session = await agentManager.getOrCreateSession(sessionId, {
+            agentId: sessionAgentId,
             workspace: resolvedWorkspace,
             provider,
             modelId,
             apiKey,
             mcpServers: agentConfig?.mcpServers,
+            systemPrompt: agentConfig?.systemPrompt,
         });
         let assistantContent = "";
         let turnPromptTokens = 0;
@@ -121,7 +124,6 @@ export async function handleRunScheduledTask(req, res) {
         res.end(JSON.stringify({ success: false, error: friendlyError }));
     }
     finally {
-        // 执行完成（成功或失败）后立即关闭并移除该 AgentSession，避免空悬占用内存/连接等资源
-        agentManager.deleteSession(sessionId);
+        agentManager.deleteSession(sessionId + COMPOSITE_KEY_SEP + sessionAgentId);
     }
 }

package/dist/gateway/server.js

@@ -35,8 +35,16 @@ import multer from "multer";
 import { handleInstallSkillFromPath } from "./methods/install-skill-from-path.js";
 import { handleInstallSkillFromUpload } from "./methods/install-skill-from-upload.js";
 import { setBackendBaseUrl } from "./backend-url.js";
-import { ensureDesktopConfigInitialized } from "../core/config/desktop-config.js";
+import { ensureDesktopConfigInitialized, getChannelsConfigSync } from "../core/config/desktop-config.js";
 import { createNestAppEmbedded } from "../server/bootstrap.js";
+import { registerChannel, startAllChannels, stopAllChannels } from "./channel/registry.js";
+import { createFeishuChannel } from "./channel/adapters/feishu.js";
+import { createDingTalkChannel } from "./channel/adapters/dingtalk.js";
+import { createTelegramChannel } from "./channel/adapters/telegram.js";
+import { setChannelSessionPersistence } from "./channel/session-persistence.js";
+import { setSessionCurrentAgentResolver, setSessionCurrentAgentUpdater, setAgentListProvider, setCreateAgentProvider, } from "../core/session-current-agent.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));
 const PACKAGE_ROOT = join(__dirname, "..", "..");
 /** 内嵌到 Electron 时由主进程设置 OPENBOT_STATIC_DIR，指向打包后的 renderer/dist */
@@ -61,6 +69,27 @@ export async function startGatewayServer(port = 38080) {
     console.log(`Starting gateway server on port ${port}...`);
     setBackendBaseUrl(`http://localhost:${port}`);
     const { app: nestApp, express: nestExpress } = await createNestAppEmbedded();
+    try {
+        const agentsService = nestApp.get(AgentsService);
+        setChannelSessionPersistence(agentsService);
+        setSessionCurrentAgentResolver((sessionId) => agentsService.getSession(sessionId)?.agentId);
+        setSessionCurrentAgentUpdater((sessionId, agentId) => agentsService.updateSessionAgentId(sessionId, agentId));
+        const agentConfigService = nestApp.get(AgentConfigService);
+        setAgentListProvider(() => agentConfigService.listAgents().then((agents) => agents.map((a) => ({ id: a.id, name: a.name }))));
+        setCreateAgentProvider(async (params) => {
+            try {
+                const agent = await agentConfigService.createAgent(params);
+                return { id: agent.id, name: agent.name };
+            }
+            catch (e) {
+                const msg = e?.message ?? e?.response?.message ?? String(e);
+                return { error: msg };
+            }
+        });
+    }
+    catch (e) {
+        console.warn("[Gateway] Channel session persistence / session-agent bridge unavailable:", e);
+    }
     const gatewayExpress = express();
     gatewayExpress.get(PATHS.HEALTH, (_req, res) => {
         res.status(200).json({ status: "ok", timestamp: Date.now() });
@@ -178,8 +207,62 @@ export async function startGatewayServer(port = 38080) {
             resolve(p);
         });
     });
+    // 通道：根据配置注册并启动（飞书 WebSocket、钉钉 Stream 等）
+    const channelsConfig = getChannelsConfigSync();
+    const feishuCfg = channelsConfig.feishu;
+    if (feishuCfg?.enabled && feishuCfg.appId?.trim() && feishuCfg.appSecret?.trim()) {
+        try {
+            const feishuChannel = createFeishuChannel({
+                appId: feishuCfg.appId.trim(),
+                appSecret: feishuCfg.appSecret.trim(),
+                defaultAgentId: feishuCfg.defaultAgentId?.trim() || "default",
+            });
+            registerChannel(feishuChannel);
+        }
+        catch (e) {
+            console.warn("Feishu channel register failed:", e);
+        }
+    }
+    else if (feishuCfg?.enabled) {
+        console.warn("[Channel] Feishu is enabled but appId or appSecret is missing; skip. Check Settings → Channels.");
+    }
+    const dingtalkCfg = channelsConfig.dingtalk;
+    if (dingtalkCfg?.enabled && dingtalkCfg.clientId?.trim() && dingtalkCfg.clientSecret?.trim()) {
+        try {
+            const dingtalkChannel = createDingTalkChannel({
+                clientId: dingtalkCfg.clientId.trim(),
+                clientSecret: dingtalkCfg.clientSecret.trim(),
+                defaultAgentId: dingtalkCfg.defaultAgentId?.trim() || "default",
+            });
+            registerChannel(dingtalkChannel);
+        }
+        catch (e) {
+            console.warn("DingTalk channel register failed:", e);
+        }
+    }
+    else if (dingtalkCfg?.enabled) {
+        console.warn("[Channel] DingTalk is enabled but clientId or clientSecret is missing; skip. Check Settings → Channels.");
+    }
+    const telegramCfg = channelsConfig.telegram;
+    if (telegramCfg?.enabled && telegramCfg.botToken?.trim()) {
+        try {
+            const telegramChannel = createTelegramChannel({
+                botToken: telegramCfg.botToken.trim(),
+                defaultAgentId: telegramCfg.defaultAgentId?.trim() || "default",
+            });
+            registerChannel(telegramChannel);
+        }
+        catch (e) {
+            console.warn("Telegram channel register failed:", e);
+        }
+    }
+    else if (telegramCfg?.enabled) {
+        console.warn("[Channel] Telegram is enabled but botToken is missing; skip. Check Settings → Channels.");
+    }
+    await startAllChannels();
     const close = async () => {
         console.log("Closing gateway server...");
+        await stopAllChannels();
         await nestApp.close();
         wss.clients.forEach((c) => c.close());
         await new Promise((r) => wss.close(() => r()));

package/dist/server/agent-config/agent-config.controller.d.ts

@@ -16,11 +16,16 @@ export declare class AgentConfigController {
     createAgent(body: {
         name: string;
         workspace: string;
+        provider?: string;
+        model?: string;
+        modelItemCode?: string;
+        systemPrompt?: string;
+        icon?: string;
     }): Promise<{
         success: boolean;
         data: AgentConfigItem;
     }>;
-    updateAgent(id: string, body: Partial<Pick<AgentConfigItem, 'name' | 'provider' | 'model' | 'modelItemCode' | 'mcpServers'>>): Promise<{
+    updateAgent(id: string, body: Partial<Pick<AgentConfigItem, 'name' | 'provider' | 'model' | 'modelItemCode' | 'mcpServers' | 'systemPrompt' | 'icon'>>): Promise<{
         success: boolean;
         data: AgentConfigItem;
     }>;

package/dist/server/agent-config/agent-config.service.d.ts

@@ -17,6 +17,10 @@ export interface AgentConfigItem {
     isDefault?: boolean;
     /** MCP 服务器配置列表，创建 Session 时传入（与 Skill 类似） */
     mcpServers?: McpServerConfig[];
+    /** 自定义系统提示词，会与技能等一起组成最终 systemPrompt */
+    systemPrompt?: string;
+    /** 智能体图标标识（前端预设图标 id，如 default、star、code 等） */
+    icon?: string;
 }
 export declare class AgentConfigService {
     private configDir;
@@ -33,8 +37,15 @@ export declare class AgentConfigService {
     createAgent(params: {
         name: string;
         workspace: string;
+        provider?: string;
+        model?: string;
+        modelItemCode?: string;
+        /** 自定义系统提示词；可由用户描述生成，创建后可在详情页修改 */
+        systemPrompt?: string;
+        /** 智能体图标标识 */
+        icon?: string;
     }): Promise<AgentConfigItem>;
-    updateAgent(id: string, updates: Partial<Pick<AgentConfigItem, 'name' | 'provider' | 'model' | 'modelItemCode' | 'mcpServers'>>): Promise<AgentConfigItem>;
+    updateAgent(id: string, updates: Partial<Pick<AgentConfigItem, 'name' | 'provider' | 'model' | 'modelItemCode' | 'mcpServers' | 'systemPrompt' | 'icon'>>): Promise<AgentConfigItem>;
     deleteAgent(id: string): Promise<void>;
     /**
      * 根据 config 的 defaultProvider / defaultModel / defaultModelItemCode 及 configuredModels 同步 agents.json 中缺省智能体的 provider、model、modelItemCode。

package/dist/server/agent-config/agent-config.service.js

@@ -93,7 +93,7 @@ let AgentConfigService = class AgentConfigService {
         return null;
     }
     async createAgent(params) {
-        const { name, workspace } = params;
+        const { name, workspace, provider, model, modelItemCode, systemPrompt, icon } = params;
         if (workspace === DEFAULT_AGENT_ID) {
             throw new BadRequestException('工作空间名 default 为系统保留（主智能体），请使用其他名称');
         }
@@ -118,8 +118,11 @@ let AgentConfigService = class AgentConfigService {
             id: workspace,
             name: trimmedName,
             workspace,
-            provider: undefined,
-            model: undefined,
+            provider: provider?.trim() || undefined,
+            model: model?.trim() || undefined,
+            modelItemCode: modelItemCode?.trim() || undefined,
+            systemPrompt: systemPrompt?.trim() || undefined,
+            icon: icon?.trim() || undefined,
         };
         file.agents.push(agent);
         await this.writeAgentsFile(file);
@@ -152,6 +155,10 @@ let AgentConfigService = class AgentConfigService {
             agent.modelItemCode = updates.modelItemCode;
         if (updates.mcpServers !== undefined)
             agent.mcpServers = updates.mcpServers;
+        if (updates.systemPrompt !== undefined)
+            agent.systemPrompt = updates.systemPrompt?.trim() || undefined;
+        if (updates.icon !== undefined)
+            agent.icon = updates.icon?.trim() || undefined;
         await this.writeAgentsFile(file);
         return { ...agent, isDefault: agent.id === DEFAULT_AGENT_ID };
     }

package/dist/server/agents/agents.controller.d.ts

@@ -22,6 +22,12 @@ export declare class AgentsController {
         success: boolean;
         data: import("./agents.service.js").AgentSession;
     };
+    updateSession(id: string, body: {
+        agentId?: string;
+    }): {
+        success: boolean;
+        data: import("./agents.service.js").AgentSession | undefined;
+    };
     deleteSession(id: string): Promise<{
         success: boolean;
         message: string;
@@ -30,6 +36,10 @@ export declare class AgentsController {
         success: boolean;
         data: import("./agents.service.js").ChatMessage[];
     };
+    clearHistory(id: string): {
+        success: boolean;
+        message: string;
+    };
     appendMessage(id: string, body: {
         role: 'user' | 'assistant';
         content: string;

package/dist/server/agents/agents.controller.js

@@ -10,7 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-import { Controller, Get, Post, Delete, Body, Param, Header, HttpException, HttpStatus, } from '@nestjs/common';
+import { Controller, Delete, Get, Patch, Post, Body, Param, Header, HttpException, HttpStatus, } from '@nestjs/common';
 import { AgentsService } from './agents.service.js';
 let AgentsController = class AgentsController {
     agentsService;
@@ -46,6 +46,17 @@ let AgentsController = class AgentsController {
             data: session,
         };
     }
+    updateSession(id, body) {
+        const session = this.agentsService.getSession(id);
+        if (!session) {
+            throw new HttpException('Session not found', HttpStatus.NOT_FOUND);
+        }
+        if (body.agentId != null) {
+            this.agentsService.updateSessionAgentId(id, String(body.agentId));
+        }
+        const updated = this.agentsService.getSession(id);
+        return { success: true, data: updated };
+    }
     async deleteSession(id) {
         await this.agentsService.deleteSession(id);
         return {
@@ -60,6 +71,14 @@ let AgentsController = class AgentsController {
             data: history,
         };
     }
+    clearHistory(id) {
+        const session = this.agentsService.getSession(id);
+        if (!session) {
+            throw new HttpException('Session not found', HttpStatus.NOT_FOUND);
+        }
+        this.agentsService.clearSessionMessages(id);
+        return { success: true, message: 'Messages cleared' };
+    }
     appendMessage(id, body) {
         this.agentsService.appendMessage(id, body.role, body.content, {
             toolCalls: body.toolCalls,
@@ -89,6 +108,14 @@ __decorate([
     __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", void 0)
 ], AgentsController.prototype, "getSession", null);
+__decorate([
+    Patch('sessions/:id'),
+    __param(0, Param('id')),
+    __param(1, Body()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Object]),
+    __metadata("design:returntype", void 0)
+], AgentsController.prototype, "updateSession", null);
 __decorate([
     Delete('sessions/:id'),
     __param(0, Param('id')),
@@ -103,6 +130,13 @@ __decorate([
     __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", void 0)
 ], AgentsController.prototype, "getHistory", null);
+__decorate([
+    Delete('sessions/:id/messages'),
+    __param(0, Param('id')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", void 0)
+], AgentsController.prototype, "clearHistory", null);
 __decorate([
     Post('sessions/:id/messages'),
     __param(0, Param('id')),

package/dist/server/agents/agents.gateway.js

@@ -51,14 +51,28 @@ let AgentsGateway = class AgentsGateway {
             client.emit('agent_tool', data);
         });
         subscriptions.set('tool', unsubTool);
-        // Subscribe to message completion
+        // turn_end / agent_end：各通道均可收到，按自身逻辑处理（如 desktop 用 agent_end 开放输入）
+        const unsubTurnEnd = this.agentsService.addEventListener('turn_end', (data) => {
+            if (data.sessionId === sessionId)
+                client.emit('turn_end', data);
+        });
+        subscriptions.set('turn_end', unsubTurnEnd);
+        const unsubAgentEnd = this.agentsService.addEventListener('agent_end', (data) => {
+            if (data.sessionId === sessionId)
+                client.emit('agent_end', data);
+        });
+        subscriptions.set('agent_end', unsubAgentEnd);
+        // 兼容：message_complete（turn_end 语义）、conversation_end（agent_end 语义）
         const unsubComplete = this.agentsService.addEventListener('message_complete', (data) => {
-            // Ensure we only emit for the subscribed session
-            if (data.sessionId === sessionId) {
+            if (data.sessionId === sessionId)
                 client.emit('message_complete', data);
-            }
         });
         subscriptions.set('complete', unsubComplete);
+        const unsubConversationEnd = this.agentsService.addEventListener('conversation_end', (data) => {
+            if (data.sessionId === sessionId)
+                client.emit('conversation_end', data);
+        });
+        subscriptions.set('conversation_end', unsubConversationEnd);
         this.sessionSubscriptions.set(client.id, subscriptions);
         return { success: true };
     }

package/dist/server/agents/agents.service.d.ts

@@ -53,6 +53,8 @@ export declare class AgentsService {
     }): Promise<AgentSession>;
     getSessions(): AgentSession[];
     getSession(sessionId: string): AgentSession | undefined;
+    /** 更新会话的当前 agent（同一 session 内切换 agent 时调用） */
+    updateSessionAgentId(sessionId: string, agentId: string): void;
     deleteSession(sessionId: string): Promise<void>;
     getMessageHistory(sessionId: string): ChatMessage[];
     addAssistantMessage(sessionId: string, content: string): void;
@@ -60,4 +62,6 @@ export declare class AgentsService {
         toolCalls?: any[];
         contentParts?: any[];
     }): void;
+    /** 清除会话的所有对话消息（保留会话本身，message_count 置 0） */
+    clearSessionMessages(sessionId: string): void;
 }

package/dist/server/agents/agents.service.js

@@ -134,12 +134,19 @@ let AgentsService = class AgentsService {
         const r = this.db.get('SELECT * FROM sessions WHERE id = ?', [sessionId]);
         return r ? this.rowToSession(r) : undefined;
     }
+    /** 更新会话的当前 agent（同一 session 内切换 agent 时调用） */
+    updateSessionAgentId(sessionId, agentId) {
+        const session = this.getSession(sessionId);
+        if (!session)
+            return;
+        this.db.run('UPDATE sessions SET agent_id = ? WHERE id = ?', [agentId, sessionId]);
+    }
     async deleteSession(sessionId) {
         const result = this.db.run('DELETE FROM sessions WHERE id = ?', [sessionId]);
         if (result.changes > 0) {
             this.db.persist();
         }
-        agentManager.deleteSession(sessionId);
+        agentManager.deleteSessionsByBusinessId(sessionId);
     }
     getMessageHistory(sessionId) {
         const rows = this.db.all('SELECT * FROM chat_messages WHERE session_id = ? ORDER BY timestamp ASC', [sessionId]);
@@ -161,6 +168,15 @@ let AgentsService = class AgentsService {
         this.db.run(`INSERT INTO chat_messages (id, session_id, role, content, timestamp, tool_calls_json) VALUES (?, ?, ?, ?, ?, ?)`, [id, sessionId, role, content, now, toolCallsJson]);
         this.db.run('UPDATE sessions SET last_active_at = ?, status = ?, message_count = message_count + 1 WHERE id = ?', [now, role === 'assistant' ? 'idle' : session.status, sessionId]);
     }
+    /** 清除会话的所有对话消息（保留会话本身，message_count 置 0） */
+    clearSessionMessages(sessionId) {
+        const session = this.getSession(sessionId);
+        if (!session)
+            return;
+        this.db.run('DELETE FROM chat_messages WHERE session_id = ?', [sessionId]);
+        this.db.run('UPDATE sessions SET message_count = 0 WHERE id = ?', [sessionId]);
+        this.db.persist();
+    }
 };
 AgentsService = __decorate([
     Injectable(),

package/dist/server/config/config.controller.d.ts

@@ -26,6 +26,7 @@ export declare class ConfigController {
                 embeddingProvider?: string;
                 embeddingModel?: string;
             };
+            channels?: import("../../core/config/desktop-config.js").ChannelsConfig;
         };
     }>;
     updateConfig(updates: Partial<AppConfig>): Promise<{
@@ -52,6 +53,7 @@ export declare class ConfigController {
                 embeddingProvider?: string;
                 embeddingModel?: string;
             };
+            channels?: import("../../core/config/desktop-config.js").ChannelsConfig;
         };
     }>;
     getProviders(): Promise<{

package/dist/server/config/config.service.d.ts

@@ -1,3 +1,4 @@
+import { type ChannelsConfig } from '../../core/config/desktop-config.js';
 import { AgentConfigService } from '../agent-config/agent-config.service.js';
 /** 模型 cost 配置，写入 models.json；缺省均为 0 */
 export interface ModelCost {
@@ -55,6 +56,8 @@ export interface AppConfig {
         embeddingProvider?: string;
         embeddingModel?: string;
     };
+    /** 通道配置：飞书、Telegram 等 token/key */
+    channels?: ChannelsConfig;
 }
 export declare class ConfigService {
     private readonly agentConfigService;

package/dist/server/config/config.service.js

@@ -11,6 +11,7 @@ import { Injectable } from '@nestjs/common';
 import { readFile, writeFile, mkdir } from 'fs/promises';
 import { join } from 'path';
 import { existsSync } from 'fs';
+import { homedir } from 'os';
 import { getProviderSupport, syncDesktopConfigToModelsJson } from '../../core/config/desktop-config.js';
 import { AgentConfigService } from '../agent-config/agent-config.service.js';
 let ConfigService = class ConfigService {
@@ -19,7 +20,7 @@ let ConfigService = class ConfigService {
     config;
     constructor(agentConfigService) {
         this.agentConfigService = agentConfigService;
-        const homeDir = process.env.HOME || process.env.USERPROFILE || '';
+        const homeDir = process.env.HOME || process.env.USERPROFILE || homedir();
         const configDir = join(homeDir, '.openbot', 'desktop');
         this.configPath = join(configDir, 'config.json');
         // Ensure config directory exists
@@ -40,6 +41,7 @@ let ConfigService = class ConfigService {
             providers: {},
             configuredModels: [],
             rag: undefined,
+            channels: {},
         };
     }
     /** 当前缺省智能体 id */

package/dist/server/saved-items/saved-items.controller.d.ts

@@ -1,11 +1,17 @@
+import type { Response } from 'express';
 import { SavedItemsService } from './saved-items.service.js';
+import { WorkspaceService } from '../workspace/workspace.service.js';
+import { ConfigService } from '../config/config.service.js';
 export declare class SavedItemsController {
     private readonly savedItemsService;
-    constructor(savedItemsService: SavedItemsService);
+    private readonly workspaceService;
+    private readonly configService;
+    constructor(savedItemsService: SavedItemsService, workspaceService: WorkspaceService, configService: ConfigService);
     list(tagId?: string, workspace?: string): Promise<{
         success: boolean;
         data: import("./saved-items.service.js").SavedItem[];
     }>;
+    imageProxy(url: string, res: Response): Promise<void>;
     get(id: string): Promise<{
         success: boolean;
         data: import("./saved-items.service.js").SavedItem;
@@ -23,4 +29,29 @@ export declare class SavedItemsController {
     delete(id: string): Promise<{
         success: boolean;
     }>;
+    /**
+     * Download the saved item URL to workspace .favorite or to a user-chosen directory.
+     * Body: { workspace?: string, targetDir?: string }.
+     * If targetDir (absolute path) is provided, file is written there; otherwise to workspace/.favorite.
+     */
+    downloadToWorkspace(id: string, body: {
+        workspace?: string;
+        targetDir?: string;
+    }): Promise<{
+        success: boolean;
+        data: {
+            absolutePath: string;
+            targetDir: string;
+            relativePath?: undefined;
+            workspace?: undefined;
+        };
+    } | {
+        success: boolean;
+        data: {
+            relativePath: string;
+            workspace: string;
+            absolutePath?: undefined;
+            targetDir?: undefined;
+        };
+    }>;
 }