openclaw-multi-auto 1.5.2 → 1.5.4

package/scripts/npm_publish.sh

@@ -118,68 +118,3 @@ PKG_NAME=$(node -e "console.log(require('./package.json').name)")
 curl -s -X PUT "https://registry-direct.npmmirror.com/${PKG_NAME}/sync?publish=true" > /dev/null && echo -e "${GREEN}[跳过]${NC}"
 
 echo -e "${GREEN}🎉 OpenClaw 发布成功！${NC}"
-
-# 8. 发布 page-action-cache 扩展
-echo -ne "${BLUE}📦 正在发布 page-action-cache 扩展...${NC}"
-
-# 进入扩展目录处理 workspace:* 依赖问题
-cd "$ROOT_DIR/extensions/page-action-cache"
-
-# 处理 package.json 中的 workspace:* 依赖（npm 不支持）
-TMP_PACKAGE_JSON="/tmp/page-action-cache-publish-$(date +%s).json"
-cp package.json "$TMP_PACKAGE_JSON"
-
-node -e "
-const pkg = JSON.parse(require('fs').readFileSync('$TMP_PACKAGE_JSON', 'utf8'));
-// 移除 workspace:* 依赖
-delete pkg.dependencies;
-// 保留 peerDependencies
-pkg.peerDependencies = pkg.peerDependencies || {};
-require('fs').writeFileSync('$TMP_PACKAGE_JSON', JSON.stringify(pkg, null, 2));
-"
-
-# 处理后的 package.json
-cp "$TMP_PACKAGE_JSON" package.json
-
-echo -ne "${GREEN}✅ 已处理 package.json（移除 workspace 依赖）${NC}"
-
-# 检查是否需要登录
-if ! npm whoami > /dev/null 2>&1; then
-    echo -ne "${YELLOW}🔐 page-action-cache 扩展发布需要 npm 登录${NC}"
-    echo -ne "${YELLOW}💡 提示: 请执行 npm login 后重新运行此脚本${NC}"
-    rm -f "$TMP_PACKAGE_JSON"
-    git checkout package.json 2>/dev/null || true
-    exit 1
-fi
-
-# 发布扩展
-echo -ne "${YELLOW}🚀 正在发布到 npm...${NC}"
-npm publish --access public
-
-if [ $? -eq 0 ]; then
-    echo -e "${GREEN}✅ page-action-cache 发布成功！${NC}"
-    # 通知镜像同步
-    curl -s -X PUT "https://registry-direct.npmmirror.com/page-action-cache/sync?publish=true" > /dev/null && echo -e "${GREEN}[完成]${NC}"
-else
-    echo -e "${RED}❌ page-action-cache 发布失败${NC}"
-    echo -e "${YELLOW}⚠️  可能的原因：${NC}"
-    echo -e "${YELLOW}1. 包还未发布到 npm，或者您没有发布权限${NC}"
-    echo -e "${YELLOW}2. 建议先单独发布扩展：${NC}"
-    echo -e "${BLUE}   cd extensions/page-action-cache${NC}"
-    echo -e "${BLUE}   npm publish --access public${NC}"
-    echo -e "${YELLOW}3. 扩展发布成功后需要重启实例才能生效${NC}"
-    echo -e "${YELLOW}   运行: cd ~/openclaws/<instance> && ./start.sh${NC}"
-fi
-
-# 恢复原始 package.json
-git checkout package.json 2>/dev/null || true
-rm -f "$TMP_PACKAGE_JSON"
-
-echo -e "${GREEN}🎉 完整发布流程完成！${NC}"
-echo -e "${GREEN}📋 已发布:${NC}"
-echo -e "${GREEN}  - openclaw-multi-auto (v${CUR_VERSION})${NC}"
-echo -e "${GREEN}  - page-action-cache (latest)${NC}"
-echo ""
-echo -e "${BLUE}💡 提示:${NC}"
-echo -e "${BLUE}  扩展发布后，需要重启实例才能生效 page-action-cache${NC}"
-echo -e "${BLUE}  运行: cd ~/openclaws/<instance> && ./start.sh${NC}"

package/scripts/npm_publish_backup.sh

@@ -0,0 +1,185 @@
+#!/usr/bin/env bash
+# =================================================================
+# OpenClaw 开发者发布工具 (npm 标准依赖版) - V12
+# =================================================================
+
+set -e
+
+# 记录初始根目录
+ROOT_DIR=$(pwd)
+
+# 颜色定义
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+BLUE='\033[1;34m'
+YELLOW='\033[1;33m'
+NC='\033[0m'
+
+echo -e "${BLUE}==== 开始发布流程 (标准 npm 依赖模式) ====${NC}"
+
+# 0. 检查登录状态
+echo -ne "${YELLOW}🔑 正在验证 npm 账户... ${NC}"
+npm whoami > /dev/null 2>&1 || {
+    echo -e "${RED}[失败]${NC}\n❌ 请先执行 npm login"
+    exit 1
+}
+echo -e "${GREEN}[OK]${NC}"
+
+# 1. 注入并校验标准依赖配置
+echo -ne "${YELLOW}🔄 正在配置重定向至 @openclaw-cn/libsignal... ${NC}"
+
+node -e "
+    const fs = require('fs');
+    const p = JSON.parse(fs.readFileSync('package.json'));
+    
+    // 锁定 baileys 版本（可选）
+    p.dependencies['@whiskeysockets/baileys'] = '7.0.0-rc.9';
+    
+    // 添加别名依赖（关键！）
+    p.dependencies['@whiskeysockets/libsignal-node'] = 'npm:@openclaw-cn/libsignal@2.0.1';
+    p.dependencies['libsignal'] = 'npm:@openclaw-cn/libsignal@2.0.1';
+    
+    // 保留 overrides 仅用于本地构建一致性
+    const redirect = 'npm:@openclaw-cn/libsignal@2.0.1';
+    p.overrides = {
+        'libsignal': redirect,
+        '@whiskeysockets/libsignal-node': redirect
+    };
+    p.pnpm = { ...p.pnpm, overrides: p.overrides };
+    
+    fs.writeFileSync('package.json', JSON.stringify(p, null, 2));
+"
+
+echo -e "${GREEN}[OK]${NC}"
+
+# 2. 准备纯净环境
+echo -ne "${YELLOW}🌐 刷新依赖树 (执行标准下载)... ${NC}"
+
+# 彻底清理锁文件和缓存，确保不走本地 link
+rm -rf dist node_modules pnpm-lock.yaml 2>/dev/null || true
+
+# 执行安装 (pnpm 会根据 overrides 自动下载 @openclaw-cn/libsignal)
+if ! pnpm install --no-frozen-lockfile --registry=https://registry.npmmirror.com > .pnpm_error.log 2>&1; then
+    echo -e "${RED}[失败]${NC}"
+    grep -E "ERROR|fatal|exit code" .pnpm_error.log | tail -n 5 || cat .pnpm_error.log
+    exit 1
+fi
+echo -e "${GREEN}[OK]${NC}"
+
+# 3. 构建
+echo -ne "${YELLOW}🛠️  执行核心构建... ${NC}"
+pnpm build > /dev/null 2>&1
+echo -e "${GREEN}[OK]${NC}"
+
+echo -ne "${YELLOW}🛠️  构建 UI 控制面板... ${NC}"
+pnpm ui:build > /dev/null 2>&1
+echo -e "${GREEN}[OK]${NC}"
+
+# 4. 生成发布压缩包
+echo -ne "${YELLOW}🔍 正在生成发布压缩包... ${NC}"
+# 此时不再需要处理 .npmignore 的物理打包逻辑，npm 默认会打包除 node_modules 外的文件
+PACK_NAME=$(npm pack 2>/dev/null)
+echo -e "${GREEN}[OK]${NC}"
+
+# 5. 模拟用户侧安装测试 (确保不再有 Git 连接)
+echo -ne "${YELLOW}🧪 执行隔离环境校验... ${NC}"
+TEST_DIR=$(mktemp -d)
+cp "$PACK_NAME" "$TEST_DIR/"
+cd "$TEST_DIR"
+tar -xzf "$PACK_NAME" > /dev/null 2>&1
+cd package
+
+# 模拟最终用户，完全不依赖本地 vendor，完全走镜像站
+if ! npm install --production --no-package-lock --registry=https://registry.npmmirror.com > .test_install_error.log 2>&1; then
+    echo -e "${RED}[安装失败]${NC}"
+    echo -e "${YELLOW}--- 错误追踪 (为何还在连 Git?) ---${NC}"
+    cat .test_install_error.log
+    exit 1
+fi
+
+# 核心验证：检查是否能跑通 (确保 libsignal 加载正常)
+if ! node -e "require('./dist/index.js')" > .load_error.log 2>&1; then
+    echo -e "${RED}[加载失败]${NC}"
+    cat .load_error.log
+    exit 1
+fi
+
+cd "$ROOT_DIR"
+echo -e "${GREEN}[通过]${NC}"
+
+# 6. 正式发布
+CUR_VERSION=$(node -e "console.log(require('./package.json').version)")
+echo -e "${BLUE}🚀 正在发布 v${CUR_VERSION} 到 npm 官方仓库...${NC}"
+npm publish "$PACK_NAME" --registry=https://registry.npmjs.org --access public
+
+# 7. 镜像同步
+echo -ne "${YELLOW}🔄 通知镜像同步... ${NC}"
+PKG_NAME=$(node -e "console.log(require('./package.json').name)")
+curl -s -X PUT "https://registry-direct.npmmirror.com/${PKG_NAME}/sync?publish=true" > /dev/null && echo -e "${GREEN}[跳过]${NC}"
+
+echo -e "${GREEN}🎉 OpenClaw 发布成功！${NC}"
+
+# 8. 发布 page-action-cache 扩展
+echo -ne "${BLUE}📦 正在发布 page-action-cache 扩展...${NC}"
+
+# 进入扩展目录处理 workspace:* 依赖问题
+cd "$ROOT_DIR/extensions/page-action-cache"
+
+# 处理 package.json 中的 workspace:* 依赖（npm 不支持）
+TMP_PACKAGE_JSON="/tmp/page-action-cache-publish-$(date +%s).json"
+cp package.json "$TMP_PACKAGE_JSON"
+
+node -e "
+const pkg = JSON.parse(require('fs').readFileSync('$TMP_PACKAGE_JSON', 'utf8'));
+// 移除 workspace:* 依赖
+delete pkg.dependencies;
+// 保留 peerDependencies
+pkg.peerDependencies = pkg.peerDependencies || {};
+require('fs').writeFileSync('$TMP_PACKAGE_JSON', JSON.stringify(pkg, null, 2));
+"
+
+# 处理后的 package.json
+cp "$TMP_PACKAGE_JSON" package.json
+
+echo -ne "${GREEN}✅ 已处理 package.json（移除 workspace 依赖）${NC}"
+
+# 检查是否需要登录
+if ! npm whoami > /dev/null 2>&1; then
+    echo -ne "${YELLOW}🔐 page-action-cache 扩展发布需要 npm 登录${NC}"
+    echo -ne "${YELLOW}💡 提示: 请执行 npm login 后重新运行此脚本${NC}"
+    rm -f "$TMP_PACKAGE_JSON"
+    git checkout package.json 2>/dev/null || true
+    exit 1
+fi
+
+# 发布扩展
+echo -ne "${YELLOW}🚀 正在发布到 npm...${NC}"
+npm publish --access public
+
+if [ $? -eq 0 ]; then
+    echo -e "${GREEN}✅ page-action-cache 发布成功！${NC}"
+    # 通知镜像同步
+    curl -s -X PUT "https://registry-direct.npmmirror.com/page-action-cache/sync?publish=true" > /dev/null && echo -e "${GREEN}[完成]${NC}"
+else
+    echo -e "${RED}❌ page-action-cache 发布失败${NC}"
+    echo -e "${YELLOW}⚠️  可能的原因：${NC}"
+    echo -e "${YELLOW}1. 包还未发布到 npm，或者您没有发布权限${NC}"
+    echo -e "${YELLOW}2. 建议先单独发布扩展：${NC}"
+    echo -e "${BLUE}   cd extensions/page-action-cache${NC}"
+    echo -e "${BLUE}   npm publish --access public${NC}"
+    echo -e "${YELLOW}3. 扩展发布成功后需要重启实例才能生效${NC}"
+    echo -e "${YELLOW}   运行: cd ~/openclaws/<instance> && ./start.sh${NC}"
+fi
+
+# 恢复原始 package.json
+git checkout package.json 2>/dev/null || true
+rm -f "$TMP_PACKAGE_JSON"
+
+echo -e "${GREEN}🎉 完整发布流程完成！${NC}"
+echo -e "${GREEN}📋 已发布:${NC}"
+echo -e "${GREEN}  - openclaw-multi-auto (v${CUR_VERSION})${NC}"
+echo -e "${GREEN}  - page-action-cache (latest)${NC}"
+echo ""
+echo -e "${BLUE}💡 提示:${NC}"
+echo -e "${BLUE}  扩展发布后，需要重启实例才能生效 page-action-cache${NC}"
+echo -e "${BLUE}  运行: cd ~/openclaws/<instance> && ./start.sh${NC}"

package/extensions/page-action-cache/dist/actions-executor.d.ts

@@ -1,62 +0,0 @@
-/**
- * Actions Executor
- * 操作执行器 - 执行缓存的原子化操作
- */
-import type { AtomicAction, ExecutionResult, PwAi, VariableMap } from "./types.js";
-/**
- * 操作执行器
- */
-export declare class ActionsExecutor {
-    private pw;
-    private cdpUrl;
-    constructor(cdpUrl?: string);
-    /**
-     * 设置 Playwright 客户端
-     */
-    setPlaywrightClient(pw: PwAi): void;
-    /**
-     * 设置 CDP URL
-     */
-    setCdpUrl(cdpUrl: string): void;
-    /**
-     * 执行单个操作
-     */
-    execute(action: AtomicAction, variables?: VariableMap): Promise<ExecutionResult>;
-    /**
-     * 批量执行操作
-     */
-    executeBatch(actions: AtomicAction[], variables?: VariableMap, options?: {
-        fromIndex?: number;
-        toIndex?: number;
-        atomic?: boolean;
-    }): Promise<ExecutionResult[]>;
-    private executeNavigate;
-    private executeClick;
-    private executeType;
-    private executePress;
-    private executeHover;
-    private executeScreenshot;
-    private executeEvaluate;
-    /**
-     * 应用变量到操作
-     */
-    private applyVariables;
-    /**
-     * 替换操作中的模板变量
-     */
-    private replaceTemplateVariables;
-    /**
-     * 格式化操作列表
-     */
-    formatActions(actions: AtomicAction[]): string;
-    /**
-     * 格式化单个操作
-     */
-    private formatAction;
-    /**
-     * 格式化执行结果
-     */
-    formatExecutionResults(results: ExecutionResult[]): string;
-}
-export declare function getActionsExecutor(cdpUrl?: string): ActionsExecutor;
-//# sourceMappingURL=actions-executor.d.ts.map

package/extensions/page-action-cache/dist/actions-executor.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"actions-executor.d.ts","sourceRoot":"","sources":["../src/actions-executor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EACV,YAAY,EACZ,eAAe,EACf,IAAI,EACJ,WAAW,EAQZ,MAAM,YAAY,CAAC;AAMpB;;GAEG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,EAAE,CAAqB;IAC/B,OAAO,CAAC,MAAM,CAAc;gBAEhB,MAAM,CAAC,EAAE,MAAM;IAM3B;;OAEG;IACH,mBAAmB,CAAC,EAAE,EAAE,IAAI,GAAG,IAAI;IAInC;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAI/B;;OAEG;IACG,OAAO,CACX,MAAM,EAAE,YAAY,EACpB,SAAS,CAAC,EAAE,WAAW,GACtB,OAAO,CAAC,eAAe,CAAC;IAiE3B;;OAEG;IACG,YAAY,CAChB,OAAO,EAAE,YAAY,EAAE,EACvB,SAAS,CAAC,EAAE,WAAW,EACvB,OAAO,CAAC,EAAE;QACR,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,GACA,OAAO,CAAC,eAAe,EAAE,CAAC;YA0Bf,eAAe;YAcf,YAAY;YAgBZ,WAAW;YAgBX,YAAY;YAaZ,YAAY;YAaZ,iBAAiB;YAWjB,eAAe;IAiB7B;;OAEG;IACH,OAAO,CAAC,cAAc;IAuCtB;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAmChC;;OAEG;IACH,aAAa,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM;IAM9C;;OAEG;IACH,OAAO,CAAC,YAAY;IA+DpB;;OAEG;IACH,sBAAsB,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,MAAM;CAW3D;AAQD,wBAAgB,kBAAkB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,eAAe,CAKnE"}

package/extensions/page-action-cache/dist/actions-executor.js

@@ -1,339 +0,0 @@
-/**
- * Actions Executor
- * 操作执行器 - 执行缓存的原子化操作
- */
-// ============================================================================
-// Actions Executor 类
-// ============================================================================
-/**
- * 操作执行器
- */
-export class ActionsExecutor {
-    pw = null;
-    cdpUrl = "";
-    constructor(cdpUrl) {
-        if (cdpUrl) {
-            this.cdpUrl = cdpUrl;
-        }
-    }
-    /**
-     * 设置 Playwright 客户端
-     */
-    setPlaywrightClient(pw) {
-        this.pw = pw;
-    }
-    /**
-     * 设置 CDP URL
-     */
-    setCdpUrl(cdpUrl) {
-        this.cdpUrl = cdpUrl;
-    }
-    /**
-     * 执行单个操作
-     */
-    async execute(action, variables) {
-        const startTime = Date.now();
-        try {
-            // 应用变量
-            const resolvedAction = this.applyVariables(action, variables);
-            // 根据操作类型执行
-            switch (resolvedAction.type) {
-                case "navigate":
-                    await this.executeNavigate(resolvedAction);
-                    break;
-                case "click":
-                    await this.executeClick(resolvedAction);
-                    break;
-                case "type":
-                    await this.executeType(resolvedAction);
-                    break;
-                case "press":
-                    await this.executePress(resolvedAction);
-                    break;
-                case "hover":
-                    await this.executeHover(resolvedAction);
-                    break;
-                case "screenshot":
-                    await this.executeScreenshot(resolvedAction);
-                    break;
-                case "scroll":
-                case "wait":
-                case "select":
-                case "focus":
-                case "drag":
-                case "upload":
-                    await this.executeEvaluate(resolvedAction);
-                    break;
-                case "composite":
-                    // 复合操作暂不实现
-                    throw new Error("Composite actions not yet implemented");
-                default:
-                    throw new Error(`Unsupported action type: ${action.type}`);
-            }
-            return {
-                action: action.type,
-                success: true,
-                duration: Date.now() - startTime,
-            };
-        }
-        catch (error) {
-            return {
-                action: action.type,
-                success: false,
-                error: error instanceof Error ? error.message : String(error),
-                duration: Date.now() - startTime,
-            };
-        }
-    }
-    /**
-     * 批量执行操作
-     */
-    async executeBatch(actions, variables, options) {
-        const from = options?.fromIndex ?? 0;
-        const to = options?.toIndex !== undefined ? options.toIndex + 1 : actions.length;
-        const atomic = options?.atomic ?? false;
-        const results = [];
-        const actionsToExecute = actions.slice(from, to);
-        for (const action of actionsToExecute) {
-            const result = await this.execute(action, variables);
-            results.push(result);
-            // 原子执行：失败则停止
-            if (atomic && !result.success) {
-                break;
-            }
-        }
-        return results;
-    }
-    // -------------------------------------------------------------------------
-    // 具体操作实现
-    // -------------------------------------------------------------------------
-    async executeNavigate(action) {
-        if (!this.pw) {
-            throw new Error("Playwright client not set");
-        }
-        await this.pw.navigateViaPlaywright({
-            cdpUrl: action.cdpUrl || this.cdpUrl,
-            targetId: action.targetId,
-            url: action.url,
-            waitUntil: action.navigationPolicy?.waitUntil || "domcontentloaded",
-            timeout: action.navigationPolicy?.timeout,
-        });
-    }
-    async executeClick(action) {
-        if (!this.pw) {
-            throw new Error("Playwright client not set");
-        }
-        await this.pw.clickViaPlaywright({
-            cdpUrl: action.cdpUrl || this.cdpUrl,
-            targetId: action.targetId,
-            ref: action.ref,
-            doubleClick: action.doubleClick,
-            button: action.button || "left",
-            modifiers: action.modifiers,
-            timeoutMs: action.timeoutMs,
-        });
-    }
-    async executeType(action) {
-        if (!this.pw) {
-            throw new Error("Playwright client not set");
-        }
-        await this.pw.typeViaPlaywright({
-            cdpUrl: action.cdpUrl || this.cdpUrl,
-            targetId: action.targetId,
-            ref: action.ref,
-            text: action.text,
-            submit: action.submit,
-            slowly: action.slowly,
-            timeoutMs: action.timeoutMs,
-        });
-    }
-    async executePress(action) {
-        if (!this.pw) {
-            throw new Error("Playwright client not set");
-        }
-        await this.pw.pressKeyViaPlaywright({
-            cdpUrl: action.cdpUrl || this.cdpUrl,
-            targetId: action.targetId,
-            key: action.key,
-            delayMs: action.delayMs,
-        });
-    }
-    async executeHover(action) {
-        if (!this.pw) {
-            throw new Error("Playwright client not set");
-        }
-        await this.pw.hoverViaPlaywright({
-            cdpUrl: action.cdpUrl || this.cdpUrl,
-            targetId: action.targetId,
-            ref: action.ref,
-            timeoutMs: action.timeoutMs,
-        });
-    }
-    async executeScreenshot(action) {
-        if (!this.pw) {
-            throw new Error("Playwright client not set");
-        }
-        return this.pw.screenshotViaPlaywright({
-            cdpUrl: action.cdpUrl || this.cdpUrl,
-            targetId: action.targetId,
-        });
-    }
-    async executeEvaluate(action) {
-        if (!this.pw) {
-            throw new Error("Playwright client not set");
-        }
-        return this.pw.evaluateViaPlaywright({
-            cdpUrl: action.cdpUrl || this.cdpUrl,
-            targetId: action.targetId,
-            code: action.evaluate.code,
-            args: action.evaluate.args,
-        });
-    }
-    // -------------------------------------------------------------------------
-    // 变量替换
-    // -------------------------------------------------------------------------
-    /**
-     * 应用变量到操作
-     */
-    applyVariables(action, variables) {
-        if (!variables) {
-            return action;
-        }
-        // 检查是否需要变量替换
-        if (!action.variable) {
-            return action;
-        }
-        // 获取变量值
-        const value = variables[action.variable];
-        if (value === undefined) {
-            // 变量未定义，返回原操作
-            return action;
-        }
-        // 根据操作类型设置正确的参数
-        const actionType = action.type;
-        if (actionType === "type") {
-            return { ...action, text: value };
-        }
-        else if (actionType === "press") {
-            return { ...action, key: value };
-        }
-        else if (actionType === "navigate") {
-            return { ...action, url: value };
-        }
-        else if (actionType === "scroll" || actionType === "wait" ||
-            actionType === "select" || actionType === "focus" ||
-            actionType === "drag" || actionType === "upload") {
-            // evaluate 操作替换模板变量
-            return this.replaceTemplateVariables(action, variables);
-        }
-        else {
-            // 其他操作替换所有字符串参数中的模板变量
-            return this.replaceTemplateVariables(action, variables);
-        }
-    }
-    /**
-     * 替换操作中的模板变量
-     */
-    replaceTemplateVariables(action, variables) {
-        const result = { ...action };
-        // 替换字符串类型参数中的 ${variable}
-        for (const key of Object.keys(action)) {
-            const value = action[key];
-            if (typeof value === "string") {
-                result[key] = value.replace(/\$\{([^}]+)\}/g, (match, varName) => {
-                    const replacement = variables[varName];
-                    return replacement !== undefined ? replacement : match;
-                });
-            }
-        }
-        // 特殊处理 evaluate.code（如果存在）
-        if (result.evaluate?.code && typeof result.evaluate.code === "string") {
-            result.evaluate.code = result.evaluate.code.replace(/\$\{([^}]+)\}/g, (match, varName) => {
-                const replacement = variables[varName];
-                return replacement !== undefined ? replacement : match;
-            });
-        }
-        return result;
-    }
-    // -------------------------------------------------------------------------
-    // 格式化输出
-    // -------------------------------------------------------------------------
-    /**
-     * 格式化操作列表
-     */
-    formatActions(actions) {
-        return actions
-            .map((action, i) => this.formatAction(action, i + 1))
-            .join("\n");
-    }
-    /**
-     * 格式化单个操作
-     */
-    formatAction(action, index) {
-        switch (action.type) {
-            case "navigate":
-                return `${index}. 导航到：${action.url}`;
-            case "screenshot":
-                return `${index}. 截图`;
-            case "click":
-                const btn = action.button || "left";
-                const dbl = action.doubleClick ? "双击" : "";
-                const mod = action.modifiers?.length
-                    ? `+${action.modifiers.join("+")}`
-                    : "";
-                return `${index}. ${dbl}点击（${btn}${mod}）：${action.ref}`;
-            case "type":
-                const txt = action.text
-                    ? `="${action.text}"`
-                    : "";
-                const sub = action.submit ? " [提交]" : "";
-                const slow = action.slowly ? " [慢速]" : "";
-                return `${index}. 输入：${action.ref}${txt}${sub}${slow}`;
-            case "press":
-                const delay = action.delayMs
-                    ? `(${action.delayMs}ms)`
-                    : "";
-                return `${index}. 按键：${action.key}${delay}${action.ref ? ` @ ${action.ref}` : ""}`;
-            case "hover":
-                return `${index}. 悬停：${action.ref}`;
-            case "scroll":
-                return `${index}. 滚动：${action.evaluate?.code || "向下滚动"}`;
-            case "wait":
-                const waitDelay = action.delay ? `(${action.delay}ms)` : "";
-                return `${index}. 等待：${action.evaluate?.code || "默认等待"}${waitDelay}`;
-            case "select":
-                return `${index}. 选择：${action.ref}`;
-            case "focus":
-                return `${index}. 聚焦：${action.ref}`;
-            case "drag":
-                return `${index}. 拖拽：${action.ref}`;
-            case "upload":
-                return `${index}. 上传：${action.ref}`;
-            default:
-                return `${index}. ${action.type}：${action.ref || ""}`;
-        }
-    }
-    /**
-     * 格式化执行结果
-     */
-    formatExecutionResults(results) {
-        return results
-            .map((r, i) => {
-            const icon = r.success ? "✅" : "❌";
-            const time = r.duration ? `(${r.duration}ms)` : "";
-            return `${icon} 操作 ${i + 1}: ${r.action} ${time}${r.error ? ` - ${r.error}` : ""}`;
-        })
-            .join("\n");
-    }
-}
-// ============================================================================
-// 单例
-// ============================================================================
-let actionsExecutorInstance = null;
-export function getActionsExecutor(cdpUrl) {
-    if (!actionsExecutorInstance) {
-        actionsExecutorInstance = new ActionsExecutor(cdpUrl);
-    }
-    return actionsExecutorInstance;
-}
-//# sourceMappingURL=actions-executor.js.map

package/extensions/page-action-cache/dist/actions-executor.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"actions-executor.js","sourceRoot":"","sources":["../src/actions-executor.ts"],"names":[],"mappings":"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"}