chore: auto release commit (2026-07-03 18:50:07)

2026-07-03 18:50:08 +08:00
parent 7136689efe
commit 48a86e56f1
31 changed files with 1605 additions and 549 deletions
--- a/.openclaw-skill-template
+++ b/.openclaw-skill-template
@@ -0,0 +1,5 @@
+# 此文件仅存在于 skill-template 源仓库。
+# 用 tools/scaffold_skill 创建新技能时，脚本会从目标目录删除本文件。
+# 若业务技能仓库中仍存在本文件，说明未正确 scaffold，tests 会失败。
+template_slug: your-skill-slug
+template_version: "1.0.32"
--- a/SKILL.md
+++ b/SKILL.md
@@ -79,11 +79,13 @@ python {baseDir}/scripts/main.py version

 ## 定制入口

-1. 复制目录为你的新 skill 仓库，全局替换 `your-skill-slug` 等占位词。
-2. 按 `development/DEVELOPMENT.md` 完成开发与文档定制。
-3. 用户市场说明写入根 `README.md`；Agent 调用契约见 `references/CLI.md`、`references/SCHEMA.md`。
-4. 同步修改 `scripts/util/constants.py` 中的 `SKILL_SLUG` / `SKILL_VERSION`。
-5. 本地 SQLite 的中文表名/字段名、标准时间字段与字段顺序规范见 `references/SCHEMA.md`（元数据表 `_jiangchang_*` + `CREATE TABLE` 物理顺序）。
+1. 从本模板创建新业务技能时，**不得保留模板 `.git`**；优先使用 [`tools/scaffold_skill.ps1`](tools/scaffold_skill.ps1)（见 [`tools/README.md`](tools/README.md)）。
+2. 业务技能仓库中**不得**存在 `.openclaw-skill-template`（仅 template 源仓库保留）。
+3. 复制目录为你的新 skill 仓库，全局替换 `your-skill-slug` 等占位词。
+4. 按 `development/DEVELOPMENT.md` 完成开发与文档定制。
+5. 用户市场说明写入根 `README.md`；Agent 调用契约见 `references/CLI.md`、`references/SCHEMA.md`。
+6. 同步修改 `scripts/util/constants.py` 中的 `SKILL_SLUG` / `SKILL_VERSION`。
+7. 本地 SQLite 的中文表名/字段名、标准时间字段与字段顺序规范见 `references/SCHEMA.md`（元数据表 `_jiangchang_*` + `CREATE TABLE` 物理顺序）。

 ## 技能命名与 slug

--- a/development/ADAPTER.md
+++ b/development/ADAPTER.md
@@ -37,17 +37,22 @@ scripts/service/<domain>_adapter/
  base.py            # 数据契约（dataclass）+ AdapterBase 接口
  mock.py            # 离线仿真，给 CI/单测
  real_api.py        # 真实系统 API
-  sim_rpa.py         # 仿真平台 RPA
+  sim_rpa.py         # 薄仿真平台 RPA adapter（委托 *_playwright.py）
  real_rpa.py        # 真实系统 RPA（占位，谨慎实现）
+
+scripts/service/
+  <platform>_playwright.py   # RPA 主流程（厚）；与薄 sim_rpa.py 并列
+  account_client.py            # account-manager subprocess 唯一封装
+  browser_session.py           # async persistent context 启动
 ```

 模板示例（均在 `examples/`，**不在** `scripts/`）：

- **仿真浏览器 RPA 完整案例**：`examples/simulator_browser_rpa/` — mock + simulator_rpa + sandbox 页面 + adapter 分层 + 测试
- **真实浏览器 RPA 完整案例**：`examples/real_browser_rpa/` — 登录/验证码/滚动采集
+- **仿真浏览器 RPA 完整案例**：`examples/simulator_browser_rpa/` — async mock + simulator_rpa + `simulator_playwright.py` + sandbox 页面 + adapter 分层 + 测试
+- **真实浏览器 RPA 完整案例**：`examples/real_browser_rpa/` — 登录/验证码/滚动采集 + `account_client.py`
 - **真实 API / 仿真 API**：`examples/real_api/`、`examples/simulator_api/` — 当前为规划占位，尚未沉淀可复制实现

-复制 adapter 分层时，以 `examples/simulator_browser_rpa/scripts/service/adapter/` 为权威参考，在新技能中创建 `scripts/service/<domain>_adapter/` 并按 README copy map 选择性复制。
+复制 adapter 分层时，以修正后的 `examples/simulator_browser_rpa/`（薄 adapter + `simulator_playwright.py`）与 `examples/real_browser_rpa/scripts/service/account_client.py` 为权威参考，在新技能中创建 `scripts/service/<domain>_adapter/` 并按 README copy map 选择性复制。

 > 先判断属于四象限哪一种（`real_browser_rpa` / `real_api` / `simulator_browser_rpa` / `simulator_api`），再读对应 `examples/*/README.md`。示例是**参考架构与边界**，不是业务代码原样复制。

@@ -93,7 +98,7 @@ def get_adapter():

 1. 在 `SKILL.md` 的 `metadata.openclaw.dependencies.required` 声明。
 2. **普通兄弟技能调用**，优先走统一 **`service.sibling_bridge`**（`call_sibling_json`），**不要**在 `task_service.py`、`task_rpa.py` 等业务流程文件中到处散落 `subprocess.run`。
-3. **account-manager 账号/租约能力**是例外：可参考 `examples/real_browser_rpa/scripts/service/account_client.py`，封装为**单一** `account_client.py`；允许在该文件内部集中通过 subprocess 调 account-manager CLI。
+3. **account-manager 账号/租约能力**是例外：可参考 `examples/real_browser_rpa/scripts/service/account_client.py` 与 `examples/simulator_browser_rpa/scripts/service/account_client.py`，封装为**单一** `account_client.py`；允许在该文件内部集中通过 subprocess 调 account-manager CLI。**禁止** import `rpa_helpers` 等 account-manager 内部模块；`simulator_rpa` 与 `real_rpa` 均走同一 `pick_web_account` / `release_lease` 模式。
 4. **不允许**直接 `import account-manager` 的内部 Python 模块（如 `service/`、`util/`、`db/`）。
 5. **pick lease 后必须 `finally release lease`**；进程被 kill 后可能残留 lease，需在运维文档说明排查方式（查 account-manager lease 列表 / 手动释放）。

--- a/development/CONFIG.md
+++ b/development/CONFIG.md
@@ -23,6 +23,7 @@ OPENCLAW_TEST_TARGET=mock              # mock | simulator_rpa | real_api | real_
 TARGET_BASE_URL=https://sandbox.jc2009.com

 # ── 默认账号（仅非敏感标识；密码走 account-manager）──
+# 浏览器 RPA simulator_rpa 联调账号来自 account-manager（platform + profile_dir），不是此处的 DEFAULT_LOGIN_ID
 DEFAULT_LOGIN_ID=04110001

 # ── 浏览器 / RPA ──
--- a/development/DEVELOPMENT.md
+++ b/development/DEVELOPMENT.md
@@ -80,11 +80,13 @@
 你不应该直接在这个仓库里开发业务，而应该：

 0. 按 [`NAMING.md`](NAMING.md) 确定 slug（`{verb}-{noun-phrase}-{platform}`）
-1. 复制这个目录
-2. 改成新 skill 的目录名（与 slug 一致）
+1. **优先**用 [`tools/scaffold_skill.ps1`](../tools/scaffold_skill.ps1) 创建新目录（见 [`tools/README.md`](../tools/README.md)）
+2. 在新目录内 `git init` 并绑定**本技能**远端（**不得**保留模板 `.git`）
 3. 把占位内容替换掉
 4. 再开始写业务逻辑

+> **Git 红线**：禁止资源管理器整文件夹复制后保留模板 `.git`；`git remote -v` 必须指向新技能仓库，不能仍是 skill-template。
+
 ## 2. 新 skill 的标准目录结构

 复制模板后，你应该保留下面这套结构：
@@ -168,10 +170,13 @@ scripts/
     - `examples/real_browser_rpa/scripts/service/task_rpa.py`
     - `examples/real_browser_rpa/scripts/service/account_client.py`
   - 若是 **仿真浏览器 RPA**（自有 sandbox、表单批量提交、可控 DOM），**必须先读** `examples/simulator_browser_rpa/README.md`，再按需复制到 `scripts/service/`：
-     - `examples/simulator_browser_rpa/scripts/service/browser_session.py`
-     - `examples/simulator_browser_rpa/scripts/service/adapter/`
-     - `examples/simulator_browser_rpa/scripts/service/task_service.py`
+     - `examples/simulator_browser_rpa/scripts/service/browser_session.py`（async）
+     - `examples/simulator_browser_rpa/scripts/service/account_client.py`（subprocess，对齐 `real_browser_rpa`）
+     - `examples/simulator_browser_rpa/scripts/service/simulator_playwright.py`（RPA 主流程，复制后改名为 `<platform>_playwright.py`）
+     - `examples/simulator_browser_rpa/scripts/service/adapter/`（薄 `simulator_rpa` + mock）
+     - `examples/simulator_browser_rpa/scripts/service/task_service.py`（async 编排）
     - `sandbox/demo_app.html` 仅留在 examples，不进入生产 skill
+   - **禁止**：`rpa_helpers`、sync Playwright 用于完整技能 RPA 主路径、`task_service` 散落 account-manager subprocess
 3. **只用共享库，不在 skill 里重写反反爬**：
   ```python
   from jiangchang_skill_core import config
@@ -244,12 +249,52 @@ release workflow 会对 `scripts/` 下的 Python 源码做加密/打包。当前

 ### 第一步：复制模板并改目录名

-例如你要开发 `your-skill-slug`（或 `disburse-payroll-icbc` 一类领域 skill）：
+例如你要开发 `disburse-payroll-icbc` 一类领域 skill（目录名 = slug）：

-1. 复制 `skill-template`
-2. 新目录改成与 `slug` 一致的名称（如 `your-skill-slug`）
-3. 初始化为独立 git 仓库
-4. 关联它自己的远端仓库
+#### 推荐方式（首选）
+
+在 **skill-template 仓库根目录**执行：
+
+```powershell
+.\tools\scaffold_skill.ps1 -Slug disburse-payroll-icbc -Destination D:\OpenClaw\client-gdcm\disburse-payroll-icbc
+cd D:\OpenClaw\client-gdcm\disburse-payroll-icbc
+git init
+git remote add origin <你的新技能 Gitea/Git 仓库 URL>
+git remote -v    # 确认 origin 不是 skill-template
+```
+
+跨平台可用 `python tools/scaffold_skill.py --slug ... --destination ...`（见 [`tools/README.md`](../tools/README.md)）。
+
+脚手架会排除 `.git`、缓存与 `.env`，并删除 `.openclaw-skill-template` 标记；**不会**自动 `git init`。
+
+#### 禁止方式
+
+| 做法 | 后果 |
+|------|------|
+| ❌ 资源管理器整文件夹复制后不做 Git 清理 | 隐藏 `.git` 被带走，push 串到 template |
+| ❌ 保留模板 `.git` 只改 `remote url` | 历史、分支、对象库仍属 template |
+| ❌ 未删 `.git` 就 `git init` | 嵌套/混乱仓库，难以排查 |
+
+#### 若已手工复制（补救）
+
+```powershell
+cd <新技能目录>
+Remove-Item -Recurse -Force .git
+Remove-Item -Recurse -Force .pytest_cache -ErrorAction SilentlyContinue
+Remove-Item -Force .openclaw-skill-template -ErrorAction SilentlyContinue
+git init
+git remote add origin <新技能仓库 URL>
+git remote -v
+```
+
+#### AI / 编程代理复制红线
+
+| 禁止 | 说明 |
+|------|------|
+| 保留模板 `.git` | 必须先 `Remove-Item -Recurse -Force .git` 再 `git init` |
+| `origin` 仍指向 skill-template | 复制后必须 `git remote -v` 自检 |
+| 保留 `.openclaw-skill-template` | 仅 template 源仓库可有；业务技能不得保留 |
+| 复制 `.pytest_cache` / `__pycache__` | 用 scaffold 已排除；手工复制应删 |

 目录名要和 skill slug 对齐，后面很多地方都依赖这个命名。

@@ -699,6 +744,9 @@ uses: client-jiangchang/jiangchang-platform-kit/.github/workflows/reusable-relea
 - [ ] 源码/文档/配置为 **UTF-8 without BOM**（Python 文件不得含 `U+FEFF`）
 - [ ] 没有新增默认必跑测试访问真实网络或浏览器
 - [ ] 如有 integration 测试需求，已写在 `tests/integration/` 下并保持 `.sample` 后缀
+- [ ] 本仓库**不是** skill-template 的误复制（根目录**无** `.openclaw-skill-template`）
+- [ ] `git remote -v` 指向**本技能**远端，URL 不含 skill-template 仓库名
+- [ ] `git log` 首条提交属于本技能（非模板历史）

 ## 17. 常见错误

@@ -758,12 +806,12 @@ uses: client-jiangchang/jiangchang-platform-kit/.github/workflows/reusable-relea

 表现：

- slug 形如 `amazon-download-settlement-report`
+- slug 形如 `erp-download-settlement-report`（平台段错误地放在最前）
 - 语义校验或 `test_slug_naming` 失败

 要改：

- 动词放首段，平台放末段，例如 `download-settlement-report-amazon`
+- 动词放首段，平台放末段，例如 `download-settlement-report-erp`
 - 见 [`NAMING.md`](NAMING.md)

 ### 错误 6：noun 段过长导致超 48 字符
@@ -789,6 +837,25 @@ uses: client-jiangchang/jiangchang-platform-kit/.github/workflows/reusable-relea
 - `SKILL.md` 的 `metadata.openclaw.slug`
 - `scripts/util/constants.py` 的 `SKILL_SLUG`

+### 错误 8：复制模板时带走了 `.git`
+
+表现：
+
+- `git remote -v` 仍显示 skill-template 的 origin
+- push 到错误仓库，或 log 里全是模板历史
+- 新技能目录里仍有 `.openclaw-skill-template`
+
+修复：
+
+```powershell
+Remove-Item -Recurse -Force .git
+Remove-Item -Force .openclaw-skill-template -ErrorAction SilentlyContinue
+git init
+git remote add origin <新技能仓库 URL>
+```
+
+以后复制请优先用 `tools/scaffold_skill.ps1`（见 [`tools/README.md`](../tools/README.md)）。
+
 ## 18. 推荐开发顺序总结

 如果让一个新人照着做，我建议他按这个顺序：
--- a/development/NAMING.md
+++ b/development/NAMING.md
@@ -165,10 +165,11 @@ slug **末段 platform** 与 `account-manager` 中的 `platform_key` **语义对
 ## 9. 复制新技能流程

 1. **先定 slug** — 按本文规范拟定 `{verb}-{noun-phrase}-{platform}`，确认在白名单内且 ≤ 48 字符
-2. **复制目录** — 将 `skill-template` 复制为新目录，**目录名 = slug**
+2. **复制目录** — **推荐** [`tools/scaffold_skill.ps1`](../tools/scaffold_skill.ps1)（`-Slug` 与目录名一致）；勿整包复制带走 `.git`
+2.5. **清理 Git（若未用 scaffold）** — 删除 `.git`、`.openclaw-skill-template`、`.pytest_cache`；再 `git init` 与 `git remote add origin`
 3. **全局替换** — `your-skill-slug` → 新 slug；更新 `SKILL.md`、`constants.py`、文档中的占位
 4. **填写 REQUIREMENTS** — 完成 [`REQUIREMENTS.md`](REQUIREMENTS.md) §0 技能标识
-5. **开发 & 自检** — `python tests/run_tests.py -v`，含 slug 语义测试
+5. **开发 & 自检** — `python tests/run_tests.py -v`，含 slug 语义测试；`git remote -v` 确认非 template

 ---

--- a/development/README.md
+++ b/development/README.md
@@ -11,5 +11,7 @@
 7. [`CONFIG.md`](CONFIG.md) — `.env` 规范与 bootstrap 机制
 8. [`RUNTIME.md`](RUNTIME.md) — 共享 runtime、数据路径、发布打包与编码约定

+脚手架与 Git 防串库：[`../tools/README.md`](../tools/README.md)（`scaffold_skill.ps1`）。
+
 Agent 调用契约见 [`../references/CLI.md`](../references/CLI.md)、[`../references/SCHEMA.md`](../references/SCHEMA.md)。  
 用户市场说明见根目录 [`README.md`](../README.md)，不要写进本目录。
--- a/development/RPA.md
+++ b/development/RPA.md
@@ -138,7 +138,7 @@ from jiangchang_skill_core.rpa.stealth import stealth_enabled, STEALTH_INIT_SCRI
   - `examples/real_browser_rpa/scripts/service/task_rpa.py` — RPA 主流程
   - `examples/real_browser_rpa/scripts/service/account_client.py` — account-manager CLI 封装

-仿真浏览器 RPA 的 adapter 分层权威参考见 `examples/simulator_browser_rpa/scripts/service/adapter/`，**不能**替代真实浏览器 RPA 规范。
+仿真浏览器 RPA 的 adapter 分层权威参考见 `examples/simulator_browser_rpa/`（含 async `simulator_playwright.py`、薄 `simulator_rpa` adapter、`account_client.py` subprocess），**不能**替代真实浏览器 RPA 规范。

 ### 1.6 仿真浏览器 RPA 示例（必读）

@@ -146,12 +146,32 @@ from jiangchang_skill_core.rpa.stealth import stealth_enabled, STEALTH_INIT_SCRI

 1. **必须先阅读** `examples/simulator_browser_rpa/README.md`
 2. 再参考：
-   - `examples/simulator_browser_rpa/scripts/service/browser_session.py`
-   - `examples/simulator_browser_rpa/scripts/service/adapter/`（base / mock / simulator_rpa / dispatch）
-   - `examples/simulator_browser_rpa/scripts/service/task_service.py`
+   - `examples/simulator_browser_rpa/scripts/service/browser_session.py` — async persistent context（**不含 goto**）
+   - `examples/simulator_browser_rpa/scripts/service/simulator_playwright.py` — RPA 主流程（厚）
+   - `examples/simulator_browser_rpa/scripts/service/adapter/`（薄 `simulator_rpa` + mock + dispatch）
+   - `examples/simulator_browser_rpa/scripts/service/account_client.py` — account-manager subprocess
+   - `examples/simulator_browser_rpa/scripts/service/task_service.py` — async 编排
   - `examples/simulator_browser_rpa/sandbox/demo_app.html`

-> **先选类型再写代码**：真实第三方网站 → `real_browser_rpa`；自有 sandbox → `simulator_browser_rpa`。不要跨类型照抄 selector 或业务流程。
+> **先选类型再写代码**：真实第三方网站 → `real_browser_rpa`；自有 sandbox / 行业仿真 → `simulator_browser_rpa`。不要跨类型照抄 selector 或业务流程。
+
+### 1.7 行业仿真平台浏览器 RPA（jc2009 类）
+
+适用：**自有或共享 `sandbox.jc2009.com` 等行业仿真平台**，不是真实高风控第三方站。
+
+工程范式与 §1.5 相同：
+
+| 项 | 标准 |
+|----|------|
+| Playwright | **async** 贯穿；禁止 sync Playwright 用于完整 RPA 主路径 |
+| 分层 | **薄 adapter** + `{domain}_playwright.py`（示例：`simulator_playwright.py`）+ `account_client.py` subprocess |
+| 登录 | **双层**：门户 HITL（`#portal-user` / `#portal-pass` 类泛化 DOM）+ 业务系统登录（技能内自写） |
+| 账号 | `url` 用行业根，不用 `/login`；`auth_strategy=per_session_manual`；`pick_web_account` + `release_lease` |
+| 禁止 | **不要** `import account-manager` 的 `rpa_helpers` 等内部模块 |
+| Selector | 用户可见文案 / `get_by_role` / `name` 优先；`data-testid` 有则用、无则 fallback；共享 sandbox **不要求**为技能加 testid |
+| Profile | Chrome persistent profile 可能缓存旧 SPA → 联调排障：手工 `--user-data-dir` 清站点数据 |
+
+权威 example：**修正后的** `examples/simulator_browser_rpa/`（不是任何生产技能仓库）。

 ---

--- a/development/TESTING.md
+++ b/development/TESTING.md
@@ -130,6 +130,20 @@ Golden fixture 流程同理（[`tests/samples/test_golden_cases.py.sample`](../t

 ---

+## 7.1 simulator_rpa 联调检查表
+
+浏览器 RPA 走 `simulator_rpa` 档位联调前，逐项确认：
+
+- [ ] 数据目录 `.env` 中 `OPENCLAW_TEST_TARGET=simulator_rpa`（非 `mock` / `unit`）
+- [ ] account-manager：`platform ensure` + 账号 `active` + 有 `profile_dir`
+- [ ] 目标 sandbox UI 已部署（跨团队；本地可用 `sandbox/demo_app.html`）
+- [ ] 失败先查 `rpa-artifacts/` 截图，再查 Chrome profile 缓存（`--user-data-dir` 手工打开清站点数据）
+- [ ] 默认 `python tests/run_tests.py -v` 仍全部通过（mock 离线）；example 内 `pytest` 不启真实浏览器
+
+参考实现：`examples/simulator_browser_rpa/README.md`。
+
+---
+
 ## 8. 新 skill 的最小测试清单

 以下清单 **原文摘自 [`tests/README.md`](../tests/README.md) 「新技能最小测试清单」**（复制新仓库后逐项勾选）：
--- a/examples/README.md
+++ b/examples/README.md
@@ -19,13 +19,23 @@

 ## 两类浏览器 RPA 的区别

-| | real_browser_rpa | simulator_browser_rpa |
+| | real_browser_rpa | simulator_browser_rpa（修正后） |
 |---|---|---|
-| 目标 | 真实第三方网页 | 自有仿真页面 / sandbox |
+| 目标 | 真实第三方网页 | 自有仿真页面 / sandbox / jc2009 类 |
 | 风控 | 高（验证码、登录态、反爬） | 低（DOM 可控） |
-| 账号 | 通常需 account-manager + profile | 示例可用 env / demo 账号 |
+| 账号 | account-manager + profile | account-manager + profile（`simulator_rpa` 档） |
 | 用途 | 生产级真实采集/操作参考 | adapter 分层 + 表单 RPA 教学 |

+### 工程范式对比
+
+| 工程范式 | real_browser_rpa | simulator_browser_rpa（修正后） |
+|---|---|---|
+| async Playwright | ✅ | ✅ |
+| 薄 adapter + `*_playwright.py` | `task_rpa.py` | `simulator_playwright.py` |
+| account-manager subprocess | ✅ | ✅（`simulator_rpa` 档位） |
+
+两者工程范式一致，差异在目标系统（真实站 vs 仿真站/本地 demo）。
+
 ## 如何选择示例

 | 你的场景 | 参考目录 |
--- a/examples/simulator_browser_rpa/README.md
+++ b/examples/simulator_browser_rpa/README.md
@@ -1,20 +1,20 @@
 # Simulator Browser RPA Example

-这是一个**仿真浏览器 RPA** 的可复制参考实现：在可控 sandbox 页面上，通过 Playwright 完成登录、表单填写、弹窗确认、结果解析。
+这是一个**仿真浏览器 RPA** 的可复制参考实现：在可控 sandbox 页面上，通过 **async Playwright** 完成门户门闩、两步登录、表单填写、PIN 弹窗、结果解析。

-本示例抽象自已跑通的「批量提交类」浏览器自动化 skill，但已去业务化，不包含真实银行/真实资金语义。
+本示例抽象自已跑通的「工行批量提交类」浏览器自动化 skill 的工程范式，但已**去业务化**——不包含真实银行/真实资金语义，也**不是** Amazon 或任何生产技能的复制。

 ## 适合什么场景

- 自有 **仿真系统 / sandbox / training 页面**
+- 自有 **行业仿真系统** / `sandbox.jc2009.com` / 本地 `sandbox/demo_app.html`
 - 需要 **浏览器 RPA** 做端到端演示或回归
- 表单较复杂：多步登录、Tab 切换、动态增行、PIN 弹窗、成功页解析
- 需要 **adapter 分层**：mock（CI）与 simulator_rpa（半集成）可切换
+- 表单较复杂：门户 HITL、多步登录、Tab 切换、动态增行、PIN 弹窗、成功页解析
+- 需要 **adapter 分层**：`mock`（CI）与 `simulator_rpa`（半集成）可切换

 ## 不适合什么场景

 - **真实第三方网站 + 高风控 + 人工验证码** → 优先看 [`../real_browser_rpa/README.md`](../real_browser_rpa/README.md)
- 目标系统有稳定 **官方 API** → 不要硬写浏览器 RPA，后续参考 `real_api`
+- 目标系统有稳定 **官方 API** → 不要硬写浏览器 RPA
 - **不要把本示例的业务字段、selector、sandbox URL 原样复制**到你的 skill

 ## 目录结构
@@ -23,22 +23,24 @@
 simulator_browser_rpa/
 ├── README.md
 ├── sandbox/
-│   └── demo_app.html          # 本地仿真页面（稳定 data-testid / name）
+│   └── demo_app.html              # 本地仿真页面（门户门闩 + 批量提交教学 DOM）
 ├── scripts/
 │   ├── service/
-│   │   ├── browser_session.py # 浏览器启动（URL 仅 page.goto）
-│   │   ├── account_client.py  # 账号来源集中封装
-│   │   ├── task_service.py    # 编排层
+│   │   ├── browser_session.py     # async 启动 persistent context（不含 goto）
+│   │   ├── account_client.py      # account-manager subprocess（对齐 real_browser_rpa）
+│   │   ├── simulator_playwright.py # RPA 主流程（厚）
+│   │   ├── task_service.py        # async 编排层
 │   │   └── adapter/
-│   │       ├── base.py        # BatchItem / BatchSubmitResult 契约
-│   │       ├── mock.py        # mock/unit 档
-│   │       ├── simulator_rpa.py
-│   │       └── __init__.py    # select_adapter
+│   │       ├── base.py            # BatchItem / BatchSubmitResult 契约
+│   │       ├── mock.py            # mock/unit 档
+│   │       ├── simulator_rpa.py   # 薄 adapter：pick / lease / 委托 RPA
+│   │       └── __init__.py        # select_adapter
 │   └── util/
 │       ├── constants.py
 │       └── logging.py
 └── tests/
    ├── test_adapter_dispatch.py
+    ├── test_no_rpa_helpers_import.py
    ├── test_simulator_rpa_unit.py
    └── test_stop_reason.py
 ```
@@ -47,91 +49,95 @@ simulator_browser_rpa/

 | 文件 | 职责 |
 |---|---|
-| `browser_session.py` | 系统 Chrome/Edge + launch args 规范；支持 profile / 无 profile |
-| `account_client.py` | 示例从环境变量读账号；真实 skill 可在此集中对接 account-manager |
-| `adapter/base.py` | 数据契约与 `BatchAdapterBase` |
+| `browser_session.py` | async 系统 Chrome/Edge + launch args；**不在此 goto** |
+| `account_client.py` | **唯一** account-manager subprocess 封装（`pick_web_account` / `release_lease`） |
+| `simulator_playwright.py` | 门户轮询、登录、批量表单、PIN、解析 `batch_id`、截图 |
+| `adapter/simulator_rpa.py` | **薄** adapter：pick 账号、lease、委托 RPA、`finally release_lease` |
 | `adapter/mock.py` | 不启浏览器，供 unit/mock/CI |
-| `adapter/simulator_rpa.py` | 仿真 RPA 主流程 |
-| `task_service.py` | 校验输入 → 选 adapter → 提交 → 返回 summary |
-| `sandbox/demo_app.html` | 可控 DOM，配合 selector 稳定 |
-| `tests/` | dispatch、URL 不进 launch args、失败转结果 |
+| `task_service.py` | async 校验输入 → 选 adapter → `await submit_batch` |
+| `sandbox/demo_app.html` | 可控 DOM；含可选门户门闩 + 原批量提交流程 |

 ## 核心流程

-1. `task_service.run_batch_submit(target, items)` 校验参数
+1. `await run_batch_submit(target, items)` 校验参数
 2. `select_adapter()` 按 `OPENCLAW_TEST_TARGET` 选择 mock 或 simulator RPA
-3. simulator 档：`pick_simulator_account()` → `set_credentials()` → `submit_batch()`
-4. RPA：登录两步 → 批量页 → 填表 → 提交 → PIN → 解析 `batch_id`
+3. `simulator_rpa` 档：`SimulatorBrowserRpaAdapter.submit_batch` 内 `pick_web_account(sim_batch)` → `submit_batch_rpa` → `release_lease`
+4. RPA：门户门闩（若可见则 HITL 轮询）→ 登录两步 → 批量页 → 填表 → 提交 → PIN → 解析 `batch_id`
 5. 失败截图（有 `artifacts_dir` 时）→ 返回 `BatchSubmitResult`

-## 复制到新 skill 时怎么做
+## 两档仿真目标

-按 copy map **选择性复制**到 `scripts/`；**不要**整包照搬本目录，**不要**把本 README 当作新技能根 README。
+| 档位 | 目标 | 说明 |
+|---|---|---|
+| 本地教学 | `sandbox/demo_app.html`（`file://`） | 结构教学 + mock 单测默认 |
+| 线上联调 | `https://sandbox.jc2009.com/...` | 设 `SIMULATOR_BASE_URL` + account-manager `sim_batch` 账号 |
+
+联调时账号 `url` 用行业根路径，**不要**写 `/login` 子路径；`auth_strategy=per_session_manual`。
+
+## account-manager 注册示例（泛化）
+
+```bash
+python .../account-manager/scripts/main.py account add-web \
+  --platform sim_batch \
+  --login-id demo001 \
+  --url file:///.../demo_app.html \
+  --environment simulator \
+  --auth-strategy per_session_manual
+```
+
+线上 sandbox 时将 `--url` 换为 `https://sandbox.jc2009.com/...` 占位路径（按团队部署填写）。
+
+**PIN/密码演示值**：RPA 从 account 的 `login_id` 取账号；`password` / `token_pin` 允许从 account 字段或环境变量 `SIMULATOR_PASSWORD` / `SIMULATOR_TOKEN_PIN` 回退；验证码固定演示值 `0000`（仅 sandbox 用）。

 ## Copy map（复制到新技能 `scripts/`）

 | 来源（examples） | 目标（新技能） | 说明 |
 |---|---|---|
-| `examples/simulator_browser_rpa/scripts/service/browser_session.py` | `scripts/service/browser_session.py` | URL 仅 `page.goto`，不进 launch args |
-| `examples/simulator_browser_rpa/scripts/service/account_client.py` | `scripts/service/account_client.py` | 账号来源集中封装 |
-| `examples/simulator_browser_rpa/scripts/service/task_service.py` | `scripts/service/task_service.py` | 编排层，合并业务逻辑 |
-| `examples/simulator_browser_rpa/scripts/service/adapter/` | `scripts/service/<domain>_adapter/` | **adapter 分层权威参考** |
-| `examples/simulator_browser_rpa/scripts/util/constants.py` | `scripts/util/constants.py` | 须替换业务常量 |
-| `examples/simulator_browser_rpa/scripts/util/logging.py` | `scripts/util/logging.py` | 可选 |
-| `examples/simulator_browser_rpa/tests/` | `tests/` | 可按需复制 dispatch / unit 测试 |
-| `examples/simulator_browser_rpa/sandbox/demo_app.html` | — | **仅仿真测试用**，不进入生产 skill |
-| `examples/simulator_browser_rpa/README.md` | — | **只读参考**，不复制为新技能根 README |
-
-**边界说明：**
-
- `sandbox/` 只用于仿真测试与本地回归，**不进入**真实生产 skill
- `adapter/` 分层（base / mock / simulator_rpa）是仿真浏览器 RPA 的权威参考
- `mock` / `simulator_rpa` 只用于测试与仿真，**不要**混入 `real_browser_rpa` 的真实站点逻辑
- `demo_app.html` 是可运行沙箱页面，**不是**真实业务系统
-
-**保留：**
-
- adapter 分层（base / mock / simulator_rpa / `select_adapter`）
- `browser_session.py` 启动规范（**URL 不进 launch args**）
- `account_client.py` 集中封装模式
- 关键节点结构化日志 + 失败截图
- 测试：dispatch、launch args、错误转 `BatchSubmitResult`
-
-**替换：**
-
- `BatchItem` 字段与校验规则
- `sandbox/demo_app.html` 或 `SIMULATOR_BASE_URL` 指向的页面
- 全部 DOM selector（必须 F12 实测）
- `task_service.py` 输入输出与 DB/任务日志
- mock 返回字段、成功页 `batch_id` 解析逻辑
+| `browser_session.py` | `scripts/service/browser_session.py` | async；URL 仅 `page.goto`，不进 launch args |
+| `account_client.py` | `scripts/service/account_client.py` | subprocess，对齐 `real_browser_rpa` |
+| `simulator_playwright.py` | `scripts/service/<platform>_playwright.py` | RPA 主流程（厚） |
+| `adapter/` | `scripts/service/<domain>_adapter/` | 薄 `simulator_rpa` + mock |
+| `task_service.py` | `scripts/service/task_service.py` | async 编排 |
+| `util/constants.py` | `scripts/util/constants.py` | 须替换 `TARGET_PLATFORM` 等业务常量 |
+| `tests/` | `tests/` | 可按需复制 dispatch / unit / 禁止 import 守护 |
+| `sandbox/demo_app.html` | — | **仅仿真测试**，不进入生产 skill |

 ## 明确禁止

- 不要复制 `__pycache__`、`.pytest_cache`、`artifacts/`、`recordings/` 等生成物
- **不要在技能侧**执行 `playwright install` / `pip install playwright`（Python 包由宿主共享 runtime 提供）
- **不要把 URL 放进** `launch_persistent_context(args=[...])`
+- **不要** `import account-manager` 内部模块（`rpa_helpers`、`inject_account_manager_scripts_path`、`get_account_credential`）
+- **不要** sync Playwright 用于完整 RPA 主路径
 - **不要在** `task_service.py` / RPA 主流程里散落 account-manager subprocess
- **不要把真实生产系统**配置到 `simulator_rpa` 档位
- 不要照抄 slug、logger 名、演示账号到生产 skill
+- **不要在技能侧**执行 `playwright install` / `pip install playwright`
+- **不要把 URL 放进** `launch_persistent_context(args=[...])`
+- **不要** vendor `scripts/jiangchang_skill_core/`
+- **不要**照抄 slug、logger 名、演示账号到生产 skill
+
+> 旧版 `pick_simulator_account()` / `SimulatorAccount` / `set_credentials()` 已废弃；账号统一由 account-manager 下发。
+
+## 联调检查表
+
+- [ ] 数据目录 `.env` 中 `OPENCLAW_TEST_TARGET=simulator_rpa`（非 mock）
+- [ ] account-manager：`platform ensure` + 账号 `active` + 有 `profile_dir`
+- [ ] 目标 sandbox UI 已部署（跨团队）
+- [ ] 失败先查 `rpa-artifacts/` 截图，再查 Chrome profile 缓存（可用 `--user-data-dir` 手工打开清站点数据）
+- [ ] 默认 `tests/run_tests.py` / 本 example `pytest` 仍全部通过（mock 离线）

 ## 依赖说明

 - Python 3.10+
- Python 包 `playwright`：由**宿主共享 runtime** 提供；技能侧不要写入 `requirements.txt`，不要 `pip install playwright`
- 默认使用**系统 Chrome/Edge**，不使用 Playwright 内置 Chromium
- 技能侧不要执行 `playwright install` / `playwright install chromium`
- 本地独立开发若缺 Playwright Python 包，仅作开发机临时补装；生产由宿主解决
- `jiangchang_skill_core.runtime_env.find_chrome_executable`（可选，用于查找系统浏览器）
+- Python 包 `playwright`：由**宿主共享 runtime** 提供；技能侧不要 `pip install playwright`
+- 默认使用**系统 Chrome/Edge**；技能侧不要 `playwright install`
+- `jiangchang_skill_core.runtime_env.find_chrome_executable`（可选）

 ## 环境变量（示例）

 | 变量 | 说明 |
 |---|---|
-| `OPENCLAW_TEST_TARGET` | `mock`/`unit` → Mock；默认 → Simulator RPA |
-| `SIMULATOR_BASE_URL` | 仿真页 URL；默认本地 `sandbox/demo_app.html` 的 file URI |
-| `SIMULATOR_LOGIN_ID` / `PASSWORD` / `TOKEN_PIN` | 演示账号 |
-| `SIMULATOR_PROFILE_DIR` | 可选 persistent profile |
-| `OPENCLAW_BROWSER_HEADLESS` | `0` 默认有头；`1` 无头模式（CI 可用） |
+| `OPENCLAW_TEST_TARGET` | `mock`/`unit` → Mock；`simulator_rpa` → 仿真 RPA |
+| `SIMULATOR_BASE_URL` | 仿真页 URL；默认本地 `demo_app.html` 的 file URI |
+| `SIMULATOR_PASSWORD` / `SIMULATOR_TOKEN_PIN` | 演示密码/PIN 回退（账号字段优先） |
+| `PORTAL_LOGIN_WAIT_SEC` | 门户 HITL 超时（默认 120） |
+| `OPENCLAW_BROWSER_HEADLESS` | `0` 默认有头；`1` 无头（CI 可用） |

 ## 运行测试

@@ -140,9 +146,9 @@ cd examples/simulator_browser_rpa
 python -m pytest tests/ -v
 ```

-测试为 mock/纯函数，**不需要启动真实浏览器**。
+测试为 mock/纯函数，**不启动真实浏览器**。

 ## 当前状态

- 示例代码与 sandbox 页面已就绪，可作为仿真浏览器 RPA 复制起点。
+- async Playwright + 薄 adapter + `simulator_playwright.py` 工程范式已对齐 `real_browser_rpa`。
 - 未接入完整 CLI、数据库与 entitlement。
--- a/examples/simulator_browser_rpa/sandbox/demo_app.html
+++ b/examples/simulator_browser_rpa/sandbox/demo_app.html
@@ -15,7 +15,16 @@
 <body>
  <h1>仿真业务系统 · 批量提交（示例）</h1>

-  <section id="login-step1-section">
+  <section id="portal-section">
+    <h2>平台门户登录（示例）</h2>
+    <form name="portalGate">
+      <label>门户账号 <input id="portal-user" name="portalUser" /></label>
+      <label>门户密码 <input id="portal-pass" name="portalPass" type="password" /></label>
+      <button type="button" id="portal-enter">进入业务系统</button>
+    </form>
+  </section>
+
+  <section id="login-step1-section" class="hidden">
    <h2>登录 · 第一步</h2>
    <form name="simLoginStep1" data-testid="login-step1">
      <label>账号 <input name="loginId" data-testid="login-id" /></label>
@@ -69,6 +78,11 @@
    const DEMO_CAPTCHA = "0000";
    let rowCount = 0;

+    document.getElementById('portal-enter').addEventListener('click', function () {
+      document.getElementById('portal-section').classList.add('hidden');
+      document.getElementById('login-step1-section').classList.remove('hidden');
+    });
+
    document.querySelector('form[name="simLoginStep1"]').addEventListener('submit', function (e) {
      e.preventDefault();
      document.getElementById('login-step1-section').classList.add('hidden');
--- a/examples/simulator_browser_rpa/scripts/service/account_client.py
+++ b/examples/simulator_browser_rpa/scripts/service/account_client.py
@@ -1,40 +1,199 @@
-"""仿真账号来源封装（示例级；真实 skill 可在此集中对接 account-manager）。"""
+"""account-manager CLI 集成（仅 subprocess，不 import 兄弟 skill 内部模块）。"""

 from __future__ import annotations

+import json
+import logging
 import os
-from dataclasses import dataclass
-from typing import Optional
+import subprocess
+import sys
+from typing import Any, Dict, List, Optional

-from util.constants import (
-    DEFAULT_DEMO_LOGIN_ID,
-    DEFAULT_DEMO_PASSWORD,
-    DEFAULT_DEMO_TOKEN_PIN,
-    ENV_SIMULATOR_LOGIN_ID,
-    ENV_SIMULATOR_PASSWORD,
-    ENV_SIMULATOR_PROFILE_DIR,
-    ENV_SIMULATOR_TOKEN_PIN,
+from jiangchang_skill_core.runtime_env import get_sibling_skills_root
+
+from util.constants import LEASE_HOLDER, LEASE_TTL_SEC, TARGET_PLATFORM
+from util.logging import mask_text
+
+logger = logging.getLogger(__name__)
+
+PLACEHOLDER_PLATFORM = TARGET_PLATFORM
+
+ACCOUNT_SETUP_MESSAGE = (
+    f"未找到可用的 {PLACEHOLDER_PLATFORM} 账号，所以还没有打开浏览器。"
+    f"请先在 account-manager 中添加 platform={PLACEHOLDER_PLATFORM}、"
+    "status=active、带 profile_dir 的账号后重新运行。"
 )

-
-@dataclass
-class SimulatorAccount:
-    login_id: str
-    password: str
-    token_pin: str
-    profile_dir: str = ""
+LEASE_BUSY_MESSAGE = "目标平台账号当前被其他任务占用，请等待释放租约后重试。"


-def pick_simulator_account() -> SimulatorAccount:
+class AccountManagerError(Exception):
+    def __init__(self, code: str, message: str) -> None:
+        super().__init__(message)
+        self.code = code
+        self.message = message
+
+
+def mask_login_id(login_id: str) -> str:
+    return mask_text(login_id)
+
+
+def _resolve_account_manager_main() -> str:
+    """解析 account-manager CLI 入口路径。
+
+    优先级：ACCOUNT_MANAGER_ROOT → get_sibling_skills_root → 开发机兜底。
    """
-    示例账号来源：优先读环境变量，否则返回内置 demo 账号。
+    env_root = (os.getenv("ACCOUNT_MANAGER_ROOT") or "").strip()
+    if env_root and os.path.isfile(os.path.join(env_root, "scripts", "main.py")):
+        return os.path.join(os.path.abspath(env_root), "scripts", "main.py")

-    真实 skill 若依赖 account-manager，应把 subprocess / sibling_bridge 调用
-    集中在本模块，不要散落到 task_service 或 RPA 主流程中。
-    """
-    return SimulatorAccount(
-        login_id=(os.getenv(ENV_SIMULATOR_LOGIN_ID) or DEFAULT_DEMO_LOGIN_ID).strip(),
-        password=(os.getenv(ENV_SIMULATOR_PASSWORD) or DEFAULT_DEMO_PASSWORD).strip(),
-        token_pin=(os.getenv(ENV_SIMULATOR_TOKEN_PIN) or DEFAULT_DEMO_TOKEN_PIN).strip(),
-        profile_dir=(os.getenv(ENV_SIMULATOR_PROFILE_DIR) or "").strip(),
+    scripts_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    skills_root = get_sibling_skills_root(scripts_dir)
+    candidate = os.path.join(skills_root, "account-manager", "scripts", "main.py")
+    if os.path.isfile(candidate):
+        return candidate
+
+    dev = r"D:\OpenClaw\client-commons\account-manager\scripts\main.py"
+    if os.path.isfile(dev):
+        return dev
+
+    raise AccountManagerError(
+        "ACCOUNT_NOT_FOUND",
+        "未找到 account-manager，请配置 ACCOUNT_MANAGER_ROOT 或安装 account-manager 技能。",
    )
+
+
+def _parse_last_json(stdout: str) -> Any:
+    lines = [ln.strip() for ln in (stdout or "").splitlines() if ln.strip()]
+    for raw in reversed(lines):
+        if raw.startswith("ERROR:"):
+            continue
+        try:
+            return json.loads(raw)
+        except json.JSONDecodeError:
+            continue
+    raise AccountManagerError("UNKNOWN_ERROR", "stdout 中没有可解析的 JSON。")
+
+
+def _run_argv(argv_suffix: List[str]) -> subprocess.CompletedProcess[str]:
+    main_py = _resolve_account_manager_main()
+    env = os.environ.copy()
+    return subprocess.run(
+        [sys.executable, main_py, *argv_suffix],
+        capture_output=True,
+        text=True,
+        encoding="utf-8",
+        errors="replace",
+        env=env,
+    )
+
+
+def _normalize_error_code(raw: str) -> str:
+    code = (raw or "").strip()
+    if code.startswith("ERROR:"):
+        code = code[6:]
+    return code
+
+
+def _validate_pick_payload(payload: dict[str, Any]) -> dict[str, Any]:
+    if payload.get("success") is False:
+        err = payload.get("error") if isinstance(payload.get("error"), dict) else {}
+        code = _normalize_error_code(str(err.get("code") or ""))
+        message = str(err.get("message") or "")
+        if code == "LEASE_CONFLICT" or "LEASE_CONFLICT" in code:
+            raise AccountManagerError("LEASE_CONFLICT", LEASE_BUSY_MESSAGE)
+        if code in ("NO_ACCOUNT", "ACCOUNT_NOT_FOUND") or "NO_ACCOUNT" in code:
+            raise AccountManagerError("NO_ACCOUNT", message or "没有可用账号。")
+        raise AccountManagerError(code or "PICK_WEB_FAILED", message or "pick-web 失败。")
+
+    if not isinstance(payload, dict):
+        raise AccountManagerError("ACCOUNT_NOT_FOUND", "pick-web 返回格式异常。")
+    if not payload.get("profile_dir"):
+        raise AccountManagerError("ACCOUNT_NOT_FOUND", "pick-web 返回的账号缺少 profile_dir。")
+    return payload
+
+
+def _pick_web_with_lease(platform: str) -> Dict[str, Any]:
+    proc = _run_argv(
+        [
+            "account",
+            "pick-web",
+            "--platform",
+            platform,
+            "--lease",
+            "--holder",
+            LEASE_HOLDER,
+            "--ttl-sec",
+            LEASE_TTL_SEC,
+        ]
+    )
+    out = proc.stdout or ""
+    if proc.returncode != 0 and not out.strip():
+        raise AccountManagerError(
+            "PICK_WEB_FAILED",
+            (proc.stderr or "").strip() or "pick-web 子进程失败",
+        )
+    payload = _parse_last_json(out)
+    if isinstance(payload, dict) and payload.get("success") is False:
+        return _validate_pick_payload(payload)
+    if not isinstance(payload, dict):
+        raise AccountManagerError("ACCOUNT_NOT_FOUND", "pick-web 返回格式异常。")
+    return payload
+
+
+def _pick_by_id(platform: str, account_id: int) -> Dict[str, Any]:
+    proc = _run_argv(["account", "get", str(account_id)])
+    out = proc.stdout or ""
+    if proc.returncode != 0 or out.startswith("ERROR:"):
+        raise AccountManagerError("ACCOUNT_NOT_FOUND", f"指定账号 {account_id} 不存在或获取失败。")
+    raw = _parse_last_json(out)
+    if isinstance(raw, dict) and "data" in raw and isinstance(raw["data"], dict):
+        data = raw["data"]
+    elif isinstance(raw, dict):
+        data = raw
+    else:
+        raise AccountManagerError("ACCOUNT_NOT_FOUND", "account get 返回非对象 JSON。")
+
+    platform_key = str(data.get("platform_key") or "").lower()
+    if platform_key != platform.lower():
+        raise AccountManagerError(
+            "ACCOUNT_NOT_FOUND",
+            f"账号 {account_id} 不是 {platform} 平台账号。",
+        )
+    profile_dir = str(data.get("profile_dir") or "").strip()
+    if not profile_dir:
+        raise AccountManagerError("ACCOUNT_NOT_FOUND", f"账号 {account_id} 缺少 profile_dir。")
+    data["profile_dir"] = profile_dir
+    data["lease_token"] = ""
+    return data
+
+
+def pick_web_account(platform: str, account_id: Optional[str] = None) -> dict:
+    """获取网页账号（profile_dir + lease_token）。"""
+    platform_key = (platform or PLACEHOLDER_PLATFORM).strip() or PLACEHOLDER_PLATFORM
+
+    if account_id:
+        try:
+            aid = int(account_id)
+        except (TypeError, ValueError):
+            raise AccountManagerError("ACCOUNT_NOT_FOUND", f"账号 ID 无效：{account_id}")
+        return _pick_by_id(platform_key, aid)
+
+    try:
+        return _pick_web_with_lease(platform_key)
+    except AccountManagerError as exc:
+        if exc.code in ("NO_ACCOUNT", "ACCOUNT_NOT_FOUND") or "NO_ACCOUNT" in exc.code:
+            raise AccountManagerError("ACCOUNT_SETUP_REQUIRED", ACCOUNT_SETUP_MESSAGE) from exc
+        raise
+
+
+def release_lease(lease_token: Optional[str]) -> None:
+    token = (lease_token or "").strip()
+    if not token:
+        return
+    try:
+        proc = _run_argv(["lease", "release", token])
+        if proc.returncode != 0:
+            logger.warning("lease_release_failed stdout=%s", (proc.stdout or "").strip())
+    except Exception:
+        logger.warning("lease_release_exception", exc_info=True)
--- a/examples/simulator_browser_rpa/scripts/service/adapter/base.py
+++ b/examples/simulator_browser_rpa/scripts/service/adapter/base.py
@@ -28,5 +28,5 @@ class BatchSubmitResult:
 class BatchAdapterBase:
    name: str = "base"

-    def submit_batch(self, target: str, items: List[BatchItem]) -> BatchSubmitResult:
+    async def submit_batch(self, target: str, items: List[BatchItem]) -> BatchSubmitResult:
        raise NotImplementedError
--- a/examples/simulator_browser_rpa/scripts/service/adapter/mock.py
+++ b/examples/simulator_browser_rpa/scripts/service/adapter/mock.py
@@ -11,7 +11,7 @@ from service.adapter.base import BatchAdapterBase, BatchItem, BatchSubmitResult
 class MockBatchAdapter(BatchAdapterBase):
    name = "mock"

-    def submit_batch(self, target: str, items: List[BatchItem]) -> BatchSubmitResult:
+    async def submit_batch(self, target: str, items: List[BatchItem]) -> BatchSubmitResult:
        del target
        if not items:
            return BatchSubmitResult(
--- a/examples/simulator_browser_rpa/scripts/service/adapter/simulator_rpa.py
+++ b/examples/simulator_browser_rpa/scripts/service/adapter/simulator_rpa.py
@@ -1,78 +1,45 @@
-"""仿真浏览器 RPA：操作 sandbox/demo_app.html 完成批量提交。"""
+"""仿真浏览器 RPA 薄 adapter：pick 账号、lease、委托 RPA、release lease。"""

 from __future__ import annotations

 import logging
-import os
-import random
-import re
-import time
 from typing import List, Optional

 from jiangchang_skill_core import config

+from service.account_client import AccountManagerError, pick_web_account, release_lease
 from service.adapter.base import BatchAdapterBase, BatchItem, BatchSubmitResult
-from service.browser_session import browser_session, find_chrome_executable
-from util.constants import (
-    DEFAULT_DEMO_CAPTCHA,
-    DEFAULT_DEMO_LOGIN_ID,
-    DEFAULT_DEMO_PASSWORD,
-    DEFAULT_DEMO_TOKEN_PIN,
-    DEFAULT_TIMEOUT_MS,
-    LOGIN_NAVIGATE_TIMEOUT_MS,
-    SUBMIT_NAVIGATE_TIMEOUT_MS,
-    resolve_simulator_base_url,
-)
+from service.browser_session import find_chrome_executable
+from service.simulator_playwright import submit_batch_rpa
+from util.constants import TARGET_PLATFORM, resolve_simulator_base_url

 logger = logging.getLogger(__name__)

-_PAUSE_MIN_MS = 500
-_PAUSE_MAX_MS = 2000

-
-class RpaError(Exception):
-    def __init__(self, message: str, screenshot_path: Optional[str] = None):
-        super().__init__(message)
-        self.screenshot_path = screenshot_path
+def _resolve_entry_url(account: dict) -> str:
+    url = str(account.get("url") or "").strip()
+    if url:
+        return url.rstrip("/")
+    return resolve_simulator_base_url()


 class SimulatorBrowserRpaAdapter(BatchAdapterBase):
-    name = "simulator_browser_rpa"
+    name = "simulator_rpa"

    def __init__(
        self,
-        base_url: Optional[str] = None,
-        headless: Optional[bool] = None,
        artifacts_dir: Optional[str] = None,
+        headless: Optional[bool] = None,
    ) -> None:
-        self.base_url = (base_url or resolve_simulator_base_url()).rstrip("/")
+        self.artifacts_dir = artifacts_dir
        if headless is None:
            self.headless = config.get_bool("OPENCLAW_BROWSER_HEADLESS", default=False)
        else:
            self.headless = headless
-        self.artifacts_dir = artifacts_dir

-        self._login_id: str = DEFAULT_DEMO_LOGIN_ID
-        self._password: str = DEFAULT_DEMO_PASSWORD
-        self._token_pin: str = DEFAULT_DEMO_TOKEN_PIN
-        self._profile_dir: Optional[str] = None
-
-    def set_credentials(
-        self,
-        login_id: str,
-        password: str,
-        token_pin: str,
-        profile_dir: str,
-    ) -> None:
-        self._login_id = login_id
-        self._password = password
-        self._token_pin = token_pin
-        stripped = (profile_dir or "").strip()
-        self._profile_dir = stripped or None
-
-    def submit_batch(self, target: str, items: List[BatchItem]) -> BatchSubmitResult:
+    async def submit_batch(self, target: str, items: List[BatchItem]) -> BatchSubmitResult:
        try:
-            from playwright.sync_api import sync_playwright  # noqa: F401
+            from playwright.async_api import async_playwright  # noqa: F401
        except ImportError:
            return BatchSubmitResult(
                ok=False,
@@ -106,236 +73,37 @@ class SimulatorBrowserRpaAdapter(BatchAdapterBase):
                artifacts={"adapter": self.name},
            )

-        start_url = self.base_url
+        lease_token: Optional[str] = None
        try:
-            with browser_session(
-                start_url,
-                profile_dir=self._profile_dir,
+            account = pick_web_account(TARGET_PLATFORM)
+            lease_token = account.get("lease_token")
+            base_url = _resolve_entry_url(account)
+            return await submit_batch_rpa(
+                account,
+                target=target,
+                items=items,
+                base_url=base_url,
+                artifacts_dir=self.artifacts_dir,
                headless=self.headless,
-            ) as page:
-                try:
-                    logger.info("rpa_login_start url=%s", start_url)
-                    self._login(page)
-                    logger.info("rpa_login_done")
-
-                    self._goto_batch_page(page)
-                    logger.info("rpa_batch_page_ready")
-
-                    self._fill_batch_form(page, target, items)
-                    logger.info("rpa_batch_form_filled rows=%s", len(items))
-
-                    batch_id = self._submit_and_get_batch_id(page)
-                    logger.info("rpa_submit_success batch_id=%s", batch_id)
-
-                    total = sum(it.amount for it in items)
-                    return BatchSubmitResult(
-                        ok=True,
-                        batch_id=batch_id,
-                        submitted_count=len(items),
-                        submitted_amount=total,
-                        error_msg=None,
-                        artifacts={"adapter": self.name},
-                    )
-                except RpaError as exc:
-                    logger.error("rpa_failed: %s", exc)
-                    arts = {"adapter": self.name}
-                    if exc.screenshot_path:
-                        arts["screenshot"] = exc.screenshot_path
-                    return BatchSubmitResult(
-                        ok=False,
-                        batch_id=None,
-                        submitted_count=0,
-                        submitted_amount=0.0,
-                        error_msg=str(exc),
-                        artifacts=arts,
-                    )
-                except Exception as exc:
-                    sp = self._safe_screenshot(page, "unexpected_error")
-                    logger.exception("rpa_unexpected: %s", exc)
-                    arts = {"adapter": self.name}
-                    if sp:
-                        arts["screenshot"] = sp
-                    return BatchSubmitResult(
-                        ok=False,
-                        batch_id=None,
-                        submitted_count=0,
-                        submitted_amount=0.0,
-                        error_msg=f"未预期异常：{type(exc).__name__}: {exc}",
-                        artifacts=arts,
-                    )
-        except Exception as outer:
+            )
+        except AccountManagerError as exc:
            return BatchSubmitResult(
                ok=False,
                batch_id=None,
                submitted_count=0,
                submitted_amount=0.0,
-                error_msg=f"启动浏览器失败：{outer}",
+                error_msg=f"ERROR:{exc.code} {exc.message}",
                artifacts={"adapter": self.name},
            )
-
-    def _pause(self, min_ms: int = _PAUSE_MIN_MS, max_ms: int = _PAUSE_MAX_MS) -> None:
-        time.sleep(random.uniform(min_ms, max_ms) / 1000.0)
-
-    def _login(self, page) -> None:
-        try:
-            page.wait_for_selector('form[name="simLoginStep1"]', timeout=LOGIN_NAVIGATE_TIMEOUT_MS)
-            self._pause()
-            page.fill('form[name="simLoginStep1"] input[name="loginId"]', self._login_id)
-            self._pause()
-            page.click('form[name="simLoginStep1"] button[type="submit"]')
        except Exception as exc:
-            sp = self._safe_screenshot(page, "login_step1_failed")
-            raise RpaError(f"登录第一步失败：{exc}", screenshot_path=sp) from exc
-
-        try:
-            page.wait_for_selector('form[name="simLoginStep2"]', timeout=DEFAULT_TIMEOUT_MS)
-            self._pause()
-            page.fill('form[name="simLoginStep2"] input[name="password"]', self._password)
-            page.fill('form[name="simLoginStep2"] input[name="captcha"]', DEFAULT_DEMO_CAPTCHA)
-            self._pause()
-            page.click('form[name="simLoginStep2"] button[type="submit"]')
-        except Exception as exc:
-            sp = self._safe_screenshot(page, "login_step2_failed")
-            raise RpaError(f"登录第二步失败：{exc}", screenshot_path=sp) from exc
-
-        try:
-            page.wait_for_selector('form[name="simBatchForm"]', timeout=LOGIN_NAVIGATE_TIMEOUT_MS)
-        except Exception as exc:
-            sp = self._safe_screenshot(page, "login_navigate_failed")
-            raise RpaError(f"登录后未进入批量提交页：{exc}", screenshot_path=sp) from exc
-
-    def _goto_batch_page(self, page) -> None:
-        try:
-            page.wait_for_selector('form[name="simBatchForm"]', timeout=DEFAULT_TIMEOUT_MS)
-            self._pause()
-        except Exception as exc:
-            sp = self._safe_screenshot(page, "goto_batch_failed")
-            raise RpaError(f"进入批量提交页失败：{exc}", screenshot_path=sp) from exc
-
-    def _select_target_account(self, page, target: str) -> None:
-        sel = page.locator('select[name="fromAccountNo"]')
-        sel.wait_for(timeout=DEFAULT_TIMEOUT_MS)
-        n = sel.locator("option").count()
-        matched_value: Optional[str] = None
-        first_value: Optional[str] = None
-        for i in range(n):
-            opt = sel.locator("option").nth(i)
-            val = opt.get_attribute("value") or ""
-            if not val.strip():
-                continue
-            label_txt = opt.inner_text()
-            if first_value is None:
-                first_value = val
-            if target.strip() and target.strip() in label_txt:
-                matched_value = val
-                break
-        pick = matched_value or first_value
-        if not pick:
-            raise RpaError("来源账户下拉无可选项")
-        if not matched_value and target.strip():
-            logger.warning("target '%s' 未匹配选项，回退 value=%s", target, pick)
-        sel.select_option(value=pick)
-        self._pause()
-
-    def _fill_batch_form(self, page, target: str, items: List[BatchItem]) -> None:
-        try:
-            page.get_by_role("button", name=re.compile(r"页面填写")).click()
-        except Exception as exc:
-            sp = self._safe_screenshot(page, "tab_switch_failed")
-            raise RpaError(f"切换到页面填写失败：{exc}", screenshot_path=sp) from exc
-
-        try:
-            self._select_target_account(page, target)
-        except RpaError:
-            raise
-        except Exception as exc:
-            sp = self._safe_screenshot(page, "select_account_failed")
-            raise RpaError(f"选择来源账户失败：{exc}", screenshot_path=sp) from exc
-
-        try:
-            existing = page.locator("tr[data-row-index]").count()
-            need_more = max(0, len(items) - existing)
-            add_btn = page.get_by_role("button", name=re.compile(r"新增一行"))
-            for _ in range(need_more):
-                self._pause(400, 900)
-                add_btn.click()
-        except Exception as exc:
-            sp = self._safe_screenshot(page, "add_rows_failed")
-            raise RpaError(f"新增明细行失败：{exc}", screenshot_path=sp) from exc
-
-        for it in items:
-            try:
-                row = page.locator(f'tr[data-row-index="{it.row_index}"]')
-                row.wait_for(timeout=DEFAULT_TIMEOUT_MS)
-                self._pause(300, 800)
-                row.locator('input[name="name"]').fill(it.name)
-                row.locator('input[name="account"]').fill(it.account)
-                row.locator('input[name="note"]').fill(it.note or "")
-                row.locator('input[name="amount"]').fill(f"{it.amount}")
-            except Exception as exc:
-                sp = self._safe_screenshot(page, f"fill_row_{it.row_index}_failed")
-                raise RpaError(f"填第 {it.row_index} 行失败：{exc}", screenshot_path=sp) from exc
-
-        try:
-            page.fill('input[name="purpose"]', "仿真批量提交示例")
-        except Exception as exc:
-            logger.warning("填写用途失败（非致命）：%s", exc)
-
-    def _submit_and_get_batch_id(self, page) -> str:
-        try:
-            self._pause(800, 1500)
-            page.locator('form[name="simBatchForm"] button[type="submit"]').click()
-        except Exception as exc:
-            sp = self._safe_screenshot(page, "click_submit_failed")
-            raise RpaError(f"点击提交失败：{exc}", screenshot_path=sp) from exc
-
-        dlg_sel = 'div[role="dialog"][aria-modal="true"]'
-        try:
-            page.wait_for_selector(dlg_sel, timeout=DEFAULT_TIMEOUT_MS)
-        except Exception as exc:
-            sp = self._safe_screenshot(page, "pin_dialog_not_open")
-            raise RpaError(f"PIN 弹窗未出现：{exc}", screenshot_path=sp) from exc
-
-        try:
-            pin_input = page.locator(f'{dlg_sel} input[type="password"][inputmode="numeric"]')
-            self._pause(500, 1200)
-            pin_input.fill(self._token_pin)
-        except Exception as exc:
-            sp = self._safe_screenshot(page, "fill_pin_failed")
-            raise RpaError(f"填写 PIN 失败：{exc}", screenshot_path=sp) from exc
-
-        try:
-            page.locator(dlg_sel).get_by_role("button", name=re.compile(r"确认提交")).click()
-        except Exception as exc:
-            sp = self._safe_screenshot(page, "click_confirm_failed")
-            raise RpaError(f"确认提交失败：{exc}", screenshot_path=sp) from exc
-
-        try:
-            page.wait_for_selector('[data-testid="batch-id"]', timeout=SUBMIT_NAVIGATE_TIMEOUT_MS)
-        except Exception as exc:
-            sp = self._safe_screenshot(page, "success_area_not_visible")
-            raise RpaError(f"提交后未出现成功区域：{exc}", screenshot_path=sp) from exc
-
-        batch_id = page.locator('[data-testid="batch-id"]').get_attribute("data-batch-id") or ""
-        if not batch_id:
-            batch_id = page.locator('[data-testid="batch-id"]').inner_text().strip()
-        url = page.url
-        if not batch_id and "#/batch/" in url:
-            batch_id = url.split("#/batch/", 1)[1].split("?")[0].split("#")[0].strip("/")
-        if not batch_id:
-            sp = self._safe_screenshot(page, "batch_id_empty")
-            raise RpaError(f"无法解析 batch_id，url={url}", screenshot_path=sp)
-        return batch_id
-
-    def _safe_screenshot(self, page, tag: str) -> Optional[str]:
-        if not self.artifacts_dir:
-            return None
-        try:
-            os.makedirs(self.artifacts_dir, exist_ok=True)
-            path = os.path.join(self.artifacts_dir, f"{tag}_{int(time.time())}.png")
-            page.screenshot(path=path, full_page=True)
-            logger.info("screenshot_saved path=%s", path)
-            return path
-        except Exception as exc:
-            logger.warning("screenshot_failed tag=%s err=%s", tag, exc)
-            return None
+            logger.exception("adapter_unexpected: %s", exc)
+            return BatchSubmitResult(
+                ok=False,
+                batch_id=None,
+                submitted_count=0,
+                submitted_amount=0.0,
+                error_msg=f"未预期异常：{type(exc).__name__}: {exc}",
+                artifacts={"adapter": self.name},
+            )
+        finally:
+            release_lease(lease_token)
--- a/examples/simulator_browser_rpa/scripts/service/browser_session.py
+++ b/examples/simulator_browser_rpa/scripts/service/browser_session.py
@@ -1,16 +1,14 @@
-"""浏览器会话启动（系统 Chrome/Edge；URL 仅通过 page.goto 打开）。"""
+"""浏览器会话启动（系统 Chrome/Edge + async Playwright persistent context）。"""

 from __future__ import annotations

 import logging
 import os
-from contextlib import contextmanager
-from typing import Any, Generator, Iterator, List, Optional, Tuple
+from typing import Any, List, Optional, Tuple

 logger = logging.getLogger(__name__)

 DEFAULT_PAGE_TIMEOUT_MS = 15_000
-GOTO_TIMEOUT_MS = 60_000

 CHROME_LAUNCH_ARGS: List[str] = [
    "--start-maximized",
@@ -33,11 +31,11 @@ def _headless_from_env() -> bool:
    return v in ("1", "true", "yes", "on")


-def _find_chrome_executable() -> str | None:
+def find_chrome_executable() -> str | None:
    try:
-        from jiangchang_skill_core.runtime_env import find_chrome_executable
+        from jiangchang_skill_core.runtime_env import find_chrome_executable as _find

-        chrome = find_chrome_executable()
+        chrome = _find()
        if chrome and os.path.isfile(chrome):
            return chrome
    except ImportError:
@@ -59,80 +57,70 @@ def _clear_node_options() -> None:
    os.environ.pop("NODE_OPTIONS", None)


-@contextmanager
-def browser_session(
-    start_url: str,
+async def start_browser_session(
+    profile_dir: str,
    *,
-    profile_dir: Optional[str] = None,
    headless: Optional[bool] = None,
-) -> Generator[Any, None, None]:
+) -> Tuple[Any, Any, Any]:
    """
-    同步 Playwright 浏览器会话。
+    启动持久化 Chrome profile，返回 (playwright, context, page)。

-    - Playwright Python 包由宿主共享 runtime 提供；技能侧不要 playwright install。
-    - launch args 仅放 Chrome 参数，不含 URL。
-    - 流程：launch → new_page → goto(start_url)
+    URL 不在此文件打开；由 simulator_playwright.py 负责 page.goto。
    """
-    from playwright.sync_api import sync_playwright
+    from playwright.async_api import async_playwright

    _clear_node_options()
    hl = headless if headless is not None else _headless_from_env()
-    chrome = _find_chrome_executable()
+    chrome = find_chrome_executable()
    if not chrome:
        raise RuntimeError(
-            "未检测到 Chrome 或 Edge 浏览器，请安装系统浏览器后重试。"
+            "ERROR:MISSING_BROWSER 未检测到 Chrome 或 Edge 浏览器，请先安装系统浏览器后重试。"
        )

    args = chrome_launch_args()
    logger.info(
-        "browser_launch chrome=%s profile_dir=%s start_url=%s args=%s headless=%s",
+        "browser_launch chrome=%s profile_dir=%s args=%s headless=%s",
        chrome,
-        profile_dir or "",
-        start_url,
+        profile_dir,
        args,
        hl,
    )

-    browser_holder = None
+    pw = await async_playwright().start()
    context = None
-    with sync_playwright() as pw:
-        try:
-            if profile_dir:
-                context = pw.chromium.launch_persistent_context(
-                    user_data_dir=profile_dir,
-                    headless=hl,
-                    executable_path=chrome,
-                    locale="zh-CN",
-                    no_viewport=True,
-                    args=args,
-                    ignore_default_args=["--enable-automation"],
-                )
-            else:
-                browser_holder = pw.chromium.launch(
-                    headless=hl,
-                    executable_path=chrome,
-                    args=args,
-                    ignore_default_args=["--enable-automation"],
-                )
-                context = browser_holder.new_context(no_viewport=True, locale="zh-CN")
+    try:
+        context = await pw.chromium.launch_persistent_context(
+            user_data_dir=profile_dir,
+            headless=hl,
+            executable_path=chrome,
+            locale="zh-CN",
+            no_viewport=True,
+            args=args,
+            ignore_default_args=["--enable-automation"],
+        )
+        await context.add_init_script(STEALTH_INIT_SCRIPT)

-            context.add_init_script(STEALTH_INIT_SCRIPT)
-            page = context.new_page()
-            page.set_default_timeout(DEFAULT_PAGE_TIMEOUT_MS)
-            page.goto(start_url, wait_until="domcontentloaded", timeout=GOTO_TIMEOUT_MS)
-            yield page
-        finally:
+        page = context.pages[0] if context.pages else await context.new_page()
+        page.set_default_timeout(DEFAULT_PAGE_TIMEOUT_MS)
+        return pw, context, page
+    except Exception:
+        if context is not None:
            try:
-                if context is not None:
-                    context.close()
-            except Exception as exc:
-                logger.warning("browser_context_close_failed: %s", exc)
-            if browser_holder is not None:
-                try:
-                    browser_holder.close()
-                except Exception as exc:
-                    logger.warning("browser_close_failed: %s", exc)
+                await context.close()
+            except Exception:
+                pass
+        await pw.stop()
+        raise


-def find_chrome_executable() -> str | None:
-    return _find_chrome_executable()
+async def close_browser_session(playwright: Any, context: Any) -> None:
+    try:
+        if context is not None:
+            await context.close()
+    except Exception:
+        pass
+    try:
+        if playwright is not None:
+            await playwright.stop()
+    except Exception:
+        pass
--- a/examples/simulator_browser_rpa/scripts/service/simulator_playwright.py
+++ b/examples/simulator_browser_rpa/scripts/service/simulator_playwright.py
@@ -0,0 +1,400 @@
+"""仿真批量提交 RPA 主流程（async Playwright）。"""
+
+from __future__ import annotations
+
+import asyncio
+import logging
+import os
+import random
+import re
+import time
+from dataclasses import dataclass
+from typing import Any, List, Optional
+
+from jiangchang_skill_core import config
+
+from service.adapter.base import BatchItem, BatchSubmitResult
+from service.browser_session import (
+    close_browser_session,
+    find_chrome_executable,
+    start_browser_session,
+)
+from util.constants import (
+    DEFAULT_DEMO_CAPTCHA,
+    DEFAULT_DEMO_LOGIN_ID,
+    DEFAULT_DEMO_PASSWORD,
+    DEFAULT_DEMO_TOKEN_PIN,
+    DEFAULT_TIMEOUT_MS,
+    ENV_SIMULATOR_PASSWORD,
+    ENV_SIMULATOR_TOKEN_PIN,
+    LOGIN_NAVIGATE_TIMEOUT_MS,
+    SUBMIT_NAVIGATE_TIMEOUT_MS,
+    portal_login_wait_sec,
+)
+
+logger = logging.getLogger(__name__)
+
+GOTO_TIMEOUT_MS = 60_000
+
+_PAUSE_MIN_MS = 500
+_PAUSE_MAX_MS = 2000
+
+
+class RpaError(Exception):
+    def __init__(self, message: str, screenshot_path: Optional[str] = None):
+        super().__init__(message)
+        self.screenshot_path = screenshot_path
+
+
+@dataclass
+class _Credentials:
+    login_id: str
+    password: str
+    token_pin: str
+
+
+def _resolve_credentials(account: dict[str, Any]) -> _Credentials:
+    login_id = str(
+        account.get("login_id") or account.get("username") or DEFAULT_DEMO_LOGIN_ID
+    ).strip()
+    password = str(
+        account.get("password")
+        or os.getenv(ENV_SIMULATOR_PASSWORD)
+        or config.get(ENV_SIMULATOR_PASSWORD)
+        or DEFAULT_DEMO_PASSWORD
+    ).strip()
+    token_pin = str(
+        account.get("token_pin")
+        or account.get("pin")
+        or os.getenv(ENV_SIMULATOR_TOKEN_PIN)
+        or config.get(ENV_SIMULATOR_TOKEN_PIN)
+        or DEFAULT_DEMO_TOKEN_PIN
+    ).strip()
+    return _Credentials(login_id=login_id, password=password, token_pin=token_pin)
+
+
+def _headless() -> bool:
+    return config.get_bool("OPENCLAW_BROWSER_HEADLESS", default=False)
+
+
+async def _pause(min_ms: int = _PAUSE_MIN_MS, max_ms: int = _PAUSE_MAX_MS) -> None:
+    await asyncio.sleep(random.uniform(min_ms, max_ms) / 1000.0)
+
+
+async def _visible(locator) -> bool:
+    try:
+        return await locator.count() > 0 and await locator.is_visible(timeout=500)
+    except Exception:
+        return False
+
+
+async def _wait_portal_gate(page, wait_sec: int) -> None:
+    portal_user = page.locator("#portal-user")
+    try:
+        if not await _visible(portal_user):
+            return
+    except Exception:
+        return
+
+    print(f"[门户] 检测到平台门户登录门闩，请手工完成门户登录，最多等待 {wait_sec} 秒...")
+    deadline = time.monotonic() + wait_sec
+    while time.monotonic() < deadline:
+        try:
+            portal_section = page.locator("#portal-section")
+            login_step1 = page.locator('form[name="simLoginStep1"]')
+            if not await _visible(portal_section) or await _visible(login_step1):
+                print("[门户] 门户门闩已通过，进入业务系统登录")
+                return
+        except Exception:
+            pass
+        await asyncio.sleep(2.0)
+
+    raise RpaError("ERROR:LOGIN_TIMEOUT 门户登录超时，请重新运行并及时完成门户登录。")
+
+
+async def _login(page, creds: _Credentials, artifacts_dir: str | None) -> None:
+    try:
+        await page.wait_for_selector(
+            'form[name="simLoginStep1"]', timeout=LOGIN_NAVIGATE_TIMEOUT_MS
+        )
+        await _pause()
+        await page.fill('form[name="simLoginStep1"] input[name="loginId"]', creds.login_id)
+        await _pause()
+        await page.click('form[name="simLoginStep1"] button[type="submit"]')
+    except Exception as exc:
+        sp = await _safe_screenshot(page, artifacts_dir, "login_step1_failed")
+        raise RpaError(f"登录第一步失败：{exc}", screenshot_path=sp) from exc
+
+    try:
+        await page.wait_for_selector('form[name="simLoginStep2"]', timeout=DEFAULT_TIMEOUT_MS)
+        await _pause()
+        await page.fill('form[name="simLoginStep2"] input[name="password"]', creds.password)
+        await page.fill('form[name="simLoginStep2"] input[name="captcha"]', DEFAULT_DEMO_CAPTCHA)
+        await _pause()
+        await page.click('form[name="simLoginStep2"] button[type="submit"]')
+    except Exception as exc:
+        sp = await _safe_screenshot(page, artifacts_dir, "login_step2_failed")
+        raise RpaError(f"登录第二步失败：{exc}", screenshot_path=sp) from exc
+
+    try:
+        await page.wait_for_selector('form[name="simBatchForm"]', timeout=LOGIN_NAVIGATE_TIMEOUT_MS)
+    except Exception as exc:
+        sp = await _safe_screenshot(page, artifacts_dir, "login_navigate_failed")
+        raise RpaError(f"登录后未进入批量提交页：{exc}", screenshot_path=sp) from exc
+
+
+async def _goto_batch_page(page, artifacts_dir: str | None) -> None:
+    try:
+        await page.wait_for_selector('form[name="simBatchForm"]', timeout=DEFAULT_TIMEOUT_MS)
+        await _pause()
+    except Exception as exc:
+        sp = await _safe_screenshot(page, artifacts_dir, "goto_batch_failed")
+        raise RpaError(f"进入批量提交页失败：{exc}", screenshot_path=sp) from exc
+
+
+async def _select_target_account(page, target: str) -> None:
+    sel = page.locator('select[name="fromAccountNo"]')
+    await sel.wait_for(timeout=DEFAULT_TIMEOUT_MS)
+    n = await sel.locator("option").count()
+    matched_value: Optional[str] = None
+    first_value: Optional[str] = None
+    for i in range(n):
+        opt = sel.locator("option").nth(i)
+        val = (await opt.get_attribute("value")) or ""
+        if not val.strip():
+            continue
+        label_txt = await opt.inner_text()
+        if first_value is None:
+            first_value = val
+        if target.strip() and target.strip() in label_txt:
+            matched_value = val
+            break
+    pick = matched_value or first_value
+    if not pick:
+        raise RpaError("来源账户下拉无可选项")
+    if not matched_value and target.strip():
+        logger.warning("target '%s' 未匹配选项，回退 value=%s", target, pick)
+    await sel.select_option(value=pick)
+    await _pause()
+
+
+async def _fill_batch_form(
+    page, target: str, items: List[BatchItem], artifacts_dir: str | None
+) -> None:
+    try:
+        await page.get_by_role("button", name=re.compile(r"页面填写")).click()
+    except Exception as exc:
+        sp = await _safe_screenshot(page, artifacts_dir, "tab_switch_failed")
+        raise RpaError(f"切换到页面填写失败：{exc}", screenshot_path=sp) from exc
+
+    try:
+        await _select_target_account(page, target)
+    except RpaError:
+        raise
+    except Exception as exc:
+        sp = await _safe_screenshot(page, artifacts_dir, "select_account_failed")
+        raise RpaError(f"选择来源账户失败：{exc}", screenshot_path=sp) from exc
+
+    try:
+        existing = await page.locator("tr[data-row-index]").count()
+        need_more = max(0, len(items) - existing)
+        add_btn = page.get_by_role("button", name=re.compile(r"新增一行"))
+        for _ in range(need_more):
+            await _pause(400, 900)
+            await add_btn.click()
+    except Exception as exc:
+        sp = await _safe_screenshot(page, artifacts_dir, "add_rows_failed")
+        raise RpaError(f"新增明细行失败：{exc}", screenshot_path=sp) from exc
+
+    for it in items:
+        try:
+            row = page.locator(f'tr[data-row-index="{it.row_index}"]')
+            await row.wait_for(timeout=DEFAULT_TIMEOUT_MS)
+            await _pause(300, 800)
+            await row.locator('input[name="name"]').fill(it.name)
+            await row.locator('input[name="account"]').fill(it.account)
+            await row.locator('input[name="note"]').fill(it.note or "")
+            await row.locator('input[name="amount"]').fill(f"{it.amount}")
+        except Exception as exc:
+            sp = await _safe_screenshot(page, artifacts_dir, f"fill_row_{it.row_index}_failed")
+            raise RpaError(f"填第 {it.row_index} 行失败：{exc}", screenshot_path=sp) from exc
+
+    try:
+        await page.fill('input[name="purpose"]', "仿真批量提交示例")
+    except Exception as exc:
+        logger.warning("填写用途失败（非致命）：%s", exc)
+
+
+async def _submit_and_get_batch_id(page, token_pin: str, artifacts_dir: str | None) -> str:
+    try:
+        await _pause(800, 1500)
+        await page.locator('form[name="simBatchForm"] button[type="submit"]').click()
+    except Exception as exc:
+        sp = await _safe_screenshot(page, artifacts_dir, "click_submit_failed")
+        raise RpaError(f"点击提交失败：{exc}", screenshot_path=sp) from exc
+
+    dlg_sel = 'div[role="dialog"][aria-modal="true"]'
+    try:
+        await page.wait_for_selector(dlg_sel, timeout=DEFAULT_TIMEOUT_MS)
+    except Exception as exc:
+        sp = await _safe_screenshot(page, artifacts_dir, "pin_dialog_not_open")
+        raise RpaError(f"PIN 弹窗未出现：{exc}", screenshot_path=sp) from exc
+
+    try:
+        pin_input = page.locator(f'{dlg_sel} input[type="password"][inputmode="numeric"]')
+        await _pause(500, 1200)
+        await pin_input.fill(token_pin)
+    except Exception as exc:
+        sp = await _safe_screenshot(page, artifacts_dir, "fill_pin_failed")
+        raise RpaError(f"填写 PIN 失败：{exc}", screenshot_path=sp) from exc
+
+    try:
+        await page.locator(dlg_sel).get_by_role("button", name=re.compile(r"确认提交")).click()
+    except Exception as exc:
+        sp = await _safe_screenshot(page, artifacts_dir, "click_confirm_failed")
+        raise RpaError(f"确认提交失败：{exc}", screenshot_path=sp) from exc
+
+    try:
+        await page.wait_for_selector('[data-testid="batch-id"]', timeout=SUBMIT_NAVIGATE_TIMEOUT_MS)
+    except Exception as exc:
+        sp = await _safe_screenshot(page, artifacts_dir, "success_area_not_visible")
+        raise RpaError(f"提交后未出现成功区域：{exc}", screenshot_path=sp) from exc
+
+    batch_id = await page.locator('[data-testid="batch-id"]').get_attribute("data-batch-id") or ""
+    if not batch_id:
+        batch_id = (await page.locator('[data-testid="batch-id"]').inner_text()).strip()
+    url = page.url
+    if not batch_id and "#/batch/" in url:
+        batch_id = url.split("#/batch/", 1)[1].split("?")[0].split("#")[0].strip("/")
+    if not batch_id:
+        sp = await _safe_screenshot(page, artifacts_dir, "batch_id_empty")
+        raise RpaError(f"无法解析 batch_id，url={url}", screenshot_path=sp)
+    return batch_id
+
+
+async def _safe_screenshot(page, artifacts_dir: str | None, tag: str) -> Optional[str]:
+    if not artifacts_dir:
+        return None
+    try:
+        os.makedirs(artifacts_dir, exist_ok=True)
+        path = os.path.join(artifacts_dir, f"{tag}_{int(time.time())}.png")
+        await page.screenshot(path=path, full_page=True)
+        logger.info("screenshot_saved path=%s", path)
+        return path
+    except Exception as exc:
+        logger.warning("screenshot_failed tag=%s err=%s", tag, exc)
+        return None
+
+
+async def submit_batch_rpa(
+    account: dict[str, Any],
+    *,
+    target: str,
+    items: list[BatchItem],
+    base_url: str,
+    artifacts_dir: str | None,
+    video_session: Any = None,
+    headless: bool | None = None,
+) -> BatchSubmitResult:
+    del video_session  # 示例占位；真实 skill 可接入 RpaVideoSession
+
+    profile_dir = str(account.get("profile_dir") or "").strip()
+    if not profile_dir:
+        return BatchSubmitResult(
+            ok=False,
+            batch_id=None,
+            submitted_count=0,
+            submitted_amount=0.0,
+            error_msg="账号缺少 profile_dir",
+            artifacts={"adapter": "simulator_rpa"},
+        )
+
+    if not items:
+        return BatchSubmitResult(
+            ok=False,
+            batch_id=None,
+            submitted_count=0,
+            submitted_amount=0.0,
+            error_msg="items 为空",
+            artifacts={"adapter": "simulator_rpa"},
+        )
+
+    if not find_chrome_executable():
+        return BatchSubmitResult(
+            ok=False,
+            batch_id=None,
+            submitted_count=0,
+            submitted_amount=0.0,
+            error_msg="未检测到 Chrome 或 Edge 浏览器，请安装系统浏览器后重试。",
+            artifacts={"adapter": "simulator_rpa"},
+        )
+
+    creds = _resolve_credentials(account)
+    portal_wait = portal_login_wait_sec()
+    hl = headless if headless is not None else _headless()
+
+    pw = None
+    context = None
+    page = None
+    try:
+        pw, context, page = await start_browser_session(profile_dir, headless=hl)
+        logger.info("rpa_goto url=%s", base_url)
+        await page.goto(base_url, wait_until="domcontentloaded", timeout=GOTO_TIMEOUT_MS)
+
+        await _wait_portal_gate(page, portal_wait)
+        logger.info("rpa_login_start")
+        await _login(page, creds, artifacts_dir)
+        logger.info("rpa_login_done")
+
+        await _goto_batch_page(page, artifacts_dir)
+        logger.info("rpa_batch_page_ready")
+
+        await _fill_batch_form(page, target, items, artifacts_dir)
+        logger.info("rpa_batch_form_filled rows=%s", len(items))
+
+        batch_id = await _submit_and_get_batch_id(page, creds.token_pin, artifacts_dir)
+        logger.info("rpa_submit_success batch_id=%s", batch_id)
+
+        total = sum(it.amount for it in items)
+        return BatchSubmitResult(
+            ok=True,
+            batch_id=batch_id,
+            submitted_count=len(items),
+            submitted_amount=total,
+            error_msg=None,
+            artifacts={"adapter": "simulator_rpa"},
+        )
+    except RpaError as exc:
+        logger.error("rpa_failed: %s", exc)
+        arts = {"adapter": "simulator_rpa"}
+        if exc.screenshot_path:
+            arts["screenshot"] = exc.screenshot_path
+        elif page is not None:
+            sp = await _safe_screenshot(page, artifacts_dir, "rpa_error")
+            if sp:
+                arts["screenshot"] = sp
+        return BatchSubmitResult(
+            ok=False,
+            batch_id=None,
+            submitted_count=0,
+            submitted_amount=0.0,
+            error_msg=str(exc),
+            artifacts=arts,
+        )
+    except Exception as exc:
+        logger.exception("rpa_unexpected: %s", exc)
+        arts = {"adapter": "simulator_rpa"}
+        if page is not None:
+            sp = await _safe_screenshot(page, artifacts_dir, "unexpected_error")
+            if sp:
+                arts["screenshot"] = sp
+        return BatchSubmitResult(
+            ok=False,
+            batch_id=None,
+            submitted_count=0,
+            submitted_amount=0.0,
+            error_msg=f"未预期异常：{type(exc).__name__}: {exc}",
+            artifacts=arts,
+        )
+    finally:
+        await close_browser_session(pw, context)
--- a/examples/simulator_browser_rpa/scripts/service/task_service.py
+++ b/examples/simulator_browser_rpa/scripts/service/task_service.py
@@ -7,8 +7,7 @@ import tempfile
 import uuid
 from typing import Any, Dict, List, Optional

-from service.account_client import pick_simulator_account
-from service.adapter import BatchItem, SimulatorBrowserRpaAdapter, select_adapter
+from service.adapter import BatchItem, select_adapter
 from util.logging import get_logger

 logger = get_logger(__name__)
@@ -42,7 +41,7 @@ def _validate_items(items: List[Dict[str, Any]]) -> tuple[List[BatchItem], Optio
    return parsed, None


-def run_batch_submit(
+async def run_batch_submit(
    target: str,
    items: List[Dict[str, Any]],
    *,
@@ -53,6 +52,7 @@ def run_batch_submit(
    最小编排示例。

    真实 skill 中还应：写 task_logs、entitlement、RpaVideoSession 等。
+    账号 pick / lease 在 adapter 内完成，编排层不直接碰 account-manager。
    """
    del force  # 示例占位；真实 skill 可用于跳过确认

@@ -70,19 +70,15 @@ def run_batch_submit(
        uuid.uuid4().hex[:8],
    )
    os.makedirs(art_dir, exist_ok=True)
-    logger.info("batch_submit_start target=%s item_count=%s artifacts_dir=%s", target_key, len(batch_items), art_dir)
+    logger.info(
+        "batch_submit_start target=%s item_count=%s artifacts_dir=%s",
+        target_key,
+        len(batch_items),
+        art_dir,
+    )

    adapter = select_adapter(artifacts_dir=art_dir)
-    if isinstance(adapter, SimulatorBrowserRpaAdapter):
-        account = pick_simulator_account()
-        adapter.set_credentials(
-            account.login_id,
-            account.password,
-            account.token_pin,
-            account.profile_dir,
-        )
-
-    result = adapter.submit_batch(target_key, batch_items)
+    result = await adapter.submit_batch(target_key, batch_items)
    summary: Dict[str, Any] = {
        "success": result.ok,
        "target": target_key,
--- a/examples/simulator_browser_rpa/scripts/util/constants.py
+++ b/examples/simulator_browser_rpa/scripts/util/constants.py
@@ -5,12 +5,19 @@ from __future__ import annotations
 import os
 from pathlib import Path

+from jiangchang_skill_core import config
+
 SKILL_SLUG = "example-simulator-browser-rpa"
 LOG_LOGGER_NAME = "openclaw.skill.example_simulator_browser_rpa"

+TARGET_PLATFORM = "sim_batch"
+LEASE_HOLDER = "example-simulator-browser-rpa"
+LEASE_TTL_SEC = "1800"
+
 DEFAULT_TIMEOUT_MS = 15_000
 LOGIN_NAVIGATE_TIMEOUT_MS = 30_000
 SUBMIT_NAVIGATE_TIMEOUT_MS = 60_000
+DEFAULT_PORTAL_LOGIN_WAIT_SEC = 120

 DEFAULT_DEMO_LOGIN_ID = "demo001"
 DEFAULT_DEMO_PASSWORD = "demo-password"
@@ -18,15 +25,26 @@ DEFAULT_DEMO_CAPTCHA = "0000"
 DEFAULT_DEMO_TOKEN_PIN = "123456"

 ENV_SIMULATOR_BASE_URL = "SIMULATOR_BASE_URL"
-ENV_SIMULATOR_LOGIN_ID = "SIMULATOR_LOGIN_ID"
 ENV_SIMULATOR_PASSWORD = "SIMULATOR_PASSWORD"
 ENV_SIMULATOR_TOKEN_PIN = "SIMULATOR_TOKEN_PIN"
-ENV_SIMULATOR_PROFILE_DIR = "SIMULATOR_PROFILE_DIR"
+ENV_PORTAL_LOGIN_WAIT_SEC = "PORTAL_LOGIN_WAIT_SEC"

 _EXAMPLE_ROOT = Path(__file__).resolve().parents[2]
 DEFAULT_DEMO_APP_PATH = _EXAMPLE_ROOT / "sandbox" / "demo_app.html"


+def portal_login_wait_sec() -> int:
+    raw = (
+        os.getenv(ENV_PORTAL_LOGIN_WAIT_SEC)
+        or config.get(ENV_PORTAL_LOGIN_WAIT_SEC)
+        or str(DEFAULT_PORTAL_LOGIN_WAIT_SEC)
+    )
+    try:
+        return max(1, int(str(raw).strip()))
+    except (TypeError, ValueError):
+        return DEFAULT_PORTAL_LOGIN_WAIT_SEC
+
+
 def resolve_simulator_base_url() -> str:
    env = (os.getenv(ENV_SIMULATOR_BASE_URL) or "").strip()
    if env:
--- a/examples/simulator_browser_rpa/scripts/util/logging.py
+++ b/examples/simulator_browser_rpa/scripts/util/logging.py
@@ -3,6 +3,8 @@
 from __future__ import annotations

 import logging
+import re
+from typing import Any

 from util.constants import LOG_LOGGER_NAME

@@ -13,3 +15,24 @@ def get_logger(name: str | None = None) -> logging.Logger:

 def configure_logging(level: int = logging.INFO) -> None:
    logging.basicConfig(level=level, format="%(levelname)s %(name)s %(message)s")
+
+
+def mask_text(value: str, *, keep_start: int = 2, keep_end: int = 2) -> str:
+    s = (value or "").strip()
+    if len(s) >= 11 and s.isdigit():
+        return s[:3] + "****" + s[-4:]
+    if len(s) > keep_start + keep_end:
+        return s[:keep_start] + "****" + s[-keep_end:]
+    return "****"
+
+
+def safe_log_value(value: Any) -> str:
+    if value is None:
+        return ""
+    text = str(value)
+    if re.fullmatch(r"\d{7,}", text):
+        return mask_text(text)
+    if "@" in text and len(text) > 6:
+        local, _, domain = text.partition("@")
+        return f"{mask_text(local, keep_start=1, keep_end=1)}@{domain}"
+    return text
--- a/examples/simulator_browser_rpa/tests/test_adapter_dispatch.py
+++ b/examples/simulator_browser_rpa/tests/test_adapter_dispatch.py
@@ -42,20 +42,20 @@ class TestAdapterDispatch(unittest.TestCase):
            self.assertIsInstance(select_adapter(), SimulatorBrowserRpaAdapter)


-class TestMockAdapter(unittest.TestCase):
-    def test_mock_success(self) -> None:
+class TestMockAdapter(unittest.IsolatedAsyncioTestCase):
+    async def test_mock_success(self) -> None:
        items = [
            BatchItem(row_index=1, name="Alice", account="1001", amount=10.5),
            BatchItem(row_index=2, name="Bob", account="1002", amount=20.0),
        ]
-        result = MockBatchAdapter().submit_batch("acct-demo-001", items)
+        result = await MockBatchAdapter().submit_batch("acct-demo-001", items)
        self.assertTrue(result.ok)
        self.assertEqual(result.submitted_count, 2)
        self.assertEqual(result.submitted_amount, 30.5)
        self.assertTrue((result.batch_id or "").startswith("MOCK-"))

-    def test_mock_empty_items(self) -> None:
-        result = MockBatchAdapter().submit_batch("acct-demo-001", [])
+    async def test_mock_empty_items(self) -> None:
+        result = await MockBatchAdapter().submit_batch("acct-demo-001", [])
        self.assertFalse(result.ok)
        self.assertEqual(result.error_msg, "items 为空")

--- a/examples/simulator_browser_rpa/tests/test_no_rpa_helpers_import.py
+++ b/examples/simulator_browser_rpa/tests/test_no_rpa_helpers_import.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+"""禁止 import account-manager 内部 RPA 辅助模块。"""
+from __future__ import annotations
+
+import os
+import re
+import unittest
+from pathlib import Path
+
+FORBIDDEN_PATTERNS = (
+    re.compile(r"\brpa_helpers\b"),
+    re.compile(r"\binject_account_manager_scripts_path\b"),
+    re.compile(r"\bget_account_credential\b"),
+)
+
+SCRIPTS_ROOT = Path(__file__).resolve().parents[1] / "scripts"
+
+
+class TestNoRpaHelpersImport(unittest.TestCase):
+    def test_scripts_tree_has_no_forbidden_account_manager_imports(self) -> None:
+        violations: list[str] = []
+        for root, _dirs, files in os.walk(SCRIPTS_ROOT):
+            for name in files:
+                if not name.endswith(".py"):
+                    continue
+                path = Path(root) / name
+                text = path.read_text(encoding="utf-8")
+                for pattern in FORBIDDEN_PATTERNS:
+                    if pattern.search(text):
+                        violations.append(f"{path.relative_to(SCRIPTS_ROOT)}: {pattern.pattern}")
+        self.assertEqual(
+            violations,
+            [],
+            msg="Forbidden account-manager internal imports found:\n" + "\n".join(violations),
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()
--- a/examples/simulator_browser_rpa/tests/test_simulator_rpa_unit.py
+++ b/examples/simulator_browser_rpa/tests/test_simulator_rpa_unit.py
@@ -2,31 +2,27 @@
 """SimulatorBrowserRpaAdapter 单元测试（不启动真实浏览器）。"""
 from __future__ import annotations

+import asyncio
 import unittest
-from unittest.mock import MagicMock, patch
+from unittest.mock import AsyncMock, MagicMock, patch

 from service.adapter import BatchItem, SimulatorBrowserRpaAdapter
 from service.browser_session import CHROME_LAUNCH_ARGS
+from service.simulator_playwright import RpaError


-class TestSimulatorRpaUnit(unittest.TestCase):
-    def test_set_credentials_and_empty_profile_dir(self) -> None:
+class TestSimulatorRpaUnit(unittest.IsolatedAsyncioTestCase):
+    async def test_submit_batch_empty_items(self) -> None:
        adapter = SimulatorBrowserRpaAdapter()
-        adapter.set_credentials("demo001", "pwd", "pin", "   ")
-        self.assertEqual(adapter._login_id, "demo001")
-        self.assertIsNone(adapter._profile_dir)
-
-    def test_submit_batch_empty_items(self) -> None:
-        adapter = SimulatorBrowserRpaAdapter()
-        result = adapter.submit_batch("acct-demo-001", [])
+        result = await adapter.submit_batch("acct-demo-001", [])
        self.assertFalse(result.ok)
        self.assertIn("items", result.error_msg or "")

    @patch("service.adapter.simulator_rpa.find_chrome_executable", return_value=None)
-    def test_no_chrome_returns_error_without_launch(self, _chrome: MagicMock) -> None:
+    async def test_no_chrome_returns_error_without_launch(self, _chrome: MagicMock) -> None:
        adapter = SimulatorBrowserRpaAdapter()
        items = [BatchItem(row_index=1, name="A", account="1", amount=1.0)]
-        result = adapter.submit_batch("acct-demo-001", items)
+        result = await adapter.submit_batch("acct-demo-001", items)
        self.assertFalse(result.ok)
        msg = result.error_msg or ""
        self.assertTrue("Chrome" in msg or "Edge" in msg or "浏览器" in msg)
@@ -38,38 +34,100 @@ class TestSimulatorRpaUnit(unittest.TestCase):
            self.assertFalse(lowered.startswith("https://"))
            self.assertFalse(lowered.startswith("file://"))

-    @patch("service.adapter.simulator_rpa.browser_session")
+    @patch("service.adapter.simulator_rpa.submit_batch_rpa", new_callable=AsyncMock)
+    @patch("service.adapter.simulator_rpa.pick_web_account")
    @patch("service.adapter.simulator_rpa.find_chrome_executable", return_value="C:/Chrome/chrome.exe")
-    def test_start_url_opened_via_goto_not_launch_args(
+    async def test_adapter_delegates_to_playwright_with_account_url(
        self,
        _chrome: MagicMock,
-        mock_session: MagicMock,
+        mock_pick: MagicMock,
+        mock_rpa: AsyncMock,
    ) -> None:
-        from service.adapter.simulator_rpa import RpaError
+        from service.adapter.base import BatchSubmitResult

-        adapter = SimulatorBrowserRpaAdapter(base_url="file:///demo/demo_app.html")
+        mock_pick.return_value = {
+            "login_id": "demo001",
+            "profile_dir": "/tmp/profile",
+            "url": "file:///demo/demo_app.html",
+            "lease_token": "tok-1",
+        }
+        mock_rpa.return_value = BatchSubmitResult(
+            ok=False,
+            batch_id=None,
+            submitted_count=0,
+            submitted_amount=0.0,
+            error_msg="login fail",
+            artifacts={"adapter": "simulator_rpa"},
+        )
+
+        adapter = SimulatorBrowserRpaAdapter(artifacts_dir="/tmp/art")
        items = [BatchItem(row_index=1, name="A", account="1", amount=1.0)]
-
-        page = MagicMock()
-        mock_cm = MagicMock()
-        mock_cm.__enter__.return_value = page
-        mock_cm.__exit__.return_value = False
-        mock_session.return_value = mock_cm
-
-        with patch.object(adapter, "_login", side_effect=RpaError("login fail")):
-            result = adapter.submit_batch("acct-demo-001", items)
+        result = await adapter.submit_batch("acct-demo-001", items)

        self.assertFalse(result.ok)
-        mock_session.assert_called_once()
-        called_start_url = mock_session.call_args[0][0]
-        self.assertEqual(called_start_url, "file:///demo/demo_app.html")
+        mock_rpa.assert_awaited_once()
+        call_kwargs = mock_rpa.call_args.kwargs
+        self.assertEqual(call_kwargs["base_url"], "file:///demo/demo_app.html")
        for arg in CHROME_LAUNCH_ARGS:
-            self.assertNotIn(arg, called_start_url)
+            self.assertNotIn(arg, call_kwargs["base_url"])

-    def test_safe_screenshot_without_artifacts_dir(self) -> None:
-        adapter = SimulatorBrowserRpaAdapter(artifacts_dir=None)
-        page = MagicMock()
-        self.assertIsNone(adapter._safe_screenshot(page, "tag"))
+    @patch("service.simulator_playwright.start_browser_session", new_callable=AsyncMock)
+    async def test_playwright_opens_url_via_goto_not_launch_args(self, mock_start: AsyncMock) -> None:
+        from service.simulator_playwright import submit_batch_rpa
+
+        page = AsyncMock()
+        page.goto = AsyncMock()
+        mock_start.return_value = (MagicMock(), MagicMock(), page)
+
+        account = {"profile_dir": "/tmp/p", "login_id": "demo001"}
+        items = [BatchItem(row_index=1, name="A", account="1", amount=1.0)]
+
+        with patch(
+            "service.simulator_playwright._wait_portal_gate",
+            new_callable=AsyncMock,
+            return_value=None,
+        ):
+            with patch(
+                "service.simulator_playwright._login",
+                new_callable=AsyncMock,
+                side_effect=RpaError("login fail"),
+            ):
+                with patch(
+                    "service.simulator_playwright.find_chrome_executable",
+                    return_value="C:/Chrome/chrome.exe",
+                ):
+                    with patch(
+                        "service.simulator_playwright.close_browser_session",
+                        new_callable=AsyncMock,
+                    ):
+                        result = await submit_batch_rpa(
+                            account,
+                            target="acct-demo-001",
+                            items=items,
+                            base_url="file:///demo/demo_app.html",
+                            artifacts_dir=None,
+                        )
+
+        self.assertFalse(result.ok)
+        page.goto.assert_awaited_once()
+        goto_url = page.goto.call_args[0][0]
+        self.assertEqual(goto_url, "file:///demo/demo_app.html")
+        for arg in CHROME_LAUNCH_ARGS:
+            self.assertNotIn(arg, goto_url)
+
+    async def test_safe_screenshot_without_artifacts_dir(self) -> None:
+        from service.simulator_playwright import _safe_screenshot
+
+        page = AsyncMock()
+        self.assertIsNone(await _safe_screenshot(page, None, "tag"))
+
+
+class TestSyncHelpers(unittest.TestCase):
+    def test_asyncio_run_smoke(self) -> None:
+        async def _noop() -> bool:
+            return True
+
+        self.assertTrue(asyncio.run(_noop()))


 if __name__ == "__main__":
--- a/examples/simulator_browser_rpa/tests/test_stop_reason.py
+++ b/examples/simulator_browser_rpa/tests/test_stop_reason.py
@@ -3,51 +3,70 @@
 from __future__ import annotations

 import unittest
-from unittest.mock import MagicMock, patch
+from unittest.mock import AsyncMock, MagicMock, patch

 from service.adapter import BatchItem, SimulatorBrowserRpaAdapter
-from service.adapter.simulator_rpa import RpaError
+from service.adapter.base import BatchSubmitResult


-class TestBatchSubmitFailureResult(unittest.TestCase):
+class TestBatchSubmitFailureResult(unittest.IsolatedAsyncioTestCase):
+    @patch("service.adapter.simulator_rpa.release_lease")
+    @patch("service.adapter.simulator_rpa.submit_batch_rpa", new_callable=AsyncMock)
+    @patch("service.adapter.simulator_rpa.pick_web_account")
    @patch("service.adapter.simulator_rpa.find_chrome_executable", return_value="C:/Chrome/chrome.exe")
-    @patch("service.adapter.simulator_rpa.browser_session")
-    def test_rpa_error_converts_to_failed_result(self, mock_session: MagicMock, _chrome: MagicMock) -> None:
-        page = MagicMock()
-        mock_cm = MagicMock()
-        mock_cm.__enter__.return_value = page
-        mock_cm.__exit__.return_value = False
-        mock_session.return_value = mock_cm
+    async def test_rpa_error_converts_to_failed_result(
+        self,
+        _chrome: MagicMock,
+        mock_pick: MagicMock,
+        mock_rpa: AsyncMock,
+        _release: MagicMock,
+    ) -> None:
+        mock_pick.return_value = {
+            "profile_dir": "/tmp/profile",
+            "lease_token": "tok",
+        }
+        mock_rpa.return_value = BatchSubmitResult(
+            ok=False,
+            batch_id=None,
+            submitted_count=0,
+            submitted_amount=0.0,
+            error_msg="登录第一步失败：timeout",
+            artifacts={"adapter": "simulator_rpa", "screenshot": "/tmp/art/x.png"},
+        )

        adapter = SimulatorBrowserRpaAdapter(artifacts_dir="/tmp/art")
        items = [BatchItem(row_index=1, name="A", account="1", amount=1.0)]
-
-        with patch.object(adapter, "_login", side_effect=RpaError("登录第一步失败：timeout", screenshot_path="/tmp/art/x.png")):
-            result = adapter.submit_batch("acct-demo-001", items)
+        result = await adapter.submit_batch("acct-demo-001", items)

        self.assertFalse(result.ok)
        self.assertIn("登录第一步失败", result.error_msg or "")
-        self.assertEqual(result.artifacts.get("adapter"), "simulator_browser_rpa")
+        self.assertEqual(result.artifacts.get("adapter"), "simulator_rpa")
        self.assertEqual(result.artifacts.get("screenshot"), "/tmp/art/x.png")

+    @patch("service.adapter.simulator_rpa.release_lease")
+    @patch("service.adapter.simulator_rpa.submit_batch_rpa", new_callable=AsyncMock)
+    @patch("service.adapter.simulator_rpa.pick_web_account")
    @patch("service.adapter.simulator_rpa.find_chrome_executable", return_value="C:/Chrome/chrome.exe")
-    @patch("service.adapter.simulator_rpa.browser_session")
-    def test_unexpected_error_includes_adapter_name(self, mock_session: MagicMock, _chrome: MagicMock) -> None:
-        page = MagicMock()
-        mock_cm = MagicMock()
-        mock_cm.__enter__.return_value = page
-        mock_cm.__exit__.return_value = False
-        mock_session.return_value = mock_cm
+    async def test_unexpected_error_includes_adapter_name(
+        self,
+        _chrome: MagicMock,
+        mock_pick: MagicMock,
+        mock_rpa: AsyncMock,
+        _release: MagicMock,
+    ) -> None:
+        mock_pick.return_value = {
+            "profile_dir": "/tmp/profile",
+            "lease_token": "tok",
+        }
+        mock_rpa.side_effect = RuntimeError("boom")

        adapter = SimulatorBrowserRpaAdapter(artifacts_dir=None)
        items = [BatchItem(row_index=1, name="A", account="1", amount=1.0)]
-
-        with patch.object(adapter, "_login", side_effect=RuntimeError("boom")):
-            result = adapter.submit_batch("acct-demo-001", items)
+        result = await adapter.submit_batch("acct-demo-001", items)

        self.assertFalse(result.ok)
        self.assertIn("未预期异常", result.error_msg or "")
-        self.assertEqual(result.artifacts.get("adapter"), "simulator_browser_rpa")
+        self.assertEqual(result.artifacts.get("adapter"), "simulator_rpa")
        self.assertNotIn("screenshot", result.artifacts)


--- a/tests/test_docs_standards.py
+++ b/tests/test_docs_standards.py
@@ -174,6 +174,84 @@ class TestDocsStandards(unittest.TestCase):
        self.assertIn("RpaVideoSession", text)
        self.assertIn("1.0.17", text)

+    def test_rpa_md_forbids_rpa_helpers_import(self) -> None:
+        text = self._read("development/RPA.md")
+        self.assertIn("rpa_helpers", text)
+        self.assertTrue(
+            "不要 import" in text or "不要" in text and "import" in text,
+            msg="RPA.md must document forbidding rpa_helpers import",
+        )
+
+    def test_rpa_md_covers_simulator_playwright_layering(self) -> None:
+        text = self._read("development/RPA.md")
+        self.assertTrue(
+            "simulator_playwright" in text
+            or ("薄 adapter" in text and "playwright.py" in text),
+            msg="RPA.md must describe thin adapter + *_playwright.py layering",
+        )
+
+    def test_rpa_md_covers_industry_simulator_portal(self) -> None:
+        text = self._read("development/RPA.md")
+        self.assertTrue(
+            any(marker in text for marker in ("jc2009", "行业仿真", "门户")),
+            msg="RPA.md must mention jc2009 / industry simulator / portal gate",
+        )
+
+    def test_simulator_example_readme_covers_async_and_account_manager(self) -> None:
+        text = self._read("examples/simulator_browser_rpa/README.md")
+        self.assertIn("async", text.lower())
+        self.assertTrue(
+            "account-manager" in text.lower() or "pick-web" in text or "pick_web_account" in text,
+            msg="simulator_browser_rpa README must mention async and account-manager",
+        )
+
+    def test_development_md_documents_scaffold_and_git_cleanup(self) -> None:
+        text = self._read("development/DEVELOPMENT.md")
+        self.assertTrue(
+            "scaffold_skill" in text or "scaffold_skill.ps1" in text,
+            msg="DEVELOPMENT.md must document scaffold_skill",
+        )
+        self.assertTrue(
+            ("Remove-Item" in text and ".git" in text)
+            or ("删除" in text and ".git" in text),
+            msg="DEVELOPMENT.md must document deleting .git",
+        )
+
+    def test_naming_md_copy_flow_documents_scaffold_or_git_cleanup(self) -> None:
+        text = self._read("development/NAMING.md")
+        self.assertTrue(
+            "scaffold" in text.lower() or ("清理" in text and ".git" in text),
+            msg="NAMING.md §9 must mention scaffold or Git cleanup",
+        )
+
+    def test_scaffold_ps1_exists(self) -> None:
+        path = os.path.join(get_skill_root(), "tools", "scaffold_skill.ps1")
+        self.assertTrue(os.path.isfile(path), msg="tools/scaffold_skill.ps1 must exist")
+
+    def test_guarded_docs_do_not_reference_amazon_implementation(self) -> None:
+        forbidden = (
+            "download-settlement-report-amazon",
+            "amazon_sim",
+            "#amz-email",
+        )
+        guarded_docs = (
+            "development/RPA.md",
+            "development/ADAPTER.md",
+            "development/DEVELOPMENT.md",
+            "development/CONFIG.md",
+            "development/TESTING.md",
+            "examples/README.md",
+            "examples/simulator_browser_rpa/README.md",
+        )
+        for rel in guarded_docs:
+            text = self._read(rel)
+            for fragment in forbidden:
+                self.assertNotIn(
+                    fragment,
+                    text,
+                    msg=f"{rel} must not reference Amazon implementation {fragment!r}",
+                )
+
    def test_adapter_md_covers_four_tiers_and_config_get(self) -> None:
        text = self._read("development/ADAPTER.md")
        for marker in (
--- a/tests/test_no_rpa_helpers_import.py
+++ b/tests/test_no_rpa_helpers_import.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+"""禁止在模板主骨架 scripts/ 中 import account-manager 内部 RPA 辅助模块。"""
+from __future__ import annotations
+
+import os
+import re
+import unittest
+
+from _support import get_skill_root
+
+FORBIDDEN_PATTERNS = (
+    re.compile(r"\brpa_helpers\b"),
+    re.compile(r"\binject_account_manager_scripts_path\b"),
+    re.compile(r"\bget_account_credential\b"),
+)
+
+
+class TestNoRpaHelpersImport(unittest.TestCase):
+    def test_scripts_tree_has_no_forbidden_account_manager_imports(self) -> None:
+        scripts_dir = os.path.join(get_skill_root(), "scripts")
+        violations: list[str] = []
+        for root, _dirs, files in os.walk(scripts_dir):
+            for name in files:
+                if not name.endswith(".py"):
+                    continue
+                rel = os.path.relpath(os.path.join(root, name), scripts_dir)
+                text = open(os.path.join(root, name), encoding="utf-8").read()
+                for pattern in FORBIDDEN_PATTERNS:
+                    if pattern.search(text):
+                        violations.append(f"{rel}: {pattern.pattern}")
+        self.assertEqual(
+            violations,
+            [],
+            msg="Forbidden account-manager internal imports in scripts/:\n" + "\n".join(violations),
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()
--- a/tests/test_scaffold_guard.py
+++ b/tests/test_scaffold_guard.py
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+"""skill-template 脚手架与 Git 防串库守护。"""
+from __future__ import annotations
+
+import os
+import unittest
+
+from _support import get_skill_root
+
+TEMPLATE_MARKER = ".openclaw-skill-template"
+TEMPLATE_SLUG = "your-skill-slug"
+
+
+def _read_skill_slug() -> str:
+    constants_path = os.path.join(get_skill_root(), "scripts", "util", "constants.py")
+    with open(constants_path, encoding="utf-8") as f:
+        for line in f:
+            if line.strip().startswith("SKILL_SLUG"):
+                _, _, value = line.partition("=")
+                return value.strip().strip('"').strip("'")
+    return ""
+
+
+class TestScaffoldGuard(unittest.TestCase):
+    def test_template_repo_has_marker(self) -> None:
+        slug = _read_skill_slug()
+        if slug != TEMPLATE_SLUG:
+            self.skipTest(f"当前 SKILL_SLUG={slug!r}，非模板占位，跳过 template marker 断言")
+        marker = os.path.join(get_skill_root(), TEMPLATE_MARKER)
+        self.assertTrue(
+            os.path.isfile(marker),
+            msg=f"skill-template 源仓库根目录必须存在 {TEMPLATE_MARKER}",
+        )
+
+    def test_business_skill_must_not_keep_template_marker(self) -> None:
+        slug = _read_skill_slug()
+        if slug == TEMPLATE_SLUG:
+            self.skipTest("当前仍为模板占位 slug，由 test_template_repo_has_marker 守护")
+        marker = os.path.join(get_skill_root(), TEMPLATE_MARKER)
+        self.assertFalse(
+            os.path.isfile(marker),
+            msg=(
+                "业务技能不得保留 .openclaw-skill-template；"
+                "请使用 tools/scaffold_skill 或删除标记文件并检查是否误复制了模板 .git"
+            ),
+        )
+
+    def test_development_md_documents_git_cleanup(self) -> None:
+        path = os.path.join(get_skill_root(), "development", "DEVELOPMENT.md")
+        with open(path, encoding="utf-8") as f:
+            text = f.read()
+        self.assertIn(".git", text)
+        self.assertTrue(
+            "scaffold_skill" in text or "scaffold" in text.lower(),
+            msg="DEVELOPMENT.md must document scaffold_skill",
+        )
+        self.assertTrue(
+            "remote" in text.lower() or "git remote" in text.lower(),
+            msg="DEVELOPMENT.md must mention git remote self-check",
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()
--- a/tools/README.md
+++ b/tools/README.md
@@ -0,0 +1,47 @@
+# skill-template 工具
+
+## 推荐：脚手架创建新技能
+
+**不要**用资源管理器整文件夹复制 `skill-template`（会带走隐藏 `.git`，导致 push 串库）。
+
+Windows 首选：
+
+```powershell
+cd D:\OpenClaw\client-commons\skill-template
+.\tools\scaffold_skill.ps1 -Slug my-new-skill -Destination D:\OpenClaw\client-gdcm\my-new-skill
+```
+
+跨平台（Python 3.10+）：
+
+```bash
+python tools/scaffold_skill.py --slug my-new-skill --destination /path/to/my-new-skill
+```
+
+脚本行为：
+
+- 复制模板到 `-Destination`（目录末段须与 `-Slug` 一致）
+- **排除**：`.git`、`.pytest_cache`、`__pycache__`、`.env`、`.env.local`、`*.pyc`
+- 删除目标中的 `.openclaw-skill-template` 标记
+- **不**自动 `git init`；打印后续 Git 与测试命令
+
+目标目录若已存在且非空，需加 `-Force` / `--force`（且目标**不得**含 `.git`）。
+
+## 手工复制后的补救
+
+若已整目录复制，必须先清理再初始化：
+
+```powershell
+cd <新技能目录>
+Remove-Item -Recurse -Force .git
+Remove-Item -Recurse -Force .pytest_cache -ErrorAction SilentlyContinue
+Remove-Item -Force .openclaw-skill-template -ErrorAction SilentlyContinue
+git init
+git remote add origin <新技能仓库 URL>
+git remote -v
+```
+
+确认 `origin` **不是** skill-template 的远端 URL。
+
+## 模板标记
+
+源仓库根目录有 `.openclaw-skill-template`（仅 template 保留）。业务技能不得保留该文件；`tests/test_scaffold_guard.py` 会守护。
--- a/tools/scaffold_skill.ps1
+++ b/tools/scaffold_skill.ps1
@@ -0,0 +1,107 @@
+#Requires -Version 5.1
+<#
+.SYNOPSIS
+  Scaffold a new skill directory from skill-template (excludes .git).
+
+.EXAMPLE
+  .\tools\scaffold_skill.ps1 -Slug my-new-skill -Destination D:\OpenClaw\client-gdcm\my-new-skill
+#>
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true)]
+    [string]$Slug,
+
+    [Parameter(Mandatory = $true)]
+    [string]$Destination,
+
+    [switch]$Force
+)
+
+$ErrorActionPreference = "Stop"
+
+function Test-KebabSlug([string]$Value) {
+    return $Value -match '^[a-z0-9]+(-[a-z0-9]+)*$'
+}
+
+function Write-ScaffoldNextSteps([string]$TargetPath) {
+    Write-Host ""
+    Write-Host "=== 脚手架复制完成 ===" -ForegroundColor Green
+    Write-Host ("目标目录: " + $TargetPath)
+    Write-Host ""
+    Write-Host "请在本机继续执行（未自动 git init，避免误操作）：" -ForegroundColor Yellow
+    Write-Host ('  cd "' + $TargetPath + '"')
+    Write-Host "  Remove-Item -Recurse -Force .git -ErrorAction SilentlyContinue"
+    Write-Host "  git init"
+    Write-Host "  git remote add origin <你的新技能仓库 URL>"
+    Write-Host "  git remote -v"
+    Write-Host "  python tests/run_tests.py -v"
+    Write-Host ""
+}
+
+$TemplateRoot = (Resolve-Path (Join-Path $PSScriptRoot "..")).Path
+$TargetPath = $Destination
+
+if (-not (Test-KebabSlug $Slug)) {
+    throw "Slug must be kebab-case. Got: $Slug"
+}
+
+$leaf = Split-Path -Leaf ($TargetPath.TrimEnd('\', '/'))
+if ($leaf -ne $Slug) {
+    throw "Destination leaf '$leaf' must match -Slug '$Slug'."
+}
+
+$parent = Split-Path -Parent $TargetPath
+if (-not $parent -or -not (Test-Path -LiteralPath $parent)) {
+    throw "Parent directory does not exist: $parent"
+}
+
+$gitPath = Join-Path $TargetPath ".git"
+if (Test-Path -LiteralPath $gitPath) {
+    throw "Target already has .git at $gitPath . Remove it first or use an empty destination."
+}
+
+$targetExists = Test-Path -LiteralPath $TargetPath
+if ($targetExists) {
+    $entries = @(Get-ChildItem -LiteralPath $TargetPath -Force -ErrorAction SilentlyContinue)
+    if ($entries.Count -gt 0 -and -not $Force) {
+        throw "Target exists and is not empty: $TargetPath . Use -Force or pick an empty directory."
+    }
+}
+
+$excludeDirs = @(".git", ".pytest_cache", "__pycache__")
+$excludeFiles = @(".env", ".env.local")
+
+function Copy-TemplateTree {
+    param(
+        [string]$Source,
+        [string]$Dest
+    )
+    if (-not (Test-Path -LiteralPath $Dest)) {
+        New-Item -ItemType Directory -Path $Dest -Force | Out-Null
+    }
+    Get-ChildItem -LiteralPath $Source -Force | ForEach-Object {
+        $name = $_.Name
+        if ($excludeDirs -contains $name) { return }
+        if ($excludeFiles -contains $name) { return }
+        if ($name -like "*.pyc") { return }
+
+        $srcPath = $_.FullName
+        $dstPath = Join-Path $Dest $name
+        if ($_.PSIsContainer) {
+            Copy-TemplateTree -Source $srcPath -Dest $dstPath
+        }
+        else {
+            Copy-Item -LiteralPath $srcPath -Destination $dstPath -Force
+        }
+    }
+}
+
+Write-Host "Copy template: $TemplateRoot -> $TargetPath" -ForegroundColor Cyan
+Copy-TemplateTree -Source $TemplateRoot -Dest $TargetPath
+
+$marker = Join-Path $TargetPath ".openclaw-skill-template"
+if (Test-Path -LiteralPath $marker) {
+    Remove-Item -LiteralPath $marker -Force
+}
+
+Write-ScaffoldNextSteps -TargetPath (Resolve-Path -LiteralPath $TargetPath).Path
--- a/tools/scaffold_skill.py
+++ b/tools/scaffold_skill.py
@@ -0,0 +1,106 @@
+#!/usr/bin/env python3
+"""跨平台 skill-template 脚手架（与 scaffold_skill.ps1 行为一致）。"""
+from __future__ import annotations
+
+import argparse
+import re
+import shutil
+import sys
+from pathlib import Path
+
+EXCLUDE_DIR_NAMES = {".git", ".pytest_cache", "__pycache__"}
+EXCLUDE_FILE_NAMES = {".env", ".env.local"}
+KEBAB_SLUG = re.compile(r"^[a-z0-9]+(-[a-z0-9]+)*$")
+
+
+def _ignore_copy(_dir: str, names: list[str]) -> set[str]:
+    ignored: set[str] = set()
+    for name in names:
+        if name in EXCLUDE_DIR_NAMES or name in EXCLUDE_FILE_NAMES:
+            ignored.add(name)
+        elif name.endswith(".pyc"):
+            ignored.add(name)
+    return ignored
+
+
+def _print_next_steps(target: Path) -> None:
+    print()
+    print("=== 脚手架复制完成 ===")
+    print(f"目标目录: {target}")
+    print()
+    print("请在本机继续执行（未自动 git init，避免误操作）：")
+    print(f'  cd "{target}"')
+    print("  Remove-Item -Recurse -Force .git -ErrorAction SilentlyContinue   # 若曾手工复制漏删")
+    print("  git init")
+    print("  git remote add origin <你的新技能仓库 URL>")
+    print("  git remote -v    # 确认 remote 不是 skill-template")
+    print("  python tests/run_tests.py -v")
+    print()
+
+
+def main(argv: list[str] | None = None) -> int:
+    parser = argparse.ArgumentParser(description="从 skill-template 脚手架复制新技能目录")
+    parser.add_argument("--slug", required=True, help="kebab-case slug，须与目标目录名一致")
+    parser.add_argument("--destination", required=True, help="新技能完整目标路径")
+    parser.add_argument("--force", action="store_true", help="目标非空时允许覆盖（目标不得含 .git）")
+    args = parser.parse_args(argv)
+
+    slug = args.slug.strip()
+    if not KEBAB_SLUG.match(slug):
+        print(f"ERROR: Slug 必须是 kebab-case，当前: {slug}", file=sys.stderr)
+        return 1
+
+    target = Path(args.destination).resolve()
+    if target.name != slug:
+        print(
+            f"ERROR: 目标目录末段 '{target.name}' 与 slug '{slug}' 不一致。",
+            file=sys.stderr,
+        )
+        return 1
+
+    parent = target.parent
+    if not parent.is_dir():
+        print(f"ERROR: 父目录不存在: {parent}", file=sys.stderr)
+        return 1
+
+    if (target / ".git").exists():
+        print(
+            f"ERROR: 目标已存在 .git，请先删除: {target / '.git'}",
+            file=sys.stderr,
+        )
+        return 1
+
+    template_root = Path(__file__).resolve().parent.parent
+    if target.exists():
+        entries = list(target.iterdir())
+        if entries and not args.force:
+            print(
+                f"ERROR: 目标目录已存在且非空: {target}\n请加 --force 或换空目录。",
+                file=sys.stderr,
+            )
+            return 1
+
+    target.mkdir(parents=True, exist_ok=True)
+    print(f"复制模板: {template_root} -> {target}")
+    for item in template_root.iterdir():
+        name = item.name
+        if name in EXCLUDE_DIR_NAMES or name in EXCLUDE_FILE_NAMES:
+            continue
+        if name.endswith(".pyc"):
+            continue
+        dest = target / name
+        if item.is_dir():
+            shutil.copytree(item, dest, ignore=_ignore_copy, dirs_exist_ok=True)
+        else:
+            shutil.copy2(item, dest)
+
+    marker = target / ".openclaw-skill-template"
+    if marker.is_file():
+        marker.unlink()
+
+    _print_next_steps(target)
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())