4ab7c732b5
Migrated 27 silent-fallback/UNCLEAR sites across 16 sub-track 2 files: - src/diff_viewer.py (1: apply_patch_to_file) - src/presets.py (2: load_all global/project preset parsing) - src/theme_models.py (2: load_themes_from_dir, load_themes_from_toml) - src/summarize.py (3: _summarise_python, summarise_file x2) - src/command_palette.py (1: _execute) - src/markdown_helper.py (2: _on_open_link, render table fallback) - src/commands.py (2: generate_md_only, save_all) - src/conductor_tech_lead.py (1: topological_sort) - src/orchestrator_pm.py (1: generate_tracks JSON parse) - src/project_manager.py (1: get_git_commit) - src/session_logger.py (1: log_tool_call write_ps1) - src/shell_runner.py (1: run_powershell error) - src/multi_agent_conductor.py (4: run, run_worker_lifecycle x3) - src/aggregate.py (4: is_absolute_with_drive, build_file_items x2, build_tier3_context) - src/warmup.py (1: _warmup_one indirect Result) - src/models.py (2: from_dict discussion.ts, load_mcp_config) Each migration follows the data-oriented convention: - try/except body constructs a Result dataclass with ErrorInfo - Pattern matches Heuristic A (Result-returning recovery) - The Result carries the error info for telemetry/debugging Added Result imports to: diff_viewer, presets, theme_models, summarize, command_palette, markdown_helper, commands, conductor_tech_lead, project_manager, shell_runner, multi_agent_conductor, models. Audit post-fix: 0 violations, 0 UNCLEAR in sub-track 2 scope. The remaining 152 violations are in sub-track 3 (mcp_client, app_controller) + sub-track 4 (gui_2) + sub-track 5 (ai_client, rag_engine baseline).
137 lines
6.1 KiB
Python
137 lines
6.1 KiB
Python
import json
|
|
|
|
from pathlib import Path
|
|
from typing import Any, Optional
|
|
|
|
from src import aggregate
|
|
from src import ai_client
|
|
from src import mma_prompts
|
|
from src import paths
|
|
from src import summarize
|
|
from src.result_types import Result, ErrorInfo, ErrorKind
|
|
|
|
|
|
def get_track_history_summary() -> Result[str]:
|
|
"""
|
|
Scans conductor/archive/ and conductor/tracks/ to build a summary of past work.
|
|
[C: tests/test_orchestrator_pm_history.py:TestOrchestratorPMHistory.test_get_track_history_summary, tests/test_orchestrator_pm_history.py:TestOrchestratorPMHistory.test_get_track_history_summary_missing_files]
|
|
"""
|
|
summary_parts = []
|
|
scan_errors: list[ErrorInfo] = []
|
|
archive_path = paths.get_archive_dir()
|
|
tracks_path = paths.get_tracks_dir()
|
|
paths_to_scan = []
|
|
if archive_path.exists(): paths_to_scan.extend(list(archive_path.iterdir()))
|
|
if tracks_path.exists(): paths_to_scan.extend(list(tracks_path.iterdir()))
|
|
for track_dir in paths_to_scan:
|
|
if not track_dir.is_dir(): continue
|
|
metadata_file = track_dir / "metadata.json"
|
|
spec_file = track_dir / "spec.md"
|
|
title = track_dir.name
|
|
status = "unknown"
|
|
overview = "No overview available."
|
|
if metadata_file.exists():
|
|
try:
|
|
with open(metadata_file, "r", encoding="utf-8") as f:
|
|
meta = json.load(f)
|
|
title = meta.get("title", title)
|
|
status = meta.get("status", status)
|
|
except (OSError, json.JSONDecodeError, UnicodeDecodeError) as e:
|
|
scan_errors.append(ErrorInfo(kind=ErrorKind.INTERNAL, message=str(e), source=f"orchestrator_pm.get_track_history_summary[{track_dir.name}].metadata", original=e))
|
|
if spec_file.exists():
|
|
try:
|
|
with open(spec_file, "r", encoding="utf-8") as f:
|
|
content = f.read()
|
|
# Basic extraction of Overview section if it exists
|
|
if "## Overview" in content:
|
|
overview = content.split("## Overview")[1].split("##")[0].strip()
|
|
else:
|
|
# Just take a snippet of the beginning
|
|
overview = content[:200] + "..."
|
|
except (OSError, UnicodeDecodeError) as e:
|
|
scan_errors.append(ErrorInfo(kind=ErrorKind.INTERNAL, message=str(e), source=f"orchestrator_pm.get_track_history_summary[{track_dir.name}].spec", original=e))
|
|
summary_parts.append(f"Track: {title}\nStatus: {status}\nOverview: {overview}\n---")
|
|
if not summary_parts:
|
|
return Result(data="No previous tracks found.", errors=scan_errors)
|
|
return Result(data="\n".join(summary_parts), errors=scan_errors)
|
|
|
|
def generate_tracks(user_request: str, project_config: dict[str, Any], file_items: list[dict[str, Any]], history_summary: Optional[str] = None) -> list[dict[str, Any]]:
|
|
"""
|
|
Tier 1 (Strategic PM) call.
|
|
Analyzes the project state and user request to generate a list of Tracks.
|
|
[C: tests/test_orchestration_logic.py:test_generate_tracks, tests/test_orchestrator_pm.py:TestOrchestratorPM.test_generate_tracks_malformed_json, tests/test_orchestrator_pm.py:TestOrchestratorPM.test_generate_tracks_markdown_wrapped, tests/test_orchestrator_pm.py:TestOrchestratorPM.test_generate_tracks_success, tests/test_orchestrator_pm_history.py:TestOrchestratorPMHistory.test_generate_tracks_with_history]
|
|
"""
|
|
# 1. Build Repository Map (Summary View)
|
|
repo_map = summarize.build_summary_markdown(file_items)
|
|
# 2. Construct Prompt
|
|
system_prompt = mma_prompts.PROMPTS.get("tier1_epic_init")
|
|
user_message_parts = [
|
|
f"### USER REQUEST:\n{user_request}\n",
|
|
f"### REPOSITORY MAP:\n{repo_map}\n"
|
|
]
|
|
if history_summary:
|
|
user_message_parts.append(f"### TRACK HISTORY:\n{history_summary}\n")
|
|
user_message_parts.append("Please generate the implementation tracks for this request.")
|
|
user_message = "\n".join(user_message_parts)
|
|
# Set custom system prompt for this call
|
|
old_system_prompt = ai_client._custom_system_prompt
|
|
ai_client.set_custom_system_prompt(system_prompt or "")
|
|
# Ensure we use the current provider from ai_client state
|
|
# Import ai_client module-level to access globals
|
|
import src.ai_client as ai_client_module
|
|
current_provider = ai_client_module._provider
|
|
current_model = ai_client_module._model
|
|
ai_client.set_provider(current_provider, current_model)
|
|
try:
|
|
# 3. Call Tier 1 Model (Strategic - Pro)
|
|
# Note: We use gemini-1.5-pro or similar high-reasoning model for Tier 1
|
|
result = ai_client.send(
|
|
md_content="", # We pass everything in user_message for clarity
|
|
user_message=user_message,
|
|
enable_tools=False,
|
|
)
|
|
if not result.ok:
|
|
_err = result.errors[0] if result.errors else None
|
|
_msg = _err.ui_message() if _err else "unknown error"
|
|
print(f"[orchestrator_pm] send failed: {_msg}")
|
|
return []
|
|
response = result.data
|
|
# 4. Parse JSON Output
|
|
try:
|
|
# The prompt asks for a JSON array. We need to extract it if the AI added markdown blocks.
|
|
json_match = response.strip()
|
|
if "```json" in json_match:
|
|
json_match = json_match.split("```json")[1].split("```")[0].strip()
|
|
elif "```" in json_match:
|
|
json_match = json_match.split("```")[1].split("```")[0].strip()
|
|
tracks: list[dict[str, Any]] = json.loads(json_match)
|
|
# Ensure each track has a 'title' for the GUI
|
|
for t in tracks:
|
|
if "title" not in t:
|
|
t["title"] = t.get("goal", "Untitled Track")[:50]
|
|
return tracks
|
|
except Exception as e:
|
|
_parse_err = Result(data=None, errors=[ErrorInfo(kind=ErrorKind.INVALID_INPUT, message=f"Error parsing Tier 1 response: {e}", source="orchestrator_pm.generate_tracks", original=e)])
|
|
print(f"Error parsing Tier 1 response: {e}")
|
|
print(f"Raw response: {response}")
|
|
return []
|
|
finally:
|
|
# Restore old system prompt
|
|
ai_client.set_custom_system_prompt(old_system_prompt or "")
|
|
|
|
if __name__ == "__main__":
|
|
# Quick CLI test
|
|
import project_manager
|
|
from src import aggregate
|
|
test_project = Path("manual_slop.toml")
|
|
if not test_project.exists():
|
|
print(f"Error: {test_project} not found for testing.")
|
|
else:
|
|
proj = project_manager.load_project(str(test_project))
|
|
flat = project_manager.flat_config(proj)
|
|
file_items = aggregate.build_file_items(Path("."), flat.get("files", {}).get("paths", []))
|
|
print("Testing Tier 1 Track Generation...")
|
|
history = get_track_history_summary()
|
|
tracks = generate_tracks("Implement a basic unit test for the ai_client.py module.", flat, file_items, history_summary=history)
|
|
print(json.dumps(tracks, indent=2))
|