Commit fde0362
committed
fix: reconcile main-merge — actors.user schema + stderr-only console
Three merge-integration fixes surfaced when running the full suite
against the consolidated feat/terminal-dx branch:
- `tolokaforge/core/dry_run.py` — use `task.resolve_user_simulator()`
instead of the removed `task.user_simulator` attribute (main's M9
project-layer work moved the field to `actors.user`).
- `tests/unit/test_dry_run.py` — same rename in the corresponding
assertion.
- `tests/unit/dx/test_cli_assets.py::test_directory_seed_stamped_and_check_passes`
— assert on `result.stderr` (not `result.output`); the terminal-dx
branch already routes progress output to stderr per PR #280's
"stdout is artifact, stderr is progress" contract, but the merge
picked up main's stdout-based assertions on this test path.1 parent 641eefd commit fde0362
3 files changed
Lines changed: 8 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
156 | 156 | | |
157 | 157 | | |
158 | 158 | | |
159 | | - | |
160 | | - | |
| 159 | + | |
| 160 | + | |
161 | 161 | | |
162 | 162 | | |
163 | 163 | | |
164 | 164 | | |
165 | | - | |
166 | | - | |
| 165 | + | |
| 166 | + | |
167 | 167 | | |
168 | 168 | | |
169 | 169 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
112 | 112 | | |
113 | 113 | | |
114 | 114 | | |
| 115 | + | |
115 | 116 | | |
116 | 117 | | |
117 | | - | |
118 | | - | |
| 118 | + | |
| 119 | + | |
119 | 120 | | |
120 | 121 | | |
121 | 122 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
89 | | - | |
| 89 | + | |
90 | 90 | | |
91 | 91 | | |
92 | 92 | | |
| |||
0 commit comments