@next-open-ai/openclawx 0.8.48 → 0.8.58

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

@@ -7,14 +7,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var ConfigService_1;
 import { Injectable } from '@nestjs/common';
 import { readFile, writeFile, mkdir } from 'fs/promises';
-import { join } from 'path';
+import { join, dirname } 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 {
+    static { ConfigService_1 = this; }
     agentConfigService;
     configPath;
     config;
@@ -30,16 +32,30 @@ let ConfigService = class ConfigService {
         this.config = this.getDefaultConfig();
         this.loadConfig();
     }
+    /** 预装本地推理缺省：与 desktop-config 的 DEFAULT_LOCAL_LLM_MODEL_ID / DEFAULT_LOCAL_MODEL_ITEM_CODE 一致 */
+    static DEFAULT_LOCAL_MODEL_ID = 'hf_Qwen_Qwen3-4B-GGUF_Qwen3-4B-Q4_K_M.gguf';
+    static DEFAULT_LOCAL_MODEL_ITEM_CODE = 'local-qwen3-4b';
     getDefaultConfig() {
         return {
             gatewayUrl: 'ws://localhost:38080',
-            defaultProvider: 'deepseek',
-            defaultModel: 'deepseek-chat',
+            defaultProvider: 'local',
+            defaultModel: ConfigService_1.DEFAULT_LOCAL_MODEL_ID,
+            defaultModelItemCode: ConfigService_1.DEFAULT_LOCAL_MODEL_ITEM_CODE,
             defaultAgentId: 'default',
             theme: 'dark',
             maxAgentSessions: 5,
-            providers: {},
-            configuredModels: [],
+            providers: {
+                local: { baseUrl: 'http://127.0.0.1:11435/v1' },
+            },
+            configuredModels: [
+                {
+                    provider: 'local',
+                    modelId: ConfigService_1.DEFAULT_LOCAL_MODEL_ID,
+                    modelItemCode: ConfigService_1.DEFAULT_LOCAL_MODEL_ITEM_CODE,
+                    type: 'llm',
+                    alias: 'Qwen3 4B Q4_K_M',
+                },
+            ],
             rag: undefined,
             memory: {},
             channels: {},
@@ -54,18 +70,54 @@ let ConfigService = class ConfigService {
         try {
             if (existsSync(this.configPath)) {
                 const content = await readFile(this.configPath, 'utf-8');
-                this.config = { ...this.getDefaultConfig(), ...JSON.parse(content) };
+                const parsed = JSON.parse(content);
+                this.config = { ...this.getDefaultConfig(), ...parsed };
                 this.config.defaultAgentId = this.getDefaultAgentId(this.config);
+                // 保证 local 与缺省本地模型始终存在，避免旧配置或空配置覆盖产品默认
+                const def = this.getDefaultConfig();
+                if (!this.config.providers?.local) {
+                    this.config.providers = { ...(this.config.providers || {}), local: def.providers.local };
+                }
+                if (!(this.config.configuredModels || []).some((m) => m.provider === 'local')) {
+                    this.config.configuredModels = [...(def.configuredModels || []), ...(this.config.configuredModels || [])];
+                }
+            }
+            else {
+                this.config = this.getDefaultConfig();
+                await this.saveConfig();
             }
         }
         catch (error) {
             console.error('Error loading config:', error);
         }
     }
-    /** 每次获取前从磁盘重新读取，保证打开配置界面时显示最新（含 CLI 写入的配置） */
+    /** 每次获取前从磁盘重新读取，保证打开配置界面时显示最新（含 CLI 写入的配置）。本地 LLM 可用时注入 local 与缺省模型项，供所有智能体使用。 */
     async getConfig() {
         await this.loadConfig();
-        return this.config;
+        const baseUrl = process.env.LOCAL_LLM_BASE_URL?.trim();
+        if (!baseUrl)
+            return this.config;
+        const out = { ...this.config };
+        out.providers = { ...(this.config.providers || {}) };
+        if (!out.providers['local']) {
+            out.providers['local'] = { baseUrl: baseUrl || 'http://127.0.0.1:11435/v1' };
+        }
+        else if (!out.providers['local'].baseUrl?.trim()) {
+            out.providers['local'] = { ...out.providers['local'], baseUrl: baseUrl || 'http://127.0.0.1:11435/v1' };
+        }
+        const list = [...(out.configuredModels || [])];
+        const hasLocal = list.some((m) => m.provider === 'local' && m.modelId === 'local-llm');
+        if (!hasLocal) {
+            list.push({
+                provider: 'local',
+                modelId: 'local-llm',
+                modelItemCode: 'local-llm',
+                type: 'llm',
+                alias: '本地 LLM（当前加载）',
+            });
+            out.configuredModels = list;
+        }
+        return out;
     }
     async updateConfig(updates) {
         this.config = { ...this.config, ...updates };
@@ -85,6 +137,7 @@ let ConfigService = class ConfigService {
     }
     async saveConfig() {
         try {
+            await mkdir(dirname(this.configPath), { recursive: true });
             await writeFile(this.configPath, JSON.stringify(this.config, null, 2));
         }
         catch (error) {
@@ -119,7 +172,7 @@ let ConfigService = class ConfigService {
         return getProviderSupport();
     }
 };
-ConfigService = __decorate([
+ConfigService = ConfigService_1 = __decorate([
     Injectable(),
     __metadata("design:paramtypes", [AgentConfigService])
 ], ConfigService);

package/dist/server/config/local-models.service.d.ts

@@ -39,13 +39,28 @@ export declare class LocalModelsService {
     getRecommendedToDownload(): Promise<RecommendedModel[]>;
     /** 检查指定模型（uri 或文件名）是否已在缓存目录存在 */
     isModelFilePresent(modelIdOrUri: string): boolean;
+    /** 正在下载任务的 AbortController，用于取消 */
+    private abortControllerMap;
     /** 获取某个 modelUri 的下载进度（不存在则表示未在下载） */
     getDownloadProgress(modelUri: string): DownloadProgress | null;
+    /**
+     * 取消指定 modelUri 的下载（若正在下载）。
+     */
+    cancelDownload(modelUri: string): void;
+    /**
+     * 返回所有推荐模型及是否已安装，用于前端展示「已下载」或下载按钮。
+     */
+    getRecommendedWithStatus(): Promise<Array<RecommendedModel & {
+        isInstalled: boolean;
+    }>>;
     /**
      * 后台下载模型（通过 node-llama-cpp resolveModelFile）。
+     * useMirror=true 使用国内镜像 hf-mirror.com，false 使用官方 huggingface.co。
      * 返回后立即响应，进度通过 getDownloadProgress 轮询获取。
      */
-    startDownload(modelUri: string): Promise<{
+    startDownload(modelUri: string, options?: {
+        useMirror?: boolean;
+    }): Promise<{
         filename: string;
     }>;
     private runDownload;

package/dist/server/config/local-models.service.js

@@ -11,14 +11,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
  * 本地 GGUF 模型管理服务。
  * 负责列出、下载（通过 node-llama-cpp resolveModelFile）、删除本地缓存的 GGUF 模型文件。
  * 推荐列表从 presets/recommended-local-models.json 加载，已安装的与推荐使用同一套展示名称且已安装的不再出现在「备下载」列表。
- * 模型缓存目录：~/.cache/llama
+ * 模型缓存目录：~/.openbot/.cached_models/
  */
 import { Injectable } from '@nestjs/common';
 import { readdir, stat, unlink, readFile } from 'node:fs/promises';
 import { join, basename } from 'node:path';
-import { homedir } from 'node:os';
 import { existsSync, mkdirSync } from 'node:fs';
-import { modelUriToFilename, modelUriBasename } from '../../core/local-llm-server/model-resolve.js';
+import { modelUriToFilename, modelUriBasename, LOCAL_LLM_CACHE_DIR } from '../../core/local-llm-server/model-resolve.js';
 /** 根据文件名推断模型类型 */
 function inferModelType(filename) {
     const lower = filename.toLowerCase();
@@ -64,7 +63,7 @@ let LocalModelsService = class LocalModelsService {
     /** 正在下载的任务：modelUri → 进度 */
     downloadingMap = new Map();
     constructor() {
-        this.cacheDir = join(homedir(), '.cache', 'llama');
+        this.cacheDir = LOCAL_LLM_CACHE_DIR;
         if (!existsSync(this.cacheDir)) {
             mkdirSync(this.cacheDir, { recursive: true });
         }
@@ -144,64 +143,97 @@ let LocalModelsService = class LocalModelsService {
             return false;
         return existsSync(join(this.cacheDir, filename));
     }
+    /** 正在下载任务的 AbortController，用于取消 */
+    abortControllerMap = new Map();
     /** 获取某个 modelUri 的下载进度（不存在则表示未在下载） */
     getDownloadProgress(modelUri) {
         return this.downloadingMap.get(modelUri) ?? null;
     }
+    /**
+     * 取消指定 modelUri 的下载（若正在下载）。
+     */
+    cancelDownload(modelUri) {
+        const controller = this.abortControllerMap.get(modelUri);
+        if (controller) {
+            controller.abort();
+            this.downloadingMap.set(modelUri, { status: '已取消' });
+            this.abortControllerMap.delete(modelUri);
+            setTimeout(() => this.downloadingMap.delete(modelUri), 3000);
+        }
+    }
+    /**
+     * 返回所有推荐模型及是否已安装，用于前端展示「已下载」或下载按钮。
+     */
+    async getRecommendedWithStatus() {
+        const [recommended, installed] = await Promise.all([
+            this.getRecommendedModelsFromPreset(),
+            this.listModels(),
+        ]);
+        const installedFilenames = new Set(installed.map((m) => m.filename));
+        return recommended.map((rec) => ({
+            ...rec,
+            isInstalled: recommendedMatchesInstalled(rec, installedFilenames),
+        }));
+    }
     /**
      * 后台下载模型（通过 node-llama-cpp resolveModelFile）。
+     * useMirror=true 使用国内镜像 hf-mirror.com，false 使用官方 huggingface.co。
      * 返回后立即响应，进度通过 getDownloadProgress 轮询获取。
      */
-    async startDownload(modelUri) {
+    async startDownload(modelUri, options) {
         if (this.downloadingMap.has(modelUri)) {
-            // 已在下载中，返回预期文件名
             return { filename: modelUriToFilename(modelUri) };
         }
+        const controller = new AbortController();
+        this.abortControllerMap.set(modelUri, controller);
         this.downloadingMap.set(modelUri, { status: '准备下载...' });
-        // 后台异步执行，不 await
-        this.runDownload(modelUri).catch((e) => {
-            this.downloadingMap.set(modelUri, { status: `下载失败: ${e?.message ?? e}` });
+        this.runDownload(modelUri, controller.signal, options?.useMirror === true).catch((e) => {
+            if (e?.name === 'AbortError' || (typeof e?.message === 'string' && e.message.includes('abort'))) {
+                this.downloadingMap.set(modelUri, { status: '已取消' });
+            }
+            else {
+                const msg = e instanceof Error ? e.message : String(e);
+                let errorMsg = `失败: ${msg}`;
+                if (msg.includes('401') || msg.includes('Unauthorized')) {
+                    errorMsg = '下载失败: 需要 Hugging Face Token。请设置环境变量 HF_TOKEN 或 HUGGING_FACE_TOKEN';
+                }
+                this.downloadingMap.set(modelUri, { status: errorMsg });
+            }
+            this.abortControllerMap.delete(modelUri);
+            setTimeout(() => this.downloadingMap.delete(modelUri), 5000);
         });
         return { filename: modelUriToFilename(modelUri) };
     }
-    async runDownload(modelUri) {
-        try {
-            const { resolveModelFile } = await import('node-llama-cpp');
-            this.downloadingMap.set(modelUri, { status: '解析模型地址...' });
-            // 从环境变量读取 Hugging Face token（可选）
-            const hfToken = process.env.HF_TOKEN || process.env.HUGGING_FACE_TOKEN;
-            const options = {
-                directory: this.cacheDir,
-                onProgress: ({ downloadedSize, totalSize }) => {
-                    const percent = totalSize ? Math.round((downloadedSize / totalSize) * 100) : 0;
-                    this.downloadingMap.set(modelUri, {
-                        status: '下载中',
-                        completed: downloadedSize,
-                        total: totalSize,
-                        percent,
-                    });
-                },
-            };
-            // 如果有 token，添加到请求头
-            if (hfToken) {
-                options.headers = { Authorization: `Bearer ${hfToken}` };
-            }
-            const resolved = await resolveModelFile(modelUri, options);
-            const filename = basename(resolved);
-            this.downloadingMap.set(modelUri, { status: `完成: ${filename}`, percent: 100 });
-            // 5 秒后清除进度记录
-            setTimeout(() => this.downloadingMap.delete(modelUri), 5000);
-        }
-        catch (e) {
-            const msg = e instanceof Error ? e.message : String(e);
-            let errorMsg = `失败: ${msg}`;
-            // 如果是 401 错误，提供更友好的提示
-            if (msg.includes('401') || msg.includes('Unauthorized')) {
-                errorMsg = '下载失败: 需要 Hugging Face Token。请设置环境变量 HF_TOKEN 或 HUGGING_FACE_TOKEN';
-            }
-            this.downloadingMap.set(modelUri, { status: errorMsg });
-            throw e;
+    async runDownload(modelUri, signal, useMirror) {
+        const { resolveModelFile } = await import('node-llama-cpp');
+        this.downloadingMap.set(modelUri, { status: '解析模型地址...' });
+        const hfToken = process.env.HF_TOKEN || process.env.HUGGING_FACE_TOKEN;
+        const options = {
+            directory: this.cacheDir,
+            onProgress: ({ downloadedSize, totalSize }) => {
+                if (signal?.aborted)
+                    return;
+                const percent = totalSize ? Math.round((downloadedSize / totalSize) * 100) : 0;
+                this.downloadingMap.set(modelUri, {
+                    status: '下载中',
+                    completed: downloadedSize,
+                    total: totalSize,
+                    percent,
+                });
+            },
+            signal,
+            endpoints: {
+                huggingFace: useMirror ? 'https://hf-mirror.com/' : 'https://huggingface.co/',
+            },
+        };
+        if (hfToken) {
+            options.headers = { Authorization: `Bearer ${hfToken}` };
         }
+        const resolved = await resolveModelFile(modelUri, options);
+        const filename = basename(resolved);
+        this.downloadingMap.set(modelUri, { status: `完成: ${filename}`, percent: 100 });
+        this.abortControllerMap.delete(modelUri);
+        setTimeout(() => this.downloadingMap.delete(modelUri), 5000);
     }
 };
 LocalModelsService = __decorate([

package/package.json

@@ -3,7 +3,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.8.48",
+    "version": "0.8.58",
     "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",

package/presets/preset-agents.json

@@ -68,7 +68,7 @@
       "useLongMemory": true,
       "mcpServers": {
         "akshare-tools": {
-          "command": "npx",
+          "command": "uvx",
           "args": ["-y", "akshare-tools"],
           "env": {}
         }
@@ -107,7 +107,11 @@
         "影刀 RPA MCP Server": {
           "command": "npx",
           "args": ["-y", "yingdao-mcp-server"],
-          "env": {}
+          "env": {
+            "RPA_MODEL": "qwen3-4b-q4_k_m",
+            "SHADOWBOT_PATH": "/Applications/影刀.app",
+            "USER_FOLDER": "/Users/ctrip/Library/Application Support/Shadowbot/users/718771925823332354"
+      }
         }
       }
     },

package/presets/preset-config.json

@@ -1,11 +1,29 @@
 {
     "presetVersion": "1.0",
     "config": {
-        "defaultProvider": "deepseek",
-        "defaultModel": "deepseek-chat",
+        "defaultProvider": "local",
+        "defaultModel": "hf_Qwen_Qwen3-4B-GGUF_Qwen3-4B-Q4_K_M.gguf",
+        "defaultModelItemCode": "local-qwen3-4b",
         "defaultAgentId": "default",
-        "maxAgentSessions": 50,
-        "providers": {},
-        "configuredModels": []
+        "maxAgentSessions": 5,
+        "providers": {
+            "local": { "baseUrl": "http://127.0.0.1:11435/v1" }
+        },
+        "configuredModels": [
+            {
+                "provider": "local",
+                "modelId": "hf_Qwen_Qwen3-4B-GGUF_Qwen3-4B-Q4_K_M.gguf",
+                "type": "llm",
+                "alias": "Qwen3 4B Q4_K_M",
+                "modelItemCode": "local-qwen3-4b"
+            },
+            {
+                "provider": "local",
+                "modelId": "hf_ggml-org_embeddinggemma-300M-GGUF_embeddinggemma-300M-Q8_0.gguf",
+                "type": "embedding",
+                "alias": "EmbeddingGemma 300M Q8 (768维)",
+                "modelItemCode": "local-embeddinggemma-300m"
+            }
+        ]
     }
-}
+}