@szc-ft/mcp-szcd-client 0.34.2 → 0.38.0

package/agents/build.js

@@ -346,6 +346,11 @@ function build() {
             const srcSkillPath = path.join(srcSkillDir, "SKILL.md");
             const destSkillDir = path.join(qwenExtDir, "skills", skillDir);
             if (fs.existsSync(srcSkillPath)) {
+                // PR #0 v3: 先 rm 旧副本，避免脏数据残留（cjs 等已废弃文件）
+                if (fs.existsSync(destSkillDir)) {
+                    fs.rmSync(destSkillDir, { recursive: true, force: true });
+                    console.log(`    ✓ Cleaned stale ${skillDir}/`);
+                }
                 copyDirRecursive(srcSkillDir, destSkillDir);
                 console.log(`    ✓ Synced skill to qwen-extension/skills/${skillDir}/`);
             }
@@ -376,6 +381,10 @@ function build() {
             const srcSkillPath = path.join(srcSkillDir, "SKILL.md");
             const destSkillDir = path.join(opencodeExtDir, "skills", skillDir);
             if (fs.existsSync(srcSkillPath)) {
+                // PR #0 v3: 先 rm 旧副本（与 5a 同步逻辑保持一致）
+                if (fs.existsSync(destSkillDir)) {
+                    fs.rmSync(destSkillDir, { recursive: true, force: true });
+                }
                 copyDirRecursive(srcSkillDir, destSkillDir);
             }
         }
@@ -496,8 +505,57 @@ function build() {
     console.log("\n✅ Agent build complete!");
 }
 
+// ★ PR #0 v3 修复：build 锁（防止并发 build 时 ENOTEMPTY）
+//   跨进程互斥：第一个 build 写 .build.lock，后续 build 等到锁释放
+const lockFile = path.join(process.cwd(), ".build.lock");
+const lockMaxWait = 30000; // 30s 超时
+const lockPollInterval = 100; // 100ms 检查一次
+const lockStaleAge = 60000; // 60s 视为 stale 锁
+async function acquireBuildLock() {
+    const start = Date.now();
+    while (Date.now() - start < lockMaxWait) {
+        try {
+            const fd = fs.openSync(lockFile, "wx");  // 独占创建（原子操作）
+            fs.writeSync(fd, String(process.pid));
+            return fd;
+        } catch (e) {
+            if (e.code === "EEXIST") {
+                // 锁存在 → 检查是否 stale
+                try {
+                    const stat = fs.statSync(lockFile);
+                    if (Date.now() - stat.mtimeMs > lockStaleAge) {
+                        console.log(`  ⚠ 锁文件陈旧 (>${lockStaleAge/1000}s)，强制删除`);
+                        try { fs.unlinkSync(lockFile); } catch {}
+                        continue;
+                    }
+                } catch {}
+                // 等待
+                await new Promise((r) => setTimeout(r, lockPollInterval));
+            } else {
+                throw e;
+            }
+        }
+    }
+    return null;  // 超时
+}
+function releaseBuildLock(fd) {
+    if (fd) {
+        try { fs.closeSync(fd); } catch {}
+        try { fs.unlinkSync(lockFile); } catch {}
+    }
+}
+
 try {
-    build();
+    const lockFd = await acquireBuildLock();
+    if (!lockFd) {
+        process.stderr.write(`❌ build 锁获取超时 (${lockMaxWait}ms)\n`);
+        process.exit(2);
+    }
+    try {
+        build();
+    } finally {
+        releaseBuildLock(lockFd);
+    }
 } catch (error) {
     console.error("❌ Build failed:", error.message);
     console.error(error.stack);

package/agents/platforms.json

@@ -6,6 +6,13 @@
             "type": "stdio",
             "command": "sketch-mcp-server",
             "args": []
+        },
+        {
+            "name": "shadcn",
+            "type": "stdio",
+            "command": "npx",
+            "args": ["-y", "shadcn@latest", "mcp"],
+            "description": "shadcn/ui 官方 stdio MCP（registry 搜索/查看/add 命令）。需项目根目录有 components.json，否则调 list_items_in_registries 报 'No registries are configured'。"
         }
     ],
     "platforms": {

package/agents/szcd-component-expert.qoder.md

@@ -15,12 +15,14 @@ tools:
 skills:
   - local-api-tool
   - local-browser-test
+  - shadcn-design-to-code
   - szcd-component-helper
   - szcd-design-to-code
   - szcd-upload-zip
 mcpServers:
   - szcd-component-helper
   - sketch-mcp-server
+  - shadcn
 ---
 
 # szcd-component-expert: szcd 组件库专家

package/opencode-extension/opencode.json

@@ -10,6 +10,15 @@
             "command": [
                 "sketch-mcp-server"
             ]
+        },
+        "shadcn": {
+            "type": "local",
+            "command": [
+                "npx",
+                "-y",
+                "shadcn@latest",
+                "mcp"
+            ]
         }
     }
 }

package/opencode-extension/skills/local-browser-test/SKILL.md

@@ -1307,3 +1307,94 @@ NODE_PATH=~/.szcd-mcp/deps/node_modules node "$EXECUTOR" --action test-case --te
 - ❌ 单元测试 / 组件级测试 → Vitest / Jest / RTL
 - ❌ 视觉回归全量对比（无 baseline 设计稿）→ Percy / Chromatic
 - ✅ 真实浏览器内的功能验证、API 时序捕获、设计稿单图对比、动态菜单批量扫描
+
+## rawScript 可用 API（PR #4 v3）
+
+`rawScript` 步骤支持两种模式：
+
+### 模式 A：inline code
+```json
+{ "type": "rawScript", "code": "return { passed: document.title.includes('登录') }" }
+```
+
+### 模式 B：codeFile（PR #4 新增）
+```json
+{ "type": "rawScript", "codeFile": ".lbt/scripts/check-title.js" }
+```
+- 相对路径相对 `process.cwd()`
+- 文件不存在 → 明确报错（指出绝对路径）
+- 文件读失败 → 明确报错
+
+### rawScript 函数签名
+
+```js
+async (page, frame, params, browser) => {
+  // page: puppeteer Page 对象
+  // frame: PuppeteerFrame（iframe 上下文）
+  // params: step.params 对象
+  // browser: puppeteer Browser 对象
+  return { passed: true, ... };  // 或 { passed: false, reason: '...' }
+}
+```
+
+### ✅ 浏览器侧可用 API
+
+| 类别 | API |
+|------|-----|
+| DOM | `document.*` / `window.*` / `frame.document` |
+| 存储 | `localStorage.*` / `sessionStorage.*` / `cookieStore` |
+| 网络 | `fetch()` / `XMLHttpRequest` / `WebSocket` |
+| JS 内置 | `JSON` / `Date` / `Math` / `Array` / `Object` / `Promise` / `async/await` |
+| 浏览器事件 | `MouseEvent` / `KeyboardEvent` / `CustomEvent` |
+| puppeteer | `page.*`（evaluate / click / type / waitForSelector 等）|
+
+### ❌ Node 侧 API 不可用（浏览器无）
+
+| 错误信息 | 原因 | 浏览器侧替代 |
+|---------|------|------------|
+| `TypeError: require is not a function` | 浏览器无 `require` | `await fetch()` / `page.evaluate(() => ...)` |
+| `ReferenceError: __dirname is not defined` | 浏览器无 Node 全局 | `window.location.origin` / `frame.url()` |
+| `ReferenceError: process is not defined` | 浏览器无 `process` | `localStorage` / `URL` 替代 |
+| `ReferenceError: Buffer is not defined` | 浏览器无 Node `Buffer` | `Uint8Array` / `TextEncoder` |
+| `TypeError: require.main is not a function` | 浏览器无 `require.main` | 不需要 |
+
+**★ PR #4 修复**：rawScript 执行器会在跑前**静态扫描**代码，发现 Node-only API 时**立即 fail**，错误信息包含"详见 SKILL.md > ## rawScript 可用 API"，避免用户踩坑。
+
+### 常见错误速查
+
+| 错误 | 修复 |
+|------|------|
+| `codeFile 不存在: /path/to/file` | 检查路径或用 inline `code` 替代 |
+| `rawScript 检测到 Node-only API: require('fs')` | 改用 `page.evaluate(() => ...)` 走浏览器 |
+| `script compile error: Unexpected token` | 检查 `code` 字段 JSON 转义（`"` → `\"`） |
+| `script execution error: ...` | 看具体堆栈；可能是 page 已 close 或网络超时 |
+
+### 示例：检查页面 title
+
+```js
+// 模式 A：inline
+{ "type": "rawScript", "code": "return { passed: document.title.includes('数据集目录'), title: document.title }" }
+
+// 模式 B：codeFile
+{ "type": "rawScript", "codeFile": ".lbt/scripts/check-dataset-title.js" }
+// .lbt/scripts/check-dataset-title.js 内容：
+//   return { passed: document.title.includes('数据集目录'), title: document.title };
+```
+
+### 示例：拿所有按钮文本
+
+```js
+{
+  "type": "rawScript",
+  "code": "return { passed: true, buttons: [...document.querySelectorAll('button')].map(b => b.textContent.trim()) }"
+}
+```
+
+### 示例：调浏览器 fetch 验证 API
+
+```js
+{
+  "type": "rawScript",
+  "code": "const r = await fetch('/api/health'); const j = await r.json(); return { passed: j.status === 'ok', data: j }"
+}
+```

package/opencode-extension/skills/local-browser-test/config.example.yaml

@@ -0,0 +1,51 @@
+# local-browser-test 配置示例
+# 复制为 .lbt/config.yaml 后填值（config.yaml 已在 .gitignore 内）
+#
+# 占位符 ${ENV_VAR} 走 process.env，CI 推荐用：
+#   export LBT_TOKEN=xxx
+#   export LBT_PASSWORD=xxx
+
+# 应用基础配置
+app:
+  baseURL: http://10.2.7.60:30020
+  timeout: 30000
+
+# 鉴权（强烈建议用环境变量，避免明文）
+auth:
+  type: bearer             # bearer | cookie | oauth2
+  token: ${LBT_TOKEN}      # 走环境变量
+  # password: ${LBT_PASSWORD}
+  # username: ${LBT_USERNAME}
+  # verifyCode: ${LBT_VERIFY_CODE}
+  storageState: null       # 可选：复用 .lbt/auth/<project>.json
+
+# 多环境配置（配合 --project <name> 切换）
+projects:
+  - name: corpus-test
+    baseURL: http://119.0.87.158
+    auth:
+      type: bearer
+      token: ${LBT_TOKEN}
+  - name: corpus-stg
+    baseURL: http://10.2.7.60:30020
+    auth:
+      type: bearer
+      token: ${LBT_TOKEN}
+  - name: corpus-prod
+    baseURL: http://172.16.0.172:30010
+    auth:
+      type: bearer
+      token: ${LBT_TOKEN}
+
+# 重试策略
+retry:
+  maxRetries: 0              # 用例级（CI 跑 2 次）
+  maxRetriesPerStep: 2       # 步骤级（验证码过期等）
+  flakyThreshold: 5          # 5 次中 1 挂 4 过 → flaky
+  noRetryActions: true       # 写操作（删除/提交/上线）永不重试
+
+# 报告（v4 Playwright 风格）
+report:
+  retainRuns: 30             # 保留最近 30 次 run
+  retainDays: 7              # 保留最近 7 天
+  retainFailedForever: true  # 失败 run 永久保留

package/opencode-extension/skills/local-browser-test/lib/api-call-executor.js

@@ -0,0 +1,251 @@
+/**
+ * apiCall step 增强执行器（PR #8 v3 走法 P）
+ *
+ * 关键设计：
+ *   - API 步骤走 Node 18+ 内置 fetch（**不通过浏览器**，但自动共享 context.cookies()）
+ *   - UI 步骤走 page（真实浏览器，CDP）
+ *   - 同一 testCase 跑（UI + API 混合），cookie 自动共享
+ *   - 首次 = 回归 = 真实行为（永远一致）
+ *   - 不引入 newman 依赖
+ *   - 不引入 axios 依赖（用 fetch 即可，Node 18+ 内置）
+ *
+ * 6 个新字段：
+ *   - assert: L1 status / L2 header / L3 body path / L4 responseTime
+ *   - captureTrace: HAR-like trace 录制（PR #5 trace-collector 集成）
+ *   - noRetry: 写操作禁重试（PR #6 retry-policy 集成）
+ *   - strategy: plan 显式（newman / browser / auto）
+ *   - headers: 自定义请求头
+ *   - tags: 用例标签（PR #7）
+ */
+
+import { redact } from './redact.js';
+
+/**
+ * apiCall step 增强 schema
+ * @typedef {object} ApiCallStep
+ * @property {'apiCall'} type
+ * @property {string} method
+ * @property {string} url
+ * @property {object} [headers]
+ * @property {object} [body]
+ * @property {object} [assert] - L1-L4 断言
+ * @property {boolean} [captureTrace] - 是否记录 trace
+ * @property {boolean} [noRetry] - 写操作禁重试（默认 true）
+ * @property {string} [strategy] - plan 显式（newman / browser / auto）
+ * @property {string[]} [tags] - 用例标签
+ */
+
+/**
+ * 共享 cookie header（PR #8 关键设计）
+ * @param {Array<{name: string, value: string, domain?: string}>} cookies
+ * @param {string} [targetOrigin]
+ * @returns {string} Cookie 头（空字符串如果无 cookie）
+ */
+export function buildCookieHeader(cookies, targetOrigin) {
+    if (!Array.isArray(cookies) || cookies.length === 0) return '';
+    const filtered = targetOrigin
+        ? cookies.filter((c) => c.domain?.endsWith(targetOrigin.replace(/^https?:\/\//, '')))
+        : cookies;
+    return filtered.map((c) => `${c.name}=${c.value}`).join('; ');
+}
+
+/**
+ * ★ axios interceptor 工厂：记录 timings（PR #5 + PR #8）
+ * @param {object} collector - { timings: Array<{name, url, method, total}> }
+ * @returns {{ request: Function, response: Function, error: Function }}
+ */
+export function createTimingsInterceptor(collector) {
+    return {
+        request(config) {
+            config.metadata = { startTime: process.hrtime.bigint() };
+            return config;
+        },
+        response(response) {
+            const ns = process.hrtime.bigint() - response.config.metadata.startTime;
+            const total = Number(ns / 1000000n);  // ms
+            collector.timings.push({
+                name: response.config.metadata.name ?? '',
+                url: response.config.url,
+                method: response.config.method?.toUpperCase(),
+                total,
+                status: response.status
+            });
+            response.config.metadata.total = total;
+            return response;
+        },
+        error(error) {
+            if (error.config?.metadata) {
+                const ns = process.hrtime.bigint() - error.config.metadata.startTime;
+                error.config.metadata.total = Number(ns / 1000000n);
+            }
+            return Promise.reject(error);
+        }
+    };
+}
+
+/**
+ * L1-L4 断言引擎
+ * @param {object} response - axios response
+ * @param {object} assertSpec - 断言规格
+ * @returns {{passed: boolean, checks: Array<{name: string, level: number, passed: boolean, actual: any, expected: any, error?: string}>}}
+ */
+export function assertApiResponse(response, assertSpec) {
+    const checks = [];
+    let allPassed = true;
+
+    // L1: status code
+    if (assertSpec.status !== undefined) {
+        const actual = response.status;
+        const expected = assertSpec.status;
+        const passed = actual === expected;
+        checks.push({ name: `Status is ${expected}`, level: 1, actual, expected, passed });
+        if (!passed) allPassed = false;
+    }
+
+    // L2: header
+    if (assertSpec.headers) {
+        for (const [key, expected] of Object.entries(assertSpec.headers)) {
+            const actual = response.headers?.[key.toLowerCase()];
+            const passed = actual === expected;
+            checks.push({ name: `Header ${key}=${expected}`, level: 2, actual, expected, passed });
+            if (!passed) allPassed = false;
+        }
+    }
+
+    // L3: body path
+    if (assertSpec.body) {
+        for (const [path, expected] of Object.entries(assertSpec.body)) {
+            const actual = getByPath(response.data, path);
+            const passed = matchValue(actual, expected);
+            checks.push({ name: `Body ${path} = ${JSON.stringify(expected)}`, level: 3, actual, expected, passed });
+            if (!passed) allPassed = false;
+        }
+    }
+
+    // L4: response time
+    if (assertSpec.responseTime !== undefined) {
+        const total = response.config?.metadata?.total ?? 0;
+        const expected = assertSpec.responseTime;
+        const passed = total < expected;
+        checks.push({ name: `Response time < ${expected}ms`, level: 4, actual: total, expected, passed });
+        if (!passed) allPassed = false;
+    }
+
+    return { passed: allPassed, checks };
+}
+
+/**
+ * 路径取值（点号访问嵌套对象）
+ */
+function getByPath(obj, path) {
+    return String(path).split('.').reduce((o, k) => o?.[k], obj);
+}
+
+/**
+ * 操作符匹配
+ * @param {any} actual
+ * @param {any} expected - 可以是值 / { $gt: n } / { $lt: n } / { $contains: 'x' } / { $regex: 'p' }
+ */
+function matchValue(actual, expected) {
+    if (expected && typeof expected === 'object' && !Array.isArray(expected)) {
+        if ('$gt' in expected && actual > expected.$gt) return true;
+        if ('$lt' in expected && actual < expected.$lt) return true;
+        if ('$gte' in expected && actual >= expected.$gte) return true;
+        if ('$lte' in expected && actual <= expected.$lte) return true;
+        if ('$contains' in expected && String(actual ?? '').includes(expected.$contains)) return true;
+        if ('$regex' in expected && new RegExp(expected.$regex).test(String(actual ?? ''))) return true;
+        if ('$in' in expected && Array.isArray(expected.$in) && expected.$in.includes(actual)) return true;
+        return false;
+    }
+    return actual === expected;
+}
+
+/**
+ * 执行 apiCall step（v3 走法 P：不通过浏览器，走 axios）
+ * @param {ApiCallStep} step
+ * @param {object} ctx - { baseURL, cookies, traceCollector? }
+ * @returns {Promise<{
+ *   name: string, status: 'passed'|'failed', duration: number,
+ *   request: object, response: object,
+ *   assertions: Array, trace: object|null, error: object|null
+ * }>}
+ */
+export async function executeApiCallStep(step, ctx = {}) {
+    const startTime = Date.now();
+    const method = (step.method || 'POST').toUpperCase();
+    const timings = [];
+    const collector = { timings };
+
+    // 1. 构造 axios request：自动共享 context.cookies()
+    const cookieHeader = buildCookieHeader(ctx.cookies ?? [], ctx.baseURL);
+    const request = axios.create({
+        baseURL: ctx.baseURL,
+        headers: {
+            Cookie: cookieHeader,
+            'Content-Type': 'application/json',
+            ...step.headers
+        },
+        // 让 axios 接受任意状态码（不抛错）
+        validateStatus: () => true
+    });
+
+    // 2. ★ axios interceptor（PR #5 + PR #8）
+    const interceptor = createTimingsInterceptor(collector);
+    request.interceptors.request.use(interceptor.request);
+    request.interceptors.response.use(interceptor.response, interceptor.error);
+
+    // 3. 发请求
+    let response;
+    let error = null;
+    try {
+        response = await request({
+            method,
+            url: step.url,
+            data: step.body
+        });
+    } catch (e) {
+        error = {
+            message: e.message ?? String(e),
+            code: e.code ?? null
+        };
+    }
+
+    const duration = Date.now() - startTime;
+    const status = response?.status ?? 0;
+
+    // 4. ★ 断言（PR #8 L1-L4）
+    let assertionResults = [];
+    let passed = error == null && status >= 200 && status < 300;  // 默认通过 = 2xx
+    if (step.assert && response) {
+        const assertResult = assertApiResponse(response, step.assert);
+        assertionResults = assertResult.checks;
+        if (!assertResult.passed) {
+            passed = false;
+        }
+    }
+
+    // 5. ★ 构造返回值（脱敏 + 统一 schema）
+    const safeResponse = response ? {
+        status: response.status,
+        statusText: response.statusText,
+        duration: response.config?.metadata?.total ?? 0,
+        headers: redact(response.headers ?? {}),
+        body: redact(response.data)
+    } : null;
+
+    return {
+        name: step.name ?? `${method} ${step.url}`,
+        status: passed ? 'passed' : 'failed',
+        duration,
+        request: {
+            method,
+            url: step.url,
+            headers: redact(step.headers ?? {}),
+            body: redact(step.body)
+        },
+        response: safeResponse,
+        assertions: assertionResults,
+        trace: step.captureTrace ? { timings: collector.timings } : null,
+        error
+    };
+}

package/opencode-extension/skills/local-browser-test/lib/browser-engine.js

@@ -16,6 +16,8 @@ import { AntAdapter } from "./ant-adapter.js";
 import { createExpect, locator as expectLocator, validation as expectValidation, url as expectUrl, api as expectApi } from "./expect.js";
 import { getBrowserConfigFromProcess } from "./cdp-browser-config.js";
 import { decryptAllPasswords } from "./decrypt-passwords.js";
+// ★ PR #6 v3: 重试 + flaky + 写操作禁重试
+import { RetryPolicy, retryPolicyFromPlan } from "./retry-policy.js";
 import { existsSync, readFileSync, writeFileSync, statSync } from 'fs';
 import { join, dirname } from 'path';
 import { homedir } from 'os';
@@ -3246,24 +3248,83 @@ export class BrowserEngine {
 
     async _rawScript(step) {
         var target = await this._getTargetFrame(step);
+        // ★ PR #4 v3 修复：抽 helper 便于测试 + 支持 step.codeFile + 静态扫描 Node-only API
+        var resolve = require('./raw-script-helpers.js');
+        var codeResult = resolve.resolveCodeFile(step, process.cwd());
+        if (codeResult.error) {
+            return resolve.buildErrorResult(codeResult.reason);
+        }
+        var code = codeResult.code;
+
+        // 静态扫描：检测常见 Node-only API（浏览器侧不可用）
+        var nodeOnlyHints = resolve.detectNodeOnlyApi(code);
+        if (nodeOnlyHints.length > 0) {
+            return resolve.buildErrorResult(
+                'rawScript 检测到 Node-only API:\n  - ' + nodeOnlyHints.join('\n  - ') +
+                '\n\n  → 修复：改用浏览器侧 API（document.* / localStorage / fetch 等）\n' +
+                '  → 详见 SKILL.md > ## rawScript 可用 API'
+            );
+        }
+
         var fn;
-        try { fn = new Function('page', 'frame', 'params', 'browser', 'return (' + step.code + ')(page, frame, params, browser)'); }
-        catch (e) { return { type: 'rawScript', passed: false, reason: 'script compile error: ' + e.message, status: 'FAIL' }; }
+        try {
+            // rawScript 签名：async (page, frame, params, browser) => { return { passed, ... } }
+            fn = new Function('page', 'frame', 'params', 'browser', 'return (async () => { ' + code + ' })()');
+        } catch (e) {
+            return resolve.buildErrorResult('script compile error: ' + e.message + '\n  → 详见 SKILL.md > ## rawScript 可用 API');
+        }
         try {
             var result = await fn(this.page, target.frame, step.params || {}, this.browser);
             return Object.assign({ type: 'rawScript' }, result);
-        } catch (e) { return { type: 'rawScript', passed: false, reason: 'script execution error: ' + e.message, status: 'FAIL' }; }
+        } catch (e) {
+            return resolve.buildErrorResult('script execution error: ' + e.message + '\n  → 详见 SKILL.md > ## rawScript 可用 API');
+        }
     }
 
     async _apiCall(step) {
-        var method = (step.method || 'POST').toUpperCase();
-        var response = await this.page.evaluate(async function(opts) {
-            var res = await fetch(opts.url, { method: opts.method, headers: Object.assign({ 'Content-Type': 'application/json' }, opts.headers || {}), body: opts.body ? JSON.stringify(opts.body) : undefined });
-            var data = await res.text();
-            try { return { status: res.status, data: JSON.parse(data) }; } catch(e) { return { status: res.status, data: data }; }
-        }, { method: method, url: step.url, body: step.body, headers: step.headers });
-        var passed = response.status >= 200 && response.status < 300;
-        return { type: 'apiCall', status: response.status, data: typeof response.data === 'string' ? response.data.slice(0, 500) : response.data, passed: passed, reason: passed ? null : 'API returned ' + response.status };
+        // ★ PR #8 v3: 走法 P — 增强 apiCall step（不通过浏览器，走 axios）
+        //   自动从 context.cookies() 共享 Cookie
+        //   6 个新字段：assert / captureTrace / noRetry / strategy / headers / tags
+        try {
+            // 从 currentPage 拿 cookies
+            let cookies = [];
+            try {
+                if (this.page && this.page.browserContext) {
+                    cookies = await this.page.browserContext().cookies();
+                }
+            } catch (e) {
+                // 跨域 iframe / about:blank 等忽略
+            }
+
+            // 调新 executor
+            const { executeApiCallStep } = await import('./api-call-executor.js');
+            const baseURL = this._baseURL || (this.page ? (new URL(this.page.url()).origin) : '');
+            const result = await executeApiCallStep(step, {
+                baseURL,
+                cookies
+            });
+
+            return {
+                type: 'apiCall',
+                passed: result.status === 'passed',
+                name: result.name,
+                status: result.response?.status ?? 0,
+                duration: result.duration,
+                request: result.request,
+                response: result.response,
+                assertions: result.assertions,
+                trace: result.trace,
+                error: result.error,
+                reason: result.status === 'passed' ? null : (result.error?.message ?? `API returned ${result.response?.status}`)
+            };
+        } catch (e) {
+            return {
+                type: 'apiCall',
+                passed: false,
+                reason: 'apiCall 执行失败: ' + e.message + '\n  → 详见 SKILL.md > ## apiCall step',
+                status: 'FAIL'
+            };
+        }
     }
 
     async _switchPage(step) {
@@ -3356,21 +3417,34 @@ export class BrowserEngine {
 
                 if (stepResult.status === "FAIL") {
                     allPassed = false;
-                    const recovery = testCase.recovery || {};
-                    const maxRetries = recovery.maxRetriesPerStep ?? 0;
-                    for (let retry = 0; retry < maxRetries; retry++) {
-                        const retryResult = await this.executeStep(step, context);
+                    // ★ PR #6 v3：用 RetryPolicy 替换简单 retry 逻辑
+                    const policy = retryPolicyFromPlan(testCase.recovery);
+                    if (policy.isStepRetryable(step)) {
+                        const maxRetries = policy.maxRetriesPerStep;
+                        for (let retry = 0; retry < maxRetries; retry++) {
+                            const retryResult = await this.executeStep(step, context);
+                            rowResults.push({
+                                ...retryResult,
+                                stepIndex,
+                                dataRowIndex,
+                                retry: retry + 1,
+                            });
+                            results.push(rowResults[rowResults.length - 1]);
+                            if (retryResult.status === "PASS") {
+                                allPassed = true;
+                                break;
+                            }
+                        }
+                    } else {
+                        // 写操作禁重试：标记 step 为 noRetry
                         rowResults.push({
-                            ...retryResult,
+                            ...stepResult,
                             stepIndex,
                             dataRowIndex,
-                            retry: retry + 1,
+                            noRetry: true,
+                            reason: (stepResult.reason ?? 'fail') + ' (写操作禁重试)'
                         });
                         results.push(rowResults[rowResults.length - 1]);
-                        if (retryResult.status === "PASS") {
-                            allPassed = true;
-                            break;
-                        }
                     }
                     if (!allPassed && step.continueOnFail === false) break;
                 }