@greatlhd/ailo-desktop 1.0.0 → 1.0.1

package/dist/cli.js

@@ -1,12 +1,26 @@
 /**
  * CLI init command for ailo-desktop.
- * Usage: ailo-desktop init [--defaults]
+ * Usage: ailo-desktop init [--defaults] [--config-dir <path>]
  */
 import { createInterface } from "readline";
-import { join } from "path";
+import { join, resolve } from "path";
+import { mkdirSync } from "fs";
 import { writeConfig } from "@greatlhd/ailo-endpoint-sdk";
 import { CONFIG_FILENAME } from "./constants.js";
-const CONFIG_PATH = join(process.cwd(), CONFIG_FILENAME);
+function parseCliArgs() {
+    const args = process.argv.slice(2);
+    let useDefaults = false;
+    let configDir = process.cwd();
+    for (let i = 0; i < args.length; i++) {
+        if (args[i] === "--defaults") {
+            useDefaults = true;
+        }
+        else if ((args[i] === "--config-dir" || args[i] === "-c") && args[i + 1]) {
+            configDir = resolve(args[++i]);
+        }
+    }
+    return { useDefaults, configDir };
+}
 async function prompt(question, defaultVal = "") {
     const rl = createInterface({ input: process.stdin, output: process.stdout });
     return new Promise((resolve) => {
@@ -17,8 +31,14 @@ async function prompt(question, defaultVal = "") {
         });
     });
 }
-export async function runInit(useDefaults = false) {
+export async function runInit(useDefaultsArg, configDirArg) {
+    const { useDefaults, configDir } = useDefaultsArg !== undefined && configDirArg !== undefined
+        ? { useDefaults: useDefaultsArg, configDir: configDirArg }
+        : parseCliArgs();
     console.log("=== Ailo Desktop 初始化 ===\n");
+    console.log(`配置目录: ${configDir}\n`);
+    mkdirSync(configDir, { recursive: true });
+    const configPath = join(configDir, CONFIG_FILENAME);
     const wsUrl = useDefaults ? "ws://127.0.0.1:19800/ws" : await prompt("Ailo WebSocket URL", "ws://127.0.0.1:19800/ws");
     const apiKey = useDefaults ? "" : await prompt("API Key (留空稍后配置)");
     const endpointId = useDefaults ? "desktop-01" : await prompt("端点 ID", "desktop-01");
@@ -29,8 +49,11 @@ export async function runInit(useDefaults = false) {
             endpointId,
         },
     };
-    writeConfig(CONFIG_PATH, config);
-    console.log(`\n已写入 ${CONFIG_PATH}`);
-    console.log("\n初始化完成！运行 ailo-desktop 启动桌面端点。");
-    console.log("配置界面端口：启动时用 --port <端口> 指定，或运行后在控制台按提示输入。");
+    writeConfig(configPath, config);
+    console.log(`\n已写入 ${configPath}`);
+    console.log("\n初始化完成！运行以下命令启动桌面端点：");
+    console.log(`  ailo-desktop --config-dir ${configDir} --port 3000`);
+}
+if (import.meta.url === `file://${process.argv[1]}`) {
+    runInit().catch(console.error);
 }

package/dist/config_server.js

@@ -1,6 +1,6 @@
 import { createServer } from "http";
 import { readFileSync, existsSync } from "fs";
-import { join, resolve, dirname, basename } from "path";
+import { join, dirname } from "path";
 import { fileURLToPath } from "url";
 import { spawnSync } from "child_process";
 import { WebSocketServer } from "ws";
@@ -165,10 +165,8 @@ export function startConfigServer(deps) {
                 return json(res, await runEnvInstall());
             if (path === "/api/tools" && req.method === "GET")
                 return json(res, await getReportedTools(deps));
-            if (path === "/api/blueprint" && req.method === "GET")
-                return json(res, await getBlueprintInfo(deps));
-            if (path === "/api/blueprints" && req.method === "GET")
-                return json(res, await getAllBlueprintsInfo(deps));
+            if (path === "/api/skills" && req.method === "GET")
+                return json(res, await getReportedSkills(deps));
             // Ailo 连接配置（仅当 configPath 存在时，供桌面端在界面填写并保存）
             if (deps.configPath) {
                 if (path === "/api/connection" && req.method === "GET")
@@ -176,13 +174,6 @@ export function startConfigServer(deps) {
                 if (path === "/api/connection" && req.method === "POST")
                     return json(res, await saveConnectionConfig(deps.configPath, await body(req), deps.onConnectionConfigSaved));
             }
-            // 邮件配置
-            if (deps.configPath) {
-                if (path === "/api/email/config" && req.method === "GET")
-                    return json(res, getEmailConfig(deps.configPath, deps.getEmailStatus));
-                if (path === "/api/email/config" && req.method === "POST")
-                    return json(res, await saveEmailConfig(deps.configPath, await body(req), deps.onEmailConfigSaved));
-            }
             // 飞书配置
             if (deps.configPath) {
                 if (path === "/api/feishu/config" && req.method === "GET")
@@ -190,20 +181,6 @@ export function startConfigServer(deps) {
                 if (path === "/api/feishu/config" && req.method === "POST")
                     return json(res, await savePlatformConfig(deps.configPath, "feishu", ["appId", "appSecret"], await body(req), deps.onFeishuConfigSaved));
             }
-            // 钉钉配置
-            if (deps.configPath) {
-                if (path === "/api/dingtalk/config" && req.method === "GET")
-                    return json(res, getPlatformConfig(deps.configPath, "dingtalk", ["clientId", "clientSecret"], deps.getDingtalkStatus));
-                if (path === "/api/dingtalk/config" && req.method === "POST")
-                    return json(res, await savePlatformConfig(deps.configPath, "dingtalk", ["clientId", "clientSecret"], await body(req), deps.onDingtalkConfigSaved));
-            }
-            // QQ 配置
-            if (deps.configPath) {
-                if (path === "/api/qq/config" && req.method === "GET")
-                    return json(res, getPlatformConfig(deps.configPath, "qq", ["appId", "appSecret", "apiBase"], deps.getQQStatus));
-                if (path === "/api/qq/config" && req.method === "POST")
-                    return json(res, await savePlatformConfig(deps.configPath, "qq", ["appId", "appSecret", "apiBase"], await body(req), deps.onQQConfigSaved));
-            }
             // MCP
             if (path === "/api/mcp" && req.method === "GET")
                 return json(res, getMCPList(deps.mcpManager));
@@ -392,114 +369,28 @@ async function runEnvInstall() {
     }
     return { installed, errors };
 }
-/** 从蓝图正文中解析 tools 列表（仅提取 name、description） */
-function parseBlueprintTools(md) {
-    const tools = [];
-    const frontmatterMatch = md.match(/^---\r?\n([\s\S]*?)\r?\n---/);
-    const yaml = frontmatterMatch?.[1] ?? "";
-    let inToolsSection = false;
-    let current = null;
-    for (const line of yaml.split(/\r?\n/)) {
-        if (line.trim() === "tools:") {
-            inToolsSection = true;
-            continue;
-        }
-        if (!inToolsSection)
-            continue;
-        const itemMatch = line.match(/^\s+-\s+name:\s*(.+)$/);
-        const descMatch = line.match(/^\s+description:\s*(.+)$/);
-        if (itemMatch) {
-            if (current)
-                tools.push(current);
-            current = { name: itemMatch[1].trim(), description: "" };
-        }
-        else if (current && descMatch) {
-            current.description = descMatch[1].trim();
-        }
-    }
-    if (current)
-        tools.push(current);
-    return tools;
-}
-async function fetchBlueprintContent(url, localFallbackPath) {
-    if (url.startsWith("file://")) {
-        const filePath = url.slice(7);
-        return readFileSync(filePath, "utf-8");
-    }
-    try {
-        const res = await fetch(url);
-        if (!res.ok)
-            throw new Error(`Blueprint fetch failed: ${res.status}`);
-        return res.text();
-    }
-    catch (e) {
-        if (localFallbackPath && existsSync(localFallbackPath)) {
-            return readFileSync(localFallbackPath, "utf-8");
-        }
-        throw e;
-    }
-}
 async function getReportedTools(deps) {
     const out = [];
-    if (deps.blueprintUrl) {
-        try {
-            const localPath = deps.blueprintLocalPath
-                ? resolve(process.cwd(), deps.blueprintLocalPath)
-                : undefined;
-            const md = await fetchBlueprintContent(deps.blueprintUrl, localPath);
-            for (const t of parseBlueprintTools(md)) {
-                out.push({ name: t.name, description: t.description, source: "builtin" });
-            }
-        }
-        catch (e) {
-            console.error("[config] 解析蓝图工具失败:", e);
+    // 内置工具
+    if (deps.getEndpointTools) {
+        for (const t of deps.getEndpointTools()) {
+            out.push({ name: t.name, description: t.description, source: "builtin" });
         }
     }
+    // MCP 工具
     for (const t of deps.mcpManager.getAllPrivateTools()) {
         out.push({ name: t.name, description: t.description ?? "", source: "mcp" });
     }
     return out;
 }
-async function getBlueprintInfo(deps) {
-    if (!deps.blueprintUrl)
-        return { url: null, content: null };
-    try {
-        const localPath = deps.blueprintLocalPath ? resolve(process.cwd(), deps.blueprintLocalPath) : undefined;
-        const content = await fetchBlueprintContent(deps.blueprintUrl, localPath);
-        return { url: deps.blueprintUrl, content };
-    }
-    catch {
-        return { url: deps.blueprintUrl, content: null };
-    }
-}
-async function getAllBlueprintsInfo(deps) {
-    const paths = deps.getBlueprintPaths?.() ?? [];
-    if (paths.length === 0) {
-        // fallback：如果没有传 getBlueprintPaths，至少返回主蓝图
-        if (deps.blueprintUrl) {
-            try {
-                const localPath = deps.blueprintLocalPath ? resolve(process.cwd(), deps.blueprintLocalPath) : undefined;
-                const content = await fetchBlueprintContent(deps.blueprintUrl, localPath);
-                const name = basename(deps.blueprintLocalPath ?? deps.blueprintUrl, ".blueprint.md");
-                return [{ name, path: deps.blueprintUrl, content }];
-            }
-            catch {
-                return [];
-            }
+async function getReportedSkills(deps) {
+    const out = [];
+    if (deps.getEndpointSkills) {
+        for (const s of deps.getEndpointSkills()) {
+            out.push({ name: s.name, description: s.description, source: "builtin" });
         }
-        return [];
     }
-    return Promise.all(paths.map(async (p) => {
-        const filePath = p.startsWith("file://") ? p.slice(7) : p;
-        const name = basename(filePath, ".blueprint.md");
-        try {
-            const content = readFileSync(filePath, "utf-8");
-            return { name, path: p, content };
-        }
-        catch {
-            return { name, path: p, content: null };
-        }
-    }));
+    return out;
 }
 function getMCPList(mgr) {
     const configs = mgr.getConfigs();
@@ -585,45 +476,6 @@ async function saveConnectionConfig(configPath, bodyStr, onSaved) {
         return { ok: false, error: errMsg(e) };
     }
 }
-function getEmailConfig(configPath, getStatus) {
-    const cfg = readConfig(configPath);
-    const email = (cfg.email ?? {});
-    const status = getStatus?.() ?? { configured: false, running: false };
-    return {
-        imapHost: email.imapHost ?? "",
-        imapUser: email.imapUser ?? "",
-        imapPassword: email.imapPassword ?? "",
-        imapPort: email.imapPort ?? 993,
-        smtpHost: email.smtpHost ?? "",
-        smtpPort: email.smtpPort ?? 465,
-        smtpUser: email.smtpUser ?? "",
-        smtpPassword: email.smtpPassword ?? "",
-        ...status,
-    };
-}
-async function saveEmailConfig(configPath, bodyStr, onSaved) {
-    try {
-        const bodyTrimmed = (bodyStr ?? "").trim();
-        if (!bodyTrimmed)
-            return { ok: false, error: "请求体为空" };
-        const existing = readConfig(configPath);
-        const b = JSON.parse(bodyTrimmed);
-        const emailFields = ["imapHost", "imapUser", "imapPassword", "imapPort", "smtpHost", "smtpPort", "smtpUser", "smtpPassword"];
-        for (const field of emailFields) {
-            if (b[field] !== undefined)
-                setNestedValue(existing, `email.${field}`, b[field]);
-        }
-        writeConfig(configPath, existing);
-        if (onSaved) {
-            await onSaved();
-            return { ok: true, message: "已保存，邮件通道正在重启…" };
-        }
-        return { ok: true, message: "已保存。" };
-    }
-    catch (e) {
-        return { ok: false, error: errMsg(e) };
-    }
-}
 function getPlatformConfig(configPath, platform, fields, getStatus) {
     const cfg = readConfig(configPath);
     const section = (cfg[platform] ?? {});