remnote-bridge 0.1.11 → 0.1.13

package/dist/cli/addon/addon-manager.js

@@ -0,0 +1,163 @@
+/**
+ * Addon 管理器
+ *
+ * 负责增强项目的安装、卸载、检测、环境变量映射和自动部署。
+ */
+import { execFile } from 'node:child_process';
+import fs from 'fs';
+import os from 'os';
+import { ADDON_REGISTRY } from './registry.js';
+const DETECT_TIMEOUT_MS = 5_000;
+const INSTALL_TIMEOUT_MS = 120_000;
+export class AddonManager {
+    config;
+    constructor(config) {
+        this.config = config;
+    }
+    /** 获取所有已注册 addon 的状态 */
+    async listAll() {
+        const entries = [...ADDON_REGISTRY.values()];
+        const installedChecks = await Promise.all(entries.map((def) => this.isInstalled(def.name)));
+        return entries.map((def, i) => {
+            const userConfig = this.config.addons?.[def.name];
+            const validation = this.validateSettings(def.name);
+            return {
+                name: def.name,
+                description: def.description,
+                enabled: userConfig?.enabled ?? false,
+                installed: installedChecks[i],
+                settingsValid: validation.valid,
+                missingSettings: validation.missing,
+            };
+        });
+    }
+    /** 检测单个 addon 是否已安装 */
+    async isInstalled(name) {
+        const def = ADDON_REGISTRY.get(name);
+        if (!def)
+            return false;
+        try {
+            await this.execCommand(def.detectCommand.bin, def.detectCommand.args, DETECT_TIMEOUT_MS, this.buildEnv(name));
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    /** 安装单个 addon */
+    async install(name, onLog) {
+        const def = ADDON_REGISTRY.get(name);
+        if (!def) {
+            throw new Error(`未知 addon: ${name}。已注册: ${[...ADDON_REGISTRY.keys()].join(', ')}`);
+        }
+        const pkg = def.packageName ?? def.name;
+        const spec = def.versionConstraint ? `${pkg}${def.versionConstraint}` : pkg;
+        onLog?.(`正在安装 ${name}...`);
+        switch (def.installer) {
+            case 'pip':
+                await this.pipInstall(spec, onLog);
+                break;
+            case 'npm':
+                await this.execCommand('npm', ['install', '-g', spec], INSTALL_TIMEOUT_MS);
+                break;
+            default:
+                throw new Error(`不支持的安装器类型: ${def.installer}`);
+        }
+        // 安装后验证
+        const installed = await this.isInstalled(name);
+        if (!installed) {
+            throw new Error(`${name} 安装命令成功但检测仍不可用，请检查 PATH 配置`);
+        }
+        onLog?.(`${name} 安装成功`);
+    }
+    /** 卸载单个 addon */
+    async uninstall(name, purge = false, onLog) {
+        const def = ADDON_REGISTRY.get(name);
+        if (!def) {
+            throw new Error(`未知 addon: ${name}`);
+        }
+        const pkg = def.packageName ?? def.name;
+        onLog?.(`正在卸载 ${name}...`);
+        switch (def.installer) {
+            case 'pip':
+                await this.execCommand('pip', ['uninstall', '-y', pkg], INSTALL_TIMEOUT_MS);
+                break;
+            case 'npm':
+                await this.execCommand('npm', ['uninstall', '-g', pkg], INSTALL_TIMEOUT_MS);
+                break;
+        }
+        if (purge && def.dataDirs) {
+            for (const dir of def.dataDirs) {
+                const resolved = dir.replace(/^~/, os.homedir());
+                if (fs.existsSync(resolved)) {
+                    fs.rmSync(resolved, { recursive: true, force: true });
+                    onLog?.(`已清理数据目录: ${resolved}`);
+                }
+            }
+        }
+        onLog?.(`${name} 卸载成功`);
+    }
+    /** 获取 addon 对应的环境变量（addon 配置已独立存储，此方法保留供未来扩展） */
+    getEnvVars(_name) {
+        return {};
+    }
+    /** 校验 addon 配置完整性（addon 配置已独立存储，此方法保留供未来扩展） */
+    validateSettings(_name) {
+        return { valid: true, missing: [] };
+    }
+    /** connect 时自动安装所有已启用但未安装的 addon */
+    async ensureEnabledAddons(onLog) {
+        const results = [];
+        for (const [name, def] of ADDON_REGISTRY) {
+            const userConfig = this.config.addons?.[name];
+            if (!userConfig?.enabled)
+                continue;
+            const installed = await this.isInstalled(name);
+            if (installed) {
+                results.push({ name, action: 'already-installed' });
+                continue;
+            }
+            // 已启用但未安装 → 自动安装
+            try {
+                await this.install(name, onLog);
+                results.push({ name, action: 'installed' });
+            }
+            catch (err) {
+                const errorMsg = err instanceof Error ? err.message : String(err);
+                onLog?.(`addon ${name} 自动安装失败: ${errorMsg}`, 'warn');
+                results.push({ name, action: 'failed', error: errorMsg });
+            }
+        }
+        return results;
+    }
+    // ── 内部方法 ──
+    buildEnv(name) {
+        return { ...process.env, ...this.getEnvVars(name) };
+    }
+    async pipInstall(spec, onLog) {
+        try {
+            await this.execCommand('pip', ['install', spec], INSTALL_TIMEOUT_MS);
+        }
+        catch {
+            // 如果直接 pip install 失败，尝试 pip install --user
+            onLog?.('pip install 失败，尝试 --user 模式...');
+            await this.execCommand('pip', ['install', '--user', spec], INSTALL_TIMEOUT_MS);
+        }
+    }
+    execCommand(bin, args, timeout, env) {
+        return new Promise((resolve, reject) => {
+            execFile(bin, args, {
+                timeout,
+                maxBuffer: 5 * 1024 * 1024,
+                env: env ?? process.env,
+            }, (error, stdout, stderr) => {
+                if (error) {
+                    const msg = stderr?.trim() || stdout?.trim() || error.message;
+                    reject(new Error(msg));
+                    return;
+                }
+                resolve(stdout.trim());
+            });
+        });
+    }
+}

package/dist/cli/addon/registry.js

@@ -0,0 +1,24 @@
+/**
+ * Addon 注册表
+ *
+ * 静态注册所有已知增强项目的元数据。
+ * 每个 addon 定义安装方式、检测命令、环境变量映射等信息。
+ */
+/** 内置 addon 注册表 */
+export const ADDON_REGISTRY = new Map([
+    [
+        'remnote-rag',
+        {
+            name: 'remnote-rag',
+            description: 'RemNote 语义搜索增强：直读本地数据库，构建向量索引',
+            installer: 'pip',
+            packageName: 'remnote-rag',
+            executableName: 'remnote-rag',
+            detectCommand: { bin: 'remnote-rag', args: ['--help'] },
+            envMapping: {},
+            requiredSettings: [],
+            dataDirs: ['~/.remnote-bridge/addons/remnote-rag'],
+            versionConstraint: '>=0.1.0',
+        },
+    ],
+]);

package/dist/cli/commands/addon.js

@@ -0,0 +1,149 @@
+/**
+ * addon 命令组
+ *
+ * 管理增强项目（addon）的安装、卸载和状态查看。
+ * - addon list          查看所有增强项目状态
+ * - addon install <name>  安装指定增强项目
+ * - addon uninstall <name> [--purge]  卸载指定增强项目
+ */
+import { loadConfig, configFilePath, saveConfig } from '../config.js';
+import { AddonManager } from '../addon/addon-manager.js';
+import { ADDON_REGISTRY } from '../addon/registry.js';
+import { jsonOutput } from '../utils/output.js';
+export async function addonListCommand(options = {}) {
+    const { json } = options;
+    const config = loadConfig();
+    const manager = new AddonManager(config);
+    const statuses = await manager.listAll();
+    if (json) {
+        jsonOutput({ ok: true, command: 'addon-list', addons: statuses });
+    }
+    else {
+        if (statuses.length === 0) {
+            console.log('暂无已注册的增强项目');
+            return;
+        }
+        console.log('增强项目列表：\n');
+        for (const s of statuses) {
+            const enableTag = s.enabled ? '[已启用]' : '[已禁用]';
+            const installTag = s.installed ? '[已安装]' : '[未安装]';
+            const settingsTag = !s.settingsValid ? ` [缺少配置: ${s.missingSettings.join(', ')}]` : '';
+            console.log(`  ${s.name}  ${enableTag} ${installTag}${settingsTag}  ${s.description}`);
+        }
+    }
+}
+export async function addonInstallCommand(name, options = {}) {
+    const { json } = options;
+    if (!ADDON_REGISTRY.has(name)) {
+        const available = [...ADDON_REGISTRY.keys()].join(', ');
+        if (json) {
+            jsonOutput({ ok: false, command: 'addon-install', error: `未知 addon: ${name}。可选: ${available}` });
+        }
+        else {
+            console.error(`错误: 未知 addon「${name}」。可选: ${available}`);
+        }
+        process.exitCode = 1;
+        return;
+    }
+    const config = loadConfig();
+    const manager = new AddonManager(config);
+    // 检查是否已安装
+    const alreadyInstalled = await manager.isInstalled(name);
+    if (alreadyInstalled) {
+        if (json) {
+            jsonOutput({ ok: true, command: 'addon-install', name, action: 'already-installed' });
+        }
+        else {
+            console.log(`${name} 已安装`);
+        }
+        // 确保配置中标记为 enabled
+        setAddonEnabled(config, name, true);
+        return;
+    }
+    try {
+        await manager.install(name, json ? undefined : (msg) => console.log(msg));
+        // 安装成功，自动启用
+        setAddonEnabled(config, name, true);
+        if (json) {
+            jsonOutput({ ok: true, command: 'addon-install', name, action: 'installed' });
+        }
+        else {
+            console.log(`\n${name} 安装成功并已启用`);
+            // 检查必需配置
+            const validation = manager.validateSettings(name);
+            if (!validation.valid) {
+                console.log(`\n注意：以下配置项尚未设置: ${validation.missing.join(', ')}`);
+                console.log(`请在配置页面或 ~/.remnote-bridge/addons/${name}/config.json 中配置`);
+            }
+        }
+    }
+    catch (err) {
+        const errorMsg = err instanceof Error ? err.message : String(err);
+        if (json) {
+            jsonOutput({ ok: false, command: 'addon-install', name, error: errorMsg });
+        }
+        else {
+            console.error(`错误: ${name} 安装失败 — ${errorMsg}`);
+        }
+        process.exitCode = 1;
+    }
+}
+export async function addonUninstallCommand(name, options = {}) {
+    const { json, purge } = options;
+    if (!ADDON_REGISTRY.has(name)) {
+        const available = [...ADDON_REGISTRY.keys()].join(', ');
+        if (json) {
+            jsonOutput({ ok: false, command: 'addon-uninstall', error: `未知 addon: ${name}。可选: ${available}` });
+        }
+        else {
+            console.error(`错误: 未知 addon「${name}」。可选: ${available}`);
+        }
+        process.exitCode = 1;
+        return;
+    }
+    const config = loadConfig();
+    const manager = new AddonManager(config);
+    try {
+        await manager.uninstall(name, purge, json ? undefined : (msg) => console.log(msg));
+        // 卸载后在配置中禁用
+        setAddonEnabled(config, name, false);
+        if (json) {
+            jsonOutput({ ok: true, command: 'addon-uninstall', name, purged: purge ?? false });
+        }
+        else {
+            console.log(`\n${name} 卸载成功${purge ? '（数据已清理）' : ''}`);
+        }
+    }
+    catch (err) {
+        const errorMsg = err instanceof Error ? err.message : String(err);
+        if (json) {
+            jsonOutput({ ok: false, command: 'addon-uninstall', name, error: errorMsg });
+        }
+        else {
+            console.error(`错误: ${name} 卸载失败 — ${errorMsg}`);
+        }
+        process.exitCode = 1;
+    }
+}
+// ── 辅助：更新配置文件 ──
+function setAddonEnabled(config, name, enabled) {
+    if (!enabled) {
+        if (!config.addons?.[name])
+            return;
+        config.addons[name].enabled = false;
+    }
+    else {
+        if (!config.addons)
+            config.addons = {};
+        if (!config.addons[name])
+            config.addons[name] = { enabled: true };
+        else
+            config.addons[name].enabled = true;
+    }
+    try {
+        saveConfig(configFilePath(), config);
+    }
+    catch {
+        // 写配置失败不阻塞主流程
+    }
+}

package/dist/cli/commands/clean.js

@@ -2,7 +2,10 @@
  * clean 命令
  *
  * 清理 remnote-bridge 在本机产生的所有残留文件：
- * - 项目根：.remnote-bridge.pid / .remnote-bridge.log / .remnote-bridge.json
+ * - ~/.remnote-bridge/instances/*.pid / *.log
+ * - ~/.remnote-bridge/registry.json
+ * - ~/.remnote-bridge/config.json（可选）
+ * - 旧版项目根：.remnote-bridge.pid / .remnote-bridge.log / .remnote-bridge.json
  * - 用户目录：~/.claude/skills/remnote-bridge/
  *
  * 如果守护进程仍在运行，先停止再清理。
@@ -10,88 +13,154 @@
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
-import { findProjectRoot, pidFilePath, logFilePath, configFilePath } from '../config.js';
-import { checkDaemon } from '../daemon/pid.js';
+import { GLOBAL_DIR } from '../config.js';
+import { loadRegistry, MAX_SLOTS, } from '../daemon/registry.js';
+import { isDaemonAlive } from '../daemon/pid.js';
+import { ADDON_REGISTRY } from '../addon/registry.js';
 import { jsonOutput } from '../utils/output.js';
 export async function cleanCommand(options = {}) {
     const { json } = options;
-    const projectRoot = findProjectRoot();
     const removed = [];
     const errors = [];
-    // 1. 如果守护进程在运行，先停止
-    const pidPath = pidFilePath(projectRoot);
-    const status = checkDaemon(pidPath);
-    if (status.running) {
-        if (!json) {
-            console.log(`守护进程运行中（PID: ${status.pid}），正在停止...`);
-        }
-        try {
-            process.kill(status.pid, 'SIGTERM');
-            // 等待最多 5 秒
-            const start = Date.now();
-            while (Date.now() - start < 5000) {
+    // 1. 停止所有运行中的 daemon
+    const registry = loadRegistry();
+    for (const entry of registry.slots) {
+        if (entry && isDaemonAlive(entry.pid)) {
+            if (!json) {
+                console.log(`守护进程运行中（PID: ${entry.pid}，实例: ${entry.instance}），正在停止...`);
+            }
+            try {
+                process.kill(entry.pid, 'SIGTERM');
+                const start = Date.now();
+                while (Date.now() - start < 5000) {
+                    try {
+                        process.kill(entry.pid, 0);
+                        await new Promise(r => setTimeout(r, 200));
+                    }
+                    catch {
+                        break;
+                    }
+                }
                 try {
-                    process.kill(status.pid, 0);
-                    await new Promise(r => setTimeout(r, 200));
+                    process.kill(entry.pid, 0);
+                    process.kill(entry.pid, 'SIGKILL');
                 }
                 catch {
-                    break; // 进程已退出
+                    // 已退出
                 }
             }
-            // 如果还没退出，强制终止
-            try {
-                process.kill(status.pid, 0);
-                process.kill(status.pid, 'SIGKILL');
-            }
             catch {
-                // 已退出
+                // 进程可能已退出
             }
         }
-        catch {
-            // 进程可能已退出
-        }
     }
-    // 2. 清理项目根下的文件
-    const projectFiles = [
-        pidFilePath(projectRoot),
-        logFilePath(projectRoot),
-        configFilePath(projectRoot),
-    ];
-    for (const filePath of projectFiles) {
-        if (fs.existsSync(filePath)) {
-            try {
-                fs.unlinkSync(filePath);
-                removed.push(filePath);
-                if (!json) {
-                    console.log(`  已删除: ${filePath}`);
+    // 2. 清理 ~/.remnote-bridge/instances/ 下的 PID 和日志文件
+    const instancesDir = path.join(GLOBAL_DIR, 'instances');
+    if (fs.existsSync(instancesDir)) {
+        for (let i = 0; i < MAX_SLOTS; i++) {
+            for (const ext of ['.pid', '.log']) {
+                const filePath = path.join(instancesDir, `${i}${ext}`);
+                if (fs.existsSync(filePath)) {
+                    try {
+                        fs.unlinkSync(filePath);
+                        removed.push(filePath);
+                        if (!json)
+                            console.log(`  已删除: ${filePath}`);
+                    }
+                    catch (err) {
+                        const msg = err instanceof Error ? err.message : String(err);
+                        errors.push(`${filePath}: ${msg}`);
+                        if (!json)
+                            console.error(`  删除失败: ${filePath} — ${msg}`);
+                    }
                 }
             }
-            catch (err) {
-                errors.push(`${filePath}: ${err.message}`);
-                if (!json) {
-                    console.error(`  删除失败: ${filePath} — ${err.message}`);
+        }
+    }
+    // 3. 清理 registry.json
+    const registryPath = path.join(GLOBAL_DIR, 'registry.json');
+    if (fs.existsSync(registryPath)) {
+        try {
+            fs.unlinkSync(registryPath);
+            removed.push(registryPath);
+            if (!json)
+                console.log(`  已删除: ${registryPath}`);
+        }
+        catch (err) {
+            const msg = err instanceof Error ? err.message : String(err);
+            errors.push(`${registryPath}: ${msg}`);
+            if (!json)
+                console.error(`  删除失败: ${registryPath} — ${msg}`);
+        }
+    }
+    // 4. 清理旧版项目根文件（向后兼容）
+    try {
+        const { findProjectRoot } = await import('../config.js');
+        const projectRoot = findProjectRoot();
+        const legacyFiles = [
+            path.join(projectRoot, '.remnote-bridge.pid'),
+            path.join(projectRoot, '.remnote-bridge.log'),
+            path.join(projectRoot, '.remnote-bridge.json'),
+        ];
+        for (const filePath of legacyFiles) {
+            if (fs.existsSync(filePath)) {
+                try {
+                    fs.unlinkSync(filePath);
+                    removed.push(filePath);
+                    if (!json)
+                        console.log(`  已删除（旧版）: ${filePath}`);
+                }
+                catch (err) {
+                    const msg = err instanceof Error ? err.message : String(err);
+                    errors.push(`${filePath}: ${msg}`);
+                    if (!json)
+                        console.error(`  删除失败: ${filePath} — ${msg}`);
                 }
             }
         }
     }
-    // 3. 清理 ~/.claude/skills/remnote-bridge/
+    catch {
+        // findProjectRoot 失败不阻塞
+    }
+    // 5. 清理 ~/.claude/skills/remnote-bridge/
     const skillDir = path.join(os.homedir(), '.claude', 'skills', 'remnote-bridge');
     if (fs.existsSync(skillDir)) {
         try {
             fs.rmSync(skillDir, { recursive: true, force: true });
             removed.push(skillDir);
-            if (!json) {
+            if (!json)
                 console.log(`  已删除: ${skillDir}`);
-            }
         }
         catch (err) {
-            errors.push(`${skillDir}: ${err.message}`);
-            if (!json) {
-                console.error(`  删除失败: ${skillDir} — ${err.message}`);
+            const msg = err instanceof Error ? err.message : String(err);
+            errors.push(`${skillDir}: ${msg}`);
+            if (!json)
+                console.error(`  删除失败: ${skillDir} — ${msg}`);
+        }
+    }
+    // 6. 清理 addon 数据目录
+    for (const [, def] of ADDON_REGISTRY) {
+        if (!def.dataDirs)
+            continue;
+        for (const dir of def.dataDirs) {
+            const resolved = dir.replace(/^~/, os.homedir());
+            if (fs.existsSync(resolved)) {
+                try {
+                    fs.rmSync(resolved, { recursive: true, force: true });
+                    removed.push(resolved);
+                    if (!json)
+                        console.log(`  已删除: ${resolved}`);
+                }
+                catch (err) {
+                    const msg = err instanceof Error ? err.message : String(err);
+                    errors.push(`${resolved}: ${msg}`);
+                    if (!json)
+                        console.error(`  删除失败: ${resolved} — ${msg}`);
+                }
             }
         }
     }
-    // 4. 输出结果
+    // 7. 输出结果
     if (json) {
         jsonOutput({
             ok: errors.length === 0,