symtest-cli 1.4.0__tar.gz → 1.4.1__tar.gz

{symtest_cli-1.4.0/src/symtest_cli.egg-info → symtest_cli-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: symtest-cli
-Version: 1.4.0
+Version: 1.4.1
 Summary: Regression testing for CLI applications, with multi-step workflows and numerical file comparison.
 Home-page: https://github.com/ozil111/symtest-cli
 Author: Xiaotong Wang

{symtest_cli-1.4.0 → symtest_cli-1.4.1}/docs/design.md

@@ -155,14 +155,11 @@ PathResolver 解析（系统命令直通、shell builtin 平台包装、复合
 → 超时 kill 整个进程组
 → 返回附带 `next_action_hint` 的结构化结果。
 
-当前实现的上述行为仍聚合在一处；1.4 将按 §10 宪法重排为
-Executor / Validator / Orchestration 三段（迁移明细见 docs/design_1_4.md）。
-
 ### 4.6 断言与文件比较集成
 
 - `compare_files` 是一等断言，经 ComparatorFactory 按类型分发（详见 §6）
 - 所有断言可选；未声明的字段不做校验
-- `--error-analysis` 为 CSV/H5 数值比较提供流式误差统计：`total_numeric_cells` / `mismatched_cells` / `max_abs_error` / `max_rel_error` / `mean_abs_error` / `rms_abs_error`
+- `--error-analysis` 为 CSV/H5 数值比较提供流式误差统计：`total_numeric_cells` / `mismatched_cells` / `max_abs_error` / `max_rel_error` / `mean_abs_error` / `rms_abs_error`；幅值统计（max/mean/rms）覆盖全体参与比较的数值单元格（含通过格），mean/rms 以 `total_numeric_cells` 为分母。`--error-analysis-all` 额外对通过用例输出统计，除此之外两者行为一致
 
 ## 5. 运行时状态持久化（`.symtest/`）
 
@@ -252,7 +249,6 @@ TUI 与 runner 共用同一解析器；宽松的展示形态在 TUI 侧自行处
 > **地位与效力**：本节自 Symtest 1.4 Phase 0 评审定稿，是本项目的核心架构契约，
 > 对所有后续 feature 具有最高约束力——任何功能需求先对照本宪法确定归属，再写代码。
 > 修订宪法必须在变更说明中显式指出所放宽/违反的条款及理由。
-> 定稿前的演进推导见开发阶段文档 docs/design_1_4.md。
 
 ### 10.1 数据流主线
 
@@ -373,16 +369,3 @@ Reporter 的合法输入只能是 Result 类型；`next_action_hint` 属于 resu
   `reporter`；
 - guard 测试纳入常规回归套件（`python tests\run_all.py`），违规即失败；
 - 冲突裁决次序：guard 测试 > 本节文字 > 个人偏好。
-
-### 10.6 现状差距与收敛路径
-
-定稿时刻（1.4 Phase 0）现行实现与本宪法的已知偏差如下，将在 1.4 对应 Phase 内
-逐项收敛（迁移明细见 docs/design_1_4.md）：
-
-| 现状 | 违反 | 收敛 |
-|---|---|---|
-| `execution.py::validate_result` 住在执行层 | 原则 2 | Phase 2 迁入 `validation/validator.py` |
-| `next_action_hint` 在 execution 层构造 | 原则 5 | Phase 2 迁入 `reporting/diagnosis.py` |
-| retry 循环在 executor 内部 | 原则 2 / 4 | Phase 2 上移编排层 |
-| Validator 侧 update_baseline 写文件 | 原则 3 | Phase 2 改为 runner 独立 accept 步骤 |
-| `parse_test_cases` TUI mode 后门 | 原则 6 | Phase 2 拆除，单一解析器 |

{symtest_cli-1.4.0 → symtest_cli-1.4.1}/docs/design_en.md

@@ -164,10 +164,6 @@ stdout / stderr / returncode / duration) → assertions (return_code / contains
 matches / compare_files) → retries on failure up to `retry_count` → kills the
 whole process group on timeout → structured result with `next_action_hint`.
 
-Today these behaviors are aggregated in one place; 1.4 rearranges them into
-Executor / Validator / Orchestration per the §10 Constitution (migration details
-in docs/design_1_4.md).
-
 ### 4.6 Assertions and File Comparison Integration
 
 - `compare_files` is a first-class assertion dispatched via ComparatorFactory (see §6)
@@ -266,8 +262,7 @@ TUI side itself (§10 Principle 6).
 > project's core architectural contract with supreme authority over all future
 > features — resolve ownership against this constitution before writing any code.
 > Amending it requires explicitly naming the clause being relaxed/waived and the
-> rationale in the change description. Pre-ratification evolution history lives in
-> the development-phase document docs/design_1_4.md.
+> rationale in the change description.
 
 ### 10.1 Data Flow Spine
 
@@ -398,17 +393,3 @@ architecture guard tests enforced by CI:
 - Guard tests are part of the regular regression suite
   (`python tests\run_all.py`); violations fail the build;
 - Conflict resolution order: guard tests > this text > personal preference.
-
-### 10.6 Current Gap to This Constitution
-
-Known deviations of the current implementation from this constitution as of
-ratification (1.4 Phase 0). Each item converges during the corresponding 1.4
-phase (migration details in docs/design_1_4.md):
-
-| Current state | Violated | Convergence |
-|---|---|---|
-| `execution.py::validate_result` lives in the execution layer | Principle 2 | Phase 2: move to `validation/validator.py` |
-| `next_action_hint` built in the execution layer | Principle 5 | Phase 2: move to `reporting/diagnosis.py` |
-| Retry loop inside the executor | Principles 2 / 4 | Phase 2: lift to orchestration |
-| update_baseline writes files inside validation | Principle 3 | Phase 2: runner-side independent accept step |
-| `parse_test_cases` TUI-mode back door | Principle 6 | Phase 2: remove; single parser |

{symtest_cli-1.4.0 → symtest_cli-1.4.1}/docs/user_manual.md

@@ -48,7 +48,7 @@ HDF5 文件比较依赖 `h5py`（已随框架安装）。如需在无 HDF5 环
 
 ## 测试用例定义
 
-> **Schema v2（1.4）**：配置采用分层 DSL——执行相关字段（`command`、`args`、`timeout`、`retry_count`、`env`、`steps`）位于 `execution` 块，调度相关字段（`depends_on`、`resources`）位于 `scheduling` 块，`expected` 保持在顶层。旧的扁平布局已移除，可使用 `symtest migrate` 迁移。
+> **Schema v2（1.4）**：配置采用分层 DSL——执行相关字段（`command`、`args`、`timeout`、`retry_count`、`env`、`steps`）位于 `execution` 块，调度相关字段（`depends_on`、`resources`）位于 `scheduling` 块，`expected` 保持在顶层。旧的扁平布局已移除，可使用 `symtest migrate` 迁移。迁移会递归处理整棵 `import` 树：默认为每个文件生成 `<stem>.v2<ext>` 副本并自动重写父文件中的 import 路径；`--in-place` 则原地覆盖所有文件（与 `--output` 互斥）。
 
 ### JSON 格式
 
@@ -275,6 +275,13 @@ test_cases:
 | `expected.output_matches` | 否 | 输出需匹配的正则表达式（单个字符串） |
 | `expected.compare_files` | 否 | 文件比较断言列表，见下文 |
 
+### execution 二选一（互斥）
+
+`execution` 有两种形态，**二选一**且互斥，同时声明两种形态属于配置错误：
+
+- **单命令形态**：`command` + `args`（`timeout` / `retry_count` / `env` 可选）
+- **序列形态**：`steps`（列表，每个 step 为 `command + args + expected`）；`command` / `args` 不得与 `steps` 并存
+
 ## Case 级环境变量（env）
 
 通过 `execution` 内与 `command`、`steps` 同级的 `env` 字段，可为单个用例注入环境变量，仅在该用例（序列模式为所有 step）的子进程内生效，不影响其他用例。
@@ -1788,12 +1795,12 @@ CSV 比较按行列结构逐单元格比对；数值单元格在容差范围内
 |---|---|
 | `total_numeric_cells` | 参与数值比较的单元格总数 |
 | `mismatched_cells` | 超出容差的单元格数 |
-| `max_abs_error` | 最大绝对误差及其位置 |
-| `max_rel_error` | 最大相对误差及其位置 |
-| `mean_abs_error` | 平均绝对误差 |
-| `rms_abs_error` | 均方根绝对误差（RMSE） |
+| `max_abs_error` | 全体数值单元格中的最大绝对误差及其位置 |
+| `max_rel_error` | 全体数值单元格中的最大相对误差及其位置 |
+| `mean_abs_error` | 全体数值单元格的平均绝对误差（分母为 `total_numeric_cells`） |
+| `rms_abs_error` | 全体数值单元格的均方根绝对误差（RMSE，分母为 `total_numeric_cells`） |
 
-统计是**流式**计算的，不依赖差异截断，覆盖全体数值单元格。默认仅失败的比较输出统计，通过的比较不输出。
+统计是**流式**计算的，不依赖差异截断，幅值统计（max/mean/rms）覆盖**全体**参与比较的数值单元格（含在容差内通过的单元格），可用于观察通过格离容差的余量；非有限值（NaN/inf）单元格不参与幅值统计。两个参数的统计口径完全一致，区别仅在于：默认仅失败的比较输出统计，通过的比较不输出。
 
 如需让**通过**的用例也输出统计信息（例如用于监控容差余量），可改用 `--error-analysis-all`（它会隐含启用 `--error-analysis`）：
 

{symtest_cli-1.4.0 → symtest_cli-1.4.1}/docs/user_manual_en.md

@@ -48,7 +48,7 @@ HDF5 file comparison depends on `h5py` (installed with the framework). If you ne
 
 ## Test Case Definition
 
-> **Schema v2 (1.4)**: The config uses a layered DSL — execution-related fields (`command`, `args`, `timeout`, `retry_count`, `env`, `steps`) live in the `execution` block, scheduling-related fields (`depends_on`, `resources`) live in the `scheduling` block, and `expected` stays at the top level. The old flat layout was removed; use `symtest migrate` to migrate.
+> **Schema v2 (1.4)**: The config uses a layered DSL — execution-related fields (`command`, `args`, `timeout`, `retry_count`, `env`, `steps`) live in the `execution` block, scheduling-related fields (`depends_on`, `resources`) live in the `scheduling` block, and `expected` stays at the top level. The old flat layout was removed; use `symtest migrate` to migrate. Migration recursively covers the whole `import` tree: by default each file gets a `<stem>.v2<ext>` copy with import paths rewritten automatically; `--in-place` overwrites all files in place (mutually exclusive with `--output`).
 
 ### JSON Format
 
@@ -275,6 +275,13 @@ test_cases:
 | `expected.output_matches` | No | Regex pattern the output must match (single string) |
 | `expected.compare_files` | No | File comparison assertions list, see below |
 
+### execution — pick one form (mutually exclusive)
+
+`execution` has two forms, **choose exactly one**; declaring both is a configuration error:
+
+- **Single-command form**: `command` + `args` (with optional `timeout` / `retry_count` / `env`)
+- **Steps form**: `steps` (a list; each step is `command + args + expected`); `command` / `args` must not be declared alongside `steps`
+
 ### File Comparison Assertions (compare_files)
 
 Declare one or more file comparison rules in `expected.compare_files`. The framework automatically uses the corresponding comparator to diff the actual output file against the baseline after command execution. The test passes only when all comparisons pass; these coexist with `return_code`, `output_contains`, and other assertions.

{symtest_cli-1.4.0 → symtest_cli-1.4.1}/src/symtest/__init__.py

@@ -16,7 +16,7 @@ runtime.  Library users can enable console logging explicitly::
     setup_console_logging(level=logging.DEBUG)
 """
 
-__version__ = "1.4.0"
+__version__ = "1.4.1"
 __author__ = "Xiaotong Wang"
 __email__ = "xiaotongwang98@gmail.com"
 

{symtest_cli-1.4.0 → symtest_cli-1.4.1}/src/symtest/cli.py

@@ -15,6 +15,7 @@ import logging
 from pathlib import Path
 
 from .logging_config import setup_console_logging
+from .reporting.diagnosis import attach_next_action_hints
 from .runners import JSONRunner, ParallelJSONRunner, ParallelYAMLRunner, YAMLRunner
 from .utils.report_generator import ReportGenerator
 from .utils.junit_xml_writer import write_junit_xml
@@ -207,6 +208,12 @@ Examples:
         '--output', '-o',
         help='Output path (default: <stem>.v2<ext>, e.g. old.json -> old.v2.json)',
     )
+    migrate_parser.add_argument(
+        '--in-place', action='store_true',
+        help='Migrate the config and every file it imports recursively, '
+             'overwriting each file in place (originals are not kept; '
+             'mutually exclusive with --output)',
+    )
 
     # ---- Compare command ----
     compare_parser = subparsers.add_parser('compare', help='Compare two files')
@@ -396,6 +403,15 @@ def run_tests(args):
         # Output results using ReportGenerator and honor --output-format
         if hasattr(runner, 'results'):
             results = runner.results
+
+            # ── Reporting 装配点（原则 5）：next_action_hint 在报告输出前
+            # 按 failure_kind 填充，orchestration 只产出失败结论 ──
+            attach_next_action_hints(
+                results,
+                update_baseline=bool(getattr(args, 'update_baseline', False)),
+                config_path=str(config_file),
+            )
+
             output_format = getattr(args, 'output_format', 'text')
 
             if output_format == 'json':

symtest_cli-1.4.1/src/symtest/commands/migrate.py

@@ -0,0 +1,160 @@
+"""``symtest migrate`` 子命令实现（1.4 Phase 4 迁移设计第一层）。
+
+确定性转换：加载 v1 配置 → ``config.migrate.migrate_config`` 机械映射 →
+按输出扩展名写出 JSON/YAML。
+
+支持递归迁移整棵 ``import`` 树（两阶段：先把全部文件加载并迁移到内存，
+任一失败则不写任何文件，全部成功后才统一写盘）：
+
+- 默认模式：每个文件写出 ``<stem>.v2<ext>`` 兄弟副本（原文件不动），
+  并把已迁移配置中的 import 路径重写为对应的 ``.v2`` 文件名，
+  迁移产物整棵树自洽、可直接 ``symtest validate``；
+- ``--in-place``：整树原地覆盖（文件名/格式/import 路径全不变），
+  默认关闭，开启即接受覆盖风险；与 ``--output`` 互斥。
+
+不做路径解析、不校验必填 —— 校验归 ``symtest validate``，人工判断项归
+迁移复查 Skill（见 examples/skill-migration）。
+"""
+
+from __future__ import annotations
+
+import logging
+from pathlib import Path
+from typing import Any, Dict, List, Tuple
+
+from ..config.config_io import save_config
+from ..config.import_expander import _load_raw_config
+from ..config.migrate import migrate_config
+
+logger = logging.getLogger("symtest.commands.migrate")
+
+
+def _resolve(path_str: str, workspace: Path) -> Path:
+    path = Path(path_str)
+    if not path.is_absolute():
+        path = workspace / path
+    return path.resolve()
+
+
+def _collect_import_tree(entry_path: Path) -> List[Path]:
+    """DFS 后序收集入口文件及全部 import 子文件。
+
+    - processed 集合保证菱形 import（同一文件被多个父文件引用）只收集一次；
+    - 递归栈检测真循环 import 并抛 RuntimeError；
+    - 子文件缺失抛 FileNotFoundError；
+    - 返回顺序保证子文件先于引用它的父文件。
+    """
+    ordered: List[Path] = []
+    processed: set = set()
+
+    def _walk(path: Path, stack: Tuple[str, ...]) -> None:
+        canonical = str(path.resolve())
+        if canonical in processed:
+            return
+        if canonical in stack:
+            raise RuntimeError(
+                f"Circular import detected: {canonical} "
+                f"(chain: {' -> '.join(stack + (canonical,))})"
+            )
+        config = _load_raw_config(path)
+        for item in config.get("test_cases", []) or []:
+            if isinstance(item, dict) and "import" in item:
+                sub_path = (path.parent / str(item["import"])).resolve()
+                if not sub_path.exists():
+                    raise FileNotFoundError(
+                        f"Imported config file not found: {sub_path} "
+                        f"(referenced from {path})"
+                    )
+                _walk(sub_path, stack + (canonical,))
+        processed.add(canonical)
+        ordered.append(path)
+
+    _walk(entry_path, ())
+    return ordered
+
+
+def _v2_sibling(import_path: str) -> str:
+    """'cases/sub.json' -> 'cases/sub.v2.json'（纯字符串变换，保留原分隔符）。"""
+    sep_idx = max(import_path.rfind("/"), import_path.rfind("\\"))
+    if sep_idx >= 0:
+        directory, filename = import_path[: sep_idx + 1], import_path[sep_idx + 1:]
+    else:
+        directory, filename = "", import_path
+    stem, dot, ext = filename.rpartition(".")
+    if not dot or not stem:
+        # 无扩展名（或 .gitignore 类隐藏名）：直接追加后缀
+        return f"{directory}{filename}.v2"
+    return f"{directory}{stem}.v2.{ext}"
+
+
+def _rewrite_import_paths(config: Dict[str, Any]) -> Dict[str, Any]:
+    """把 config 中 import 条目的路径改写为 .v2 兄弟名（就地修改并返回）。
+
+    import 条目中的其他字段（如 tags）原样保留。
+    """
+    for item in config.get("test_cases", []) or []:
+        if isinstance(item, dict) and "import" in item:
+            item["import"] = _v2_sibling(str(item["import"]))
+    return config
+
+
+def run_migrate(args) -> bool:
+    """CLI 壳：收集 import 树 → 整树 migrate_config → 按模式统一写盘。
+
+    Returns
+    -------
+    True 成功；输入不存在/加载失败/循环 import/输出格式不支持返回 False。
+    """
+    workspace = Path(getattr(args, "workspace", None) or Path.cwd()).resolve()
+
+    input_path = _resolve(args.config_file, workspace)
+    if not input_path.exists():
+        logger.error("Configuration file not found: %s", input_path)
+        return False
+
+    in_place = getattr(args, "in_place", False)
+    output_arg = getattr(args, "output", None)
+    if in_place and output_arg:
+        logger.error("--output cannot be combined with --in-place")
+        return False
+
+    try:
+        files = _collect_import_tree(input_path)
+        # 第一阶段：整树加载并迁移到内存，任一失败则不写任何文件
+        pending: List[Tuple[Path, Dict[str, Any]]] = [
+            (f, migrate_config(_load_raw_config(f))) for f in files
+        ]
+    except Exception as exc:
+        logger.error("Migration failed: %s", exc)
+        return False
+
+    if output_arg and not in_place:
+        entry_output = _resolve(output_arg, workspace)
+    else:
+        # 默认输出 <stem>.v2<原扩展名>，如 old.json → old.v2.json
+        entry_output = input_path.parent / f"{input_path.stem}.v2{input_path.suffix}"
+
+    written: List[Path] = []
+    try:
+        # 第二阶段：统一写盘
+        for src, migrated in pending:
+            if in_place:
+                target = src
+            else:
+                # import 路径指向 .v2 子副本（--output 仅移动入口文件位置，
+                # 隐含假设输出与入口同目录，否则需手工核对相对路径）
+                _rewrite_import_paths(migrated)
+                if src == input_path:
+                    target = entry_output
+                else:
+                    target = src.parent / f"{src.stem}.v2{src.suffix}"
+            save_config(migrated, target)
+            written.append(target)
+    except ValueError as exc:
+        logger.error("%s", exc)
+        return False
+
+    for target in written:
+        logger.info("Migrated config written to: %s", target)
+        print(str(target))
+    return True

{symtest_cli-1.4.0 → symtest_cli-1.4.1}/src/symtest/config/config_schema.py

@@ -164,11 +164,24 @@ CONFIG_SCHEMA: Dict[str, Any] = {
         },
         "executionSpec": {
             "type": "object",
-            "additionalProperties": False,
             "description": (
                 "Execution semantics (v2): single-command shorthand "
                 "(command/args/timeout/retry_count/env) OR the full steps form "
-                "(steps[]) — 二选一. Case-level env applies to all steps."
+                "(steps[]) — 二选一，由 oneOf 强制互斥. Case-level env applies "
+                "to all steps. Declaring both forms is a schema violation."
+            ),
+            "oneOf": [
+                {"$ref": "#/$defs/commandExecution"},
+                {"$ref": "#/$defs/stepsExecution"},
+            ],
+        },
+        "commandExecution": {
+            "type": "object",
+            "required": ["command", "args"],
+            "additionalProperties": False,
+            "description": (
+                "Single-command shorthand form: requires command + args; "
+                "the steps form must not be declared alongside."
             ),
             "properties": {
                 "command": {
@@ -201,12 +214,41 @@ CONFIG_SCHEMA: Dict[str, Any] = {
                         "and scheduler-injected environment variables."
                     ),
                 },
+            },
+        },
+        "stepsExecution": {
+            "type": "object",
+            "required": ["steps"],
+            "additionalProperties": False,
+            "description": (
+                "Full steps form: requires steps; command/args must not be "
+                "declared alongside."
+            ),
+            "properties": {
                 "steps": {
                     "type": "array",
                     "minItems": 1,
                     "items": {"$ref": "#/$defs/step"},
                     "description": "Steps run in order with fail-fast semantics.",
                 },
+                "timeout": {
+                    "type": ["number", "null"],
+                    "description": "Timeout in seconds (default 3600); null = no limit.",
+                },
+                "retry_count": {
+                    "type": "integer",
+                    "minimum": 0,
+                    "description": "Retries after the first failure; passing after retry marks the result flaky.",
+                },
+                "env": {
+                    "type": "object",
+                    "additionalProperties": {"type": ["string", "number", "boolean"]},
+                    "description": (
+                        "Case-level environment variables injected into every "
+                        "step (subprocess). Overrides setup-level and "
+                        "scheduler-injected environment variables."
+                    ),
+                },
             },
         },
         "schedulingSpec": {

symtest_cli-1.4.1/src/symtest/config/normalize.py

@@ -0,0 +1,43 @@
+"""Draft 配置规范化（宽松形态归一，1.4 原则 6 的 DSL 层配套）。
+
+core parser 全系统唯一且只接受 canonical TestCase；半成品/草稿配置
+（TUI 编辑中间态、v1 迁移输出等）先经 ``normalize_draft_config`` 补齐
+必填字段缺省值，再调用严格 ``core.config_loader.parse_test_cases``。
+
+本模块属于 ``config`` 层（DSL 规范化），不在 ``core`` 内 —— core 不提供
+任何宽松解析形态。
+"""
+from __future__ import annotations
+
+import copy
+from typing import Any, Dict
+
+
+def normalize_draft_config(config: Dict[str, Any]) -> Dict[str, Any]:
+    """Normalize half-finished draft cases into canonical config dicts.
+
+    为缺字段的 case 补齐 canonical 必填项的缺省值（深拷贝，不改动入参）：
+
+    - case 级：``name`` / ``execution`` / ``expected``；
+    - 单命令形态：``execution.command`` / ``execution.args``；
+    - steps 形态：每个 step 的 ``command`` / ``args`` / ``expected``。
+
+    ``import`` 引用项原样跳过（由 import 展开管线处理）。
+    """
+    normalized = copy.deepcopy(config)
+    for case in normalized.get("test_cases", []):
+        if not isinstance(case, dict) or "import" in case:
+            continue
+        case.setdefault("name", "")
+        execution = case.setdefault("execution", {})
+        if "steps" in execution:
+            for step in execution.get("steps", []):
+                if isinstance(step, dict):
+                    step.setdefault("command", "")
+                    step.setdefault("args", [])
+                    step.setdefault("expected", {})
+        else:
+            execution.setdefault("command", "")
+            execution.setdefault("args", [])
+        case.setdefault("expected", {})
+    return normalized

{symtest_cli-1.4.0 → symtest_cli-1.4.1}/src/symtest/core/base_runner.py

@@ -176,7 +176,6 @@ class BaseRunner(ABC):
                             "description": case.description or None,
                             "tags": case.tags or [],
                         }
-                        self._fill_hint_command(skip_result, case.name)
                         self.results["details"].append(skip_result)
                         logger.warning("⊘ Test %d skipped: %s", i, case.name)
                         logger.warning("  Reason: %s", skip_result["message"])
@@ -191,7 +190,6 @@ class BaseRunner(ABC):
                 result["expected"] = case.expected if case.expected else None
                 result["description"] = case.description or None
                 result["tags"] = case.tags or []
-                self._fill_hint_command(result, case.name)
 
                 self.results["details"].append(result)
                 duration = result.get("duration", 0)
@@ -298,23 +296,6 @@ class BaseRunner(ABC):
 
         return result
 
-    def _fill_hint_command(self, result: Dict[str, Any], case_name: str) -> None:
-        """Fill in the concrete CLI command inside ``next_action_hint``.
-
-        The execution layer attaches the hint with ``command=None`` because it
-        does not know the config file path; the runner does.
-        """
-        hint = result.get("next_action_hint")
-        if not hint or hint.get("command"):
-            return
-        config = str(self.config_path)
-        if hint.get("action") == "update_baseline":
-            hint["command"] = (
-                f'symtest run "{config}" --update-baseline -t "{case_name}"'
-            )
-        else:
-            hint["command"] = f'symtest run "{config}" -t "{case_name}"'
-
     def _apply_xfail_status(self, result: Dict[str, Any], case: "TestCase") -> None:
         """Apply xfail (expected failure) status mapping to a test result.
 

{symtest_cli-1.4.0 → symtest_cli-1.4.1}/src/symtest/core/config_loader.py

@@ -17,7 +17,7 @@ import re
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple
 
-from .test_case import TestCase, TestCaseStep
+from .test_case import TestCase, TestStep
 from ..utils.path_resolver import resolve_paths
 
 logger = logging.getLogger("symtest.core.config_loader")
@@ -94,8 +94,6 @@ def parse_test_cases(
     config: Dict[str, Any],
     workspace: Optional[Path] = None,
     path_resolver: Any = None,
-    *,
-    strict: bool = True,
 ) -> List[TestCase]:
     """Parse ``config['test_cases']`` (Schema v2) into ``TestCase`` objects.
 
@@ -106,11 +104,9 @@ def parse_test_cases(
     When *workspace* and *path_resolver* are provided (Runner mode),
     command/args paths are resolved.
 
-    Required-field validation is controlled by the explicit *strict* flag
-    (1.4 原则 6：拆除隐式 TUI 后门).  Runners use the default ``strict=True``;
-    the TUI passes ``strict=False`` explicitly and owns the relaxed form
-    (missing fields get sensible defaults and raw values are kept as-is for
-    display purposes).
+    解析器全系统唯一且只接受 canonical TestCase：必填字段缺失即抛
+    ``ValueError``（1.4 原则 6：无 TUI 宽松模式后门）。编辑半成品的
+    宽松形态由 TUI 侧自行 normalize 后再调用本函数。
     """
     cases: List[TestCase] = []
     resolve = workspace is not None and path_resolver is not None
@@ -122,8 +118,16 @@ def parse_test_cases(
 
         # Normalize both modes to a single ``steps`` list.  A single-command
         # shorthand becomes a single-element list; a sequence case uses its
-        # ``execution.steps`` directly.
+        # ``execution.steps`` directly.  Declaring both forms is ambiguous
+        # (Schema v2 oneOf 互斥) and is rejected outright instead of being
+        # silently resolved.
         is_sequence = "steps" in execution
+        if is_sequence and ("command" in execution or "args" in execution):
+            raise ValueError(
+                f"Test case '{case.get('name', 'unnamed')}': 'execution' "
+                f"declares both 'steps' and 'command'/'args' — the two forms "
+                f"are mutually exclusive (choose one)"
+            )
         if is_sequence:
             step_configs: List[Dict[str, Any]] = list(execution.get("steps", []))
         else:
@@ -135,15 +139,14 @@ def parse_test_cases(
                 "retry_count": execution.get("retry_count", 0),
             }]
 
-        steps: List[TestCaseStep] = []
+        steps: List[TestStep] = []
         for step in step_configs:
-            if strict:
-                step_required = ["command", "args", "expected"]
-                if not all(field in step for field in step_required):
-                    raise ValueError(
-                        f"Step in test case '{case.get('name', 'unnamed')}' "
-                        f"is missing required fields"
-                    )
+            step_required = ["command", "args", "expected"]
+            if not all(field in step for field in step_required):
+                raise ValueError(
+                    f"Step in test case '{case.get('name', 'unnamed')}' "
+                    f"is missing required fields"
+                )
             if resolve:
                 executable, resolved_args = _split_and_resolve(
                     step["command"], step["args"], workspace, path_resolver
@@ -151,7 +154,7 @@ def parse_test_cases(
             else:
                 executable = step.get("command", "")
                 resolved_args = step.get("args", [])
-            steps.append(TestCaseStep(
+            steps.append(TestStep.from_flat(
                 command=executable,
                 args=resolved_args,
                 expected=step["expected"] if "expected" in step else step.get("expected", {}),
@@ -175,14 +178,13 @@ def parse_test_cases(
             ))
         else:
             # ── Single-command mode: execution shorthand fields → steps[0] ──
-            if strict:
-                missing = [f for f in ("name", "execution", "expected") if f not in case]
-                missing += [f for f in ("command", "args") if f not in execution]
-                if missing:
-                    raise ValueError(
-                        f"Test case {case.get('name', 'unnamed')} "
-                        f"is missing required fields"
-                    )
+            missing = [f for f in ("name", "execution", "expected") if f not in case]
+            missing += [f for f in ("command", "args") if f not in execution]
+            if missing:
+                raise ValueError(
+                    f"Test case {case.get('name', 'unnamed')} "
+                    f"is missing required fields"
+                )
             cases.append(TestCase(
                 name=case.get("name", ""),
                 steps=None,