@greatlhd/ailo-desktop 1.0.0 → 1.0.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@greatlhd/ailo-desktop",
-  "version": "1.0.0",
-  "description": "Ailo 超级端点 — 桌面能力 + 飞书 + 钉钉 + QQ + 邮件，按需配置启用",
+  "version": "1.0.1",
+  "description": "Ailo 超级端点 — 桌面能力 + 飞书，按需配置启用。支持桌面模式和服务器模式。",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,22 +14,16 @@
     "start": "node dist/index.js"
   },
   "dependencies": {
-    "@greatlhd/ailo-endpoint-sdk": "^1.0.0",
+    "@greatlhd/ailo-endpoint-sdk": "^1.0.1",
     "@larksuiteoapi/node-sdk": "^1.56.1",
-    "dingtalk-stream": "^2.0.4",
     "glob": "^11.0.0",
-    "imapflow": "^1.2.10",
-    "mailparser": "^3.6.6",
-    "nodemailer": "^8.0.1",
     "pixelmatch": "^7.1.0",
     "playwright": "^1.50.0",
     "pngjs": "^7.0.0",
     "ws": "^8.18.0"
   },
   "devDependencies": {
-    "@types/mailparser": "^3.4.5",
     "@types/node": "^22.0.0",
-    "@types/nodemailer": "^6.4.17",
     "@types/pixelmatch": "^5.2.0",
     "@types/ws": "^8.5.0",
     "tsx": "^4.0.0",

package/src/cli.ts

@@ -1,14 +1,29 @@
 /**
  * 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(): { useDefaults: boolean; configDir: string } {
+  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: string, defaultVal = ""): Promise<string> {
   const rl = createInterface({ input: process.stdin, output: process.stdout });
@@ -21,8 +36,16 @@ async function prompt(question: string, defaultVal = ""): Promise<string> {
   });
 }
 
-export async function runInit(useDefaults = false): Promise<void> {
+export async function runInit(useDefaultsArg?: boolean, configDirArg?: string): Promise<void> {
+  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 (留空稍后配置)");
@@ -36,9 +59,13 @@ export async function runInit(useDefaults = false): Promise<void> {
     },
   };
 
-  writeConfig(CONFIG_PATH, config);
-  console.log(`\n已写入 ${CONFIG_PATH}`);
+  writeConfig(configPath, config);
+  console.log(`\n已写入 ${configPath}`);
+
+  console.log("\n初始化完成！运行以下命令启动桌面端点：");
+  console.log(`  ailo-desktop --config-dir ${configDir} --port 3000`);
+}
 
-  console.log("\n初始化完成！运行 ailo-desktop 启动桌面端点。");
-  console.log("配置界面端口：启动时用 --port <端口> 指定，或运行后在控制台按提示输入。");
+if (import.meta.url === `file://${process.argv[1]}`) {
+  runInit().catch(console.error);
 }

package/src/config_server.ts

@@ -1,6 +1,6 @@
 import { createServer, type IncomingMessage, type ServerResponse } from "http";
 import { readFileSync, existsSync } from "fs";
-import { join, resolve, dirname, basename } from "path";
+import { join, resolve, dirname } from "path";
 import { fileURLToPath } from "url";
 import { spawnSync } from "child_process";
 import { WebSocketServer, type WebSocket } from "ws";
@@ -45,38 +45,26 @@ interface ConfigServerDeps {
   port: number;
   /** config.json path for Ailo connection config */
   configPath?: string;
-  /** 蓝图的 URL（与上报给 Ailo 的 blueprints 一致），用于 GET /api/tools 解析内置工具 */
-  blueprintUrl?: string;
-  /** 远程蓝图 404 时的本地回退路径（绝对路径或相对 cwd） */
-  blueprintLocalPath?: string;
   /** 当存在时启用网页聊天：同一端口提供 /chat 与 /chat/ws，并调用 onWebchatReady */
   webchatCtx?: EndpointContext;
   /** 动态获取网页聊天上下文（连接建立后可挂载，无需重启） */
   getWebchatCtx?: () => EndpointContext | null;
+  /** 获取端点上下文（用于获取已上报的工具和技能） */
+  getEndpointCtx?: () => EndpointContext | null;
+  /** 获取已上报的内置工具列表 */
+  getEndpointTools?: () => { name: string; description: string }[];
+  /** 获取已上报的技能列表 */
+  getEndpointSkills?: () => { name: string; description: string }[];
   /** 网页聊天就绪后回调，供 index 的 send 工具使用 */
   onWebchatReady?: (api: { recordAiloReply: (text: string, participantName: string, content?: WebchatContentItem[]) => boolean }) => void;
   /** 请求热重连以刷新服务端 Skills 列表（启用/禁用后调用，无需重启） */
   onRequestReconnect?: () => Promise<void>;
   /** 保存 Ailo 连接配置后调用，用于断线后使用新配置重连 */
   onConnectionConfigSaved?: (config: { ailoWsUrl: string; ailoApiKey: string; endpointId: string }) => Promise<void>;
-  /** 邮件配置保存后回调，重建邮件通道 */
-  onEmailConfigSaved?: () => Promise<void>;
-  /** 获取邮件通道状态 */
-  getEmailStatus?: () => { configured: boolean; running: boolean };
   /** 飞书配置保存后回调 */
   onFeishuConfigSaved?: () => Promise<void>;
   /** 获取飞书通道状态 */
   getFeishuStatus?: () => { configured: boolean; running: boolean };
-  /** 钉钉配置保存后回调 */
-  onDingtalkConfigSaved?: () => Promise<void>;
-  /** 获取钉钉通道状态 */
-  getDingtalkStatus?: () => { configured: boolean; running: boolean };
-  /** QQ 配置保存后回调 */
-  onQQConfigSaved?: () => Promise<void>;
-  /** 获取 QQ 通道状态 */
-  getQQStatus?: () => { configured: boolean; running: boolean };
-  /** 动态返回当前所有已激活蓝图的本地路径（用于 /api/blueprints 多蓝图展示） */
-  getBlueprintPaths?: () => string[];
 }
 
 function getChatHtmlPath(): string {
@@ -228,33 +216,17 @@ export function startConfigServer(deps: ConfigServerDeps): ConfigServerRef {
       if (path === "/api/env/check" && req.method === "GET") return json(res, await getEnvCheck());
       if (path === "/api/env/install" && req.method === "POST") 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") return json(res, getConnectionConfig(deps.configPath));
         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") return json(res, getPlatformConfig(deps.configPath, "feishu", ["appId", "appSecret"], deps.getFeishuStatus));
         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));
       if (path === "/api/mcp" && req.method === "POST") return json(res, await deps.mcpManager.handle(JSON.parse(await body(req))));
@@ -439,109 +411,33 @@ async function runEnvInstall(): Promise<{ installed: string[]; errors: string[]
   return { installed, errors };
 }
 
-/** 从蓝图正文中解析 tools 列表（仅提取 name、description） */
-function parseBlueprintTools(md: string): { name: string; description: string }[] {
-  const tools: { name: string; description: string }[] = [];
-  const frontmatterMatch = md.match(/^---\r?\n([\s\S]*?)\r?\n---/);
-  const yaml = frontmatterMatch?.[1] ?? "";
-  let inToolsSection = false;
-  let current: { name: string; description: string } | null = 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: string, localFallbackPath?: string): Promise<string> {
-  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: ConfigServerDeps): Promise<{ name: string; description: string; source: string }[]> {
   const out: { name: string; description: string; source: string }[] = [];
-  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: ConfigServerDeps): Promise<{ url: string | null; content: string | null }> {
-  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 getReportedSkills(deps: ConfigServerDeps): Promise<{ name: string; description: string; source: string }[]> {
+  const out: { name: string; description: string; source: string }[] = [];
 
-async function getAllBlueprintsInfo(deps: ConfigServerDeps): Promise<{ name: string; path: string; content: string | null }[]> {
-  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 [];
-      }
+  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: LocalMCPManager) {
@@ -635,51 +531,6 @@ async function saveConnectionConfig(
   }
 }
 
-function getEmailConfig(
-  configPath: string,
-  getStatus?: () => { configured: boolean; running: boolean },
-): Record<string, unknown> {
-  const cfg = readConfig(configPath) as Record<string, unknown>;
-  const email = (cfg.email ?? {}) as Record<string, unknown>;
-  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: string,
-  bodyStr: string,
-  onSaved?: () => Promise<void>,
-): Promise<{ ok: boolean; message?: string; error?: string }> {
-  try {
-    const bodyTrimmed = (bodyStr ?? "").trim();
-    if (!bodyTrimmed) return { ok: false, error: "请求体为空" };
-    const existing = readConfig(configPath) as Record<string, unknown>;
-    const b = JSON.parse(bodyTrimmed) as Record<string, unknown>;
-    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: unknown) {
-    return { ok: false, error: errMsg(e) };
-  }
-}
-
 function getPlatformConfig(
   configPath: string,
   platform: string,