@next-open-ai/openbot 0.1.6 → 0.1.8

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

@@ -10,6 +10,8 @@ export interface AgentConfigItem {
     workspace: string;
     provider?: string;
     model?: string;
+    /** 匹配 config.configuredModels 中的 modelItemCode，优先于 provider/model */
+    modelItemCode?: string;
     /** 是否为系统缺省智能体（主智能体），不可删除 */
     isDefault?: boolean;
 }
@@ -29,6 +31,20 @@ export declare class AgentConfigService {
         name: string;
         workspace: string;
     }): Promise<AgentConfigItem>;
-    updateAgent(id: string, updates: Partial<Pick<AgentConfigItem, 'name' | 'provider' | 'model'>>): Promise<AgentConfigItem>;
+    updateAgent(id: string, updates: Partial<Pick<AgentConfigItem, 'name' | 'provider' | 'model' | 'modelItemCode'>>): Promise<AgentConfigItem>;
     deleteAgent(id: string): Promise<void>;
+    /**
+     * 根据 config 的 defaultProvider / defaultModel / defaultModelItemCode 及 configuredModels 同步 agents.json 中缺省智能体的 provider、model、modelItemCode。
+     * 在桌面保存配置（如修改默认模型）后调用，保证 agents 与 config 一致。
+     */
+    syncDefaultAgentFromConfig(config: {
+        defaultProvider?: string;
+        defaultModel?: string;
+        defaultModelItemCode?: string;
+        configuredModels?: Array<{
+            provider: string;
+            modelId: string;
+            modelItemCode?: string;
+        }>;
+    }): Promise<void>;
 }

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

@@ -148,6 +148,8 @@ let AgentConfigService = class AgentConfigService {
             agent.provider = updates.provider;
         if (updates.model !== undefined)
             agent.model = updates.model;
+        if (updates.modelItemCode !== undefined)
+            agent.modelItemCode = updates.modelItemCode;
         await this.writeAgentsFile(file);
         return { ...agent, isDefault: agent.id === DEFAULT_AGENT_ID };
     }
@@ -163,6 +165,44 @@ let AgentConfigService = class AgentConfigService {
         file.agents.splice(idx, 1);
         await this.writeAgentsFile(file);
     }
+    /**
+     * 根据 config 的 defaultProvider / defaultModel / defaultModelItemCode 及 configuredModels 同步 agents.json 中缺省智能体的 provider、model、modelItemCode。
+     * 在桌面保存配置（如修改默认模型）后调用，保证 agents 与 config 一致。
+     */
+    async syncDefaultAgentFromConfig(config) {
+        const list = config.configuredModels ?? [];
+        let provider = config.defaultProvider?.trim();
+        let model = config.defaultModel?.trim();
+        let modelItemCode = config.defaultModelItemCode?.trim();
+        if (modelItemCode && list.length) {
+            const item = list.find((m) => m.modelItemCode === modelItemCode);
+            if (item) {
+                provider = item.provider;
+                model = item.modelId;
+            }
+        }
+        if (!provider || !model)
+            return;
+        if (!modelItemCode && list.length) {
+            const item = list.find((m) => m.provider === provider && m.modelId === model);
+            if (item?.modelItemCode)
+                modelItemCode = item.modelItemCode;
+        }
+        await this.ensureDefaultWorkspace();
+        const file = await this.readAgentsFile();
+        let idx = file.agents.findIndex((a) => a.id === DEFAULT_AGENT_ID);
+        if (idx < 0) {
+            file.agents.unshift(this.defaultAgent({ provider, model, modelItemCode }));
+            idx = 0;
+        }
+        else {
+            const agent = file.agents[idx];
+            agent.provider = provider;
+            agent.model = model;
+            agent.modelItemCode = modelItemCode;
+        }
+        await this.writeAgentsFile(file);
+    }
 };
 AgentConfigService = __decorate([
     Injectable(),

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

@@ -9,6 +9,7 @@ export declare class ConfigController {
             gatewayUrl: string;
             defaultProvider: string;
             defaultModel: string;
+            defaultModelItemCode?: string;
             defaultAgentId?: string;
             theme: "light" | "dark";
             maxAgentSessions?: number;
@@ -21,6 +22,10 @@ export declare class ConfigController {
                 };
             };
             configuredModels?: import("./config.service.js").ConfiguredModelItem[];
+            rag?: {
+                embeddingProvider?: string;
+                embeddingModel?: string;
+            };
         };
     }>;
     updateConfig(updates: Partial<AppConfig>): Promise<{
@@ -30,6 +35,7 @@ export declare class ConfigController {
             gatewayUrl: string;
             defaultProvider: string;
             defaultModel: string;
+            defaultModelItemCode?: string;
             defaultAgentId?: string;
             theme: "light" | "dark";
             maxAgentSessions?: number;
@@ -42,6 +48,10 @@ export declare class ConfigController {
                 };
             };
             configuredModels?: import("./config.service.js").ConfiguredModelItem[];
+            rag?: {
+                embeddingProvider?: string;
+                embeddingModel?: string;
+            };
         };
     }>;
     getProviders(): Promise<{

package/dist/server/config/config.module.js

@@ -7,10 +7,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { Module } from '@nestjs/common';
 import { ConfigController } from './config.controller.js';
 import { ConfigService } from './config.service.js';
+import { AgentConfigModule } from '../agent-config/agent-config.module.js';
 let ConfigModule = class ConfigModule {
 };
 ConfigModule = __decorate([
     Module({
+        imports: [AgentConfigModule],
         controllers: [ConfigController],
         providers: [ConfigService],
         exports: [ConfigService],

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

@@ -1,3 +1,4 @@
+import { AgentConfigService } from '../agent-config/agent-config.service.js';
 /** 模型 cost 配置，写入 models.json；缺省均为 0 */
 export interface ModelCost {
     input?: number;
@@ -13,6 +14,8 @@ export interface ConfiguredModelItem {
     type: 'llm' | 'embedding' | 'image';
     /** 显示用别名，缺省用模型名；重名时自动加后缀区分 */
     alias?: string;
+    /** 唯一编码，供界面与 agent.modelItemCode 匹配已设好的模型 */
+    modelItemCode?: string;
     /** 是否推理模型，缺省 false；写入 models.json */
     reasoning?: boolean;
     /** 成本配置，缺省均为 0；写入 models.json */
@@ -26,6 +29,8 @@ export interface AppConfig {
     gatewayUrl: string;
     defaultProvider: string;
     defaultModel: string;
+    /** 缺省模型在 configuredModels 中的唯一标识（defaultModelItemCode），与 defaultProvider/defaultModel 一起确定缺省模型 */
+    defaultModelItemCode?: string;
     /** 缺省智能体 id */
     defaultAgentId?: string;
     theme: 'light' | 'dark';
@@ -45,15 +50,22 @@ export interface AppConfig {
     };
     /** 已配置的模型列表（备用），从该列表中选一个为缺省模型 */
     configuredModels?: ConfiguredModelItem[];
+    /** RAG 知识库：embedding 使用该 provider+model，未配置时基于 RAG 的长记忆空转 */
+    rag?: {
+        embeddingProvider?: string;
+        embeddingModel?: string;
+    };
 }
 export declare class ConfigService {
+    private readonly agentConfigService;
     private configPath;
     private config;
-    constructor();
+    constructor(agentConfigService: AgentConfigService);
     private getDefaultConfig;
     /** 当前缺省智能体 id */
     getDefaultAgentId(config?: AppConfig): string;
     private loadConfig;
+    /** 每次获取前从磁盘重新读取，保证打开配置界面时显示最新（含 CLI 写入的配置） */
     getConfig(): Promise<AppConfig>;
     updateConfig(updates: Partial<AppConfig>): Promise<AppConfig>;
     private saveConfig;

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

@@ -12,10 +12,13 @@ import { readFile, writeFile, mkdir } from 'fs/promises';
 import { join } from 'path';
 import { existsSync } from 'fs';
 import { getProviderSupport, syncDesktopConfigToModelsJson } from '../../config/desktop-config.js';
+import { AgentConfigService } from '../agent-config/agent-config.service.js';
 let ConfigService = class ConfigService {
+    agentConfigService;
     configPath;
     config;
-    constructor() {
+    constructor(agentConfigService) {
+        this.agentConfigService = agentConfigService;
         const homeDir = process.env.HOME || process.env.USERPROFILE || '';
         const configDir = join(homeDir, '.openbot', 'desktop');
         this.configPath = join(configDir, 'config.json');
@@ -36,6 +39,7 @@ let ConfigService = class ConfigService {
             maxAgentSessions: 5,
             providers: {},
             configuredModels: [],
+            rag: undefined,
         };
     }
     /** 当前缺省智能体 id */
@@ -55,13 +59,24 @@ let ConfigService = class ConfigService {
             console.error('Error loading config:', error);
         }
     }
+    /** 每次获取前从磁盘重新读取，保证打开配置界面时显示最新（含 CLI 写入的配置） */
     async getConfig() {
+        await this.loadConfig();
         return this.config;
     }
     async updateConfig(updates) {
         this.config = { ...this.config, ...updates };
         this.config.defaultAgentId = this.getDefaultAgentId(this.config);
+        const p = this.config.defaultProvider;
+        const m = this.config.defaultModel;
+        const list = this.config.configuredModels ?? [];
+        if (p && m && list.length) {
+            const item = list.find((x) => x.provider === p && x.modelId === m);
+            if (item?.modelItemCode)
+                this.config.defaultModelItemCode = item.modelItemCode;
+        }
         await this.saveConfig();
+        await this.agentConfigService.syncDefaultAgentFromConfig(this.config).catch((err) => console.warn('[ConfigService] syncDefaultAgentFromConfig failed', err));
         await syncDesktopConfigToModelsJson().catch((err) => console.warn('[ConfigService] syncDesktopConfigToModelsJson failed', err));
         return this.config;
     }
@@ -103,6 +118,6 @@ let ConfigService = class ConfigService {
 };
 ConfigService = __decorate([
     Injectable(),
-    __metadata("design:paramtypes", [])
+    __metadata("design:paramtypes", [AgentConfigService])
 ], ConfigService);
 export { ConfigService };

package/package.json

@@ -3,7 +3,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.1.6",
+    "version": "0.1.8",
     "description": "CLI and library to run prompts with skill paths (Agent Skills style). Use as npm package or openbot CLI.",
     "type": "module",
     "main": "dist/index.js",
@@ -35,7 +35,6 @@
         "@nestjs/platform-socket.io": "^10.3.0",
         "@nestjs/websockets": "^10.3.0",
         "@sinclair/typebox": "^0.34.41",
-        "@xenova/transformers": "^2.17.2",
         "agent-browser": "^0.8.5",
         "commander": "^14.0.2",
         "reflect-metadata": "^0.2.1",