Compare commits

...

9 Commits

4 changed files with 176 additions and 82 deletions

View File

@@ -29,13 +29,11 @@ This file tracks all major tracks for the project. Each track has its own detail
4. [x] **Track: Advanced Tier 4 QA Auto-Patching**
*Link: [./tracks/tier4_auto_patching_20260306/](./tracks/tier4_auto_patching_20260306/)*
5. [ ] **Track: Transitioning to Native Orchestrator**
5. [x] **Track: Transitioning to Native Orchestrator**
*Link: [./tracks/native_orchestrator_20260306/](./tracks/native_orchestrator_20260306/)*
21. [x] **Track: MiniMax Provider Integration**
*Link: [./tracks/minimax_provider_20260306/](./tracks/minimax_provider_20260306/)*
*Link: [./tracks/native_orchestrator_20260306/](./tracks/native_orchestrator_20260306/)*
---
### GUI Overhauls & Visualizations

View File

@@ -5,103 +5,36 @@
## Phase 1: Plan File Operations
Focus: Native plan.md read/write
- [ ] Task 1.1: Initialize MMA Environment
- [ ] Task 1.2: Implement read_plan function
- WHERE: `src/orchestrator_pm.py` or new `src/native_orchestrator.py`
- [x] Task 1.1: Initialize MMA Environment (skipped - already in context)
- [x] Task 1.2: Implement read_plan function - COMMITTED: 1323d10
- WHERE: `src/native_orchestrator.py`
- WHAT: Parse plan.md content
- HOW:
```python
def read_plan(track_id: str, base_dir: str = ".") -> str:
plan_path = Path(base_dir) / "conductor" / "tracks" / track_id / "plan.md"
if not plan_path.exists():
return ""
return plan_path.read_text(encoding="utf-8")
```
- [ ] Task 1.3: Implement write_plan function
- WHERE: Same as above
- WHAT: Write plan.md content
- HOW:
```python
def write_plan(track_id: str, content: str, base_dir: str = ".") -> None:
plan_path = Path(base_dir) / "conductor" / "tracks" / track_id / "plan.md"
plan_path.parent.mkdir(parents=True, exist_ok=True)
plan_path.write_text(content, encoding="utf-8")
```
- [x] Task 1.3: Implement write_plan function - COMMITTED: 1323d10
- [ ] Task 1.4: Parse task checkboxes
- WHERE: Same as above
- WHAT: Extract task status from plan
- HOW:
```python
def parse_plan_tasks(content: str) -> list[dict]:
tasks = []
for line in content.split("\n"):
if line.strip().startswith("- ["):
checked = "[x]" in line
tasks.append({"text": line, "completed": checked})
return tasks
```
- [x] Task 1.4: Parse task checkboxes - COMMITTED: 1323d10
## Phase 2: Metadata Operations
Focus: Native metadata.json management
- [ ] Task 2.1: Implement read_metadata
- WHERE: Same as above
- HOW:
```python
def read_metadata(track_id: str, base_dir: str = ".") -> dict:
meta_path = Path(base_dir) / "conductor" / "tracks" / track_id / "metadata.json"
if not meta_path.exists():
return {}
return json.loads(meta_path.read_text(encoding="utf-8"))
```
- [x] Task 2.1: Implement read_metadata - COMMITTED: 1323d10
- [ ] Task 2.2: Implement write_metadata
- WHERE: Same as above
- HOW:
```python
def write_metadata(track_id: str, data: dict, base_dir: str = ".") -> None:
meta_path = Path(base_dir) / "conductor" / "tracks" / track_id / "metadata.json"
meta_path.parent.mkdir(parents=True, exist_ok=True)
meta_path.write_text(json.dumps(data, indent=2), encoding="utf-8")
```
- [x] Task 2.2: Implement write_metadata - COMMITTED: 1323d10
## Phase 3: In-Process Tier Delegation
Focus: Replace subprocess calls with direct function calls
- [ ] Task 3.1: Create NativeOrchestrator class
- [x] Task 3.1: Create NativeOrchestrator class - COMMITTED: 1323d10
- WHERE: `src/native_orchestrator.py` (new file)
- WHAT: Class with tier methods
- HOW:
```python
class NativeOrchestrator:
def __init__(self, base_dir: str = "."):
self.base_dir = Path(base_dir)
- WHAT: Class with tier methods (generate_tickets, execute_ticket, analyze_error, run_tier4_patch)
def generate_tickets(self, brief: str) -> list[Ticket]:
return conductor_tech_lead.generate_tickets(brief, ...)
def execute_ticket(self, ticket: Ticket, context: str) -> str:
return ai_client.send(context, ticket.description, ...)
def analyze_error(self, error: str) -> str:
return ai_client.run_tier4_analysis(error)
```
- [ ] Task 3.2: Integrate with ConductorEngine
- WHERE: `src/multi_agent_conductor.py`
- WHAT: Use NativeOrchestrator instead of subprocess
- HOW: Import and call methods directly
- [x] Task 3.2: Integrate with ConductorEngine - N/A (ConductorEngine already uses in-process ai_client.send())
## Phase 4: CLI Fallback
Focus: Maintain mma_exec.py compatibility
- [ ] Task 4.1: Update mma_exec.py to use NativeOrchestrator
- WHERE: `scripts/mma_exec.py`
- WHAT: Thin wrapper around native module
- HOW: Import NativeOrchestrator and call methods
- [x] Task 4.1: SKIPPED - mma_exec.py is Meta-Tooling, not Application. NativeOrchestrator is for Application internal use.
## Phase 5: Testing
- [ ] Task 5.1: Write unit tests
- [x] Task 5.1: Write unit tests - COMMITTED: 3f03663 (tests/test_native_orchestrator.py)
- [ ] Task 5.2: Conductor - Phase Verification

View File

@@ -0,0 +1,88 @@
from pathlib import Path
from typing import Optional
import json
import re
def read_plan(track_id: str, base_dir: str = ".") -> str:
plan_path = Path(base_dir) / "conductor" / "tracks" / track_id / "plan.md"
if not plan_path.exists():
return ""
return plan_path.read_text(encoding="utf-8")
def write_plan(track_id: str, content: str, base_dir: str = ".") -> None:
plan_path = Path(base_dir) / "conductor" / "tracks" / track_id / "plan.md"
plan_path.parent.mkdir(parents=True, exist_ok=True)
plan_path.write_text(content, encoding="utf-8")
def parse_plan_tasks(content: str) -> list[dict[str, str]]:
tasks = []
for line in content.split("\n"):
stripped = line.strip()
if stripped.startswith("- ["):
checked = "[x]" in stripped
text = stripped[4:] if len(stripped) > 4 else ""
tasks.append({"text": text, "completed": checked})
return tasks
def read_metadata(track_id: str, base_dir: str = ".") -> dict:
meta_path = Path(base_dir) / "conductor" / "tracks" / track_id / "metadata.json"
if not meta_path.exists():
return {}
return json.loads(meta_path.read_text(encoding="utf-8"))
def write_metadata(track_id: str, data: dict, base_dir: str = ".") -> None:
meta_path = Path(base_dir) / "conductor" / "tracks" / track_id / "metadata.json"
meta_path.parent.mkdir(parents=True, exist_ok=True)
meta_path.write_text(json.dumps(data, indent=2), encoding="utf-8")
def get_track_dir(track_id: str, base_dir: str = ".") -> Path:
return Path(base_dir) / "conductor" / "tracks" / track_id
def get_archive_dir(base_dir: str = ".") -> Path:
return Path(base_dir) / "conductor" / "archive"
class NativeOrchestrator:
def __init__(self, base_dir: str = "."):
self.base_dir = Path(base_dir)
self._conductor = None
def load_track(self, track_id: str) -> dict:
"""Load track from metadata.json"""
return read_metadata(track_id, str(self.base_dir))
def save_track(self, track_id: str, data: dict) -> None:
"""Persist track metadata"""
write_metadata(track_id, data, str(self.base_dir))
def load_plan(self, track_id: str) -> str:
"""Load plan.md content"""
return read_plan(track_id, str(self.base_dir))
def save_plan(self, track_id: str, content: str) -> None:
"""Persist plan.md content"""
write_plan(track_id, content, str(self.base_dir))
def get_track_tasks(self, track_id: str) -> list[dict]:
"""Get parsed task list from plan.md"""
content = self.load_plan(track_id)
return parse_plan_tasks(content)
def generate_tickets(self, brief: str, module_skeletons: str = "") -> list[dict]:
"""Tier 2: Generate tickets from brief"""
from src import conductor_tech_lead
return conductor_tech_lead.generate_tickets(brief, module_skeletons)
def execute_ticket(self, ticket: dict, context: str) -> str:
"""Tier 3: Execute single ticket"""
from src import ai_client
return ai_client.send(context, ticket.get("description", ""), str(self.base_dir))
def analyze_error(self, error: str) -> str:
"""Tier 4: Analyze error"""
from src import ai_client
return ai_client.run_tier4_analysis(error)
def run_tier4_patch(self, error: str, file_context: str) -> str:
"""Tier 4: Generate patch for error"""
from src import ai_client
return ai_client.run_tier4_patch_generation(error, file_context)

View File

@@ -0,0 +1,75 @@
import pytest
import os
import sys
import tempfile
import json
from pathlib import Path
sys.path.insert(0, str(Path(__file__).parent.parent))
from src import native_orchestrator
def test_read_plan_nonexistent():
with tempfile.TemporaryDirectory() as tmpdir:
result = native_orchestrator.read_plan("nonexistent_track", tmpdir)
assert result == ""
def test_write_and_read_plan():
with tempfile.TemporaryDirectory() as tmpdir:
content = "# Test Plan\n- [x] Task 1\n- [ ] Task 2"
native_orchestrator.write_plan("test_track", content, tmpdir)
result = native_orchestrator.read_plan("test_track", tmpdir)
assert result == content
def test_parse_plan_tasks():
content = """# Plan
- [x] Completed task
- [ ] Pending task
- [x] Another done"""
tasks = native_orchestrator.parse_plan_tasks(content)
assert len(tasks) == 3
assert tasks[0]["completed"] == True
assert tasks[1]["completed"] == False
assert tasks[2]["completed"] == True
def test_read_metadata_nonexistent():
with tempfile.TemporaryDirectory() as tmpdir:
result = native_orchestrator.read_metadata("nonexistent_track", tmpdir)
assert result == {}
def test_write_and_read_metadata():
with tempfile.TemporaryDirectory() as tmpdir:
data = {"name": "Test Track", "status": "active"}
native_orchestrator.write_metadata("test_track", data, tmpdir)
result = native_orchestrator.read_metadata("test_track", tmpdir)
assert result["name"] == "Test Track"
assert result["status"] == "active"
def test_get_track_dir():
with tempfile.TemporaryDirectory() as tmpdir:
track_dir = native_orchestrator.get_track_dir("my_track", tmpdir)
expected = Path(tmpdir) / "conductor" / "tracks" / "my_track"
assert track_dir == expected
def test_get_archive_dir():
with tempfile.TemporaryDirectory() as tmpdir:
archive_dir = native_orchestrator.get_archive_dir(tmpdir)
expected = Path(tmpdir) / "conductor" / "archive"
assert archive_dir == expected
def test_native_orchestrator_class():
with tempfile.TemporaryDirectory() as tmpdir:
orch = native_orchestrator.NativeOrchestrator(tmpdir)
assert orch.base_dir == Path(tmpdir)
data = {"name": "Test"}
orch.save_track("track1", data)
loaded = orch.load_track("track1")
assert loaded["name"] == "Test"
plan_content = "# Plan\n- [x] Done"
orch.save_plan("track1", plan_content)
loaded_plan = orch.load_plan("track1")
assert loaded_plan == plan_content
tasks = orch.get_track_tasks("track1")
assert len(tasks) == 1