snapshot-checker 0.8.3 → 0.8.7

package/README.md

@@ -4,33 +4,15 @@
 
 **主场景为 `report`**：按 checkpoint 风险目标采集 trace/perf，可选 hstack 与 sourcemap 解析，输出 `dump_stack.*`。
 
-**0.7.0 相对 0.6.x 的破坏性变更**
+---
 
-- `report` 默认 `--trace-from` 由 `hitrace` 改为 **`mix`**（采集默认带 `--raw-data`，analysis 默认预处理 hitrace 并使用 **perfFirst** sidecar）。
-- 日志格式统一为行首 `[ISO8601] {级别} {正文}`（无 consola 颜色）。
-- 依赖升级：`hiperf_txt_parser` 2.0、`hm-pt-core` 1.0、`hmtrace-parser` 0.8；analysis trace 解码改由 pipeline 编排；公共类型与 trace 机制自 `hm-pt-core` 导入。
-- 若需与 0.6.x 相同默认行为，显式传入 `--trace-from hitrace`。
+## 安装
 
-**前置条件**
+### 前置条件
 
 - **Node.js** ≥ 18。
 - PATH 中可用 **`hdc`**，并已连接目标设备。
-- 本机 analysis 依赖 **`hiperf_txt_parser` ^2.0**、**`hm-pt-core` ^1.0**、**`hmtrace-parser` ^0.8**（随 `npm install` 安装）：hitrace 预处理与索引由 hmtrace 构建，公共类型与 trace 机制由 hm-pt-core 提供，样本级并行解码与 hitrace 合并由 hiperf 完成。
-
-## 架构与 hmcommand-runner
-
-自 **0.8.x** 起，命令调度与执行引擎已提取为独立 npm 包 **[`hmcommand-runner`](https://www.npmjs.com/package/hmcommand-runner)**（`1.0.0`）：
-
-| 层级 | 包 / 目录 | 职责 |
-|------|-----------|------|
-| 执行框架 | `hmcommand-runner` | `CommandDef` 类型、组调度（`group:N`）、Shell/Builtin/Embed Runner、通用 CLI 注册器 |
-| 领域场景 | `commands/`、`src/lib/presets.ts` 等 | forkall/report 场景、hdc/hiperf/hitrace 命令拼装与解码 |
-
-`snapshot-checker` 的公开 API（`resolveScenario`、`runScenarioGroups`、`executeAll` 等）继续从主包 re-export，现有 `import from 'snapshot-checker'` 的代码无需修改。若只需通用命令编排框架，可直接依赖 `hmcommand-runner`。
-
----
-
-## 安装
+- 本机 analysis 依赖 **`hiperf_txt_parser` ^2.2**、**`hm-pt-core` ^2.0**、**`hmtrace-parser` ^0.9**（随 `npm install` 安装）：hitrace 预处理与索引由 hmtrace 构建，公共类型与 trace 机制由 hm-pt-core 提供，样本级并行解码与 hitrace 合并由 hiperf 完成。
 
 ### 直接安装（推荐）
 
@@ -60,6 +42,8 @@ npm start -- report --help          # 或: node dist/src/cli.js report --help
 npm run dev -- report --help
 ```
 
+独立二进制（`npm run build:bin`）与 npm 全局安装共用同一套命令注册；版本号均来自 `package.json`（pkg 构建时注入 `HYPER_STARTUP_CHECKER_BUNDLED_VERSION`）。
+
 ---
 
 ## `report` 命令
@@ -81,7 +65,7 @@ checkpoint 镜像失效等风险的专项采集与分析。按 `--risk-targets`
 
 ### analysis 阶段 trace 解码
 
-analysis 通过 `src/lib/pipeline.ts` 的 pipeline 执行，trace 解码由 `src/lib/perf_decode.ts` 编排（不再在 checker 内逐样本循环）：
+analysis 通过 `src/lib/report/pipeline.ts` 的 pipeline 执行，trace 解码由 `src/lib/report/decode.ts` 编排（不再在 checker 内逐样本循环）：
 
 1. 按 `--trace-format-profile`（或 `auto` 时从设备读取的 format）构建 trace registry。
 2. 若 `--trace-from` 为 `hitrace` 或 `mix`：主线程一次调用 `hmtrace-parser` 的 `buildHitraceIndexSnapshot` 解析 `workspace/hyperstart_hitrace.txt`。
@@ -110,7 +94,7 @@ analysis 通过 `src/lib/pipeline.ts` 的 pipeline 执行，trace 解码由 `src
 
 | 选项 | 说明 |
 | ---- | ---- |
-| `--app <app>` | 应用包名 |
+| `--app <app>` | 应用包名（**`--list` / `--dry-run` / 正式执行均必填**） |
 | `--risk-targets <targets>` | 风险事件类型，默认 `all` |
 | `--trace-from <source>` | **采集**：hiperf record 是否 `--raw-data`（`mix` 默认带，`hiperf` 带，`hitrace` 不带）。**analysis**：是否预处理 hitrace 及 sidecar 策略（见上表）；与 `--trace-format-profile` 独立 |
 | `--hstack-tool-path <path>` | hstack 可执行文件；不配置则跳过 |
@@ -127,13 +111,16 @@ analysis 通过 `src/lib/pipeline.ts` 的 pipeline 执行，trace 解码由 `src
 | `--skip-non-backtrack` | `backtrackFS` 使用 `keepNonFsRevoked: false` |
 | `--drop-failed-samples` | 丢弃无 trace 解析器的 raw 样本 |
 
-**全局选项**（对各子命令均生效）
+**全局选项**（对各子命令均生效；完整说明见下文「Agent 闭环」）
 
 | 选项 | 说明 |
 | ---- | ---- |
 | `--hdc-target <sn>` | 全部 `hdc` 命令加 `-t <sn>` |
 | `--parse-concurrency <n>` | perf **加载**与 **trace 解码** 的 Worker 数，默认 `1`；`profile=auto` 且 format 含主线程 `transformFieldDict` 时解码回退单线程 |
+| `--output-format <text\|json>` | CLI 结果格式，默认 `text` |
+| `--log-level <level>` | 覆盖环境变量中的默认日志级别 |
 | `--log-file [path]` | 日志追加写文件；省略 path 时写入 `<output-dir>/workspace/checker.log` |
+| `--continue-on-error` | 忽略失败并继续后续阶段（默认遇错即停） |
 
 ### 使用方式
 
@@ -160,7 +147,7 @@ analysis 通过 `src/lib/pipeline.ts` 的 pipeline 执行，trace 解码由 `src
 **`--list` 输出格式**（节选）：
 
 ```text
-[report] 场景命令（按 group 展示）:
+[report] 命令套件（按 group 展示）:
 
 Group: init
     [mac] hdc shell remount — hdc shell remount
@@ -190,12 +177,15 @@ Group: monitor
 
 ```text
 output/
+├── plan.json               # plan 命令生成（执行前）
+├── run_manifest.json       # apply 写入（执行状态）
 ├── dump_stack.txt          # 最终调用栈（文本）
-├── dump_stack.json         # 同上（JSON）
+├── dump_stack.json         # 同上（JSON）；validate 必需
 ├── dump_stack.xlsx         # 同上（Excel）
 ├── perf_txt/
 │   └── hyperstart_perf.data.txt    # 设备 hiperf dump 文本
 └── workspace/              # 中间产物
+    ├── checker.log           # --log-file 默认路径
     ├── hyperstart_log.txt    # hilog 采集
     ├── hyperstart_hitrace.txt
     ├── perf.data
@@ -275,6 +265,17 @@ snapshot-checker report --app com.example.app \
   --sourcemap-dir /path/to/sourcemaps
 ```
 
+**相机应用完整采集（`hitrace` + `rls` profile）**
+
+```bash
+snapshot-checker report --app com.huawei.hmos.camera --output-dir .\output_camera --trace-format-profile rls --risk-targets all --backtrack-delay 75 --duration 75 --log-file --parse-concurrency 1 --log-key "pid" --trace-from hitrace --skip-backtrack
+```
+
+- `--trace-from hitrace`：采集不带 `--raw-data`，analysis 使用 **hitraceFirst** sidecar（与 0.6.x 默认一致）。
+- `--trace-format-profile rls`：使用 RLS trace 解码 profile。
+- `--skip-backtrack`：跳过 `backtrackFS` 后处理；`--backtrack-delay` / `--duration` 均为 75 秒。
+- `--log-file`：日志写入 `.\output_camera\workspace\checker.log`（Windows 路径写法；Unix 可改为 `./output_camera`）。
+
 **正式采集（需已连接 hdc 设备）**
 
 ```bash
@@ -285,6 +286,20 @@ snapshot-checker report --app com.example.app --output-dir ./output
 
 **常见错误**
 
+缺 `--app`（退出码 `2`）：
+
+```bash
+snapshot-checker report --dry-run
+# ERROR_MISSING_APP: report requires --app <bundle_name>.
+```
+
+未知 `--group`（退出码 `2`，json 模式含 `available_groups`）：
+
+```bash
+snapshot-checker report --dry-run --app com.example.app --group missing
+# UNKNOWN_GROUP: Group 'missing' does not exist.
+```
+
 无效 `--trace-from` 值会直接报错并退出，例如：
 
 ```bash
@@ -308,57 +323,179 @@ snapshot-checker report-user --dry-run --app com.example.app --ability EntryAbil
 
 ---
 
-## `forkall` 命令（已过时）
+## Agent 闭环
 
-> **已过时**：请改用 `report`。`forkall` 仅保留兼容，后续可能移除。
+`snapshot-checker --help` 除命令套件子命令 `report`、`report-user` 外，还提供下列**顶层命令**（`report` 与 `report-user` 输出目录结构一致，闭环命令不按套件嵌套）：
 
-针对单一 `--event-path` 做监控或「改配置后重启再采」。支持 `--mode monitor`（默认）与 `reboot-monitor`。详见 `snapshot-checker forkall --help` 或 `commands/forkall.ts`。
+| 命令 | 说明 |
+| ---- | ---- |
+| `preflight` | 运行前环境检查（Node、hdc、设备、应用、输出目录、命令套件权限等） |
+| `plan` | 生成可保存的执行计划 `plan.json`（不连设备、不执行）；默认 `--command-suite report` |
+| `apply` | 按 `plan.json` 执行采集与分析，写入 `run_manifest.json`；采用 plan 中 `execution_options` 与 `global_options`，不可覆盖（不一致时退出码 `2` / `PLAN_OPTION_OVERRIDE`） |
+| `status` | 读取 `run_manifest.json` 执行状态 |
+| `validate` | 验收 `output-dir` 产物（必需 `dump_stack.json`） |
+
+**推荐 Agent 顺序**：`preflight` → `plan` → `apply` → `status` → `validate`。详细契约见 [`skills/snapshot-checker/SKILL.md`](skills/snapshot-checker/SKILL.md)。
 
 ```bash
-snapshot-checker forkall --event-path checkpoint/vfs_snapshot_dump_monitor --app com.example.app
+snapshot-checker preflight --app com.example.app --output-dir ./output --output-format json
+snapshot-checker plan --command-suite report --app com.example.app --output-dir ./output --output-format json
+snapshot-checker apply --plan ./output/plan.json --output-format json
+snapshot-checker status --output-dir ./output --output-format json
+snapshot-checker validate --output-dir ./output --output-format json
 ```
 
----
+### 全局选项
 
-## 测试
+对各子命令均生效（含顶层命令与 `report` / `report-user`）：
+
+| 选项 | 说明 |
+| ---- | ---- |
+| `--output-format <text\|json>` | CLI 结果写出格式，默认 `text`；**与 `--output-dir`（采集产物目录）无关** |
+| `--log-level <level>` | 日志级别；未设则读环境变量，默认 `info` |
+| `--log-file [path]` | 日志追加写文件；省略 path 时写入 `<output-dir>/workspace/checker.log` |
+| `--hdc-target <sn>` | 全部 `hdc` 命令加 `-t <sn>` |
+| `--parse-concurrency <n>` | perf 加载与 trace 解码 Worker 数，默认 `1` |
+
+### `--output-format json`
+
+- **stdout**：仅一行 JSON（含 `schema_version: "1"`、`ok`、命令结果或 `error.code`）。
+- **stderr**：结构化日志与进度；自动设置 `NO_COLOR=1`。
+- 适用于 `--list`、`--dry-run`、正式执行，以及 `preflight` / `plan` / `apply` / `status` / `validate`。
+
+### 退出码
+
+| 退出码 | 含义 |
+| ------ | ---- |
+| `0` | 成功 |
+| `1` | 执行失败、验收失败、preflight 有 `fail` 检查项 |
+| `2` | 参数/契约错误（如缺 `--app`、未知 `--group`、Shell 参数非法、plan 文件无效或摘要不匹配） |
+
+常见 `error.code`：`ERROR_MISSING_APP`、`ERROR_MISSING_ABILITY`、`UNKNOWN_GROUP`、`INVALID_IDENTIFIER`、`INVALID_NUMERIC`、`INVALID_PATH`、`PLAN_CHANGED`、`PLAN_VERSION_MISMATCH`、`PLAN_OPTION_OVERRIDE`、`PLAN_NOT_FOUND`、`MANIFEST_NOT_FOUND`、`MANIFEST_INVALID_JSON`、`MANIFEST_INVALID`、`MANIFEST_UNSUPPORTED_SCHEMA`。完整列表见 [`skills/snapshot-checker/references/error_codes.md`](skills/snapshot-checker/references/error_codes.md)。
+
+### 环境变量
+
+| 变量 | 说明 |
+| ---- | ---- |
+| `HYPER_STARTUP_CHECKER_LOG_LEVEL` | 默认日志级别（优先于 `LOG_LEVEL`） |
+| `HYPER_STARTUP_CHECKER_BUNDLED_VERSION` | pkg 二进制嵌入版本（构建注入） |
+| `NO_COLOR` / `FORCE_COLOR` | 控制台颜色 |
+
+旧名 `SNAPSHOT_CHECKER_LOG_LEVEL`、`SNAPSHOT_CHECKER_BUNDLED_VERSION` 仍可读，建议迁移至上表新名。
+
+### Agent 调用与评测
+
+Agent 相关能力已接入 CLI 与测试；**契约细节以 Skill 为准**，上文提供速查。
+
+- 技能文档：[`skills/snapshot-checker/SKILL.md`](skills/snapshot-checker/SKILL.md)
+- 集成说明：[`skills/INTEGRATION.md`](skills/INTEGRATION.md)
+- 端到端评测：`tests/agent_e2e.test.ts`（仅解析 JSON 与退出码，无需真实设备）
+- 安全与 Plan 完整性：`tests/shell_identifiers.test.ts`、`tests/shell_params.test.ts`、`tests/plan_integrity.test.ts`
 
 ```bash
-npm test              # 单元与集成
-npm run test:perf     # 性能回归
-npm run test:all      # 全部
-npm run format        # Prettier 格式化 src / commands / tests / demos
-npm run format:check  # 仅检查格式（CI 可用）
+npm run test -- tests/agent_e2e.test.ts
 ```
 
+离线预览计划（无需设备）：
+
+```bash
+snapshot-checker plan --command-suite report --app com.example.app --output-dir ./output --output-format json
+# 等价：snapshot-checker report --dry-run --app com.example.app --output-format json
+```
+
+---
+
+## 架构与 hmcommand-runner
+
+自 **0.8.x** 起，命令调度与执行引擎已提取为独立 npm 包 **[`hmcommand-runner`](https://www.npmjs.com/package/hmcommand-runner)**（当前依赖 `^1.3.2`）：
+
+| 层级 | 包 / 目录 | 职责 |
+|------|-----------|------|
+| 执行框架 | `hmcommand-runner` | `CommandDef` 类型、组调度（`group:N`）、Shell/Builtin/Embed Runner、`registerCommandSuites` |
+| 领域命令套件 | `src/commands/`、`src/lib/report/` 等 | report/report-user 命令套件、hdc/hiperf/hitrace 命令拼装与解码 |
+
+`snapshot-checker` 的公开 API（`resolveCommandSuite`、`runCommandSuiteGroups`、`executeAll` 等）从主包 re-export（底层委托 `hmcommand-runner`）。npm 仍可通过 `snapshot-checker/commands/report` 引用命令套件模块。若只需通用命令编排框架，可直接依赖 `hmcommand-runner`。
+
+---
+
 ## 作为库使用
 
 ```ts
-import { resolveScenario, runScenarioGroups } from "snapshot-checker";
+import { resolveCommandSuite, runCommandSuiteGroups } from "snapshot-checker";
 import * as report from "snapshot-checker/commands/report";
 
 // dryRun: true 与 CLI --dry-run 相同，applyOptions 不会创建 outputDir
-const { groups, defaultGroupOrder } = resolveScenario(
+const { groups, defaultGroupOrder } = resolveCommandSuite(
   report,
   { app: "com.example.app", riskTargets: "all", dryRun: true },
   { hdcTarget: "DEVICE01" },
 );
 
-await runScenarioGroups({ groups, defaultGroupOrder, stopOnError: true });
+await runCommandSuiteGroups({ groups, defaultGroupOrder });
 ```
 
-独立示例：`demos/consumer-app`（见该目录 `README.md`）。
+默认遇错即停；需忽略失败继续时传 `stopOnError: false`。
 
 ---
 
-## CLI 场景框架
+## CLI 命令套件框架
+
+本工具将 `src/commands/*.ts` 静态注册为子命令，并由顶层命令提供 Agent 闭环（见「Agent 闭环」）。每个命令套件导出 **`groups`**、**`defaultGroupOrder`**，可选 **`options`** 与 **`applyOptions(opts)`**。
+
+- **`src/commands/`**：设备联调命令套件，**`report`**（主套件）、**`report-user`**（无 hidumper/revoke_switch 权限）。
+- **`src/lib/`**：领域实现（如 `lib/report/decode.ts`、`lib/report/pipeline.ts`、`lib/report/command_suite.ts`）；调度类型与执行器来自 **`hmcommand-runner`**。
+
+`plan.json` 主要字段：`command_suite`、`command_suite_options`、`commands`、`commands_digest`、`execution_options`（如 `ignorePlatform`）、`tool_version`；`plan --output-format json` 的 stdout 含 `ok: true`、`command: "plan"`。`run_manifest.json` 与 preflight JSON 中套件标识同为 `command_suite`。
 
-本工具按命名场景（`commands/*.ts`、`demos/*.ts`）注册子命令。每个场景导出 **`groups`**、**`defaultGroupOrder`**，可选 **`options`** 与 **`applyOptions(opts)`**。
+命令套件子命令通用开关：`--list`、`--dry-run`、`-g,--group`、`--wait`、`--silent`、`--continue-on-error` 等。完整列表见 `snapshot-checker <command> --help`。
 
-- **`commands/`**：设备联调场景，主场景 **`report`**、**`report-user`**（无 hidumper/revoke_switch 权限）；**`forkall`** 已过时（analysis 默认 `--trace-from mix`）。
-- **`demos/`**：示例场景（`context-demo`、`timeout-demo` 等）。
-- **`src/`**：实现采用 **下划线** 源文件名（如 `group_specs.ts`、`run_command.ts`、`lib/perf_decode.ts`、`runners/platform_shell_executor.ts`）。
+---
+
+## 测试
+
+```bash
+npm test              # 单元与集成
+npm run test:perf     # 性能回归
+npm run test:all      # 全部
+npm run format        # Prettier 格式化 src / tests
+npm run format:check  # 仅检查格式（CI 可用）
+```
+
+Agent 相关测试见上文「Agent 闭环 → Agent 调用与评测」。
+
+---
+
+## 更新说明
+
+### 0.8.6 依赖升级
+
+- **`hmtrace-parser` ^0.9.0**：内置 profile 统一为 `rls`（`default` 为其别名）；`checkpoint_revoked` 字段改为 `checkpoint_monitor_id` / `revoke_reason`，FS 类型自动展开 `revoke_reason`；`vfs_snapshot_dump_monitor` 支持 `op_flag` 可读化。CLI 行为不变，仍通过 `--trace-format-profile rls` 选用该 profile。
+
+### 0.8.5 依赖升级
+
+- **`hm-pt-core` ^2.0**：`RecordSample.id` / `time` / `stream_id` / `period` 统一为 `bigint`，与 hiperf 2.1+ 对齐；hiperf / hmtrace 均复用该类型，pipeline 不再需要类型断言。
+- **`hiperf_txt_parser` ^2.2**：依赖 hm-pt-core 2.0；fieldDict 解码后 raw 行改为键值展示，测试侧用保留 hex raw 的 fixture 模拟「perf 已解码」场景。
+- **`hmtrace-parser` ^0.8.3**、**`hmcommand-runner` ^1.3.2**：小版本对齐，无 CLI 行为变更。
+
+### 0.7.0 相对 0.6.x 的破坏性变更
+
+- `report` 默认 `--trace-from` 由 `hitrace` 改为 **`mix`**（采集默认带 `--raw-data`，analysis 默认预处理 hitrace 并使用 **perfFirst** sidecar）。
+- 日志格式统一为行首 `[ISO8601] {级别} {正文}`（无 consola 颜色）。
+- 依赖升级：`hiperf_txt_parser` 2.0、`hm-pt-core` 1.0、`hmtrace-parser` 0.8；analysis trace 解码改由 pipeline 编排；公共类型与 trace 机制自 `hm-pt-core` 导入。
+- 若需与 0.6.x 相同默认行为，显式传入 `--trace-from hitrace`。
 
-通用开关（各场景子命令可用）：`--list`、`--dry-run`、`--stop-on-error`、`-g,--group`、`--wait`、`--silent` 等。完整列表见 `snapshot-checker <scene> --help`。
+### 0.8.x Agent-friendly 变更（相对早期 0.8）
+
+- **统一 CLI 入口**：npm 与 pkg 独立二进制共用 `src/cli.ts`，能力一致（含 `report-user`、`--list`、`--dry-run`、顶层闭环命令）。
+- **默认 fail-fast**：命令套件执行遇错即停；需继续时使用 `--continue-on-error`（`--stop-on-error` 为同义显式写法）。失败时仍会补跑 `restore` 组。
+- **参数校验**：`report` / `report-user` / `plan` 要求非空 `--app`；未知 `--group` 返回退出码 `2` 与稳定错误码（如 `ERROR_MISSING_APP`、`UNKNOWN_GROUP`）。
+- **Shell 安全边界**：进入 Shell 或重定向的参数经统一校验——标识符白名单（`--app`、`--ability`、`--log-key`、`--hitrace-tag`、`--hdc-target` 等 → `INVALID_IDENTIFIER`）；数值纯整数解析（`--duration`、`--buffer-size` → `INVALID_NUMERIC`）；路径拒绝 Shell 元字符（`--output-dir`、`--hstack-tool-path`、`--sourcemap-dir` → `INVALID_PATH`）。
+- **Plan 完整性**：`plan.json` 含 `commands_digest` 与 `execution_options`（如 `ignorePlatform`）；`apply` 校验存储 commands 与重新生成 commands 的双摘要，并**始终**采用 plan 保存的执行选项与全局选项（与 plan 不一致的 `apply --ignore-platform`、`--hdc-target`、`--parse-concurrency` 返回 `PLAN_OPTION_OVERRIDE`，需重新 `plan`）；`0.x` 版本兼容比较 major+minor。
+- **机器可读输出**：全局 `--output-format json`（与采集目录 `--output-dir` 无关）；json 模式下 **stdout 仅 JSON**，日志写 **stderr**。
+- **顶层闭环命令**：`preflight`、`plan`、`apply`、`status`、`validate`（详见「Agent 闭环」）。
+- **环境变量**：`HYPER_STARTUP_CHECKER_LOG_LEVEL`、`HYPER_STARTUP_CHECKER_BUNDLED_VERSION`（旧名 `SNAPSHOT_CHECKER_*` 仍可读）。
+- **CommandSuite 命名**（依赖 `hmcommand-runner@^1.3.0`）：原 `Scenario*` API 与 JSON 字段 `scenario` / `scenario_options` 分别改为 `CommandSuite*`、`command_suite` / `command_suite_options`；`plan` / `preflight` 使用 `--command-suite`。
+- **命令套件源码位置**：`report` / `report-user` 定义迁至 `src/commands/`，CLI 静态注册（不再扫描目录动态加载）。
 
 ### License
 

package/dist/src/cli.d.ts

@@ -1,3 +1,12 @@
 #!/usr/bin/env node
-export {};
+import type { Command } from "commander";
+export declare function createHyperStartUpCheckerProgram(): Command;
+export interface RunHyperStartUpCheckerCliOptions {
+    /** 是否在解析前执行 pkg 二进制 preflight（默认 true） */
+    preflight?: boolean;
+    /** 自定义 argv，默认 `process.argv` */
+    argv?: readonly string[];
+}
+/** 注册场景子命令并解析 CLI（npm 与独立二进制共用）。 */
+export declare function runHyperStartUpCheckerCli(options?: RunHyperStartUpCheckerCliOptions): Promise<void>;
 //# sourceMappingURL=cli.d.ts.map

package/dist/src/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":""}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":";AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAgDzC,wBAAgB,gCAAgC,IAAI,OAAO,CAoC1D;AAED,MAAM,WAAW,gCAAgC;IAC/C,0CAA0C;IAC1C,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iCAAiC;IACjC,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1B;AAED,oCAAoC;AACpC,wBAAsB,yBAAyB,CAC7C,OAAO,GAAE,gCAAqC,GAC7C,OAAO,CAAC,IAAI,CAAC,CAgGf"}

package/dist/src/cli.js

@@ -1,13 +1,19 @@
 #!/usr/bin/env node
 import { program, Option } from "commander";
-import { dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
-import { registerScenarios, } from "hmcommand-runner/cli";
+import { registerCommandSuites } from "hmcommand-runner/cli";
 import { setLoggerHooks, setGlobalLogLevelFromCli as setRunnerLogLevelFromCli, registerLogFilePathForTee, } from "hmcommand-runner";
-import { attachLoggerFileSink, createModuleLogger, resolveLogDumpPath, restoreBaselineLogLevel, setGlobalLogLevelFromCli, SNAPSHOT_CHECKER_LOG_LEVEL_CHOICES, } from "./logger.js";
-import { buildApplyOptionsInput } from "./lib/scenario_globals.js";
-import { formatInvocationCommandLine, readSnapshotCheckerVersion, } from "./lib/version.js";
-const cliModuleDir = dirname(fileURLToPath(import.meta.url));
+import { REPORT_GUARANTEED_ON_FAILURE_GROUP_NAMES } from "./lib/command_suite/runner.js";
+import * as reportMod from "./commands/report.js";
+import * as reportUserMod from "./commands/report-user.js";
+import { attachLoggerFileSink, createModuleLogger, resolveLogDumpPath, restoreBaselineLogLevel, setGlobalLogLevelFromCli, HYPER_STARTUP_CHECKER_LOG_LEVEL_CHOICES, } from "./logger.js";
+import { buildApplyOptionsInput } from "./lib/command_suite/globals.js";
+import { formatInvocationCommandLine, readHyperStartUpCheckerVersion, SNAPSHOT_CHECKER_CLI_NAME, } from "./lib/cli/version.js";
+import { runBinaryPreflight } from "./lib/preflight/preflight.js";
+import { handleCliFatalError } from "./lib/cli/fatal.js";
+import { collectReportOutputArtifacts, resolveOutputFormatFromCli, } from "./lib/cli/output.js";
+import { clearPendingCommandSuiteError, takePendingCommandSuiteError } from "./lib/execution/execution_error.js";
+import { registerPreflightCommand } from "./lib/preflight/register_preflight.js";
+import { registerExecutionCommands } from "./lib/execution/register_execution.js";
 const cliLogger = createModuleLogger(import.meta.url);
 setLoggerHooks({
     onQuietSilentAttach: () => {
@@ -20,46 +26,58 @@ setLoggerHooks({
         setGlobalLogLevelFromCli(level);
     },
 });
-program
-    .name("snapshot-checker")
-    .description("顺序执行 bat / mac / shell 命令")
-    .version(readSnapshotCheckerVersion())
-    .configureHelp({ showGlobalOptions: true })
-    .addOption(new Option("--log-level <level>", "日志级别；未设则读 SNAPSHOT_CHECKER_LOG_LEVEL / LOG_LEVEL，默认 info").choices([...SNAPSHOT_CHECKER_LOG_LEVEL_CHOICES]))
-    .addOption(new Option("--log-file [path]", "日志与子进程输出追加写文件；省略 path 则 <output-dir>/workspace/checker.log"))
-    .addOption(new Option("--hdc-target <sn>", "hdc -t 目标设备序列号；指定后全部 hdc 命令带 -t"))
-    .addOption(new Option("--parse-concurrency <n>", "hiperf_txt_parser 解析/解码/写回并发 Worker 数，默认 1（串行，无 Worker 开销）").default(1));
-async function main() {
-    await registerScenarios({
-        program: program,
-        scenarioDirs: [
+export function createHyperStartUpCheckerProgram() {
+    return program
+        .name(SNAPSHOT_CHECKER_CLI_NAME)
+        .description("顺序执行 bat / mac / shell 命令")
+        .version(readHyperStartUpCheckerVersion())
+        .configureHelp({ showGlobalOptions: true })
+        .addOption(new Option("--log-level <level>", "日志级别；未设则读 HYPER_STARTUP_CHECKER_LOG_LEVEL / LOG_LEVEL，默认 info").choices([...HYPER_STARTUP_CHECKER_LOG_LEVEL_CHOICES]))
+        .addOption(new Option("--log-file [path]", "日志与子进程输出追加写文件；省略 path 则 <output-dir>/workspace/checker.log"))
+        .addOption(new Option("--hdc-target <sn>", "hdc -t 目标设备序列号；指定后全部 hdc 命令带 -t"))
+        .addOption(new Option("--parse-concurrency <n>", "hiperf_txt_parser 解析/解码/写回并发 Worker 数，默认 1（串行，无 Worker 开销）").default(1))
+        .addOption(new Option("--output-format <format>", "CLI 结果写出格式（stdout）；与采集产物目录 --output-dir 无关：text（默认）或 json").choices(["text", "json"]));
+}
+/** 注册场景子命令并解析 CLI（npm 与独立二进制共用）。 */
+export async function runHyperStartUpCheckerCli(options = {}) {
+    const { preflight = true, argv = process.argv } = options;
+    if (preflight) {
+        runBinaryPreflight(argv.slice(2));
+    }
+    const rootProgram = createHyperStartUpCheckerProgram();
+    registerPreflightCommand(rootProgram);
+    registerExecutionCommands(rootProgram, argv);
+    await registerCommandSuites({
+        program: rootProgram,
+        commandSuiteModules: [
             {
-                dirPath: join(cliModuleDir, "..", "commands"),
-                displayPrefix: "commands",
+                commandName: "report",
+                module: reportMod,
+                displayPath: "commands/report.ts",
             },
             {
-                dirPath: join(cliModuleDir, "..", "demos"),
-                displayPrefix: "demos",
+                commandName: "report-user",
+                module: reportUserMod,
+                displayPath: "commands/report-user.ts",
             },
         ],
-        mergeScenarioOptions: (scenarioOpts, globals) => buildApplyOptionsInput(scenarioOpts, {
+        mergeCommandSuiteOptions: (commandSuiteOpts, globals) => buildApplyOptionsInput(commandSuiteOpts, {
             hdcTarget: globals.hdcTarget,
             parseConcurrency: globals.parseConcurrency,
         }),
         onBeforeRun: async ({ globals, opts }) => {
+            clearPendingCommandSuiteError();
             const logFileOpt = globals.logFile;
             const skipLogSinkOnList = opts.list === true &&
                 (logFileOpt === undefined ||
                     logFileOpt === true ||
                     (typeof logFileOpt === "string" && logFileOpt.trim() === ""));
-            const logDumpPath = skipLogSinkOnList
-                ? undefined
-                : resolveLogDumpPath(globals);
+            const logDumpPath = skipLogSinkOnList ? undefined : resolveLogDumpPath(globals);
             if (logDumpPath === undefined) {
                 return {};
             }
-            const commandLine = formatInvocationCommandLine();
-            const version = readSnapshotCheckerVersion();
+            const commandLine = formatInvocationCommandLine(argv);
+            const version = readHyperStartUpCheckerVersion();
             const detachChecker = attachLoggerFileSink(logDumpPath, {
                 commandLine,
                 version,
@@ -73,14 +91,39 @@ async function main() {
             };
         },
         logger: cliLogger,
+        guaranteedOnFailureGroupNames: [...REPORT_GUARANTEED_ON_FAILURE_GROUP_NAMES],
+        resolveOutputFormat: ({ globals }) => resolveOutputFormatFromCli(globals),
+        buildCommandSuiteResultExtras: async ({ commandName, opts, mode, failed }) => {
+            if (mode === "run" && failed) {
+                const pending = takePendingCommandSuiteError();
+                if (pending) {
+                    return {
+                        error: pending,
+                        errors: [pending.message],
+                    };
+                }
+            }
+            if (mode !== "run" || failed) {
+                return {};
+            }
+            if (commandName !== "report" && commandName !== "report-user") {
+                return {};
+            }
+            return {
+                outputs: collectReportOutputArtifacts(typeof opts.outputDir === "string" ? opts.outputDir : undefined),
+            };
+        },
     });
-    program.hook("preAction", (thisCommand) => {
-        const { logLevel } = thisCommand.optsWithGlobals();
+    rootProgram.hook("preAction", (thisCommand) => {
+        const { logLevel, outputFormat } = thisCommand.optsWithGlobals();
+        if (outputFormat === "json") {
+            process.env.NO_COLOR = "1";
+            process.env.FORCE_COLOR = "0";
+        }
         setGlobalLogLevelFromCli(logLevel);
         setRunnerLogLevelFromCli(logLevel);
     });
-    await program.parseAsync();
+    await rootProgram.parseAsync(argv);
 }
-// eslint-disable-next-line @typescript-eslint/no-floating-promises
-main();
+runHyperStartUpCheckerCli().catch((error) => handleCliFatalError(error, process.argv));
 //# sourceMappingURL=cli.js.map

package/dist/src/cli.js.map

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

package/dist/{commands → src/commands}/report-user.d.ts

@@ -1,4 +1,4 @@
-import type { Groups } from "../src/types.js";
+import type { Groups } from "hmcommand-runner";
 /** report-user 场景占位；内容由 `applyOptions` 注入 */
 export declare const groups: Groups;
 export declare const defaultGroupOrder: string[];

package/dist/src/commands/report-user.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"report-user.d.ts","sourceRoot":"","sources":["../../../src/commands/report-user.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAO/C,6CAA6C;AAC7C,eAAO,MAAM,MAAM,EAAE,MAAW,CAAC;AAEjC,eAAO,MAAM,iBAAiB,EAAE,MAAM,EAAoC,CAAC;AAE3E,eAAO,MAAM,OAAO;;;;;;;;;;IAOnB,CAAC;AAEF,sFAAsF;AACtF,wBAAgB,YAAY,CAAC,GAAG,EAAE;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,MAAM,EAAE,CAAA;CAAE,CAElD"}

package/dist/{commands → src/commands}/report-user.js

@@ -1,4 +1,4 @@
-import { applyReportScenarioOptions, REPORT_DEFAULT_GROUP_ORDER, REPORT_OPTIONS, } from "../src/lib/report_scenario.js";
+import { applyReportCommandSuiteOptions, REPORT_DEFAULT_GROUP_ORDER, REPORT_OPTIONS, } from "../lib/report/command_suite.js";
 /** report-user 场景占位；内容由 `applyOptions` 注入 */
 export const groups = {};
 export const defaultGroupOrder = [...REPORT_DEFAULT_GROUP_ORDER];
@@ -12,6 +12,6 @@ export const options = [
 ];
 /** 注入 init/monitor/collect/restore/filter/analysis 流水线（无 hidumper / revoke_switch） */
 export function applyOptions(ctx) {
-    return applyReportScenarioOptions(ctx, "user");
+    return applyReportCommandSuiteOptions(ctx, "user");
 }
 //# sourceMappingURL=report-user.js.map

package/dist/src/commands/report-user.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"report-user.js","sourceRoot":"","sources":["../../../src/commands/report-user.ts"],"names":[],"mappings":"AACA,OAAO,EACL,8BAA8B,EAC9B,0BAA0B,EAC1B,cAAc,GACf,MAAM,gCAAgC,CAAC;AAExC,6CAA6C;AAC7C,MAAM,CAAC,MAAM,MAAM,GAAW,EAAE,CAAC;AAEjC,MAAM,CAAC,MAAM,iBAAiB,GAAa,CAAC,GAAG,0BAA0B,CAAC,CAAC;AAE3E,MAAM,CAAC,MAAM,OAAO,GAAG;IACrB,GAAG,cAAc;IACjB;QACE,KAAK,EAAE,qBAAqB;QAC5B,WAAW,EAAE,yCAAyC;QACtD,SAAS,EAAE,QAAQ;KACpB;CACF,CAAC;AAEF,sFAAsF;AACtF,MAAM,UAAU,YAAY,CAAC,GAI5B;IACC,OAAO,8BAA8B,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrD,CAAC"}

package/dist/{commands → src/commands}/report.d.ts

@@ -1,4 +1,4 @@
-import type { Groups } from "../src/types.js";
+import type { Groups } from "hmcommand-runner";
 /** report 场景占位；内容由 `applyOptions` 注入 */
 export declare const groups: Groups;
 export declare const defaultGroupOrder: string[];

package/dist/src/commands/report.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/commands/report.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAO/C,wCAAwC;AACxC,eAAO,MAAM,MAAM,EAAE,MAAW,CAAC;AAEjC,eAAO,MAAM,iBAAiB,EAAE,MAAM,EAAoC,CAAC;AAE3E,eAAO,MAAM,OAAO;;;;;;;;;;IAQnB,CAAC;AAEF,oEAAoE;AACpE,wBAAgB,YAAY,CAAC,GAAG,EAAE;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,MAAM,EAAE,CAAA;CAAE,CAElD"}

package/dist/{commands → src/commands}/report.js

@@ -1,4 +1,4 @@
-import { applyReportScenarioOptions, REPORT_DEFAULT_GROUP_ORDER, REPORT_OPTIONS, } from "../src/lib/report_scenario.js";
+import { applyReportCommandSuiteOptions, REPORT_DEFAULT_GROUP_ORDER, REPORT_OPTIONS, } from "../lib/report/command_suite.js";
 /** report 场景占位；内容由 `applyOptions` 注入 */
 export const groups = {};
 export const defaultGroupOrder = [...REPORT_DEFAULT_GROUP_ORDER];
@@ -12,6 +12,6 @@ export const options = [
 ];
 /** 注入 init/monitor/collect/restore/filter/analysis 流水线及风险目标等派生命令 */
 export function applyOptions(ctx) {
-    return applyReportScenarioOptions(ctx, "full");
+    return applyReportCommandSuiteOptions(ctx, "full");
 }
 //# sourceMappingURL=report.js.map

package/dist/src/commands/report.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"report.js","sourceRoot":"","sources":["../../../src/commands/report.ts"],"names":[],"mappings":"AACA,OAAO,EACL,8BAA8B,EAC9B,0BAA0B,EAC1B,cAAc,GACf,MAAM,gCAAgC,CAAC;AAExC,wCAAwC;AACxC,MAAM,CAAC,MAAM,MAAM,GAAW,EAAE,CAAC;AAEjC,MAAM,CAAC,MAAM,iBAAiB,GAAa,CAAC,GAAG,0BAA0B,CAAC,CAAC;AAE3E,MAAM,CAAC,MAAM,OAAO,GAAG;IACrB,GAAG,cAAc;IACjB;QACE,KAAK,EAAE,kBAAkB;QACzB,WAAW,EACT,uEAAuE;QACzE,SAAS,EAAE,QAAQ;KACpB;CACF,CAAC;AAEF,oEAAoE;AACpE,MAAM,UAAU,YAAY,CAAC,GAI5B;IACC,OAAO,8BAA8B,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrD,CAAC"}

package/dist/src/index.d.ts

@@ -1,7 +1,7 @@
 export { executeOne, executeAll, finalizeBackgroundProcesses, getCommandsToRun, getCommandsToRunWithRepeat, getGroupChunks, runGroupChunks, isSupportedOnCurrentPlatform, type GroupChunk, type GroupSpec, type RunGroupChunksOptions, type ExecuteAllOptions, } from "hmcommand-runner";
 export { parseGroupSpecs } from "hmcommand-runner";
-export { buildApplyOptionsInput, resolveScenario, runScenarioGroups, normalizeGroupCliArg, type ScenarioGlobalOptions, type ScenarioModuleLike, type RunScenarioGroupsInput, type RunScenarioGroupsResult, } from "./lib/scenario.js";
-export { createHdcCli, type HdcCli } from "./lib/hdc.js";
-export { CommandKind, createCommandContext, getCurrentPlatformKind } from "hmcommand-runner";
+export { buildApplyOptionsInput, resolveCommandSuite, runCommandSuiteGroups, normalizeGroupCliArg, type CommandSuiteGlobalOptions, type CommandSuiteModule, type RunCommandSuiteGroupsInput, type RunCommandSuiteGroupsResult, } from "./lib/command_suite/runner.js";
+export { createHdcCli, type HdcCli } from "./lib/report/hdc.js";
+export { CommandKind, createCommandContext, getCurrentPlatformKind, } from "hmcommand-runner";
 export type { CommandContext, CommandDef, CommandResult, RunOptions, Groups, } from "hmcommand-runner";
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,UAAU,EACV,2BAA2B,EAC3B,gBAAgB,EAChB,0BAA0B,EAC1B,cAAc,EACd,cAAc,EACd,4BAA4B,EAC5B,KAAK,UAAU,EACf,KAAK,SAAS,EACd,KAAK,qBAAqB,EAC1B,KAAK,iBAAiB,GACvB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EACL,sBAAsB,EACtB,eAAe,EACf,iBAAiB,EACjB,oBAAoB,EACpB,KAAK,qBAAqB,EAC1B,KAAK,kBAAkB,EACvB,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,GAC7B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC7F,YAAY,EACV,cAAc,EACd,UAAU,EACV,aAAa,EACb,UAAU,EACV,MAAM,GACP,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,UAAU,EACV,2BAA2B,EAC3B,gBAAgB,EAChB,0BAA0B,EAC1B,cAAc,EACd,cAAc,EACd,4BAA4B,EAC5B,KAAK,UAAU,EACf,KAAK,SAAS,EACd,KAAK,qBAAqB,EAC1B,KAAK,iBAAiB,GACvB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EACL,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,EACrB,oBAAoB,EACpB,KAAK,yBAAyB,EAC9B,KAAK,kBAAkB,EACvB,KAAK,0BAA0B,EAC/B,KAAK,2BAA2B,GACjC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EACL,WAAW,EACX,oBAAoB,EACpB,sBAAsB,GACvB,MAAM,kBAAkB,CAAC;AAC1B,YAAY,EACV,cAAc,EACd,UAAU,EACV,aAAa,EACb,UAAU,EACV,MAAM,GACP,MAAM,kBAAkB,CAAC"}