@wu529778790/open-im 1.0.3-beta.4 → 1.0.3

package/dist/cli.js

@@ -144,12 +144,6 @@ async function cmdStop() {
     console.log(`open-im 已停止 (pid=${pid})`);
 }
 async function cmdInit() {
-    if (!needsSetup()) {
-        console.log("检测到已存在配置文件。如需重新配置，请先删除配置文件：");
-        console.log(`  ${join(APP_HOME, "config.json")}`);
-        console.log("\n或直接编辑配置文件后重新运行。");
-        return;
-    }
     console.log("\n━━━ open-im 配置向导 ━━━\n");
     const saved = await runInteractiveSetup();
     if (saved) {
@@ -170,7 +164,7 @@ function showHelp(exitCode = 0) {
 命令:
   start    后台运行服务
   stop     停止后台服务
-  init     初始化配置（不启动服务）
+  init     配置向导（首次或追加配置，会覆盖已有 config.json）
   dev      前台运行（调试模式），Ctrl+C 停止
 
 选项:

package/dist/setup.d.ts

@@ -1,5 +1,5 @@
 /**
- * 首次运行时的交互式配置引导
+ * 首次运行时的交互式配置引导（支持增量：保留已有平台配置）
  * 使用 prompts 库，兼容 tsx watch、IDE 终端等环境
  * Telegram Token 使用 readline 避免 Windows 终端 prompts 重绘问题
  */

package/dist/setup.js

@@ -1,13 +1,47 @@
 /**
- * 首次运行时的交互式配置引导
+ * 首次运行时的交互式配置引导（支持增量：保留已有平台配置）
  * 使用 prompts 库，兼容 tsx watch、IDE 终端等环境
  * Telegram Token 使用 readline 避免 Windows 终端 prompts 重绘问题
  */
 import prompts from "prompts";
 import { createInterface } from "node:readline";
-import { mkdirSync, writeFileSync, existsSync } from "node:fs";
+import { mkdirSync, writeFileSync, existsSync, readFileSync } from "node:fs";
 import { join, dirname } from "node:path";
 import { APP_HOME } from "./constants.js";
+function loadExistingConfig() {
+    const configPath = join(APP_HOME, "config.json");
+    if (!existsSync(configPath))
+        return null;
+    try {
+        return JSON.parse(readFileSync(configPath, "utf-8"));
+    }
+    catch {
+        return null;
+    }
+}
+function getConfiguredPlatforms(existing) {
+    if (!existing?.platforms)
+        return [];
+    const names = [
+        { k: "telegram", label: "Telegram" },
+        { k: "feishu", label: "飞书" },
+        { k: "wechat", label: "微信" },
+    ];
+    return names
+        .filter(({ k }) => {
+        const p = existing.platforms?.[k];
+        if (!p)
+            return false;
+        if (k === "telegram")
+            return !!p.botToken;
+        if (k === "feishu")
+            return !!(p.appId && p.appSecret);
+        if (k === "wechat")
+            return !!(p.appId && p.appSecret);
+        return false;
+    })
+        .map(({ label }) => label);
+}
 function question(prompt) {
     const rl = createInterface({ input: process.stdin, output: process.stdout });
     return new Promise((resolve) => {
@@ -62,26 +96,41 @@ export async function runInteractiveSetup() {
         printManualInstructions(configPath);
         return false;
     }
-    console.log("\n━━━ open-im 首次配置 ━━━\n");
+    const existing = loadExistingConfig();
+    const configured = getConfiguredPlatforms(existing);
+    console.log("\n━━━ open-im 配置向导 ━━━\n");
     console.log("配置将保存到:", configPath);
+    if (configured.length > 0) {
+        console.log("当前已配置:", configured.join("、"));
+        console.log("（本次可追加或修改，未选中的平台配置将保留）");
+    }
     console.log("");
     const onCancel = () => {
         console.log("\n已取消配置。");
         process.exit(0);
     };
-    // 第一步：选择平台
+    const hasTg = !!existing?.platforms?.telegram?.botToken;
+    const hasFs = !!(existing?.platforms?.feishu?.appId && existing?.platforms?.feishu?.appSecret);
+    const hasWc = !!(existing?.platforms?.wechat?.appId && existing?.platforms?.wechat?.appSecret);
+    // 第一步：选择平台（在选项和提示中显示已配置项）
+    const configuredHint = configured.length > 0 ? `（当前已配置: ${configured.join("、")}）` : "";
     const platformResp = await prompts({
         type: "select",
         name: "platform",
-        message: "选择要配置的平台（↑↓ 选择）",
+        message: `选择要配置的平台 ${configuredHint}（↑↓ 选择）`,
         choices: [
-            { title: "Telegram - 需要 Bot Token", value: "telegram" },
             {
-                title: "飞书 (Feishu/Lark) - 需要 App ID 和 App Secret",
+                title: "Telegram - 需要 Bot Token" + (hasTg ? " ✓已配置" : ""),
+                value: "telegram",
+            },
+            {
+                title: "飞书 (Feishu/Lark) - 需要 App ID 和 App Secret" +
+                    (hasFs ? " ✓已配置" : ""),
                 value: "feishu",
             },
             {
-                title: "微信 (WeChat) - 需要 App ID 和 App Secret（AGP 协议）",
+                title: "微信 (WeChat) - 需要 App ID 和 App Secret（AGP 协议）" +
+                    (hasWc ? " ✓已配置" : ""),
                 value: "wechat",
             },
             { title: "配置多个平台", value: "multi" },
@@ -101,9 +150,9 @@ export async function runInteractiveSetup() {
             name: "platforms",
             message: "选择要配置的平台（空格选择，回车确认）",
             choices: [
-                { title: "Telegram", value: "telegram", selected: true },
-                { title: "飞书 (Feishu)", value: "feishu" },
-                { title: "微信 (WeChat)", value: "wechat" },
+                { title: "Telegram" + (hasTg ? " ✓已配置" : ""), value: "telegram", selected: hasTg },
+                { title: "飞书 (Feishu)" + (hasFs ? " ✓已配置" : ""), value: "feishu", selected: hasFs },
+                { title: "微信 (WeChat)" + (hasWc ? " ✓已配置" : ""), value: "wechat", selected: hasWc },
             ],
         }, { onCancel });
         if (!multiResp.platforms || multiResp.platforms.length === 0) {
@@ -117,10 +166,14 @@ export async function runInteractiveSetup() {
     }
     // 收集平台配置（Telegram 用 readline 避免 Windows 下 prompts 重绘/重复行问题）
     if (selectedPlatforms.includes("telegram")) {
-        const token = await question("Telegram Bot Token（从 @BotFather 获取）: ");
+        const hint = hasTg ? "（留空保留现有）" : "";
+        const token = await question(`Telegram Bot Token（从 @BotFather 获取）${hint}: `);
         if (token) {
             config.telegramBotToken = token;
         }
+        else if (hasTg) {
+            config.telegramBotToken = existing.platforms.telegram.botToken;
+        }
         else if (platform === "telegram") {
             console.log("Token 不能为空");
             return false;
@@ -132,21 +185,25 @@ export async function runInteractiveSetup() {
                 type: "text",
                 name: "appId",
                 message: "飞书 App ID（从飞书开放平台获取）",
+                initial: existing?.platforms?.feishu?.appId ?? "",
                 validate: (v) => (v.trim() ? true : "App ID 不能为空"),
             },
             {
                 type: "text",
                 name: "appSecret",
                 message: "飞书 App Secret（从飞书开放平台获取）",
+                initial: existing?.platforms?.feishu?.appSecret ?? "",
                 validate: (v) => (v.trim() ? true : "App Secret 不能为空"),
             },
         ], { onCancel });
-        if (feishuResp.appId && feishuResp.appSecret) {
+        const fsAppId = feishuResp.appId?.trim() || existing?.platforms?.feishu?.appId;
+        const fsAppSecret = feishuResp.appSecret?.trim() || existing?.platforms?.feishu?.appSecret;
+        if (fsAppId && fsAppSecret) {
             config.platforms.feishu = {
                 ...config.platforms.feishu,
                 enabled: true,
-                appId: feishuResp.appId.trim(),
-                appSecret: feishuResp.appSecret.trim(),
+                appId: fsAppId,
+                appSecret: fsAppSecret,
             };
         }
         else if (platform === "feishu") {
@@ -159,129 +216,171 @@ export async function runInteractiveSetup() {
                 type: "text",
                 name: "appId",
                 message: "微信 App ID（从微信开放平台获取）",
+                initial: existing?.platforms?.wechat?.appId ?? "",
                 validate: (v) => (v.trim() ? true : "App ID 不能为空"),
             },
             {
                 type: "text",
                 name: "appSecret",
                 message: "微信 App Secret（从微信开放平台获取）",
+                initial: existing?.platforms?.wechat?.appSecret ?? "",
                 validate: (v) => (v.trim() ? true : "App Secret 不能为空"),
             },
             {
                 type: "text",
                 name: "wsUrl",
                 message: "AGP WebSocket URL（可选，留空使用默认）",
-                initial: "",
+                initial: existing?.platforms?.wechat?.wsUrl ?? "",
             },
         ], { onCancel });
-        if (wechatResp.appId && wechatResp.appSecret) {
+        const wcAppId = wechatResp.appId?.trim() || existing?.platforms?.wechat?.appId;
+        const wcAppSecret = wechatResp.appSecret?.trim() || existing?.platforms?.wechat?.appSecret;
+        if (wcAppId && wcAppSecret) {
             config.platforms.wechat = {
                 enabled: true,
-                appId: wechatResp.appId.trim(),
-                appSecret: wechatResp.appSecret.trim(),
-                wsUrl: wechatResp.wsUrl?.trim() || undefined,
+                appId: wcAppId,
+                appSecret: wcAppSecret,
+                wsUrl: wechatResp.wsUrl?.trim() || existing?.platforms?.wechat?.wsUrl || undefined,
             };
         }
         else if (platform === "wechat") {
             return false;
         }
     }
-    // 通用配置
-    const commonResp = await prompts([
-        {
+    // 通用配置：只询问所选平台的白名单，未选平台沿用已有配置
+    const tgIds = existing?.platforms?.telegram?.allowedUserIds?.join(", ") ?? "";
+    const fsIds = existing?.platforms?.feishu?.allowedUserIds?.join(", ") ?? "";
+    const wcIds = existing?.platforms?.wechat?.allowedUserIds?.join(", ") ?? "";
+    const aiIdx = ["claude", "codex", "cursor"].indexOf(existing?.aiCommand ?? "claude");
+    const commonPrompts = [];
+    if (selectedPlatforms.includes("telegram")) {
+        commonPrompts.push({
             type: "text",
             name: "telegramAllowedUserIds",
             message: "Telegram 白名单用户 ID（可选，逗号分隔，留空=所有人可访问）",
-            initial: "",
-        },
-        {
+            initial: tgIds,
+        });
+    }
+    if (selectedPlatforms.includes("feishu")) {
+        commonPrompts.push({
             type: "text",
             name: "feishuAllowedUserIds",
             message: "飞书白名单用户 ID（可选，逗号分隔，留空=所有人可访问）",
-            initial: "",
-        },
-        {
+            initial: fsIds,
+        });
+    }
+    if (selectedPlatforms.includes("wechat")) {
+        commonPrompts.push({
             type: "text",
             name: "wechatAllowedUserIds",
             message: "微信白名单用户 ID（可选，逗号分隔，留空=所有人可访问）",
-            initial: "",
-        },
-        {
-            type: "select",
-            name: "aiCommand",
-            message: "AI 工具（↑↓ 选择）",
-            choices: [
-                { title: "claude-code", value: "claude" },
-                { title: "codex", value: "codex" },
-                { title: "cursor", value: "cursor" },
-            ],
-            initial: 0,
-        },
-        {
-            type: "text",
-            name: "workDir",
-            message: "工作目录",
-            initial: process.cwd(),
-        },
-    ], { onCancel });
+            initial: wcIds,
+        });
+    }
+    commonPrompts.push({
+        type: "select",
+        name: "aiCommand",
+        message: "AI 工具（↑↓ 选择）",
+        choices: [
+            { title: "claude-code", value: "claude" },
+            { title: "codex", value: "codex" },
+            { title: "cursor", value: "cursor" },
+        ],
+        initial: aiIdx >= 0 ? aiIdx : 0,
+    }, {
+        type: "text",
+        name: "workDir",
+        message: "工作目录",
+        initial: existing?.claudeWorkDir ?? process.cwd(),
+    });
+    const commonResp = await prompts(commonPrompts, { onCancel });
     const parseIds = (value) => value
         ? value
             .split(",")
             .map((s) => s.trim())
             .filter(Boolean)
         : [];
-    // 分平台白名单
-    const telegramIds = parseIds(commonResp.telegramAllowedUserIds);
-    const feishuIds = parseIds(commonResp.feishuAllowedUserIds);
-    const wechatIds = parseIds(commonResp.wechatAllowedUserIds);
+    // 分平台白名单：已询问的用输入值，未询问的用已有配置
+    const telegramIds = selectedPlatforms.includes("telegram")
+        ? parseIds(commonResp.telegramAllowedUserIds)
+        : parseIds(existing?.platforms?.telegram?.allowedUserIds?.join(", "));
+    const feishuIds = selectedPlatforms.includes("feishu")
+        ? parseIds(commonResp.feishuAllowedUserIds)
+        : parseIds(existing?.platforms?.feishu?.allowedUserIds?.join(", "));
+    const wechatIds = selectedPlatforms.includes("wechat")
+        ? parseIds(commonResp.wechatAllowedUserIds)
+        : parseIds(existing?.platforms?.wechat?.allowedUserIds?.join(", "));
+    // 增量合并：以已有配置为底，只覆盖本次选中的平台（不写入根级旧字段 telegramBotToken 等）
+    const base = existing
+        ? JSON.parse(JSON.stringify(existing))
+        : null;
+    const { telegramBotToken: _, feishuAppId: __, feishuAppSecret: ___, ...baseRest } = (base ?? {});
+    const out = {
+        ...baseRest,
+        platforms: { ...(base?.platforms ?? {}) },
+        claudeWorkDir: (commonResp.workDir || process.cwd()).trim(),
+        claudeSkipPermissions: base?.claudeSkipPermissions ?? true,
+        aiCommand: commonResp.aiCommand ?? base?.aiCommand ?? "claude",
+    };
     if (selectedPlatforms.includes("telegram")) {
-        config.platforms.telegram = {
-            ...config.platforms.telegram,
+        out.platforms.telegram = {
+            ...base?.platforms?.telegram,
             enabled: true,
-            botToken: config.telegramBotToken ?? undefined,
+            botToken: config.telegramBotToken ?? base?.platforms?.telegram?.botToken,
             allowedUserIds: telegramIds,
         };
     }
-    else {
-        config.platforms.telegram = {
-            enabled: false,
-            allowedUserIds: telegramIds,
+    else if (base?.platforms?.telegram) {
+        out.platforms.telegram = {
+            ...base.platforms.telegram,
+            allowedUserIds: telegramIds.length > 0 ? telegramIds : base.platforms.telegram.allowedUserIds,
         };
     }
+    else {
+        out.platforms.telegram = { enabled: false, allowedUserIds: telegramIds };
+    }
     if (selectedPlatforms.includes("feishu")) {
-        config.platforms.feishu = {
-            ...config.platforms.feishu,
+        out.platforms.feishu = {
+            ...base?.platforms?.feishu,
             enabled: true,
+            appId: config.platforms.feishu?.appId,
+            appSecret: config.platforms.feishu?.appSecret,
             allowedUserIds: feishuIds,
         };
     }
-    else {
-        config.platforms.feishu = {
-            enabled: false,
-            allowedUserIds: feishuIds,
+    else if (base?.platforms?.feishu) {
+        out.platforms.feishu = {
+            ...base.platforms.feishu,
+            allowedUserIds: feishuIds.length > 0 ? feishuIds : base.platforms.feishu.allowedUserIds,
         };
     }
+    else {
+        out.platforms.feishu = { enabled: false, allowedUserIds: feishuIds };
+    }
     if (selectedPlatforms.includes("wechat")) {
-        config.platforms.wechat = {
-            ...config.platforms.wechat,
+        out.platforms.wechat = {
+            ...base?.platforms?.wechat,
             enabled: true,
+            appId: config.platforms.wechat?.appId,
+            appSecret: config.platforms.wechat?.appSecret,
+            wsUrl: config.platforms.wechat?.wsUrl,
             allowedUserIds: wechatIds,
         };
     }
-    else {
-        config.platforms.wechat = {
-            enabled: false,
-            allowedUserIds: wechatIds,
+    else if (base?.platforms?.wechat) {
+        out.platforms.wechat = {
+            ...base.platforms.wechat,
+            allowedUserIds: wechatIds.length > 0 ? wechatIds : base.platforms.wechat.allowedUserIds,
         };
     }
-    config.claudeWorkDir = (commonResp.workDir || process.cwd()).trim();
-    config.claudeSkipPermissions = true;
-    config.aiCommand = commonResp.aiCommand ?? "claude";
+    else {
+        out.platforms.wechat = { enabled: false, allowedUserIds: wechatIds };
+    }
     const dir = dirname(configPath);
     if (!existsSync(dir)) {
         mkdirSync(dir, { recursive: true });
     }
-    writeFileSync(configPath, JSON.stringify(config, null, 2), "utf-8");
+    writeFileSync(configPath, JSON.stringify(out, null, 2), "utf-8");
     console.log("\n✅ 配置已保存到", configPath);
     console.log("");
     return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wu529778790/open-im",
-  "version": "1.0.3-beta.4",
+  "version": "1.0.3",
   "description": "Multi-platform IM bridge for AI CLI tools (Claude, Codex, Cursor)",
   "type": "module",
   "main": "dist/index.js",
@@ -16,6 +16,7 @@
   "scripts": {
     "build": "tsc",
     "dev": "tsx src/index.ts",
+    "init": "tsx src/cli.ts init",
     "start": "node dist/cli.js start",
     "stop": "node dist/cli.js stop",
     "test": "npm run build",