remnote-bridge 0.1.13 → 0.1.15

package/dist/cli/commands/health.js

@@ -2,16 +2,21 @@
  * health 命令
  *
  * 检查守护进程、Plugin 连接、SDK 状态，输出 ✅/❌ 列表。
- * - 全部健康 → 退出码 0
- * - 部分不健康 → 退出码 1
- * - 守护进程不可达 → 退出码 2
+ *
+ * 两种模式：
+ * - 全量模式（默认）：遍历注册表所有活跃实例，逐个查询状态
+ * - 单实例模式（--instance / --headless）：只查询指定实例
+ *
+ * 退出码：
+ * - 0：全部健康
+ * - 1：部分不健康
+ * - 2：无活跃实例 / 守护进程不可达
  */
 import { resolveInstanceId, loadRegistry, cleanStaleSlots, findSlotByInstance, } from '../daemon/registry.js';
 import { sendDaemonRequest } from '../daemon/send-request.js';
 import { jsonOutput } from '../utils/output.js';
 export async function healthCommand(options = {}) {
     const { json, diagnose, reload } = options;
-    const instanceId = resolveInstanceId(options.instance);
     // --diagnose 和 --reload 不能同时使用
     if (diagnose && reload) {
         const error = '--diagnose 和 --reload 不能同时使用';
@@ -24,7 +29,44 @@ export async function healthCommand(options = {}) {
         process.exitCode = 1;
         return;
     }
-    // 通过注册表检查 daemon 是否运行
+    // --diagnose / --reload 走单实例模式（不变）
+    if (diagnose || reload) {
+        const instanceId = resolveInstanceId(options.instance);
+        const registry = loadRegistry();
+        cleanStaleSlots(registry);
+        const entry = findSlotByInstance(registry, instanceId);
+        if (!entry) {
+            const error = `守护进程未运行（实例: ${instanceId}），请先执行 remnote-bridge connect`;
+            if (json) {
+                jsonOutput({ ok: false, command: 'health', error });
+            }
+            else {
+                console.error(error);
+            }
+            process.exitCode = 2;
+            return;
+        }
+        if (diagnose) {
+            await handleDiagnose(entry, instanceId, options);
+        }
+        else {
+            await handleReload(entry, instanceId, options);
+        }
+        return;
+    }
+    // 判断全量 vs 单实例
+    const isExplicitInstance = !!options.instance || process.env.REMNOTE_HEADLESS === '1';
+    if (isExplicitInstance) {
+        await handleSingleInstance(options);
+    }
+    else {
+        await handleAllInstances(options);
+    }
+}
+// ── 单实例模式 ──
+async function handleSingleInstance(options) {
+    const { json } = options;
+    const instanceId = resolveInstanceId(options.instance);
     const registry = loadRegistry();
     cleanStaleSlots(registry);
     const entry = findSlotByInstance(registry, instanceId);
@@ -36,6 +78,7 @@ export async function healthCommand(options = {}) {
                 daemon: { running: false },
                 plugin: { connected: false },
                 sdk: { ready: false },
+                error: `守护进程未运行（实例: ${instanceId}），请先执行 remnote-bridge connect`,
             });
         }
         else {
@@ -47,97 +90,6 @@ export async function healthCommand(options = {}) {
         process.exitCode = 2;
         return;
     }
-    // --diagnose 模式
-    if (diagnose) {
-        try {
-            const result = await sendDaemonRequest('diagnose', {}, { instance: options.instance });
-            if (!result) {
-                const error = '非 headless 模式，不支持 --diagnose';
-                if (json) {
-                    jsonOutput({ ok: false, command: 'health', error });
-                }
-                else {
-                    console.error(error);
-                }
-                process.exitCode = 1;
-                return;
-            }
-            if (json) {
-                jsonOutput({ ok: true, command: 'health', mode: 'diagnose', instance: instanceId, ...result });
-            }
-            else {
-                console.log('=== Headless Chrome 诊断 ===');
-                console.log(`状态: ${result.headless.status}`);
-                console.log(`Chrome 连接: ${result.headless.chromeConnected ? '是' : '否'}`);
-                console.log(`页面 URL: ${result.headless.pageUrl ?? '无'}`);
-                console.log(`重载次数: ${result.headless.reloadCount}`);
-                console.log(`Plugin 连接: ${result.pluginConnected ? '是' : '否'}`);
-                console.log(`SDK 就绪: ${result.sdkReady ? '是' : '否'}`);
-                if (result.screenshotPath) {
-                    console.log(`截图: ${result.screenshotPath}`);
-                }
-                if (result.headless.lastError) {
-                    console.log(`\n最近错误: ${result.headless.lastError}`);
-                }
-                if (result.headless.recentConsoleErrors.length > 0) {
-                    console.log('\nConsole 错误:');
-                    for (const err of result.headless.recentConsoleErrors) {
-                        console.log(`  ${err}`);
-                    }
-                }
-                if (!result.headless.chromeConnected) {
-                    console.log('\n排查建议: Chrome 已断开，尝试 `health --reload` 重载');
-                }
-                else if (!result.pluginConnected) {
-                    console.log('\n排查建议: Chrome 运行中但 Plugin 未连接，可能页面加载异常，尝试 `health --reload`');
-                }
-                else if (!result.sdkReady) {
-                    console.log('\n排查建议: Plugin 已连接但 SDK 未就绪，等待几秒后重试');
-                }
-            }
-        }
-        catch (err) {
-            const errorMsg = err instanceof Error ? err.message : String(err);
-            if (json) {
-                jsonOutput({ ok: false, command: 'health', error: errorMsg });
-            }
-            else {
-                console.error(`诊断失败: ${errorMsg}`);
-            }
-            process.exitCode = 1;
-        }
-        return;
-    }
-    // --reload 模式
-    if (reload) {
-        try {
-            const result = await sendDaemonRequest('headless_reload', {}, { instance: options.instance });
-            if (json) {
-                jsonOutput({ ok: result.ok, command: 'health', mode: 'reload', instance: instanceId, error: result.error });
-            }
-            else {
-                if (result.ok) {
-                    console.log('Headless Chrome 页面已重载');
-                }
-                else {
-                    console.error(`重载失败: ${result.error}`);
-                }
-            }
-            process.exitCode = result.ok ? 0 : 1;
-        }
-        catch (err) {
-            const errorMsg = err instanceof Error ? err.message : String(err);
-            if (json) {
-                jsonOutput({ ok: false, command: 'health', mode: 'reload', error: errorMsg });
-            }
-            else {
-                console.error(`重载失败: ${errorMsg}`);
-            }
-            process.exitCode = 1;
-        }
-        return;
-    }
-    // 通过 WS 连接守护进程获取状态
     let status;
     try {
         status = await sendDaemonRequest('get_status', {}, { instance: options.instance });
@@ -155,7 +107,7 @@ export async function healthCommand(options = {}) {
             });
         }
         else {
-            console.log('❌ 守护进程  不可达');
+            console.log(`❌ 守护进程  不可达（实例: ${instanceId}）`);
             console.log('❌ Plugin    未连接');
             console.log('❌ SDK       不可用');
             console.log(`\n错误: ${errorMsg}`);
@@ -163,7 +115,6 @@ export async function healthCommand(options = {}) {
         process.exitCode = 2;
         return;
     }
-    // 退出码
     const allHealthy = status.pluginConnected && status.sdkReady;
     const exitCode = allHealthy ? 0 : 1;
     if (json) {
@@ -171,34 +122,202 @@ export async function healthCommand(options = {}) {
             ok: allHealthy, command: 'health', exitCode,
             instance: instanceId, slotIndex: entry.index,
             daemon: { running: true, pid: entry.pid, reachable: true, uptime: status.uptime },
-            plugin: { connected: status.pluginConnected },
+            plugin: { connected: status.pluginConnected, isTwin: status.pluginIsTwin },
             sdk: { ready: status.sdkReady },
             timeoutRemaining: status.timeoutRemaining,
             ...(status.headless ? { headless: status.headless } : {}),
         });
     }
     else {
-        console.log(`✅ 守护进程  运行中（PID: ${entry.pid}，实例: ${instanceId}，槽位: ${entry.index}，已运行 ${formatUptime(status.uptime)}）`);
-        if (status.pluginConnected) {
-            console.log('✅ Plugin    已连接');
+        printInstanceStatus(entry, instanceId, status);
+    }
+    process.exitCode = exitCode;
+}
+// ── 全量模式 ──
+async function handleAllInstances(options) {
+    const { json } = options;
+    const registry = loadRegistry();
+    cleanStaleSlots(registry);
+    const activeEntries = registry.slots.filter((e) => e !== null);
+    if (activeEntries.length === 0) {
+        if (json) {
+            jsonOutput({
+                ok: false, command: 'health', exitCode: 2,
+                instances: [],
+                error: '没有活跃的实例，请执行 remnote-bridge connect 启动守护进程',
+            });
         }
         else {
-            console.log('❌ Plugin    未连接');
+            console.log('没有活跃的实例。执行 `remnote-bridge connect` 启动守护进程。');
         }
-        if (status.sdkReady) {
-            console.log('✅ SDK       就绪');
+        process.exitCode = 2;
+        return;
+    }
+    const instances = [];
+    let allHealthy = true;
+    let anyUnreachable = false;
+    for (const entry of activeEntries) {
+        try {
+            const status = await sendDaemonRequest('get_status', {}, { instance: entry.instance });
+            const healthy = status.pluginConnected && status.sdkReady;
+            if (!healthy)
+                allHealthy = false;
+            instances.push({
+                instance: entry.instance,
+                slotIndex: entry.index,
+                daemon: { running: true, pid: entry.pid, reachable: true, uptime: status.uptime },
+                plugin: { connected: status.pluginConnected, isTwin: status.pluginIsTwin },
+                sdk: { ready: status.sdkReady },
+                timeoutRemaining: status.timeoutRemaining,
+                ...(status.headless ? { headless: status.headless } : {}),
+            });
+            if (!json) {
+                if (instances.length > 1)
+                    console.log('');
+                printInstanceStatus(entry, entry.instance, status);
+            }
+        }
+        catch {
+            allHealthy = false;
+            anyUnreachable = true;
+            instances.push({
+                instance: entry.instance,
+                slotIndex: entry.index,
+                daemon: { running: true, pid: entry.pid, reachable: false },
+                plugin: { connected: false },
+                sdk: { ready: false },
+            });
+            if (!json) {
+                if (instances.length > 1)
+                    console.log('');
+                console.log(`=== 实例: ${entry.instance}（槽位 ${entry.index}）===`);
+                console.log(`❌ 守护进程  不可达（PID: ${entry.pid}）`);
+                console.log('❌ Plugin    未连接');
+                console.log('❌ SDK       不可用');
+            }
+        }
+    }
+    const exitCode = allHealthy ? 0 : anyUnreachable ? 2 : 1;
+    if (json) {
+        jsonOutput({
+            ok: allHealthy, command: 'health', exitCode,
+            instances,
+        });
+    }
+    process.exitCode = exitCode;
+}
+// ── diagnose / reload ──
+async function handleDiagnose(entry, instanceId, options) {
+    const { json } = options;
+    try {
+        const result = await sendDaemonRequest('diagnose', {}, { instance: options.instance });
+        if (!result) {
+            const error = '非 headless 模式，不支持 --diagnose';
+            if (json) {
+                jsonOutput({ ok: false, command: 'health', error });
+            }
+            else {
+                console.error(error);
+            }
+            process.exitCode = 1;
+            return;
+        }
+        if (json) {
+            jsonOutput({ ok: true, command: 'health', mode: 'diagnose', instance: instanceId, ...result });
+        }
+        else {
+            console.log('=== Headless Chrome 诊断 ===');
+            console.log(`状态: ${result.headless.status}`);
+            console.log(`Chrome 连接: ${result.headless.chromeConnected ? '是' : '否'}`);
+            console.log(`页面 URL: ${result.headless.pageUrl ?? '无'}`);
+            console.log(`重载次数: ${result.headless.reloadCount}`);
+            console.log(`Plugin 连接: ${result.pluginConnected ? '是' : '否'}`);
+            console.log(`SDK 就绪: ${result.sdkReady ? '是' : '否'}`);
+            if (result.screenshotPath) {
+                console.log(`截图: ${result.screenshotPath}`);
+            }
+            if (result.headless.lastError) {
+                console.log(`\n最近错误: ${result.headless.lastError}`);
+            }
+            if (result.headless.recentConsoleErrors.length > 0) {
+                console.log('\nConsole 错误:');
+                for (const err of result.headless.recentConsoleErrors) {
+                    console.log(`  ${err}`);
+                }
+            }
+            if (!result.headless.chromeConnected) {
+                console.log('\n排查建议: Chrome 已断开，尝试 `health --reload` 重载');
+            }
+            else if (!result.pluginConnected) {
+                console.log('\n排查建议: Chrome 运行中但 Plugin 未连接，可能页面加载异常，尝试 `health --reload`');
+            }
+            else if (!result.sdkReady) {
+                console.log('\n排查建议: Plugin 已连接但 SDK 未就绪，等待几秒后重试');
+            }
+        }
+    }
+    catch (err) {
+        const errorMsg = err instanceof Error ? err.message : String(err);
+        if (json) {
+            jsonOutput({ ok: false, command: 'health', error: errorMsg });
         }
         else {
-            console.log('❌ SDK       未就绪');
+            console.error(`诊断失败: ${errorMsg}`);
+        }
+        process.exitCode = 1;
+    }
+}
+async function handleReload(entry, instanceId, options) {
+    const { json } = options;
+    try {
+        const result = await sendDaemonRequest('headless_reload', {}, { instance: options.instance });
+        if (json) {
+            jsonOutput({ ok: result.ok, command: 'health', mode: 'reload', instance: instanceId, error: result.error });
+        }
+        else {
+            if (result.ok) {
+                console.log('Headless Chrome 页面已重载');
+            }
+            else {
+                console.error(`重载失败: ${result.error}`);
+            }
         }
-        if (status.headless) {
-            const h = status.headless;
-            const icon = h.status === 'running' ? '✅' : '❌';
-            console.log(`${icon} Chrome     ${h.status}${h.lastError ? ` (${h.lastError})` : ''}`);
+        process.exitCode = result.ok ? 0 : 1;
+    }
+    catch (err) {
+        const errorMsg = err instanceof Error ? err.message : String(err);
+        if (json) {
+            jsonOutput({ ok: false, command: 'health', mode: 'reload', error: errorMsg });
         }
-        console.log(`\n超时: ${formatUptime(status.timeoutRemaining)} 后自动关闭`);
+        else {
+            console.error(`重载失败: ${errorMsg}`);
+        }
+        process.exitCode = 1;
     }
-    process.exitCode = exitCode;
+}
+// ── 共享输出 ──
+function printInstanceStatus(entry, instanceId, status) {
+    console.log(`=== 实例: ${instanceId}（槽位 ${entry.index}）===`);
+    console.log(`✅ 守护进程  运行中（PID: ${entry.pid}，已运行 ${formatUptime(status.uptime)}）`);
+    if (status.pluginConnected) {
+        const twinLabel = status.pluginIsTwin ? '孪生' : '非孪生';
+        console.log(`✅ Plugin    已连接（${twinLabel}）`);
+    }
+    else {
+        console.log('❌ Plugin    未连接');
+    }
+    if (status.sdkReady) {
+        console.log('✅ SDK       就绪');
+    }
+    else {
+        console.log('❌ SDK       未就绪');
+    }
+    if (status.headless) {
+        const h = status.headless;
+        const icon = h.status === 'running' ? '✅' : '❌';
+        console.log(`${icon} Chrome     ${h.status}${h.lastError ? ` (${h.lastError})` : ''}`);
+    }
+    console.log(`超时: ${formatUptime(status.timeoutRemaining)} 后自动关闭`);
 }
 function formatUptime(seconds) {
     if (seconds < 60)

package/dist/cli/commands/read-rem-in-tree.js

@@ -0,0 +1,84 @@
+/**
+ * read-rem-in-tree 命令
+ *
+ * 一次调用同时完成 read-tree + 对树中每个 Rem 执行 read-rem。
+ * 返回 outline + remObjects，同时建立 tree 和 rem 双重缓存。
+ */
+import { sendDaemonRequest } from '../daemon/send-request.js';
+import { jsonOutput, handleCommandError } from '../utils/output.js';
+export async function readRemInTreeCommand(remId, options = {}) {
+    const { json } = options;
+    const depth = options.depth !== undefined ? parseInt(options.depth, 10) : undefined;
+    const maxNodes = options.maxNodes !== undefined ? parseInt(options.maxNodes, 10) : undefined;
+    const maxSiblings = options.maxSiblings !== undefined ? parseInt(options.maxSiblings, 10) : undefined;
+    const ancestorLevels = options.ancestorLevels !== undefined ? parseInt(options.ancestorLevels, 10) : undefined;
+    if ((depth !== undefined && isNaN(depth)) || (maxNodes !== undefined && isNaN(maxNodes)) || (maxSiblings !== undefined && isNaN(maxSiblings)) || (ancestorLevels !== undefined && isNaN(ancestorLevels))) {
+        const errMsg = '--depth, --max-nodes, --max-siblings, --ancestor-levels must be numbers';
+        if (json) {
+            jsonOutput({ ok: false, command: 'read-rem-in-tree', error: errMsg });
+        }
+        else {
+            console.error(`错误: ${errMsg}`);
+        }
+        process.exitCode = 1;
+        return;
+    }
+    // 构造 payload
+    const payload = { remId, depth, maxNodes, maxSiblings, ancestorLevels };
+    if (options.includePowerup)
+        payload.includePowerup = true;
+    if (options.full)
+        payload.full = true;
+    if (options.fields) {
+        payload.fields = Array.isArray(options.fields)
+            ? options.fields
+            : options.fields.split(',').map(f => f.trim()).filter(Boolean);
+    }
+    let result;
+    try {
+        result = await sendDaemonRequest('read_rem_in_tree', payload);
+    }
+    catch (err) {
+        handleCommandError(err, 'read-rem-in-tree', json);
+        return;
+    }
+    const data = result;
+    const cacheOverridden = data._cacheOverridden;
+    delete data._cacheOverridden;
+    const powerupFiltered = data.powerupFiltered;
+    delete data.powerupFiltered;
+    const ancestors = data.ancestors;
+    delete data.ancestors;
+    if (json) {
+        jsonOutput({
+            ok: true, command: 'read-rem-in-tree', data,
+            ...(ancestors ? { ancestors } : {}),
+            ...(cacheOverridden ? { cacheOverridden } : {}),
+            ...(powerupFiltered ? { powerupFiltered } : {}),
+        });
+    }
+    else {
+        if (cacheOverridden) {
+            console.warn(`注意: Tree ${cacheOverridden.id} 的缓存（${cacheOverridden.previousCachedAt}）已被本次 read 覆盖`);
+        }
+        if (powerupFiltered) {
+            console.warn(`⚠ 已过滤 Powerup 系统数据（${powerupFiltered.tags} 个 Tag、${powerupFiltered.children} 个隐藏子 Rem）。`);
+        }
+        if (ancestors && ancestors.length > 0) {
+            const pathParts = [...ancestors].reverse().map(a => {
+                const topMark = a.isTopLevel ? ' [top]' : '';
+                return `${a.name} (${a.id}${topMark})`;
+            });
+            console.log(`<!-- ancestors: ${pathParts.join(' > ')} -->`);
+        }
+        // 输出 outline
+        console.log(data.outline);
+        // 输出 remObjects 摘要
+        const remObjects = data.remObjects;
+        if (remObjects) {
+            const count = Object.keys(remObjects).length;
+            console.log(`\n--- ${count} RemObjects ---`);
+            console.log(JSON.stringify(remObjects, null, 2));
+        }
+    }
+}

package/dist/cli/config.js

@@ -24,6 +24,7 @@ export const DEFAULT_DEFAULTS = {
     readTreeDepth: 3,
     readTreeAncestorLevels: 0,
     readTreeIncludePowerup: false,
+    readRemInTreeMaxNodes: 50,
     readGlobeDepth: -1,
     readContextMode: 'focus',
     readContextAncestorLevels: 2,
@@ -54,6 +55,7 @@ function mergeDefaults(parsed) {
             ? parsed.readTreeAncestorLevels : DEFAULT_DEFAULTS.readTreeAncestorLevels,
         readTreeIncludePowerup: typeof parsed.readTreeIncludePowerup === 'boolean'
             ? parsed.readTreeIncludePowerup : DEFAULT_DEFAULTS.readTreeIncludePowerup,
+        readRemInTreeMaxNodes: isPositiveNumber(parsed.readRemInTreeMaxNodes) ? parsed.readRemInTreeMaxNodes : DEFAULT_DEFAULTS.readRemInTreeMaxNodes,
         readGlobeDepth: typeof parsed.readGlobeDepth === 'number' ? parsed.readGlobeDepth : DEFAULT_DEFAULTS.readGlobeDepth,
         readContextMode: parsed.readContextMode === 'focus' || parsed.readContextMode === 'page'
             ? parsed.readContextMode : DEFAULT_DEFAULTS.readContextMode,

package/dist/cli/daemon/registry.js

@@ -135,11 +135,19 @@ export function instanceLogPath(slotIndex) {
  * 解析实例标识。
  *
  * 优先级：REMNOTE_HEADLESS（最高，覆盖一切）> cliArg > REMNOTE_BRIDGE_INSTANCE > "default"
+ *
+ * "headless" 是保留实例名，只能通过 --headless 全局选项设置，不允许通过 --instance 或环境变量直接指定。
  */
 export function resolveInstanceId(cliArg) {
     // headless 模式覆盖 --instance，固定实例名
     if (process.env.REMNOTE_HEADLESS === '1')
         return 'headless';
+    // 禁止通过 --instance 或环境变量使用保留名 "headless"
+    const candidate = cliArg || process.env.REMNOTE_BRIDGE_INSTANCE;
+    if (candidate === 'headless') {
+        throw new Error('--instance headless 不是合法用法。请使用 --headless 全局选项。'
+            + '\n用法: remnote-bridge --headless connect → remnote-bridge --headless <命令>');
+    }
     if (cliArg)
         return cliArg;
     const fromEnv = process.env.REMNOTE_BRIDGE_INSTANCE;

package/dist/cli/handlers/edit-handler.js

@@ -63,6 +63,9 @@ export class EditHandler {
         const currentJson = JSON.stringify(currentRemObject, null, 2);
         const cachedJson = JSON.stringify(cachedObj, null, 2);
         if (currentJson !== cachedJson) {
+            // 诊断日志：打出具体哪些字段不同，帮助定位并发误判
+            const diff = diffFields(cachedObj, currentRemObject);
+            console.error(`[defense-2] Rem ${remId} conflict detected. Changed fields: ${diff.join(', ') || '(JSON differs but no top-level field diff — possible nested change)'}`);
             // 不更新缓存 — 迫使 AI re-read
             throw new Error(`Rem ${remId} has been modified since last read. Please read it again before editing.`);
         }
@@ -126,3 +129,14 @@ export class EditHandler {
         };
     }
 }
+/** 比较两个 RemObject 的顶层字段，返回值不同的 key 列表 */
+function diffFields(cached, current) {
+    const allKeys = new Set([...Object.keys(cached), ...Object.keys(current)]);
+    const changed = [];
+    for (const key of allKeys) {
+        if (JSON.stringify(cached[key]) !== JSON.stringify(current[key])) {
+            changed.push(key);
+        }
+    }
+    return changed;
+}