openclaw-multi-auto 1.2.5 → 1.2.6

package/scripts/create-instance.sh

@@ -13,36 +13,60 @@ YELLOW='\033[1;33m'
 BLUE='\033[0;34m'
 NC='\033[0m'
 
+# --- 检查必要命令 ---
+for cmd in node pnpm; do
+    if ! command -v "$cmd" &> /dev/null; then
+        echo -e "${RED}❌ 错误: 未找到命令 '$cmd'，请先安装${NC}"
+        exit 1
+    fi
+done
+
 # --- 1. 路径溯源与环境检查 ---
 GLOBAL_PREFIX=$(npm config get prefix)
 INSTANCES_BASE=$(eval echo "$HOME/openclaws")
 DEFAULT_SOURCE="${GLOBAL_PREFIX}/lib/node_modules/openclaw-multi-auto"
-#[ -d "$HOME/projects/openclaw" ] && DEFAULT_SOURCE=$(eval echo "$HOME/projects/openclaw")
-
+# [ -d "$HOME/projects/openclaw" ] && DEFAULT_SOURCE=$(eval echo "$HOME/projects/openclaw")
 SOURCE_CODE="$DEFAULT_SOURCE"
-echo "SOURCE_CODE = $SOURCE_CODE"
 
+# --- 2. 获取实例名称 ---
+INSTANCE_NAME="${1:-}"
+if [ -z "$INSTANCE_NAME" ]; then
+    read -p "请输入实例名称 (默认: yunwei): " INPUT_NAME
+    INSTANCE_NAME="${INPUT_NAME:-yunwei}"
+fi
+
+# --- 3. 获取端口 ---
+if [ -n "$2" ]; then
+    PORT="$2"
+else
+    # 更稳健的现有实例计数：使用 find 统计目录数
+    EXISTING_COUNT=$(find "$INSTANCES_BASE" -maxdepth 1 -type d -name "*" ! -name ".*" 2>/dev/null | wc -l | tr -d ' ')
+    PORT=$((18790 + EXISTING_COUNT))
+fi
+
+# --- 4. 定义实例目录并清理旧残留 ---
 INSTANCE_DIR="$INSTANCES_BASE/${INSTANCE_NAME}"
 DIST_DIR="${INSTANCE_DIR}/dist"
 
-# 清理旧残留，防止隔离失效
+echo -e "${BLUE}🏗️  正在深度初始化实例: ${INSTANCE_NAME} (端口 ${PORT})${NC}"
+echo "SOURCE_CODE = $SOURCE_CODE"
+
+# 清理旧实例目录（如果存在）
 if [ -d "$INSTANCE_DIR" ]; then
     echo -e "${YELLOW}⚠️  清理旧实例目录...${NC}"
     rm -rf "$INSTANCE_DIR"
 fi
-# 删除可能存在的父目录 node_modules 和 workspace 文件
+# 删除可能存在的父目录 node_modules 和 workspace 文件（避免干扰）
 [ -d "${INSTANCES_BASE}/node_modules" ] && rm -rf "${INSTANCES_BASE}/node_modules"
 [ -f "${INSTANCES_BASE}/pnpm-workspace.yaml" ] && rm -f "${INSTANCES_BASE}/pnpm-workspace.yaml"
 
-echo -e "${BLUE}🏗️  正在深度初始化实例: ${INSTANCE_NAME} (端口 ${PORT})${NC}"
-
-# --- 2. 完整目录结构创建 ---
+# --- 5. 完整目录结构创建 ---
 mkdir -p "${INSTANCE_DIR}/config" "${INSTANCE_DIR}/tmp" "${INSTANCE_DIR}/workspace"
 mkdir -p "${INSTANCE_DIR}/workspace/memory"
 mkdir -p "${INSTANCE_DIR}/agents/main/agent/sessions"
 mkdir -p "${INSTANCE_DIR}/credentials" "${INSTANCE_DIR}/media"
 
-# --- 3 动态提取母本版本号 ---
+# --- 6. 动态提取母本版本号 ---
 echo -e "${BLUE}🔍 正在提取母本版本信息...${NC}"
 PKG_PATH="${SOURCE_CODE}/package.json"
 if [ -f "$PKG_PATH" ]; then
@@ -53,23 +77,26 @@ else
     echo -e "${YELLOW}⚠️  未找到 package.json，使用兜底版本: ${CURRENT_VERSION}${NC}"
 fi
 
-# --- 4. 核心代码同步 (rsync 对齐并增加预检) ---
-echo -e "${BLUE}🔄 分发代码产物 (物理对齐)...${NC}"
+# --- 7. 核心代码同步 (物理对齐) ---
+echo -e "${BLUE}🔄 分发代码产物...${NC}"
 rm -rf "$DIST_DIR" && mkdir -p "$DIST_DIR"
 if [ -d "${SOURCE_CODE}/dist" ]; then
     cp -r "${SOURCE_CODE}/dist/." "${DIST_DIR}/"
     echo "cp exit code: $?"
 
     # 检查所有被引用的 utils 文件是否存在
-    for chunk in $(grep -oE "utils-[A-Za-z0-9]+\.js" "${DIST_DIR}/index.js" 2>/dev/null | sort -u); do
-        if [ ! -f "${DIST_DIR}/${chunk}" ]; then
-            echo -e "${RED}❌ 致命错误: dist 缺失关键模块 ${chunk}${NC}"
-            echo -e "${YELLOW}请在源码端执行: rm -rf dist && pnpm build && npm publish${NC}"
-            exit 1
-        fi
-    done
+    if [ -f "${DIST_DIR}/index.js" ]; then
+        for chunk in $(grep -oE "utils-[A-Za-z0-9]+\.js" "${DIST_DIR}/index.js" 2>/dev/null | sort -u); do
+            if [ ! -f "${DIST_DIR}/${chunk}" ]; then
+                echo -e "${RED}❌ 致命错误: dist 缺失关键模块 ${chunk}${NC}"
+                echo -e "${YELLOW}请在源码端执行: rm -rf dist && pnpm build && npm publish${NC}"
+                exit 1
+            fi
+        done
+    fi
 else
-    echo -e "${RED}❌ 错误: 母本 dist 不存在${NC}"; exit 1
+    echo -e "${RED}❌ 错误: 母本 dist 不存在${NC}"
+    exit 1
 fi
 
 cp "${SOURCE_CODE}/package.json" "${INSTANCE_DIR}/package.json"
@@ -97,20 +124,7 @@ if [ ! -d "node_modules" ]; then
 fi
 echo -e "${GREEN}✅ 依赖安装成功，node_modules 已生成在实例目录${NC}"
 
-# --- 5. 参数与交互式获取 ---
-INSTANCE_NAME="${1:-}"
-if [ -z "$INSTANCE_NAME" ]; then
-    read -p "请输入实例名称 (默认: yunwei): " INPUT_NAME
-    INSTANCE_NAME="${INPUT_NAME:-yunwei}"
-fi
-
-if [ -n "$2" ]; then
-    PORT="$2"
-else
-    EXISTING_COUNT=$(ls -d "$INSTANCES_BASE"/*/ 2>/dev/null | wc -l | tr -d ' ')
-    PORT=$((18790 + EXISTING_COUNT))
-fi
-
+# --- 8. 参数与交互式获取 ---
 MODEL_PROVIDER="${3:-}"
 if [ -z "$MODEL_PROVIDER" ]; then
     echo -e "${BLUE}--- 请选择模型供应商 ---${NC}"
@@ -131,7 +145,7 @@ if [ -z "$API_KEY" ]; then
     read -p "请输入您的 ${MODEL_PROVIDER} API Key: " API_KEY
 fi
 
-# --- 6. 生成深度配置文件 ---
+# --- 9. 生成深度配置文件 ---
 DEFAULT_MODEL="zai/glm-5"
 ZAI_KEY=""; DS_KEY=""; MX_KEY=""; KIMI_KEY=""; QWEN_KEY=""
 
@@ -143,11 +157,19 @@ case "$MODEL_PROVIDER" in
     qwen) PRIMARY_MODEL="qwen/qwen-plus"; QWEN_KEY="$API_KEY" ;;
 esac
 
+# 生成时间戳（兼容 macOS/Linux）
+if date -u +"%Y-%m-%dT%H:%M:%S.%3NZ" 2>/dev/null; then
+    TIMESTAMP=$(date -u +"%Y-%m-%dT%H:%M:%S.%3NZ")
+else
+    # macOS 不支持 %3N，改用秒级精度
+    TIMESTAMP=$(date -u +"%Y-%m-%dT%H:%M:%S.000Z")
+fi
+
 cat > "${INSTANCE_DIR}/config/openclaw.json" << EOF
 {
   "meta": {
     "lastTouchedVersion": "${CURRENT_VERSION}",
-    "lastTouchedAt": "$(date -u +"%Y-%m-%dT%H:%M:%S.%3NZ")"
+    "lastTouchedAt": "${TIMESTAMP}"
   },
   "models": {
     "providers": {
@@ -221,7 +243,7 @@ cat > "${INSTANCE_DIR}/config/openclaw.json" << EOF
 }
 EOF
 
-# --- 7. 预装可选技能 (修复：即使失败也不影响主流程) ---
+# --- 10. 预装可选技能 (失败不影响主流程) ---
 echo -e "${BLUE}🤖 正在注入飞书运维机器人引导...${NC}"
 SKILLS_DIR="${INSTANCE_DIR}/workspace/skills"
 mkdir -p "$SKILLS_DIR"
@@ -229,17 +251,16 @@ mkdir -p "$SKILLS_DIR"
 SKILL_PKG="jinyu-skill-feishu-config"
 REGISTRY="https://registry.npmmirror.com"
 
-# 创建临时目录用于下载
 TEMP_DIR=$(mktemp -d)
 cd "$TEMP_DIR"
 
-if npm pack "$SKILL_PKG@latest" --registry="$REGISTRY" --quiet > /dev/null 2>&1; then
+if npm pack "$SKILL_PKG@latest" --registry="$REGISTRY" --quiet > /dev/null; then
     TARBALL=$(ls *.tgz)
     mkdir -p "$SKILLS_DIR/feishu-config"
     tar -xzf "$TARBALL" -C "$SKILLS_DIR/feishu-config" --strip-components=1
     echo -e "${GREEN}✅ 技能 feishu-config 安装成功${NC}"
 else
-    echo -e "${YELLOW}⚠️  技能 feishu-config 下载失败，跳过${NC}"
+    echo -e "${YELLOW}⚠️  技能 feishu-config 下载失败，跳过（可手动安装）${NC}"
 fi
 
 cd - > /dev/null
@@ -248,31 +269,26 @@ rm -rf "$TEMP_DIR"
 # --- 如果实例是 yunwei，安装角色包并初始化 workspace ---
 if [ "$INSTANCE_NAME" = "yunwei" ]; then
     echo -e "${BLUE}🛠️  检测到运维实例，正在安装角色包 role-openclaw-yunwei...${NC}"
-    
-    # 创建临时目录用于下载和解压
+
     TEMP_ROLE_DIR=$(mktemp -d)
     cd "$TEMP_ROLE_DIR"
-    
-    # 使用 npm pack 下载包到临时目录（避免全局安装）
-    npm pack role-openclaw-yunwei@latest --registry=https://registry.npmmirror.com --quiet > /dev/null
-    TARBALL=$(ls *.tgz)
-    
-    # 解压包内容，--strip-components=1 去除顶层 package/ 目录
-    tar -xzf "$TARBALL" --strip-components=1
-    rm "$TARBALL"
-    
-    # 将包内所有文件复制到实例的 workspace 目录（不覆盖已有文件？根据需求选择）
-    # 使用 -n 避免覆盖已存在的文件（如用户可能修改过）
-    cp -rn "$TEMP_ROLE_DIR"/* "$INSTANCE_DIR/workspace/"
-    
-    # 清理临时目录
+
+    if npm pack role-openclaw-yunwei@latest --registry=https://registry.npmmirror.com --quiet > /dev/null; then
+        TARBALL=$(ls *.tgz)
+        tar -xzf "$TARBALL" --strip-components=1
+        rm "$TARBALL"
+        # 使用 . 复制所有内容，避免 * 在空目录时出错
+        cp -rn "$TEMP_ROLE_DIR"/. "$INSTANCE_DIR/workspace/"
+        echo -e "${GREEN}✅ 角色包安装完成，workspace 已初始化${NC}"
+    else
+        echo -e "${YELLOW}⚠️  角色包下载失败，请检查网络或手动安装${NC}"
+    fi
+
     cd - > /dev/null
     rm -rf "$TEMP_ROLE_DIR"
-    
-    echo -e "${GREEN}✅ 角色包安装完成，workspace 已初始化${NC}"
 fi
 
-# --- 8. 生成增强型启动脚本 ---
+# --- 11. 生成增强型启动脚本 ---
 cat > "${INSTANCE_DIR}/start.sh" << 'EOF'
 #!/usr/bin/env bash
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
@@ -281,12 +297,12 @@ INSTANCE_NAME=$(basename "$SCRIPT_DIR")
 export OPENCLAW_CONFIG_PATH="$SCRIPT_DIR/config/openclaw.json"
 export OPENCLAW_TMP_DIR="$SCRIPT_DIR/tmp"
 
-# 从配置导出 API Key
+# 从配置导出 API Key（如果存在 env 字段）
 if [ -f "$OPENCLAW_CONFIG_PATH" ]; then
     eval $(node -e "const env = require('$OPENCLAW_CONFIG_PATH').env || {}; Object.keys(env).forEach(k => { if(env[k]) console.log('export ' + k + '=\"' + env[k] + '\"'); })")
 fi
 
-# macOS launchd 守护配置（保持不变）
+# macOS launchd 守护配置
 if [[ "$OSTYPE" == "darwin"* ]]; then
     PLIST_LABEL="ai.openclaw.$INSTANCE_NAME"
     PLIST_PATH="$HOME/Library/LaunchAgents/$PLIST_LABEL.plist"
@@ -328,17 +344,34 @@ fi
 EOF
 chmod +x "${INSTANCE_DIR}/start.sh"
 
-# --- 9. 执行拉起 ---
+# --- 12. 执行拉起 ---
 echo -e "${BLUE}⚡ 正在后台启动服务...${NC}"
-nohup ./start.sh > "${INSTANCE_DIR}/workspace/server.log" 2>&1 &
-
-sleep 2ƒ
-if ps -p $! > /dev/null; then
-    echo -e "${GREEN}================================================${NC}"
-    echo -e "${GREEN}🎉 实例 [${INSTANCE_NAME}] 初始化成功！${NC}"
-    echo -e "🌐 本地网关: http://localhost:${PORT}"
-    echo -e "📄 实时日志: tail -f ${INSTANCE_DIR}/workspace/server.log"
-    echo -e "${GREEN}================================================${NC}"
+# 使用完整路径启动，避免相对路径问题
+nohup "${INSTANCE_DIR}/start.sh" > "${INSTANCE_DIR}/workspace/server.log" 2>&1 &
+PID=$!
+
+# 等待几秒检查进程是否存活，并验证端口监听
+sleep 3
+if kill -0 $PID 2>/dev/null; then
+    # 额外检查端口是否监听（需要 lsof 或 nc）
+    if command -v nc &> /dev/null; then
+        if nc -z localhost "$PORT" 2>/dev/null; then
+            echo -e "${GREEN}================================================${NC}"
+            echo -e "${GREEN}🎉 实例 [${INSTANCE_NAME}] 初始化成功！${NC}"
+            echo -e "🌐 本地网关: http://localhost:${PORT}"
+            echo -e "📄 实时日志: tail -f ${INSTANCE_DIR}/workspace/server.log"
+            echo -e "${GREEN}================================================${NC}"
+        else
+            echo -e "${YELLOW}⚠️  进程存在但端口 ${PORT} 未监听，请查看日志: ${INSTANCE_DIR}/workspace/server.log${NC}"
+        fi
+    else
+        # 没有 nc，仅提示进程存在
+        echo -e "${GREEN}================================================${NC}"
+        echo -e "${GREEN}🎉 实例 [${INSTANCE_NAME}] 启动中（进程 PID: $PID）${NC}"
+        echo -e "📄 实时日志: tail -f ${INSTANCE_DIR}/workspace/server.log"
+        echo -e "${GREEN}================================================${NC}"
+    fi
 else
-    echo -e "${RED}❌ 启动失败，请运行 tail -n 20 ${INSTANCE_DIR}/workspace/server.log 查看报错内容${NC}"
+    echo -e "${RED}❌ 启动失败，请查看日志: tail -n 20 ${INSTANCE_DIR}/workspace/server.log${NC}"
+    exit 1
 fi

package/dist/plugin-sdk/accounts-CJWOBzwB.js

@@ -1,35 +0,0 @@
-import { ot as normalizeAccountId } from "./run-with-concurrency-Bt_ks0Qa.js";
-import { v as resolveAccountEntry, y as createAccountListHelpers } from "./accounts-DP1-L-QS.js";
-
-//#region src/imessage/accounts.ts
-const { listAccountIds, resolveDefaultAccountId } = createAccountListHelpers("imessage");
-const listIMessageAccountIds = listAccountIds;
-const resolveDefaultIMessageAccountId = resolveDefaultAccountId;
-function resolveAccountConfig(cfg, accountId) {
-	return resolveAccountEntry(cfg.channels?.imessage?.accounts, accountId);
-}
-function mergeIMessageAccountConfig(cfg, accountId) {
-	const { accounts: _ignored, ...base } = cfg.channels?.imessage ?? {};
-	const account = resolveAccountConfig(cfg, accountId) ?? {};
-	return {
-		...base,
-		...account
-	};
-}
-function resolveIMessageAccount(params) {
-	const accountId = normalizeAccountId(params.accountId);
-	const baseEnabled = params.cfg.channels?.imessage?.enabled !== false;
-	const merged = mergeIMessageAccountConfig(params.cfg, accountId);
-	const accountEnabled = merged.enabled !== false;
-	const configured = Boolean(merged.cliPath?.trim() || merged.dbPath?.trim() || merged.service || merged.region?.trim() || merged.allowFrom && merged.allowFrom.length > 0 || merged.groupAllowFrom && merged.groupAllowFrom.length > 0 || merged.dmPolicy || merged.groupPolicy || typeof merged.includeAttachments === "boolean" || merged.attachmentRoots && merged.attachmentRoots.length > 0 || merged.remoteAttachmentRoots && merged.remoteAttachmentRoots.length > 0 || typeof merged.mediaMaxMb === "number" || typeof merged.textChunkLimit === "number" || merged.groups && Object.keys(merged.groups).length > 0);
-	return {
-		accountId,
-		enabled: baseEnabled && accountEnabled,
-		name: merged.name?.trim() || void 0,
-		config: merged,
-		configured
-	};
-}
-
-//#endregion
-export { resolveDefaultIMessageAccountId as n, resolveIMessageAccount as r, listIMessageAccountIds as t };

package/dist/plugin-sdk/accounts-DP1-L-QS.js

@@ -1,288 +0,0 @@
-import { at as DEFAULT_ACCOUNT_ID, ot as normalizeAccountId, st as normalizeOptionalAccountId } from "./run-with-concurrency-Bt_ks0Qa.js";
-import { o as resolveOAuthDir } from "./paths-MKyEVmEb.js";
-import { Pr as formatCliCommand } from "./config-BkEnz2Po.js";
-import { B as success, E as resolveUserPath, G as getChildLogger, I as info, c as defaultRuntime, x as jidToE164 } from "./logger-CZY9KIoY.js";
-import fs from "node:fs";
-import path from "node:path";
-import fs$1 from "node:fs/promises";
-
-//#region src/channels/plugins/account-helpers.ts
-function createAccountListHelpers(channelKey) {
-	function resolveConfiguredDefaultAccountId(cfg) {
-		const channel = cfg.channels?.[channelKey];
-		const preferred = normalizeOptionalAccountId(typeof channel?.defaultAccount === "string" ? channel.defaultAccount : void 0);
-		if (!preferred) return;
-		if (listAccountIds(cfg).some((id) => normalizeAccountId(id) === preferred)) return preferred;
-	}
-	function listConfiguredAccountIds(cfg) {
-		const accounts = (cfg.channels?.[channelKey])?.accounts;
-		if (!accounts || typeof accounts !== "object") return [];
-		return Object.keys(accounts).filter(Boolean);
-	}
-	function listAccountIds(cfg) {
-		const ids = listConfiguredAccountIds(cfg);
-		if (ids.length === 0) return [DEFAULT_ACCOUNT_ID];
-		return ids.toSorted((a, b) => a.localeCompare(b));
-	}
-	function resolveDefaultAccountId(cfg) {
-		const preferred = resolveConfiguredDefaultAccountId(cfg);
-		if (preferred) return preferred;
-		const ids = listAccountIds(cfg);
-		if (ids.includes(DEFAULT_ACCOUNT_ID)) return DEFAULT_ACCOUNT_ID;
-		return ids[0] ?? DEFAULT_ACCOUNT_ID;
-	}
-	return {
-		listConfiguredAccountIds,
-		listAccountIds,
-		resolveDefaultAccountId
-	};
-}
-
-//#endregion
-//#region src/routing/account-lookup.ts
-function resolveAccountEntry(accounts, accountId) {
-	if (!accounts || typeof accounts !== "object") return;
-	if (Object.hasOwn(accounts, accountId)) return accounts[accountId];
-	const normalized = accountId.toLowerCase();
-	const matchKey = Object.keys(accounts).find((key) => key.toLowerCase() === normalized);
-	return matchKey ? accounts[matchKey] : void 0;
-}
-
-//#endregion
-//#region src/web/auth-store.ts
-function resolveDefaultWebAuthDir() {
-	return path.join(resolveOAuthDir(), "whatsapp", DEFAULT_ACCOUNT_ID);
-}
-const WA_WEB_AUTH_DIR = resolveDefaultWebAuthDir();
-function resolveWebCredsPath(authDir) {
-	return path.join(authDir, "creds.json");
-}
-function resolveWebCredsBackupPath(authDir) {
-	return path.join(authDir, "creds.json.bak");
-}
-function hasWebCredsSync(authDir) {
-	try {
-		const stats = fs.statSync(resolveWebCredsPath(authDir));
-		return stats.isFile() && stats.size > 1;
-	} catch {
-		return false;
-	}
-}
-function readCredsJsonRaw(filePath) {
-	try {
-		if (!fs.existsSync(filePath)) return null;
-		const stats = fs.statSync(filePath);
-		if (!stats.isFile() || stats.size <= 1) return null;
-		return fs.readFileSync(filePath, "utf-8");
-	} catch {
-		return null;
-	}
-}
-function maybeRestoreCredsFromBackup(authDir) {
-	const logger = getChildLogger({ module: "web-session" });
-	try {
-		const credsPath = resolveWebCredsPath(authDir);
-		const backupPath = resolveWebCredsBackupPath(authDir);
-		const raw = readCredsJsonRaw(credsPath);
-		if (raw) {
-			JSON.parse(raw);
-			return;
-		}
-		const backupRaw = readCredsJsonRaw(backupPath);
-		if (!backupRaw) return;
-		JSON.parse(backupRaw);
-		fs.copyFileSync(backupPath, credsPath);
-		try {
-			fs.chmodSync(credsPath, 384);
-		} catch {}
-		logger.warn({ credsPath }, "restored corrupted WhatsApp creds.json from backup");
-	} catch {}
-}
-async function webAuthExists(authDir = resolveDefaultWebAuthDir()) {
-	const resolvedAuthDir = resolveUserPath(authDir);
-	maybeRestoreCredsFromBackup(resolvedAuthDir);
-	const credsPath = resolveWebCredsPath(resolvedAuthDir);
-	try {
-		await fs$1.access(resolvedAuthDir);
-	} catch {
-		return false;
-	}
-	try {
-		const stats = await fs$1.stat(credsPath);
-		if (!stats.isFile() || stats.size <= 1) return false;
-		const raw = await fs$1.readFile(credsPath, "utf-8");
-		JSON.parse(raw);
-		return true;
-	} catch {
-		return false;
-	}
-}
-async function clearLegacyBaileysAuthState(authDir) {
-	const entries = await fs$1.readdir(authDir, { withFileTypes: true });
-	const shouldDelete = (name) => {
-		if (name === "oauth.json") return false;
-		if (name === "creds.json" || name === "creds.json.bak") return true;
-		if (!name.endsWith(".json")) return false;
-		return /^(app-state-sync|session|sender-key|pre-key)-/.test(name);
-	};
-	await Promise.all(entries.map(async (entry) => {
-		if (!entry.isFile()) return;
-		if (!shouldDelete(entry.name)) return;
-		await fs$1.rm(path.join(authDir, entry.name), { force: true });
-	}));
-}
-async function logoutWeb(params) {
-	const runtime = params.runtime ?? defaultRuntime;
-	const resolvedAuthDir = resolveUserPath(params.authDir ?? resolveDefaultWebAuthDir());
-	if (!await webAuthExists(resolvedAuthDir)) {
-		runtime.log(info("No WhatsApp Web session found; nothing to delete."));
-		return false;
-	}
-	if (params.isLegacyAuthDir) await clearLegacyBaileysAuthState(resolvedAuthDir);
-	else await fs$1.rm(resolvedAuthDir, {
-		recursive: true,
-		force: true
-	});
-	runtime.log(success("Cleared WhatsApp Web credentials."));
-	return true;
-}
-function readWebSelfId(authDir = resolveDefaultWebAuthDir()) {
-	try {
-		const credsPath = resolveWebCredsPath(resolveUserPath(authDir));
-		if (!fs.existsSync(credsPath)) return {
-			e164: null,
-			jid: null
-		};
-		const raw = fs.readFileSync(credsPath, "utf-8");
-		const jid = JSON.parse(raw)?.me?.id ?? null;
-		return {
-			e164: jid ? jidToE164(jid, { authDir }) : null,
-			jid
-		};
-	} catch {
-		return {
-			e164: null,
-			jid: null
-		};
-	}
-}
-/**
-* Return the age (in milliseconds) of the cached WhatsApp web auth state, or null when missing.
-* Helpful for heartbeats/observability to spot stale credentials.
-*/
-function getWebAuthAgeMs(authDir = resolveDefaultWebAuthDir()) {
-	try {
-		const stats = fs.statSync(resolveWebCredsPath(resolveUserPath(authDir)));
-		return Date.now() - stats.mtimeMs;
-	} catch {
-		return null;
-	}
-}
-function logWebSelfId(authDir = resolveDefaultWebAuthDir(), runtime = defaultRuntime, includeChannelPrefix = false) {
-	const { e164, jid } = readWebSelfId(authDir);
-	const details = e164 || jid ? `${e164 ?? "unknown"}${jid ? ` (jid ${jid})` : ""}` : "unknown";
-	const prefix = includeChannelPrefix ? "Web Channel: " : "";
-	runtime.log(info(`${prefix}${details}`));
-}
-async function pickWebChannel(pref, authDir = resolveDefaultWebAuthDir()) {
-	const choice = pref === "auto" ? "web" : pref;
-	if (!await webAuthExists(authDir)) throw new Error(`No WhatsApp Web session found. Run \`${formatCliCommand("openclaw channels login --channel whatsapp --verbose")}\` to link.`);
-	return choice;
-}
-
-//#endregion
-//#region src/web/accounts.ts
-const { listConfiguredAccountIds, listAccountIds, resolveDefaultAccountId } = createAccountListHelpers("whatsapp");
-const listWhatsAppAccountIds = listAccountIds;
-const resolveDefaultWhatsAppAccountId = resolveDefaultAccountId;
-function listWhatsAppAuthDirs(cfg) {
-	const oauthDir = resolveOAuthDir();
-	const whatsappDir = path.join(oauthDir, "whatsapp");
-	const authDirs = new Set([oauthDir, path.join(whatsappDir, DEFAULT_ACCOUNT_ID)]);
-	const accountIds = listConfiguredAccountIds(cfg);
-	for (const accountId of accountIds) authDirs.add(resolveWhatsAppAuthDir({
-		cfg,
-		accountId
-	}).authDir);
-	try {
-		const entries = fs.readdirSync(whatsappDir, { withFileTypes: true });
-		for (const entry of entries) {
-			if (!entry.isDirectory()) continue;
-			authDirs.add(path.join(whatsappDir, entry.name));
-		}
-	} catch {}
-	return Array.from(authDirs);
-}
-function hasAnyWhatsAppAuth(cfg) {
-	return listWhatsAppAuthDirs(cfg).some((authDir) => hasWebCredsSync(authDir));
-}
-function resolveAccountConfig(cfg, accountId) {
-	return resolveAccountEntry(cfg.channels?.whatsapp?.accounts, accountId);
-}
-function resolveDefaultAuthDir(accountId) {
-	return path.join(resolveOAuthDir(), "whatsapp", normalizeAccountId(accountId));
-}
-function resolveLegacyAuthDir() {
-	return resolveOAuthDir();
-}
-function legacyAuthExists(authDir) {
-	try {
-		return fs.existsSync(path.join(authDir, "creds.json"));
-	} catch {
-		return false;
-	}
-}
-function resolveWhatsAppAuthDir(params) {
-	const accountId = params.accountId.trim() || DEFAULT_ACCOUNT_ID;
-	const configured = resolveAccountConfig(params.cfg, accountId)?.authDir?.trim();
-	if (configured) return {
-		authDir: resolveUserPath(configured),
-		isLegacy: false
-	};
-	const defaultDir = resolveDefaultAuthDir(accountId);
-	if (accountId === DEFAULT_ACCOUNT_ID) {
-		const legacyDir = resolveLegacyAuthDir();
-		if (legacyAuthExists(legacyDir) && !legacyAuthExists(defaultDir)) return {
-			authDir: legacyDir,
-			isLegacy: true
-		};
-	}
-	return {
-		authDir: defaultDir,
-		isLegacy: false
-	};
-}
-function resolveWhatsAppAccount(params) {
-	const rootCfg = params.cfg.channels?.whatsapp;
-	const accountId = params.accountId?.trim() || resolveDefaultWhatsAppAccountId(params.cfg);
-	const accountCfg = resolveAccountConfig(params.cfg, accountId);
-	const enabled = accountCfg?.enabled !== false;
-	const { authDir, isLegacy } = resolveWhatsAppAuthDir({
-		cfg: params.cfg,
-		accountId
-	});
-	return {
-		accountId,
-		name: accountCfg?.name?.trim() || void 0,
-		enabled,
-		sendReadReceipts: accountCfg?.sendReadReceipts ?? rootCfg?.sendReadReceipts ?? true,
-		messagePrefix: accountCfg?.messagePrefix ?? rootCfg?.messagePrefix ?? params.cfg.messages?.messagePrefix,
-		authDir,
-		isLegacyAuthDir: isLegacy,
-		selfChatMode: accountCfg?.selfChatMode ?? rootCfg?.selfChatMode,
-		dmPolicy: accountCfg?.dmPolicy ?? rootCfg?.dmPolicy,
-		allowFrom: accountCfg?.allowFrom ?? rootCfg?.allowFrom,
-		groupAllowFrom: accountCfg?.groupAllowFrom ?? rootCfg?.groupAllowFrom,
-		groupPolicy: accountCfg?.groupPolicy ?? rootCfg?.groupPolicy,
-		textChunkLimit: accountCfg?.textChunkLimit ?? rootCfg?.textChunkLimit,
-		chunkMode: accountCfg?.chunkMode ?? rootCfg?.chunkMode,
-		mediaMaxMb: accountCfg?.mediaMaxMb ?? rootCfg?.mediaMaxMb,
-		blockStreaming: accountCfg?.blockStreaming ?? rootCfg?.blockStreaming,
-		ackReaction: accountCfg?.ackReaction ?? rootCfg?.ackReaction,
-		groups: accountCfg?.groups ?? rootCfg?.groups,
-		debounceMs: accountCfg?.debounceMs ?? rootCfg?.debounceMs
-	};
-}
-
-//#endregion
-export { webAuthExists as _, resolveWhatsAppAuthDir as a, logWebSelfId as c, pickWebChannel as d, readCredsJsonRaw as f, resolveWebCredsPath as g, resolveWebCredsBackupPath as h, resolveWhatsAppAccount as i, logoutWeb as l, resolveDefaultWebAuthDir as m, listWhatsAppAccountIds as n, WA_WEB_AUTH_DIR as o, readWebSelfId as p, resolveDefaultWhatsAppAccountId as r, getWebAuthAgeMs as s, hasAnyWhatsAppAuth as t, maybeRestoreCredsFromBackup as u, resolveAccountEntry as v, createAccountListHelpers as y };

package/dist/plugin-sdk/accounts-DZhWlEg3.js

@@ -1,46 +0,0 @@
-import { ot as normalizeAccountId } from "./run-with-concurrency-Bt_ks0Qa.js";
-import { v as resolveAccountEntry, y as createAccountListHelpers } from "./accounts-DP1-L-QS.js";
-
-//#region src/signal/accounts.ts
-const { listAccountIds, resolveDefaultAccountId } = createAccountListHelpers("signal");
-const listSignalAccountIds = listAccountIds;
-const resolveDefaultSignalAccountId = resolveDefaultAccountId;
-function resolveAccountConfig(cfg, accountId) {
-	return resolveAccountEntry(cfg.channels?.signal?.accounts, accountId);
-}
-function mergeSignalAccountConfig(cfg, accountId) {
-	const { accounts: _ignored, ...base } = cfg.channels?.signal ?? {};
-	const account = resolveAccountConfig(cfg, accountId) ?? {};
-	return {
-		...base,
-		...account
-	};
-}
-function resolveSignalAccount(params) {
-	const accountId = normalizeAccountId(params.accountId);
-	const baseEnabled = params.cfg.channels?.signal?.enabled !== false;
-	const merged = mergeSignalAccountConfig(params.cfg, accountId);
-	const accountEnabled = merged.enabled !== false;
-	const enabled = baseEnabled && accountEnabled;
-	const host = merged.httpHost?.trim() || "127.0.0.1";
-	const port = merged.httpPort ?? 8080;
-	const baseUrl = merged.httpUrl?.trim() || `http://${host}:${port}`;
-	const configured = Boolean(merged.account?.trim() || merged.httpUrl?.trim() || merged.cliPath?.trim() || merged.httpHost?.trim() || typeof merged.httpPort === "number" || typeof merged.autoStart === "boolean");
-	return {
-		accountId,
-		enabled,
-		name: merged.name?.trim() || void 0,
-		baseUrl,
-		configured,
-		config: merged
-	};
-}
-function listEnabledSignalAccounts(cfg) {
-	return listSignalAccountIds(cfg).map((accountId) => resolveSignalAccount({
-		cfg,
-		accountId
-	})).filter((account) => account.enabled);
-}
-
-//#endregion
-export { resolveSignalAccount as i, listSignalAccountIds as n, resolveDefaultSignalAccountId as r, listEnabledSignalAccounts as t };