diff --git a/lib/network.js b/lib/network.js
index 29d4e69..014339b 100644
--- a/lib/network.js
+++ b/lib/network.js
@@ -1,374 +1,407 @@
-'use strict';
-
-const { execSync } = require('child_process');
-const fs = require('fs');
-const os = require('os');
-const log = require('./logger');
-
-const AP_SSID_PREFIX = 'ClawBox-';
-const AP_IP = '10.42.0.1';
-const AP_PASSWORD = '12345678';
-const AP_IFACE = process.env.CLAWD_WIFI_IFACE || '';
-const CON_NAME = 'clawd-hotspot';
-
-/** 产品 RJ45 在 sysfs 中的默认名；等价于检测 `cat /sys/class/net/end0/carrier` */
-const DEFAULT_ETH_IFACE = 'end0';
-
-function _ethIfaceEnvOrDefault() {
-  return process.env.CLAWD_ETH_IFACE || DEFAULT_ETH_IFACE;
-}
-
-function _netIfaceExists(name) {
-  try {
-    return fs.existsSync(`/sys/class/net/${name}`);
-  } catch (_) {
-    return false;
-  }
-}
-
-/** 读取 `/sys/class/net/<iface>/carrier`，`1` 为链路 up；缺失或异常视为 down */
-function _sysfsCarrierUp(iface) {
-  try {
-    return fs.readFileSync(`/sys/class/net/${iface}/carrier`, 'utf8').trim() === '1';
-  } catch (_) {
-    return false;
-  }
-}
-
-/** 非 WiFi、非典型虚拟接口，用于开发机扫描有线口（enp* 等） */
-function _isExcludedVirtualIface(name) {
-  if (name === 'lo' || name === 'bonding_masters') return true;
-  if (name.startsWith('wl')) return true;
-  if (name.startsWith('docker')) return true;
-  if (name.startsWith('veth')) return true;
-  if (name.startsWith('virbr')) return true;
-  if (name.startsWith('br-')) return true;
-  if (name.startsWith('tun') || name.startsWith('tap')) return true;
-  if (name.startsWith('wg') || name.startsWith('bond')) return true;
-  if (name.startsWith('can')) return true;
-  return false;
-}
-
-/**
- * 开发机：无 CLAWD_ETH_IFACE 且无 end0 时，扫描 sysfs 找第一个 carrier=1 的有线口。
- */
-function _firstScanWiredIfaceWithCarrier() {
-  try {
-    const names = fs.readdirSync('/sys/class/net');
-    for (const name of names.sort()) {
-      if (_isExcludedVirtualIface(name)) continue;
-      if (_sysfsCarrierUp(name)) return name;
-    }
-  } catch (_) {}
-  return null;
-}
-
-/**
- * 返回当前可用于「有线 ping / 路由」的网卡名。
- * 优先级：CLAWD_ETH_IFACE → 存在 end0 则只用 end0 → 否则扫描 sysfs。
- */
-function getWiredIfaceWithCarrier() {
-  const explicit = process.env.CLAWD_ETH_IFACE;
-  if (explicit) {
-    return _netIfaceExists(explicit) && _sysfsCarrierUp(explicit) ? explicit : null;
-  }
-  if (_netIfaceExists(DEFAULT_ETH_IFACE)) {
-    return _sysfsCarrierUp(DEFAULT_ETH_IFACE) ? DEFAULT_ETH_IFACE : null;
-  }
-  return _firstScanWiredIfaceWithCarrier();
-}
-
-function hasWiredCarrier() {
-  return getWiredIfaceWithCarrier() !== null;
-}
-
-/**
- * LAN 面板灯：只反映 RJ45 对应口，与 `cat /sys/class/net/end0/carrier 2>/dev/null` 同源（仅读 carrier）。
- * 若配置的接口在 sysfs 中不存在（常见为开发机无 end0），则退回与 hasWiredCarrier() 一致，避免灯永远灭。
- */
-function hasLanCableCarrier() {
-  const iface = _ethIfaceEnvOrDefault();
-  if (_netIfaceExists(iface)) return _sysfsCarrierUp(iface);
-  return hasWiredCarrier();
-}
-
-function _tryPingInternet() {
-  try {
-    run('ping -c 1 -W 3 8.8.8.8');
-    return true;
-  } catch (_) {}
-
-  // 开热点时默认路由可能走 wlan，无 -I 的 ping 会误判；指定有线口再试
-  const wired = getWiredIfaceWithCarrier();
-  if (wired) {
-    try {
-      run(`ping -c 1 -W 3 -I ${wired} 8.8.8.8`);
-      return true;
-    } catch (_) {}
-  }
-  return false;
-}
-
-/**
- * 仅经有线口 ping 公网（不依赖默认路由）。
- * AP 开启时 hasInternet() 易误判；维持 WS / 网络监视时用此兜底。
- */
-function hasWiredInternetProbe() {
-  const wired = getWiredIfaceWithCarrier();
-  if (!wired) return false;
-  try {
-    run(`ping -c 1 -W 3 -I ${wired} 8.8.8.8`);
-    return true;
-  } catch (_) {}
-  return false;
-}
-
-/**
- * 检测是否有互联网连接（nmcli 连通性 + ping 兜底）
- */
-function hasInternet() {
-  // 物理层快检：无 WiFi STA 且无任何有线 carrier → 立即 false（nmcli 有缓存，不可信）
-  if (!isWifiStaConnected() && !hasWiredCarrier()) return false;
-
-  try {
-    const out = run('nmcli networking connectivity check').trim();
-    if (out === 'full' || out === 'limited') return true;
-  } catch (_) {}
-
-  return _tryPingInternet();
-}
-
-/**
- * 获取默认 WiFi 接口名（wlan0 等）
- */
-function getWifiIface() {
-  if (AP_IFACE) return AP_IFACE;
-  try {
-    const out = run('nmcli -t -f DEVICE,TYPE device | grep wifi | head -1');
-    const iface = out.split(':')[0].trim();
-    if (iface) return iface;
-  } catch (_) {}
-
-  // 兜底
-  try {
-    const out = run("ls /sys/class/net | grep -E '^wl'");
-    const iface = out.split('\n')[0].trim();
-    if (iface) return iface;
-  } catch (_) {}
-
-  return 'wlan0';
-}
-
-/**
- * 扫描周围 WiFi，返回 [{ ssid, signal, security }]
- */
-function scanWifi() {
-  const iface = getWifiIface();
-  try {
-    // 先触发一次扫描
-    try { run(`nmcli device wifi rescan ifname ${iface}`); } catch (_) {}
-    // 等扫描完成
-    sleep(2000);
-
-    const out = run('nmcli -t -f SSID,SIGNAL,SECURITY device wifi list');
-    const seen = new Set();
-    const results = [];
-    for (const line of out.split('\n')) {
-      if (!line.trim()) continue;
-      const parts = line.split(':');
-      const ssid = parts[0].trim().replace(/\\:/g, ':');
-      if (!ssid || seen.has(ssid)) continue;
-      seen.add(ssid);
-      results.push({
-        ssid,
-        signal:   parseInt(parts[1], 10) || 0,
-        security: parts.slice(2).join(':').trim() || 'Open',
-      });
-    }
-    results.sort((a, b) => b.signal - a.signal);
-    return results;
-  } catch (e) {
-    log.error('network', 'WiFi 扫描失败:', e.message);
-    return [];
-  }
-}
-
-/** AP 切 STA 后等待网卡进入 connected 的最长时间（不依赖外网探测） */
-const CONNECT_WIFI_STA_WAIT_MS = 25_000;
-const CONNECT_WIFI_STA_POLL_MS = 1_000;
-
-/**
- * 连接指定 WiFi（配网场景：成功 = NM 显示 STA 已连上目标网，不要求一定能 ping 通 8.8.8.8）
- * @returns {{ success: boolean, error?: string }}
- */
-function connectWifi(ssid, password) {
-  const iface = getWifiIface();
-  log.info('network', `尝试连接 WiFi: ${ssid}`);
-  try {
-    // 先删除可能残留的同名连接
-    try { run(`nmcli connection delete "${ssid}"`); } catch (_) {}
-
-    const pwdArg = password ? `password "${password}"` : '';
-    run(`nmcli device wifi connect "${ssid}" ${pwdArg} ifname ${iface}`, 60000);
-
-    const deadline = Date.now() + CONNECT_WIFI_STA_WAIT_MS;
-    while (Date.now() < deadline) {
-      if (isWifiStaConnected()) {
-        if (hasInternet()) {
-          log.info('network', `WiFi 已连接且有外网: ${ssid}`);
-        } else {
-          log.warn(
-            'network',
-            `WiFi STA 已连接（${ssid}），暂未检测到外网；配网仍视为成功（内网/防火墙/国内 DNS 常见）`,
-          );
-        }
-        return { success: true };
-      }
-      sleep(CONNECT_WIFI_STA_POLL_MS);
-    }
-    return { success: false, error: '超时：网卡未进入已连接状态' };
-  } catch (e) {
-    log.error('network', `WiFi 连接失败: ${e.message}`);
-    return { success: false, error: e.message };
-  }
-}
-
-/**
- * 启动 WiFi AP 热点
- */
-function startAP(clawId) {
-  const iface = getWifiIface();
-  const ssid  = `${AP_SSID_PREFIX}${clawId || 'Setup'}`;
-
-  log.info('network', `启动 AP 热点: ${ssid} (${iface})`);
-
-  // 关闭已有热点
-  stopAP();
-
-  try {
-    // nmcli 创建热点（开放网络）
-    const cmd = [
-      'nmcli device wifi hotspot',
-      `ifname ${iface}`,
-      `con-name ${CON_NAME}`,
-      `ssid "${ssid}"`,
-      'band bg',
-    ];
-    // 如果需要密码
-    if (AP_PASSWORD) {
-      cmd.push(`password "${AP_PASSWORD}"`);
-    }
-    run(cmd.join(' '));
-
-    // 等待 AP 启动
-    sleep(2000);
-    log.info('network', `AP 已启动: ${ssid}, 网关 ${AP_IP}`);
-    return { ssid, ip: AP_IP, iface };
-  } catch (e) {
-    log.error('network', `AP 启动失败: ${e.message}`);
-    throw e;
-  }
-}
-
-/**
- * 关闭热点，恢复普通 WiFi 模式
- */
-function stopAP() {
-  try {
-    run(`nmcli connection down ${CON_NAME}`);
-  } catch (_) {}
-  try {
-    run(`nmcli connection delete ${CON_NAME}`);
-  } catch (_) {}
-}
-
-// ── 工具 ─────────────────────────────────────────────────────────────────────
-
-function run(cmd, timeout = 10000) {
-  return execSync(cmd, {
-    encoding: 'utf8',
-    timeout,
-    stdio: ['ignore', 'pipe', 'pipe'],
-  });
-}
-
-function sleep(ms) {
-  execSync(`sleep ${ms / 1000}`, { timeout: ms + 2000 });
-}
-
-/**
- * 检测是否有已保存的 WiFi STA 连接（排除自身热点）
- */
-function hasSavedWifiConnection() {
-  try {
-    const out = run('nmcli -t -f NAME,TYPE connection show');
-    for (const line of out.split('\n')) {
-      const [name, type] = line.split(':');
-      if (type === '802-11-wireless' && name !== CON_NAME) {
-        return true;
-      }
-    }
-  } catch (_) {}
-  return false;
-}
-
-/**
- * 检测 wlan0 是否以 STA 模式连接了 WiFi（排除自身热点）
- */
-function isWifiStaConnected() {
-  const iface = getWifiIface();
-  try {
-    const out = run('nmcli -t -f DEVICE,TYPE,STATE,CONNECTION device');
-    for (const line of out.split('\n')) {
-      const parts = line.split(':');
-      const dev = (parts[0] || '').trim();
-      const type = (parts[1] || '').trim();
-      const state = (parts[2] || '').trim();
-      const conn = (parts[3] || '').trim();
-      if (dev === iface && type === 'wifi' && state === 'connected') {
-        return conn !== CON_NAME;
-      }
-    }
-  } catch (_) {}
-  return false;
-}
-
-/**
- * 获取本机所有非回环 IPv4 地址，逗号拼接返回
- * 例：'192.168.1.100' 或 '192.168.1.100,10.0.0.5'
- */
-function getLocalIps() {
-  try {
-    const ifaces = os.networkInterfaces();
-    const ips = [];
-    for (const [name, addrs] of Object.entries(ifaces)) {
-      if (!addrs) continue;
-      for (const addr of addrs) {
-        if (addr.family === 'IPv4' && !addr.internal && !addr.address.startsWith('10.42.')) {
-          ips.push(addr.address);
-        }
-      }
-    }
-    return ips.length > 0 ? ips.join(',') : null;
-  } catch (e) {
-    log.warn('network', '获取本机 IP 失败:', e.message);
-    return null;
-  }
-}
-
-module.exports = {
-  hasInternet,
-  hasWiredCarrier,
-  hasLanCableCarrier,
-  hasWiredInternetProbe,
-  getWiredIfaceWithCarrier,
-  hasSavedWifiConnection,
-  isWifiStaConnected,
-  getWifiIface,
-  scanWifi,
-  connectWifi,
-  startAP,
-  stopAP,
-  AP_IP,
-  getLocalIps,
-};
+'use strict';
+
+const { execSync, spawnSync } = require('child_process');
+const fs = require('fs');
+const os = require('os');
+const log = require('./logger');
+
+const AP_SSID_PREFIX = 'ClawBox-';
+const AP_IP = '10.42.0.1';
+const AP_PASSWORD = '12345678';
+const AP_IFACE = process.env.CLAWD_WIFI_IFACE || '';
+const CON_NAME = 'clawd-hotspot';
+
+/** 产品 RJ45 在 sysfs 中的默认名；等价于检测 `cat /sys/class/net/end0/carrier` */
+const DEFAULT_ETH_IFACE = 'end0';
+
+function _ethIfaceEnvOrDefault() {
+  return process.env.CLAWD_ETH_IFACE || DEFAULT_ETH_IFACE;
+}
+
+function _netIfaceExists(name) {
+  try {
+    return fs.existsSync(`/sys/class/net/${name}`);
+  } catch (_) {
+    return false;
+  }
+}
+
+/** 读取 `/sys/class/net/<iface>/carrier`，`1` 为链路 up；缺失或异常视为 down */
+function _sysfsCarrierUp(iface) {
+  try {
+    return fs.readFileSync(`/sys/class/net/${iface}/carrier`, 'utf8').trim() === '1';
+  } catch (_) {
+    return false;
+  }
+}
+
+/** 非 WiFi、非典型虚拟接口，用于开发机扫描有线口（enp* 等） */
+function _isExcludedVirtualIface(name) {
+  if (name === 'lo' || name === 'bonding_masters') return true;
+  if (name.startsWith('wl')) return true;
+  if (name.startsWith('docker')) return true;
+  if (name.startsWith('veth')) return true;
+  if (name.startsWith('virbr')) return true;
+  if (name.startsWith('br-')) return true;
+  if (name.startsWith('tun') || name.startsWith('tap')) return true;
+  if (name.startsWith('wg') || name.startsWith('bond')) return true;
+  if (name.startsWith('can')) return true;
+  return false;
+}
+
+/**
+ * 开发机：无 CLAWD_ETH_IFACE 且无 end0 时，扫描 sysfs 找第一个 carrier=1 的有线口。
+ */
+function _firstScanWiredIfaceWithCarrier() {
+  try {
+    const names = fs.readdirSync('/sys/class/net');
+    for (const name of names.sort()) {
+      if (_isExcludedVirtualIface(name)) continue;
+      if (_sysfsCarrierUp(name)) return name;
+    }
+  } catch (_) {}
+  return null;
+}
+
+/**
+ * 返回当前可用于「有线 ping / 路由」的网卡名。
+ * 优先级：CLAWD_ETH_IFACE → 存在 end0 则只用 end0 → 否则扫描 sysfs。
+ */
+function getWiredIfaceWithCarrier() {
+  const explicit = process.env.CLAWD_ETH_IFACE;
+  if (explicit) {
+    return _netIfaceExists(explicit) && _sysfsCarrierUp(explicit) ? explicit : null;
+  }
+  if (_netIfaceExists(DEFAULT_ETH_IFACE)) {
+    return _sysfsCarrierUp(DEFAULT_ETH_IFACE) ? DEFAULT_ETH_IFACE : null;
+  }
+  return _firstScanWiredIfaceWithCarrier();
+}
+
+function hasWiredCarrier() {
+  return getWiredIfaceWithCarrier() !== null;
+}
+
+/**
+ * LAN 面板灯：只反映 RJ45 对应口，与 `cat /sys/class/net/end0/carrier 2>/dev/null` 同源（仅读 carrier）。
+ * 若配置的接口在 sysfs 中不存在（常见为开发机无 end0），则退回与 hasWiredCarrier() 一致，避免灯永远灭。
+ */
+function hasLanCableCarrier() {
+  const iface = _ethIfaceEnvOrDefault();
+  if (_netIfaceExists(iface)) return _sysfsCarrierUp(iface);
+  return hasWiredCarrier();
+}
+
+function _tryPingInternet() {
+  try {
+    run('ping -c 1 -W 3 8.8.8.8');
+    return true;
+  } catch (_) {}
+
+  // 开热点时默认路由可能走 wlan，无 -I 的 ping 会误判；指定有线口再试
+  const wired = getWiredIfaceWithCarrier();
+  if (wired) {
+    try {
+      run(`ping -c 1 -W 3 -I ${wired} 8.8.8.8`);
+      return true;
+    } catch (_) {}
+  }
+  return false;
+}
+
+/**
+ * 仅经有线口 ping 公网（不依赖默认路由）。
+ * AP 开启时 hasInternet() 易误判；维持 WS / 网络监视时用此兜底。
+ */
+function hasWiredInternetProbe() {
+  const wired = getWiredIfaceWithCarrier();
+  if (!wired) return false;
+  try {
+    run(`ping -c 1 -W 3 -I ${wired} 8.8.8.8`);
+    return true;
+  } catch (_) {}
+  return false;
+}
+
+/**
+ * 检测是否有互联网连接（nmcli 连通性 + ping 兜底）
+ */
+function hasInternet() {
+  // 物理层快检：无 WiFi STA 且无任何有线 carrier → 立即 false（nmcli 有缓存，不可信）
+  if (!isWifiStaConnected() && !hasWiredCarrier()) return false;
+
+  try {
+    const out = run('nmcli networking connectivity check').trim();
+    if (out === 'full' || out === 'limited') return true;
+  } catch (_) {}
+
+  return _tryPingInternet();
+}
+
+/**
+ * 获取默认 WiFi 接口名（wlan0 等）。
+ * 必须 TYPE 精确为 wifi，不能用 grep wifi（会误匹配 wifi-p2p，导致选到 p2p-dev-wlan0，STA/热点均失败）。
+ */
+function getWifiIface() {
+  if (AP_IFACE) return AP_IFACE;
+  try {
+    const out = run('nmcli -t -f DEVICE,TYPE device');
+    let fallback = '';
+    for (const line of out.split('\n')) {
+      if (!line.trim()) continue;
+      const parts = line.split(':');
+      const dev = (parts[0] || '').trim();
+      const type = (parts[1] || '').trim();
+      if (type !== 'wifi' || !dev) continue;
+      if (dev.startsWith('p2p-dev-')) continue;
+      if (dev.startsWith('wlan')) return dev;
+      if (!fallback) fallback = dev;
+    }
+    if (fallback) return fallback;
+  } catch (_) {}
+
+  try {
+    const out = run("ls /sys/class/net | grep -E '^wl'");
+    const iface = out.split('\n')[0].trim();
+    if (iface) return iface;
+  } catch (_) {}
+
+  return 'wlan0';
+}
+
+/**
+ * 扫描周围 WiFi，返回 [{ ssid, signal, security }]
+ */
+function scanWifi() {
+  const iface = getWifiIface();
+  try {
+    // 先触发一次扫描
+    try { run(`nmcli device wifi rescan ifname ${iface}`); } catch (_) {}
+    // 等扫描完成
+    sleep(2000);
+
+    const out = run('nmcli -t -f SSID,SIGNAL,SECURITY device wifi list');
+    const seen = new Set();
+    const results = [];
+    for (const line of out.split('\n')) {
+      if (!line.trim()) continue;
+      const parts = line.split(':');
+      const ssid = parts[0].trim().replace(/\\:/g, ':');
+      if (!ssid || seen.has(ssid)) continue;
+      seen.add(ssid);
+      results.push({
+        ssid,
+        signal:   parseInt(parts[1], 10) || 0,
+        security: parts.slice(2).join(':').trim() || 'Open',
+      });
+    }
+    results.sort((a, b) => b.signal - a.signal);
+    return results;
+  } catch (e) {
+    log.error('network', 'WiFi 扫描失败:', e.message);
+    return [];
+  }
+}
+
+/** AP 切 STA 后等待网卡进入 connected 的最长时间（不依赖外网探测） */
+const CONNECT_WIFI_STA_WAIT_MS = 25_000;
+const CONNECT_WIFI_STA_POLL_MS = 1_000;
+
+/** 不走 shell，避免 SSID/密码中的引号、空格、$ 等破坏命令 */
+function nmcliSync(args, timeoutMs = 60000) {
+  const r = spawnSync('nmcli', args, {
+    encoding: 'utf8',
+    timeout: timeoutMs,
+    maxBuffer: 2 * 1024 * 1024,
+  });
+  if (r.error) throw r.error;
+  if (r.status !== 0) {
+    const msg = (r.stderr || '').trim() || (r.stdout || '').trim() || `nmcli exit ${r.status}`;
+    throw new Error(msg);
+  }
+  return (r.stdout || '').trim();
+}
+
+/**
+ * 连接指定 WiFi（配网场景：成功 = NM 显示 STA 已连上目标网，不要求一定能 ping 通 8.8.8.8）
+ * @returns {{ success: boolean, error?: string }}
+ */
+function connectWifi(ssid, password) {
+  const iface = getWifiIface();
+  log.info('network', `尝试连接 WiFi: ${ssid}（ifname=${iface}）`);
+  try {
+    try {
+      nmcliSync(['connection', 'delete', ssid], 15000);
+    } catch (_) {}
+
+    // 关热点后部分固件需显式保证由 NM 管理、再关联
+    try {
+      nmcliSync(['device', 'set', iface, 'managed', 'yes'], 8000);
+    } catch (_) {}
+
+    const args = ['device', 'wifi', 'connect', ssid];
+    if (password) args.push('password', password);
+    args.push('ifname', iface);
+    nmcliSync(args, 120000);
+
+    const deadline = Date.now() + CONNECT_WIFI_STA_WAIT_MS;
+    while (Date.now() < deadline) {
+      if (isWifiStaConnected()) {
+        if (hasInternet()) {
+          log.info('network', `WiFi 已连接且有外网: ${ssid}`);
+        } else {
+          log.warn(
+            'network',
+            `WiFi STA 已连接（${ssid}），暂未检测到外网；配网仍视为成功（内网/防火墙/国内 DNS 常见）`,
+          );
+        }
+        return { success: true };
+      }
+      sleep(CONNECT_WIFI_STA_POLL_MS);
+    }
+    return { success: false, error: '超时：网卡未进入已连接状态' };
+  } catch (e) {
+    log.error('network', `WiFi 连接失败: ${e.message}`);
+    return { success: false, error: e.message };
+  }
+}
+
+/**
+ * 启动 WiFi AP 热点
+ */
+function startAP(clawId) {
+  const iface = getWifiIface();
+  const ssid  = `${AP_SSID_PREFIX}${clawId || 'Setup'}`;
+
+  log.info('network', `启动 AP 热点: ${ssid} (${iface})`);
+
+  // 关闭已有热点
+  stopAP();
+
+  try {
+    // nmcli 创建热点（开放网络）
+    const cmd = [
+      'nmcli device wifi hotspot',
+      `ifname ${iface}`,
+      `con-name ${CON_NAME}`,
+      `ssid "${ssid}"`,
+      'band bg',
+    ];
+    // 如果需要密码
+    if (AP_PASSWORD) {
+      cmd.push(`password "${AP_PASSWORD}"`);
+    }
+    run(cmd.join(' '));
+
+    // 等待 AP 启动
+    sleep(2000);
+    log.info('network', `AP 已启动: ${ssid}, 网关 ${AP_IP}`);
+    return { ssid, ip: AP_IP, iface };
+  } catch (e) {
+    log.error('network', `AP 启动失败: ${e.message}`);
+    throw e;
+  }
+}
+
+/**
+ * 关闭热点，恢复普通 WiFi 模式
+ */
+function stopAP() {
+  try {
+    run(`nmcli connection down ${CON_NAME}`);
+  } catch (_) {}
+  try {
+    run(`nmcli connection delete ${CON_NAME}`);
+  } catch (_) {}
+}
+
+// ── 工具 ─────────────────────────────────────────────────────────────────────
+
+function run(cmd, timeout = 10000) {
+  return execSync(cmd, {
+    encoding: 'utf8',
+    timeout,
+    stdio: ['ignore', 'pipe', 'pipe'],
+  });
+}
+
+function sleep(ms) {
+  execSync(`sleep ${ms / 1000}`, { timeout: ms + 2000 });
+}
+
+/**
+ * 检测是否有已保存的 WiFi STA 连接（排除自身热点）
+ */
+function hasSavedWifiConnection() {
+  try {
+    const out = run('nmcli -t -f NAME,TYPE connection show');
+    for (const line of out.split('\n')) {
+      const [name, type] = line.split(':');
+      if (type === '802-11-wireless' && name !== CON_NAME) {
+        return true;
+      }
+    }
+  } catch (_) {}
+  return false;
+}
+
+/**
+ * 是否已以 STA 连上某 WiFi（排除自身热点）。
+ * 不用 device 列表按 `:` 拆字段（连接名含冒号会错；state 含 connecting 勿误匹配 connected）。
+ */
+function isWifiStaConnected() {
+  const iface = getWifiIface();
+  let state;
+  let conn;
+  try {
+    state = nmcliSync(['-g', 'GENERAL.STATE', 'device', 'show', iface], 8000);
+    conn = nmcliSync(['-g', 'GENERAL.CONNECTION', 'device', 'show', iface], 8000);
+  } catch (_) {
+    return false;
+  }
+  const s = (state || '').trim();
+  const c = (conn || '').trim();
+  if (!/\(connected\)/.test(s)) return false;
+  if (!c || c === CON_NAME) return false;
+  return true;
+}
+
+/**
+ * 获取本机所有非回环 IPv4 地址，逗号拼接返回
+ * 例：'192.168.1.100' 或 '192.168.1.100,10.0.0.5'
+ */
+function getLocalIps() {
+  try {
+    const ifaces = os.networkInterfaces();
+    const ips = [];
+    for (const [name, addrs] of Object.entries(ifaces)) {
+      if (!addrs) continue;
+      for (const addr of addrs) {
+        if (addr.family === 'IPv4' && !addr.internal && !addr.address.startsWith('10.42.')) {
+          ips.push(addr.address);
+        }
+      }
+    }
+    return ips.length > 0 ? ips.join(',') : null;
+  } catch (e) {
+    log.warn('network', '获取本机 IP 失败:', e.message);
+    return null;
+  }
+}
+
+module.exports = {
+  hasInternet,
+  hasWiredCarrier,
+  hasLanCableCarrier,
+  hasWiredInternetProbe,
+  getWiredIfaceWithCarrier,
+  hasSavedWifiConnection,
+  isWifiStaConnected,
+  getWifiIface,
+  scanWifi,
+  connectWifi,
+  startAP,
+  stopAP,
+  AP_IP,
+  getLocalIps,
+};
diff --git a/lib/provisioning.js b/lib/provisioning.js
index 292e060..d56a0bc 100644
--- a/lib/provisioning.js
+++ b/lib/provisioning.js
@@ -2,7 +2,7 @@
 
 const EventEmitter = require('events');
 const log = require('./logger');
-const { hasInternet, hasSavedWifiConnection, isWifiStaConnected, scanWifi, startAP, stopAP, connectWifi, AP_IP } = require('./network');
+const { hasInternet, hasSavedWifiConnection, isWifiStaConnected, scanWifi, startAP, stopAP, connectWifi, getWifiIface, AP_IP } = require('./network');
 const { DnsHijack }    = require('./dns-hijack');
 const { CaptiveServer } = require('./captive-server');
 const led = require('./led');
@@ -131,9 +131,9 @@ class ProvisionManager extends EventEmitter {
       this._cachedWifiList = scanWifi();
       log.info('provision', `扫描到 ${this._cachedWifiList.length} 个网络`);
 
-      // 写 DNS 劫持配置（NM 启动热点时加载）
+      // 写 DNS 劫持配置（NM 启动热点时加载）；接口名与热点一致，勿写死 wlan0
       this._dns = new DnsHijack();
-      this._dns.start('wlan0', AP_IP);
+      this._dns.start(getWifiIface(), AP_IP);
 
       const ap = startAP(this._clawId);
 
@@ -149,6 +149,7 @@ class ProvisionManager extends EventEmitter {
       log.info('provision', `配网地址: http://10.42.0.1`);
     } catch (e) {
       log.error('provision', `AP 启动失败: ${e.message}`);
+      if (this._state !== 'sta') this._state = 'idle';
     }
   }
 
@@ -161,24 +162,40 @@ class ProvisionManager extends EventEmitter {
     log.info('provision', `用户请求连接 WiFi: ${ssid}`);
     led.blink(); // 正在连接 → 闪烁
 
-    this._stopAPServices();
+    try {
+      this._stopAPServices();
 
-    // 关热点后射频/模式切换需要时间，立刻 connect 在部分板子上会失败
-    await new Promise((r) => setTimeout(r, 2500));
+      // 关热点后射频/模式切换需要时间，立刻 connect 在部分板子上会失败
+      await new Promise((r) => setTimeout(r, 3500));
 
-    const result = connectWifi(ssid, password);
+      const result = connectWifi(ssid, password);
 
-    if (result.success) {
-      this._state = 'sta';
-      log.info('provision', `WiFi 已连接: ${ssid}`);
-      led.on(); // WiFi 灯：连接成功 → 常亮
-      this.emit('network-ready');
+      if (result.success) {
+        this._state = 'sta';
+        log.info('provision', `WiFi 已连接: ${ssid}`);
+        led.on(); // WiFi 灯：连接成功 → 常亮
+        this.emit('network-ready');
+        return result;
+      }
+
+      log.warn('provision', `WiFi 连接失败: ${result.error}，重新启动 AP`);
+      this._safeReenterAP();
       return result;
+    } catch (e) {
+      log.error('provision', `配网过程异常: ${e.message}`);
+      this._safeReenterAP();
+      return { success: false, error: e.message };
     }
+  }
 
-    log.warn('provision', `WiFi 连接失败: ${result.error}，重新启动 AP`);
-    this._enterAP();
-    return result;
+  /** 重新开 AP；失败时勿把 _state 永久卡在 connecting */
+  _safeReenterAP() {
+    try {
+      this._enterAP();
+    } catch (e) {
+      log.error('provision', `重新启动 AP 失败: ${e.message}`);
+      this._state = 'idle';
+    }
   }
 
   // ── WiFi 状态监控 ─────────────────────────────────────────────────────────