@@ -70,13 +70,13 @@ When invoked, you must follow these phases sequentially:
7070
7171 ``` bash
7272 # Unit tests
73- pytest tests/unit -v --cov --cov-report=json --tb=short
73+ cargo test --lib --bins -- --nocapture
7474
7575 # Integration tests
76- pytest tests/integration -v --tb=short
76+ cargo test --test ' * ' -- --nocapture
7777
78- # Performance tests (if applicable)
79- pytest tests/performance -v --tb=short
78+ # All tests
79+ cargo test --all-targets --all-features
8080 ```
8181
82822 . ** Capture Baseline Metrics**
@@ -114,15 +114,15 @@ When invoked, you must follow these phases sequentially:
1141142 . ** Build File Change Matrix**
115115 Create a matrix showing which files are modified by each branch:
116116 ```
117- Branch A: file1.py , file2.py , file3.py
118- Branch B: file2.py , file4.py
119- Branch C: file1.py , file5.py
117+ Branch A: file1.rs , file2.rs , file3.rs
118+ Branch B: file2.rs , file4.rs
119+ Branch C: file1.rs , file5.rs
120120 ```
121121
1221223 . ** Detect Potential Conflicts**
123123 Identify branch pairs that modify the same files:
124- - High risk: Branches A & C (both modify file1.py )
125- - Medium risk: Branches A & B (both modify file2.py )
124+ - High risk: Branches A & C (both modify file1.rs )
125+ - Medium risk: Branches A & B (both modify file2.rs )
126126 - Low risk: Branches B & others (minimal overlap)
127127
1281284 . ** Build Dependency Graph**
@@ -153,16 +153,14 @@ When invoked, you must follow these phases sequentially:
153153 # Check for uncommitted changes
154154 git status --porcelain
155155
156- # Activate worktree's isolated virtualenv
157- if [ -d " venv" ]; then
158- source venv/bin/activate
159- echo " ✓ Virtualenv activated for worktree"
160- else
161- echo " ⚠ WARNING: No virtualenv found in worktree - tests may use wrong environment"
156+ # Verify Rust project builds
157+ cargo build
158+ if [ $? -ne 0 ]; then
159+ echo " ⚠ WARNING: Worktree does not compile - implementation incomplete"
162160 fi
163161
164162 # Run tests in worktree
165- pytest tests/ -v --tb=short
163+ cargo test --all-targets --all-features
166164 ```
167165
1681662 . ** Classification**
@@ -180,11 +178,11 @@ When invoked, you must follow these phases sequentially:
180178 ...
181179
182180 Requires Attention (2):
183- - task/feature-x (DIRTY: uncommitted changes in src/main.py )
181+ - task/feature-x (DIRTY: uncommitted changes in src/main.rs )
184182 - task/feature-y (FAILING: 3 tests fail)
185183
186184 High Risk (1):
187- - task/feature-z (CONFLICT: overlaps with task/feature-a in core.py )
185+ - task/feature-z (CONFLICT: overlaps with task/feature-a in core.rs )
188186 ```
189187
1901884 . ** Block on Issues**
@@ -238,7 +236,7 @@ When invoked, you must follow these phases sequentially:
238236 ** Step 2d: Post-Merge Test Validation**
239237 ``` bash
240238 # Run full test suite
241- pytest tests/ -v --cov --cov-report=json --tb=short
239+ cargo test --all-targets --all-features
242240 ```
243241
244242 ** If tests pass:**
@@ -265,19 +263,19 @@ When invoked, you must follow these phases sequentially:
265263 For each conflicting file:
266264 ``` bash
267265 # Show conflict markers
268- git diff file.py
266+ git diff file.rs
269267
270268 # Show three-way diff
271- git show :1:file.py # common ancestor
272- git show :2:file.py # current branch (ours)
273- git show :3:file.py # incoming branch (theirs)
269+ git show :1:file.rs # common ancestor
270+ git show :2:file.rs # current branch (ours)
271+ git show :3:file.rs # incoming branch (theirs)
274272 ```
275273
276274 ** Step 3c: Automated Resolution (Simple Cases)**
277275
278276 ** Whitespace-only conflicts:**
279277 - If one side has only whitespace changes, accept the other side
280- - Use ` git checkout --ours file.py ` or ` git checkout --theirs file.py `
278+ - Use ` git checkout --ours file.rs ` or ` git checkout --theirs file.rs `
281279
282280 ** Non-overlapping line changes:**
283281 - If changes are in different line ranges, merge both automatically
@@ -308,25 +306,25 @@ When invoked, you must follow these phases sequentially:
308306 git commit --no-edit
309307
310308 # Validate tests pass
311- pytest tests/ -v --tb=short
309+ cargo test --all-targets --all-features
312310 ```
313311
314312### Phase 6: Post-Merge Validation
315313
3163141 . ** Run Comprehensive Test Suite**
317315 Execute all test categories:
318316 ``` bash
319- # Unit tests with coverage
320- pytest tests/unit -v --cov --cov-report=json --cov-report=term
317+ # Unit tests
318+ cargo test --lib --bins
321319
322320 # Integration tests
323- pytest tests/integration -v --tb=short
321+ cargo test --test ' * '
324322
325- # Performance tests
326- pytest tests/performance -v --tb=short
323+ # All tests with verbose output
324+ cargo test --all-targets --all-features -- --nocapture
327325
328- # End-to-end tests (if applicable)
329- pytest tests/e2e -v --tb=short
326+ # Benchmarks (if applicable)
327+ cargo bench
330328 ```
331329
3323302 . ** Compare Against Baseline**
@@ -480,7 +478,7 @@ When invoked, you must follow these phases sequentially:
480478 ## Conflicts Encountered
481479
482480 ### task/feature-b
483- - ** File:** src/core.py
481+ - ** File:** src/core.rs
484482 - ** Type:** Overlapping code changes
485483 - ** Resolution:** Automated (merged both changes)
486484 - ** Outcome:** Tests passed
0 commit comments