Skip to content

Commit 9e40a82

Browse files
committed
make our init clone into the the .claude directory
1 parent 30fe59b commit 9e40a82

19 files changed

+680
-563
lines changed

.claude/agents/abathur/git-worktree-merge-orchestrator.md

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -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

8282
2. **Capture Baseline Metrics**
@@ -114,15 +114,15 @@ When invoked, you must follow these phases sequentially:
114114
2. **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

122122
3. **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

128128
4. **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

168166
2. **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

190188
4. **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

316314
1. **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

332330
2. **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

.claude/agents/abathur/requirements-gatherer.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ When invoked, you must follow these steps:
125125
- Identify resource constraints (time, budget, team size)
126126
- Identify external constraints (compliance, regulations, APIs)
127127
- Document any hard vs. soft constraints
128-
- **Infer implicit constraints** from project context (e.g., if project uses Python, assume Python is required)
128+
- **Infer implicit constraints** from project context (e.g., if project uses Rust, assume Rust toolchain is required)
129129

130130
4. **Success Criteria Definition**
131131
- Define measurable success criteria
@@ -554,6 +554,7 @@ tech_architect_task = task_enqueue({
554554
"priority": 7,
555555
"agent_type": "technical-architect",
556556
"prerequisite_task_ids": [current_task_id],
557+
"parent_task_id": current_task_id, # Track lineage: this agent spawned the tech-architect task
557558
"metadata": {
558559
"requirements_task_id": current_task_id,
559560
"memory_namespace": f"task:{current_task_id}:requirements",

0 commit comments

Comments
 (0)