libp2p-mesh 2026.6.6 → 2026.6.8

package/dist/index.js

@@ -166,10 +166,19 @@ export default definePluginEntry({
     description: "P2P network for cross-instance agent communication via libp2p.",
     configSchema: createLibp2pMeshConfigSchema(),
     register: (api) => {
+        if (api.registrationMode === "cli-metadata" ||
+            api.registrationMode === "discovery" ||
+            api.registrationMode === "full") {
+            api.registerCli(registerLibp2pMeshCli, {
+                commands: ["libp2p-mesh"],
+            });
+            if (api.registrationMode === "cli-metadata") {
+                return;
+            }
+        }
+        if (api.registrationMode !== "full") {
+            return;
+        }
         registerLibp2pMesh(api);
-        // 5. Register CLI commands (setup wizard + config management)
-        api.registerCli(registerLibp2pMeshCli, {
-            commands: ["libp2p-mesh"],
-        });
     },
 });

package/dist/src/plugin.js

@@ -16,7 +16,14 @@ export function registerLibp2pMesh(api) {
     const store = createInstancePeerStore({ logger: api.logger });
     const delivery = createOpenClawRuntimeInboundDelivery({
         config: api.config,
-        loadAdapter: (channel) => api.runtime.channel.outbound.loadAdapter(channel),
+        loadAdapter: async (channel) => {
+            const loadAdapter = api.runtime?.channel?.outbound?.loadAdapter;
+            if (typeof loadAdapter !== "function") {
+                api.logger.warn?.(`[libp2p-mesh] runtime channel outbound adapter is unavailable; cannot deliver to ${channel}`);
+                return undefined;
+            }
+            return loadAdapter(channel);
+        },
         logger: api.logger,
     });
     const router = createInstanceRouter({

package/dist/src/wizard.js

@@ -19,19 +19,22 @@ export function validateMultiaddr(raw) {
 function isTTY() {
     return Boolean(process.stdout.isTTY && process.stdin.isTTY);
 }
+function supportsInteractiveSelect() {
+    return isTTY() && process.platform !== "win32";
+}
 /**
- * Move cursor up `n` lines using ANSI escape (no-op on dumb terminals).
+ * Clear entire current line: carriage-return to col 0, then erase to end.
  */
-function ansiUp(n) {
-    if (n <= 0)
-        return;
-    process.stdout.write(`\x1b[${n}A`);
+function clearLine() {
+    process.stdout.write("\r\x1b[K");
 }
 /**
- * Clear current line from cursor to end.
+ * Move cursor up `n` lines.
  */
-function ansiClearLine() {
-    process.stdout.write("\x1b[K");
+function cursorUp(n) {
+    if (n <= 0)
+        return;
+    process.stdout.write(`\x1b[${n}A`);
 }
 function renderChoices(choices, selectedIdx) {
     for (let i = 0; i < choices.length; i++) {
@@ -47,11 +50,16 @@ function renderChoices(choices, selectedIdx) {
         }
     }
 }
+/**
+ * Re-render the choice list in-place. Assumes cursor is immediately below
+ * the last choice line.
+ */
 function reRenderChoices(choices, selectedIdx) {
     const n = choices.length;
-    ansiUp(n);
+    // Jump back to the first choice line
+    cursorUp(n);
     for (let i = 0; i < n; i++) {
-        ansiClearLine();
+        clearLine(); // \r\x1b[K  -- always starts at col 0
         const c = choices[i];
         const pointer = i === selectedIdx ? "❯" : " ";
         const hint = c.hint ? `（${c.hint}）` : "";
@@ -63,15 +71,20 @@ function reRenderChoices(choices, selectedIdx) {
             process.stdout.write(`${line}\n`);
         }
     }
+    // Cursor is now back below the last choice line — same position as before.
 }
-function clearChoices(count) {
-    ansiUp(count);
+/**
+ * Erase the choice list from the screen (used after selection).
+ * Assumes cursor is immediately below the last choice line.
+ */
+function eraseChoices(count) {
+    cursorUp(count);
     for (let i = 0; i < count; i++) {
-        ansiClearLine();
+        clearLine();
         process.stdout.write("\n");
     }
-    // Now we're back where the first choice was rendered
-    ansiUp(count);
+    // Back to where the first choice was
+    cursorUp(count);
 }
 function interactiveSelect(prompt, choices) {
     let selectedIdx = 0;
@@ -81,10 +94,10 @@ function interactiveSelect(prompt, choices) {
     renderChoices(choices, selectedIdx);
     return new Promise((resolve) => {
         const wasRaw = process.stdin.isRaw;
-        process.stdin.setRawMode(true);
-        readline.emitKeypressEvents(process.stdin);
+        const wasPaused = process.stdin.isPaused();
+        let resolved = false;
         const onKeypress = (_str, key) => {
-            if (!key)
+            if (!key || !key.name)
                 return;
             if (key.name === "up" || key.name === "k") {
                 selectedIdx =
@@ -96,9 +109,10 @@ function interactiveSelect(prompt, choices) {
                 reRenderChoices(choices, selectedIdx);
             }
             else if (key.name === "return" || key.name === "space") {
+                resolved = true;
                 const chosen = choices[selectedIdx];
                 cleanup();
-                clearChoices(choices.length);
+                eraseChoices(choices.length);
                 process.stdout.write(`  → ${chosen.label}\n`);
                 resolve(chosen.value);
             }
@@ -109,9 +123,39 @@ function interactiveSelect(prompt, choices) {
             }
         };
         const cleanup = () => {
-            process.stdin.setRawMode(wasRaw ?? false);
+            if (resolved)
+                return;
+            try {
+                // Always restore to non-raw so subsequent readline works
+                process.stdin.setRawMode(false);
+            }
+            catch {
+                // best-effort restore
+            }
+            if (wasPaused)
+                process.stdin.pause();
             process.stdin.removeListener("keypress", onKeypress);
         };
+        // Pause before reconfiguring stdin to avoid data race
+        process.stdin.pause();
+        // Must call emitKeypressEvents BEFORE setRawMode per Node.js docs
+        try {
+            readline.emitKeypressEvents(process.stdin);
+        }
+        catch {
+            cleanup();
+            fallbackNumberedSelect(prompt, choices).then(resolve);
+            return;
+        }
+        try {
+            process.stdin.setRawMode(true);
+        }
+        catch {
+            cleanup();
+            fallbackNumberedSelect(prompt, choices).then(resolve);
+            return;
+        }
+        process.stdin.resume();
         process.stdin.on("keypress", onKeypress);
     });
 }
@@ -252,7 +296,7 @@ export function createReadlinePrompter() {
             : choices;
         // Release readline so it doesn't fight over stdin in raw mode
         disposeRL();
-        const result = isTTY()
+        const result = supportsInteractiveSelect()
             ? await interactiveSelect(prompt, allChoices)
             : await fallbackNumberedSelect(prompt, allChoices);
         if (result === SENTINEL_FINISH)
@@ -333,10 +377,7 @@ export async function runSetupWizard(prompter, currentConfig, availableChannels)
             "我们将引导你完成 P2P Mesh 网络的基础配置。",
             "任何时候按 Ctrl+C 可退出，配置不会被保存。",
         ]);
-        // =================================================================
-        // Layer 1: Core Path
-        // =================================================================
-        // Step 1: Discovery mode  (select throws WizardFinishError on Finish)
+        // Step 1: Discovery mode
         const discovery = await prompter.select("选择节点发现方式：", [
             {
                 value: "mdns",
@@ -353,15 +394,13 @@ export async function runSetupWizard(prompter, currentConfig, availableChannels)
                 label: "DHT — Kademlia 分布式发现",
                 hint: "需要至少一个 bootstrap 入口",
             },
-        ], { includeSkip: true });
-        if (!isSkip(discovery)) {
-            config.discovery = discovery;
-            // Step 2: Bootstrap addresses (only if discovery=bootstrap or dht)
-            if (discovery === "bootstrap" || discovery === "dht") {
-                const addrs = await prompter.multiline("输入 Bootstrap 节点地址（每行一个，空行结束）：", "  格式: /ip4/<IP>/tcp/<端口>/p2p/<PeerID>");
-                if (addrs.length > 0) {
-                    config.bootstrapList = addrs;
-                }
+        ]);
+        config.discovery = discovery;
+        // Step 2: Bootstrap addresses (only if discovery=bootstrap or dht)
+        if (discovery === "bootstrap" || discovery === "dht") {
+            const addrs = await prompter.multiline("输入 Bootstrap 节点地址（每行一个，空行结束，直接回车跳过）：", "  格式: /ip4/<IP>/tcp/<端口>/p2p/<PeerID>");
+            if (addrs.length > 0) {
+                config.bootstrapList = addrs;
             }
         }
         // Step 3: Inbound targets
@@ -369,116 +408,95 @@ export async function runSetupWizard(prompter, currentConfig, availableChannels)
             prompter.displayWarning("未检测到已安装的聊天频道插件。你可以稍后在 openclaw.json 中手动配置 inboundTargets。");
         }
         else {
-            const wantInbound = await prompter.confirm("是否配置 P2P 消息的接收目标？", false, { allowSkip: true });
-            assertNotFinished(wantInbound);
-            if (wantInbound === true) {
-                const targets = [];
-                let addMore = true;
-                while (addMore) {
-                    const channelChoices = availableChannels.map((ch) => ({
+            const targets = [];
+            while (true) {
+                const doneLabel = targets.length > 0
+                    ? "完成接收目标配置"
+                    : hasInboundConfig(currentConfig)
+                        ? "保留现有接收目标并继续"
+                        : "暂不配置接收目标";
+                const channelChoices = [
+                    ...availableChannels.map((ch) => ({
                         value: ch,
                         label: ch,
-                    }));
-                    // select throws WizardFinishError on Finish
-                    const channel = await prompter.select("选择接收 P2P 消息的聊天频道：", channelChoices, { includeSkip: true });
-                    if (isSkip(channel))
-                        break;
-                    const target = await prompter.question(`输入 ${channel} 的接收目标（如 user:ou_xxx 或 chat:oc_xxx）：`, undefined, { allowSkip: true });
-                    assertNotFinished(target);
-                    if (isSkip(target))
-                        break;
-                    if (target) {
-                        targets.push({ channel, target });
-                    }
-                    const more = await prompter.confirm("是否添加更多接收目标？", false);
-                    assertNotFinished(more);
-                    addMore = more ?? false;
+                    })),
+                    {
+                        value: SENTINEL_SKIP,
+                        label: doneLabel,
+                    },
+                ];
+                const channel = await prompter.select("选择接收 P2P 消息的聊天频道：", channelChoices);
+                if (channel === SENTINEL_SKIP)
+                    break;
+                const target = await prompter.question(`输入 ${channel} 的接收目标（如 user:ou_xxx 或 chat:oc_xxx，直接回车跳过当前频道）：`, undefined, { allowSkip: true });
+                assertNotFinished(target);
+                if (isSkip(target)) {
+                    continue;
                 }
-                if (targets.length > 0) {
-                    if (targets.length === 1 &&
-                        !currentConfig.inboundChannel &&
-                        !currentConfig.inboundTarget) {
-                        // Single target: also set legacy inboundChannel/inboundTarget for backwards compat
-                        config.inboundChannel = targets[0].channel;
-                        config.inboundTarget = targets[0].target;
-                    }
-                    config.inboundTargets = targets;
+                if (target) {
+                    targets.push({ channel, target });
                 }
             }
-            // wantInbound === null (skip) or false (no) → skip inbound config
-        }
-        // Step 4: Preview core config and confirm
-        const corePreview = formatConfigPreview(config);
-        prompter.displayBox("即将写入以下配置：", corePreview);
-        const coreConfirmed = await prompter.confirm("确认写入？", true);
-        if (!coreConfirmed) {
-            prompter.displayWarning("已取消，配置未保存。");
-            throw new WizardCancelledError();
+            if (targets.length > 0) {
+                applyInboundTargets(config, targets);
+            }
         }
-        // =================================================================
-        // Layer 2: Advanced (optional)
-        // =================================================================
-        const wantsAdvanced = await prompter.confirm("需要在不同网络之间使用吗（跨 WiFi / 跨城市）？", false, { allowSkip: true });
-        assertNotFinished(wantsAdvanced);
-        if (wantsAdvanced === true) {
-            // Fixed port
-            const wantFixedPort = await prompter.confirm("是否使用固定监听端口？（推荐跨网络场景）", false, { allowSkip: true });
-            assertNotFinished(wantFixedPort);
-            if (wantFixedPort === true) {
-                const port = await prompter.question("端口号", "4001", {
-                    allowSkip: true,
-                });
-                assertNotFinished(port);
-                if (!isSkip(port)) {
-                    const portNum = parseInt(port, 10);
-                    if (!isNaN(portNum) && portNum > 0 && portNum < 65536) {
-                        config.listenAddrs = [`/ip4/0.0.0.0/tcp/${portNum}`];
-                    }
-                    else {
-                        prompter.displayWarning("端口号无效，使用默认动态端口。");
-                    }
+        // Step 4: Network profile
+        const networkMode = await prompter.select("选择网络使用场景：", [
+            {
+                value: "lan",
+                label: "局域网 / 默认配置",
+                hint: "同一 WiFi 或内网使用",
+            },
+            {
+                value: "wan",
+                label: "跨网络 / 高级配置",
+                hint: "跨 WiFi、跨城市或需要固定入口",
+            },
+        ]);
+        if (networkMode === "wan") {
+            const port = await prompter.question("固定监听端口（直接回车跳过，使用动态端口）", "4001", { allowSkip: true });
+            assertNotFinished(port);
+            if (!isSkip(port)) {
+                const portNum = parseInt(port, 10);
+                if (!isNaN(portNum) && portNum > 0 && portNum < 65536) {
+                    config.listenAddrs = [`/ip4/0.0.0.0/tcp/${portNum}`];
                 }
-            }
-            // NAT traversal
-            const wantNAT = await prompter.confirm("是否启用 NAT 穿透？（默认开启，推荐保留）", true, { allowSkip: true });
-            assertNotFinished(wantNAT);
-            if (wantNAT !== null) {
-                config.enableNATTraversal = wantNAT;
-            }
-            // Circuit Relay
-            const wantRelay = await prompter.confirm("需要配置 Circuit Relay 中继节点吗？", false, { allowSkip: true });
-            assertNotFinished(wantRelay);
-            if (wantRelay === true) {
-                const relays = await prompter.multiline("输入 Relay 节点地址（每行一个，空行结束）：", "  格式: /ip4/<IP>/tcp/<端口>/p2p/<PeerID>");
-                if (relays.length > 0) {
-                    config.relayList = relays;
+                else {
+                    prompter.displayWarning("端口号无效，使用默认动态端口。");
                 }
             }
-            // Custom instance name
-            const wantName = await prompter.confirm("为此节点设置一个自定义名称吗？（用于 P2P 网络中的身份显示）", false, { allowSkip: true });
-            assertNotFinished(wantName);
-            if (wantName === true) {
-                const name = await prompter.question("节点名称", undefined, {
-                    allowSkip: true,
-                });
-                assertNotFinished(name);
-                if (!isSkip(name) && name) {
-                    config.instanceName = name;
-                }
+            const natTraversal = await prompter.select("NAT 穿透：", [
+                {
+                    value: "true",
+                    label: "启用",
+                    hint: "默认，推荐保留",
+                },
+                {
+                    value: "false",
+                    label: "禁用",
+                    hint: "仅在明确需要时关闭",
+                },
+            ]);
+            config.enableNATTraversal = natTraversal === "true";
+            const relays = await prompter.multiline("输入 Relay 节点地址（每行一个，空行结束，直接回车跳过）：", "  格式: /ip4/<IP>/tcp/<端口>/p2p/<PeerID>");
+            if (relays.length > 0) {
+                config.relayList = relays;
             }
-            // Final preview and confirm (only if advanced config changed)
-            if (wantFixedPort === true ||
-                wantRelay === true ||
-                wantName === true ||
-                (wantNAT !== null && !config.enableNATTraversal)) {
-                const finalPreview = formatConfigPreview(config);
-                prompter.displayBox("高级配置已追加，最终预览：", finalPreview);
-                const finalConfirmed = await prompter.confirm("确认写入？", true);
-                if (!finalConfirmed) {
-                    prompter.displayWarning("已取消高级配置，核心配置已保存。");
-                }
+            const name = await prompter.question("节点名称（直接回车跳过）", undefined, { allowSkip: true });
+            assertNotFinished(name);
+            if (!isSkip(name) && name) {
+                config.instanceName = name;
             }
         }
+        // Step 5: Final preview and confirm
+        const finalPreview = formatConfigPreview(config);
+        prompter.displayBox("即将写入以下配置：", finalPreview);
+        const confirmed = await prompter.confirm("确认写入？", true);
+        if (!confirmed) {
+            prompter.displayWarning("已取消，配置未保存。");
+            throw new WizardCancelledError();
+        }
         prompter.displaySuccess("配置完成。运行 openclaw gateway restart 使配置生效。");
         return config;
     }
@@ -511,6 +529,23 @@ export class WizardFinishError extends Error {
     }
 }
 // --- Helpers ---
+function hasInboundConfig(config) {
+    return ((Array.isArray(config.inboundTargets) && config.inboundTargets.length > 0) ||
+        (Boolean(config.inboundChannel) && Boolean(config.inboundTarget)));
+}
+function applyInboundTargets(config, targets) {
+    delete config.inboundTargets;
+    delete config.inboundChannel;
+    delete config.inboundTarget;
+    if (targets.length === 0) {
+        return;
+    }
+    config.inboundTargets = targets;
+    if (targets.length === 1) {
+        config.inboundChannel = targets[0].channel;
+        config.inboundTarget = targets[0].target;
+    }
+}
 function formatConfigPreview(config) {
     const lines = [];
     if (config.discovery) {

package/index.ts

@@ -169,10 +169,23 @@ export default definePluginEntry({
   description: "P2P network for cross-instance agent communication via libp2p.",
   configSchema: createLibp2pMeshConfigSchema(),
   register: (api) => {
+    if (
+      api.registrationMode === "cli-metadata" ||
+      api.registrationMode === "discovery" ||
+      api.registrationMode === "full"
+    ) {
+      api.registerCli(registerLibp2pMeshCli, {
+        commands: ["libp2p-mesh"],
+      });
+      if (api.registrationMode === "cli-metadata") {
+        return;
+      }
+    }
+
+    if (api.registrationMode !== "full") {
+      return;
+    }
+
     registerLibp2pMesh(api);
-    // 5. Register CLI commands (setup wizard + config management)
-    api.registerCli(registerLibp2pMeshCli, {
-      commands: ["libp2p-mesh"],
-    });
   },
 });

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "libp2p-mesh",
-  "version": "2026.6.6",
+  "version": "2026.6.8",
   "description": "OpenClaw libp2p P2P mesh network plugin for cross-instance agent communication",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc -p tsconfig.json",
-    "test": "node --import tsx --tSest test/*.test.ts",
+    "test": "node --import tsx --test test/*.test.ts",
     "prepack": "npm run build"
   },
   "files": [

package/src/plugin.ts

@@ -20,7 +20,16 @@ export function registerLibp2pMesh(api: OpenClawPluginApi) {
   const store = createInstancePeerStore({ logger: api.logger });
   const delivery = createOpenClawRuntimeInboundDelivery({
     config: api.config,
-    loadAdapter: (channel: string) => api.runtime.channel.outbound.loadAdapter(channel),
+    loadAdapter: async (channel: string) => {
+      const loadAdapter = api.runtime?.channel?.outbound?.loadAdapter;
+      if (typeof loadAdapter !== "function") {
+        api.logger.warn?.(
+          `[libp2p-mesh] runtime channel outbound adapter is unavailable; cannot deliver to ${channel}`,
+        );
+        return undefined;
+      }
+      return loadAdapter(channel);
+    },
     logger: api.logger,
   });
   const router = createInstanceRouter({

package/src/wizard.ts

@@ -57,19 +57,23 @@ function isTTY(): boolean {
   return Boolean(process.stdout.isTTY && process.stdin.isTTY);
 }
 
+function supportsInteractiveSelect(): boolean {
+  return isTTY() && process.platform !== "win32";
+}
+
 /**
- * Move cursor up `n` lines using ANSI escape (no-op on dumb terminals).
+ * Clear entire current line: carriage-return to col 0, then erase to end.
  */
-function ansiUp(n: number): void {
-  if (n <= 0) return;
-  process.stdout.write(`\x1b[${n}A`);
+function clearLine(): void {
+  process.stdout.write("\r\x1b[K");
 }
 
 /**
- * Clear current line from cursor to end.
+ * Move cursor up `n` lines.
  */
-function ansiClearLine(): void {
-  process.stdout.write("\x1b[K");
+function cursorUp(n: number): void {
+  if (n <= 0) return;
+  process.stdout.write(`\x1b[${n}A`);
 }
 
 function renderChoices(
@@ -89,14 +93,19 @@ function renderChoices(
   }
 }
 
+/**
+ * Re-render the choice list in-place. Assumes cursor is immediately below
+ * the last choice line.
+ */
 function reRenderChoices(
   choices: PromptChoice[],
   selectedIdx: number,
 ): void {
   const n = choices.length;
-  ansiUp(n);
+  // Jump back to the first choice line
+  cursorUp(n);
   for (let i = 0; i < n; i++) {
-    ansiClearLine();
+    clearLine(); // \r\x1b[K  -- always starts at col 0
     const c = choices[i]!;
     const pointer = i === selectedIdx ? "❯" : " ";
     const hint = c.hint ? `（${c.hint}）` : "";
@@ -107,16 +116,21 @@ function reRenderChoices(
       process.stdout.write(`${line}\n`);
     }
   }
+  // Cursor is now back below the last choice line — same position as before.
 }
 
-function clearChoices(count: number): void {
-  ansiUp(count);
+/**
+ * Erase the choice list from the screen (used after selection).
+ * Assumes cursor is immediately below the last choice line.
+ */
+function eraseChoices(count: number): void {
+  cursorUp(count);
   for (let i = 0; i < count; i++) {
-    ansiClearLine();
+    clearLine();
     process.stdout.write("\n");
   }
-  // Now we're back where the first choice was rendered
-  ansiUp(count);
+  // Back to where the first choice was
+  cursorUp(count);
 }
 
 function interactiveSelect(
@@ -133,15 +147,15 @@ function interactiveSelect(
 
   return new Promise((resolve) => {
     const wasRaw = process.stdin.isRaw;
+    const wasPaused = process.stdin.isPaused();
 
-    process.stdin.setRawMode(true);
-    readline.emitKeypressEvents(process.stdin);
+    let resolved = false;
 
     const onKeypress = (
       _str: string | undefined,
       key: { name?: string; ctrl?: boolean },
     ) => {
-      if (!key) return;
+      if (!key || !key.name) return;
 
       if (key.name === "up" || key.name === "k") {
         selectedIdx =
@@ -151,9 +165,10 @@ function interactiveSelect(
         selectedIdx = (selectedIdx + 1) % choices.length;
         reRenderChoices(choices, selectedIdx);
       } else if (key.name === "return" || key.name === "space") {
+        resolved = true;
         const chosen = choices[selectedIdx]!;
         cleanup();
-        clearChoices(choices.length);
+        eraseChoices(choices.length);
         process.stdout.write(`  → ${chosen.label}\n`);
         resolve(chosen.value);
       } else if (key.ctrl && key.name === "c") {
@@ -164,10 +179,36 @@ function interactiveSelect(
     };
 
     const cleanup = () => {
-      process.stdin.setRawMode(wasRaw ?? false);
+      if (resolved) return;
+      try {
+        // Always restore to non-raw so subsequent readline works
+        process.stdin.setRawMode(false);
+      } catch {
+        // best-effort restore
+      }
+      if (wasPaused) process.stdin.pause();
       process.stdin.removeListener("keypress", onKeypress);
     };
 
+    // Pause before reconfiguring stdin to avoid data race
+    process.stdin.pause();
+    // Must call emitKeypressEvents BEFORE setRawMode per Node.js docs
+    try {
+      readline.emitKeypressEvents(process.stdin);
+    } catch {
+      cleanup();
+      fallbackNumberedSelect(prompt, choices).then(resolve);
+      return;
+    }
+    try {
+      process.stdin.setRawMode(true);
+    } catch {
+      cleanup();
+      fallbackNumberedSelect(prompt, choices).then(resolve);
+      return;
+    }
+    process.stdin.resume();
+
     process.stdin.on("keypress", onKeypress);
   });
 }
@@ -328,7 +369,7 @@ export function createReadlinePrompter(): WizardPrompter {
     // Release readline so it doesn't fight over stdin in raw mode
     disposeRL();
 
-    const result = isTTY()
+    const result = supportsInteractiveSelect()
       ? await interactiveSelect(prompt, allChoices)
       : await fallbackNumberedSelect(prompt, allChoices);
 
@@ -428,11 +469,7 @@ export async function runSetupWizard(
       "任何时候按 Ctrl+C 可退出，配置不会被保存。",
     ]);
 
-    // =================================================================
-    // Layer 1: Core Path
-    // =================================================================
-
-    // Step 1: Discovery mode  (select throws WizardFinishError on Finish)
+    // Step 1: Discovery mode
     const discovery = await prompter.select(
       "选择节点发现方式：",
       [
@@ -452,20 +489,17 @@ export async function runSetupWizard(
           hint: "需要至少一个 bootstrap 入口",
         },
       ],
-      { includeSkip: true },
     );
-    if (!isSkip(discovery)) {
-      config.discovery = discovery;
-
-      // Step 2: Bootstrap addresses (only if discovery=bootstrap or dht)
-      if (discovery === "bootstrap" || discovery === "dht") {
-        const addrs = await prompter.multiline(
-          "输入 Bootstrap 节点地址（每行一个，空行结束）：",
-          "  格式: /ip4/<IP>/tcp/<端口>/p2p/<PeerID>",
-        );
-        if (addrs.length > 0) {
-          config.bootstrapList = addrs;
-        }
+    config.discovery = discovery;
+
+    // Step 2: Bootstrap addresses (only if discovery=bootstrap or dht)
+    if (discovery === "bootstrap" || discovery === "dht") {
+      const addrs = await prompter.multiline(
+        "输入 Bootstrap 节点地址（每行一个，空行结束，直接回车跳过）：",
+        "  格式: /ip4/<IP>/tcp/<端口>/p2p/<PeerID>",
+      );
+      if (addrs.length > 0) {
+        config.bootstrapList = addrs;
       }
     }
 
@@ -475,162 +509,124 @@ export async function runSetupWizard(
         "未检测到已安装的聊天频道插件。你可以稍后在 openclaw.json 中手动配置 inboundTargets。",
       );
     } else {
-      const wantInbound = await prompter.confirm(
-        "是否配置 P2P 消息的接收目标？",
-        false,
-        { allowSkip: true },
-      );
-      assertNotFinished(wantInbound);
-      if (wantInbound === true) {
-        const targets: Array<{ id?: string; channel: string; target: string }> =
-          [];
-        let addMore = true;
-        while (addMore) {
-          const channelChoices: PromptChoice[] = availableChannels.map(
-            (ch) => ({
-              value: ch,
-              label: ch,
-            }),
-          );
-          // select throws WizardFinishError on Finish
-          const channel = await prompter.select(
-            "选择接收 P2P 消息的聊天频道：",
-            channelChoices,
-            { includeSkip: true },
-          );
-          if (isSkip(channel)) break;
-
-          const target = await prompter.question(
-            `输入 ${channel} 的接收目标（如 user:ou_xxx 或 chat:oc_xxx）：`,
-            undefined,
-            { allowSkip: true },
-          );
-          assertNotFinished(target);
-          if (isSkip(target)) break;
-          if (target) {
-            targets.push({ channel, target });
-          }
-          const more = await prompter.confirm("是否添加更多接收目标？", false);
-          assertNotFinished(more);
-          addMore = more ?? false;
+      const targets: Array<{ id?: string; channel: string; target: string }> = [];
+      while (true) {
+        const doneLabel =
+          targets.length > 0
+            ? "完成接收目标配置"
+            : hasInboundConfig(currentConfig)
+              ? "保留现有接收目标并继续"
+              : "暂不配置接收目标";
+        const channelChoices: PromptChoice[] = [
+          ...availableChannels.map((ch) => ({
+            value: ch,
+            label: ch,
+          })),
+          {
+            value: SENTINEL_SKIP,
+            label: doneLabel,
+          },
+        ];
+        const channel = await prompter.select(
+          "选择接收 P2P 消息的聊天频道：",
+          channelChoices,
+        );
+        if (channel === SENTINEL_SKIP) break;
+
+        const target = await prompter.question(
+          `输入 ${channel} 的接收目标（如 user:ou_xxx 或 chat:oc_xxx，直接回车跳过当前频道）：`,
+          undefined,
+          { allowSkip: true },
+        );
+        assertNotFinished(target);
+        if (isSkip(target)) {
+          continue;
         }
-        if (targets.length > 0) {
-          if (
-            targets.length === 1 &&
-            !currentConfig.inboundChannel &&
-            !currentConfig.inboundTarget
-          ) {
-            // Single target: also set legacy inboundChannel/inboundTarget for backwards compat
-            config.inboundChannel = targets[0]!.channel;
-            config.inboundTarget = targets[0]!.target;
-          }
-          config.inboundTargets = targets;
+        if (target) {
+          targets.push({ channel, target });
         }
       }
-      // wantInbound === null (skip) or false (no) → skip inbound config
-    }
 
-    // Step 4: Preview core config and confirm
-    const corePreview = formatConfigPreview(config);
-    prompter.displayBox("即将写入以下配置：", corePreview);
-    const coreConfirmed = await prompter.confirm("确认写入？", true);
-    if (!coreConfirmed) {
-      prompter.displayWarning("已取消，配置未保存。");
-      throw new WizardCancelledError();
+      if (targets.length > 0) {
+        applyInboundTargets(config, targets);
+      }
     }
 
-    // =================================================================
-    // Layer 2: Advanced (optional)
-    // =================================================================
-
-    const wantsAdvanced = await prompter.confirm(
-      "需要在不同网络之间使用吗（跨 WiFi / 跨城市）？",
-      false,
-      { allowSkip: true },
+    // Step 4: Network profile
+    const networkMode = await prompter.select(
+      "选择网络使用场景：",
+      [
+        {
+          value: "lan",
+          label: "局域网 / 默认配置",
+          hint: "同一 WiFi 或内网使用",
+        },
+        {
+          value: "wan",
+          label: "跨网络 / 高级配置",
+          hint: "跨 WiFi、跨城市或需要固定入口",
+        },
+      ],
     );
-    assertNotFinished(wantsAdvanced);
-    if (wantsAdvanced === true) {
-      // Fixed port
-      const wantFixedPort = await prompter.confirm(
-        "是否使用固定监听端口？（推荐跨网络场景）",
-        false,
+    if (networkMode === "wan") {
+      const port = await prompter.question(
+        "固定监听端口（直接回车跳过，使用动态端口）",
+        "4001",
         { allowSkip: true },
       );
-      assertNotFinished(wantFixedPort);
-      if (wantFixedPort === true) {
-        const port = await prompter.question("端口号", "4001", {
-          allowSkip: true,
-        });
-        assertNotFinished(port);
-        if (!isSkip(port)) {
-          const portNum = parseInt(port, 10);
-          if (!isNaN(portNum) && portNum > 0 && portNum < 65536) {
-            config.listenAddrs = [`/ip4/0.0.0.0/tcp/${portNum}`];
-          } else {
-            prompter.displayWarning("端口号无效，使用默认动态端口。");
-          }
+      assertNotFinished(port);
+      if (!isSkip(port)) {
+        const portNum = parseInt(port, 10);
+        if (!isNaN(portNum) && portNum > 0 && portNum < 65536) {
+          config.listenAddrs = [`/ip4/0.0.0.0/tcp/${portNum}`];
+        } else {
+          prompter.displayWarning("端口号无效，使用默认动态端口。");
         }
       }
 
-      // NAT traversal
-      const wantNAT = await prompter.confirm(
-        "是否启用 NAT 穿透？（默认开启，推荐保留）",
-        true,
-        { allowSkip: true },
+      const natTraversal = await prompter.select(
+        "NAT 穿透：",
+        [
+          {
+            value: "true",
+            label: "启用",
+            hint: "默认，推荐保留",
+          },
+          {
+            value: "false",
+            label: "禁用",
+            hint: "仅在明确需要时关闭",
+          },
+        ],
       );
-      assertNotFinished(wantNAT);
-      if (wantNAT !== null) {
-        config.enableNATTraversal = wantNAT;
-      }
+      config.enableNATTraversal = natTraversal === "true";
 
-      // Circuit Relay
-      const wantRelay = await prompter.confirm(
-        "需要配置 Circuit Relay 中继节点吗？",
-        false,
-        { allowSkip: true },
+      const relays = await prompter.multiline(
+        "输入 Relay 节点地址（每行一个，空行结束，直接回车跳过）：",
+        "  格式: /ip4/<IP>/tcp/<端口>/p2p/<PeerID>",
       );
-      assertNotFinished(wantRelay);
-      if (wantRelay === true) {
-        const relays = await prompter.multiline(
-          "输入 Relay 节点地址（每行一个，空行结束）：",
-          "  格式: /ip4/<IP>/tcp/<端口>/p2p/<PeerID>",
-        );
-        if (relays.length > 0) {
-          config.relayList = relays;
-        }
+      if (relays.length > 0) {
+        config.relayList = relays;
       }
 
-      // Custom instance name
-      const wantName = await prompter.confirm(
-        "为此节点设置一个自定义名称吗？（用于 P2P 网络中的身份显示）",
-        false,
+      const name = await prompter.question(
+        "节点名称（直接回车跳过）",
+        undefined,
         { allowSkip: true },
       );
-      assertNotFinished(wantName);
-      if (wantName === true) {
-        const name = await prompter.question("节点名称", undefined, {
-          allowSkip: true,
-        });
-        assertNotFinished(name);
-        if (!isSkip(name) && name) {
-          config.instanceName = name;
-        }
+      assertNotFinished(name);
+      if (!isSkip(name) && name) {
+        config.instanceName = name;
       }
+    }
 
-      // Final preview and confirm (only if advanced config changed)
-      if (
-        wantFixedPort === true ||
-        wantRelay === true ||
-        wantName === true ||
-        (wantNAT !== null && !config.enableNATTraversal)
-      ) {
-        const finalPreview = formatConfigPreview(config);
-        prompter.displayBox("高级配置已追加，最终预览：", finalPreview);
-        const finalConfirmed = await prompter.confirm("确认写入？", true);
-        if (!finalConfirmed) {
-          prompter.displayWarning("已取消高级配置，核心配置已保存。");
-        }
-      }
+    // Step 5: Final preview and confirm
+    const finalPreview = formatConfigPreview(config);
+    prompter.displayBox("即将写入以下配置：", finalPreview);
+    const confirmed = await prompter.confirm("确认写入？", true);
+    if (!confirmed) {
+      prompter.displayWarning("已取消，配置未保存。");
+      throw new WizardCancelledError();
     }
 
     prompter.displaySuccess(
@@ -672,6 +668,32 @@ export class WizardFinishError extends Error {
 
 // --- Helpers ---
 
+function hasInboundConfig(config: Record<string, unknown>): boolean {
+  return (
+    (Array.isArray(config.inboundTargets) && config.inboundTargets.length > 0) ||
+    (Boolean(config.inboundChannel) && Boolean(config.inboundTarget))
+  );
+}
+
+function applyInboundTargets(
+  config: Record<string, unknown>,
+  targets: Array<{ id?: string; channel: string; target: string }>,
+): void {
+  delete config.inboundTargets;
+  delete config.inboundChannel;
+  delete config.inboundTarget;
+
+  if (targets.length === 0) {
+    return;
+  }
+
+  config.inboundTargets = targets;
+  if (targets.length === 1) {
+    config.inboundChannel = targets[0]!.channel;
+    config.inboundTarget = targets[0]!.target;
+  }
+}
+
 function formatConfigPreview(
   config: Record<string, unknown>,
 ): string[] {