diff --git a/.github/workflows/maint-76-claude-code-review.yml b/.github/workflows/maint-76-claude-code-review.yml index a86edf9f7..7f487aac6 100644 --- a/.github/workflows/maint-76-claude-code-review.yml +++ b/.github/workflows/maint-76-claude-code-review.yml @@ -189,7 +189,7 @@ jobs: - name: Run Claude Code Review id: claude continue-on-error: true - uses: anthropics/claude-code-action@51705da45eecce209d4700538bf8377d5b5fc695 # v1 + uses: anthropics/claude-code-action@2fee15510437d71399d9139ed60433470484a8fb # v1 with: claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }} allowed_bots: '*' diff --git a/scripts/check_agents_md_freshness.py b/scripts/check_agents_md_freshness.py new file mode 100644 index 000000000..9ef30d028 --- /dev/null +++ b/scripts/check_agents_md_freshness.py @@ -0,0 +1,161 @@ +#!/usr/bin/env python3 +"""Warn when the managed Orchestrator AGENTS.md section cites stale repo facts.""" + +from __future__ import annotations + +import argparse +import json +import re +import shutil +import sys +from dataclasses import dataclass +from pathlib import Path + +MANAGED_START = "" +MANAGED_END = "" +PATH_SUFFIXES = { + ".cfg", + ".ini", + ".js", + ".json", + ".md", + ".py", + ".sh", + ".toml", + ".txt", + ".yaml", + ".yml", +} + + +@dataclass(frozen=True) +class Finding: + kind: str + value: str + message: str + + def as_dict(self) -> dict[str, str]: + return {"kind": self.kind, "value": self.value, "message": self.message} + + +def managed_section(text: str) -> str | None: + start = text.find(MANAGED_START) + end = text.find(MANAGED_END, start + len(MANAGED_START)) if start >= 0 else -1 + if start < 0 or end < 0 or end < start: + return None + return text[start : end + len(MANAGED_END)] + + +def _clean_ref(value: str) -> str: + value = value.strip().strip("\"'") + value = re.sub(r"[:#]L?\d+(?:-L?\d+)?$", "", value) + return value + + +def _looks_like_path(value: str) -> bool: + if value.startswith(("./", "../", ".github/", "docs/", "scripts/", "templates/", "tools/")): + return True + path = Path(value) + return "/" in value or path.suffix.lower() in PATH_SUFFIXES + + +def _path_exists(repo_root: Path, ref: str) -> bool: + return (repo_root / ref).exists() + + +def _command_exists(repo_root: Path, ref: str) -> bool: + parts = ref.split() + if not parts: + return True + command = parts[0] + if command.startswith(("./", "../")) or "/" in command: + return (repo_root / command).exists() + return shutil.which(command) is not None + + +def _check_command_ref(repo_root: Path, ref: str) -> list[Finding]: + findings: list[Finding] = [] + if not _command_exists(repo_root, ref): + findings.append(Finding("command", ref, f"referenced command not found: {ref}")) + for arg in ref.split()[1:]: + arg = _clean_ref(arg) + if "=" in arg: + _, arg = arg.split("=", 1) + arg = _clean_ref(arg) + if _looks_like_path(arg) and not _path_exists(repo_root, arg): + findings.append(Finding("path", arg, f"referenced path not found: {arg}")) + return findings + + +def cited_refs(section: str) -> list[str]: + refs: list[str] = [] + for raw in re.findall(r"`([^`]+)`", section): + value = _clean_ref(raw) + if not value or value.startswith(("http://", "https://")): + continue + refs.append(value) + return refs + + +def check_agents_md(repo_root: Path, agents_md: Path | None = None) -> list[Finding]: + agents_path = agents_md or repo_root / "AGENTS.md" + if not agents_path.exists(): + return [] + section = managed_section(agents_path.read_text(encoding="utf-8")) + if section is None: + return [] + + findings: list[Finding] = [] + seen: set[tuple[str, str]] = set() + for ref in cited_refs(section): + if " " in ref: + for finding in _check_command_ref(repo_root, ref): + key = (finding.kind, finding.value) + if key not in seen: + findings.append(finding) + seen.add(key) + elif _looks_like_path(ref): + key = ("path", ref) + if key not in seen and not _path_exists(repo_root, ref): + findings.append(Finding("path", ref, f"referenced path not found: {ref}")) + seen.add(key) + return findings + + +def _emit_github_warnings(findings: list[Finding]) -> None: + for finding in findings: + message = finding.message.replace("%", "%25").replace("\n", "%0A").replace("\r", "%0D") + print(f"::warning title=AGENTS.md freshness::{message}") + + +def main(argv: list[str] | None = None) -> int: + parser = argparse.ArgumentParser(description=__doc__) + parser.add_argument("--repo-root", type=Path, default=Path.cwd()) + parser.add_argument("--agents-md", type=Path) + parser.add_argument("--github-annotations", action="store_true") + parser.add_argument("--json", action="store_true", dest="as_json") + parser.add_argument( + "--strict", action="store_true", help="Exit non-zero when findings are present." + ) + args = parser.parse_args(argv) + + repo_root = args.repo_root.resolve() + agents_md = args.agents_md.resolve() if args.agents_md else None + findings = check_agents_md(repo_root, agents_md) + + if args.as_json: + print(json.dumps({"findings": [finding.as_dict() for finding in findings]}, indent=2)) + elif findings: + for finding in findings: + print(finding.message) + else: + print("AGENTS.md managed section freshness check passed.") + + if args.github_annotations and findings: + _emit_github_warnings(findings) + + return 1 if args.strict and findings else 0 + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/scripts/langchain/progress_reviewer.py b/scripts/langchain/progress_reviewer.py index cddac1ace..ec7471f57 100755 --- a/scripts/langchain/progress_reviewer.py +++ b/scripts/langchain/progress_reviewer.py @@ -427,14 +427,11 @@ def review_progress_with_llm( rounds_without_completion, ) try: - from scripts.langchain._llm_client import build_client + from tools.langchain_client import build_chat_client except ImportError: - try: - from _llm_client import build_client - except ImportError: - build_client = None + build_chat_client = None - resolved = build_client(model=model) if build_client else None + resolved = build_chat_client(model=model) if build_chat_client else None if not resolved: score, aligned, unaligned = heuristic_alignment_check( acceptance_criteria, recent_commits, files_changed diff --git a/scripts/orchestrator_skill.py b/scripts/orchestrator_skill.py index cebe93da8..f2fc2e66c 100644 --- a/scripts/orchestrator_skill.py +++ b/scripts/orchestrator_skill.py @@ -80,7 +80,8 @@ def _require_nonempty_string(value: Any, field_name: str) -> str: def _validate_repo(repo: str) -> str: - if "/" not in repo or repo.startswith("/") or repo.endswith("/"): + parts = repo.split("/") + if len(parts) != 2 or not all(parts): raise OrchestratorSkillConfigError("repo must use owner/name format") return repo diff --git a/scripts/reference_packs.py b/scripts/reference_packs.py index 1654cc323..9bedba532 100644 --- a/scripts/reference_packs.py +++ b/scripts/reference_packs.py @@ -83,7 +83,8 @@ def _require_nonempty_string(value: Any, field_name: str) -> str: def _validate_repo(repo: str) -> str: - if "/" not in repo or repo.startswith("/") or repo.endswith("/"): + parts = repo.split("/") + if len(parts) != 2 or not all(parts): raise ReferencePackConfigError("repo must use owner/name format") return repo diff --git a/scripts/runner_lib/core.py b/scripts/runner_lib/core.py index c4933094a..e5bede8e9 100644 --- a/scripts/runner_lib/core.py +++ b/scripts/runner_lib/core.py @@ -5,6 +5,7 @@ import argparse import base64 import binascii +import contextlib import dataclasses import datetime as dt import hashlib @@ -356,11 +357,6 @@ def materialize_orchestrator_skill( return None if plan.pack: - materialize_reference_packs( - workspace_path, - reference_pack_name=plan.pack, - token=token, - ) reference_packs = _load_reference_packs_module() snapshot = reference_packs.load_reference_packs(workspace_path) matching = [ @@ -371,6 +367,13 @@ def materialize_orchestrator_skill( if not matching: raise ValueError(f"orchestrator skill reference pack not found: {plan.pack}") checkout_path = workspace_path / matching[0].checkout_path + with contextlib.suppress(FileNotFoundError): + shutil.rmtree(checkout_path) + materialize_reference_packs( + workspace_path, + reference_pack_name=plan.pack, + token=token, + ) else: checkout_path = _materialize_single_checkout_plan( workspace_path, @@ -413,12 +416,19 @@ def assemble_prompt( ) if context.get("materialize_orchestrator_skill"): - materialize_orchestrator_skill( + orchestrator_summary_path = materialize_orchestrator_skill( workspace, pack_override=context.get("orchestrator_skill_pack") or None, enabled_override=context.get("orchestrator_skill_enabled"), token=token, ) + else: + orchestrator_summary_raw = context.get("orchestrator_skill_summary_path") + orchestrator_summary_path = ( + Path(str(orchestrator_summary_raw)) if orchestrator_summary_raw else None + ) + if orchestrator_summary_path and not orchestrator_summary_path.is_absolute(): + orchestrator_summary_path = workspace / orchestrator_summary_path output_file = str( context.get("output_file") or _prompt_output_name(provider, context.get("pr_number")) @@ -448,12 +458,11 @@ def assemble_prompt( if reference_summary.is_file(): parts.extend(["\n\n## Reference Packs\n", _read_text(reference_summary).rstrip()]) - orchestrator_summary = workspace / ".reference" / "ORCHESTRATOR_SKILL.md" - if orchestrator_summary.is_file(): + if orchestrator_summary_path and orchestrator_summary_path.is_file(): parts.extend( [ "\n\n## Orchestrator Skill Context\n", - _read_text(orchestrator_summary).rstrip(), + _read_text(orchestrator_summary_path).rstrip(), ] ) @@ -943,6 +952,7 @@ def _cmd_assemble(args: argparse.Namespace) -> int: "materialize_orchestrator_skill": args.materialize_orchestrator_skill, "orchestrator_skill_pack": args.orchestrator_skill_pack or None, "orchestrator_skill_enabled": _parse_optional_bool(args.orchestrator_skill_enabled), + "orchestrator_skill_summary_path": os.environ.get("ORCHESTRATOR_SKILL_SUMMARY_PATH"), "github_token": os.environ.get("GH_TOKEN") or os.environ.get("GITHUB_TOKEN"), } prompt = assemble_prompt(args.reference_pack_name, context, args.provider) diff --git a/tools/langchain_client.py b/tools/langchain_client.py index 2daa62d57..1f1617db7 100644 --- a/tools/langchain_client.py +++ b/tools/langchain_client.py @@ -8,28 +8,13 @@ from __future__ import annotations import contextlib +import json import logging import os from dataclasses import dataclass +from pathlib import Path -from tools import llm_registry as _llm_registry from tools.llm_provider import DEFAULT_MODEL, GITHUB_MODELS_BASE_URL -from tools.llm_registry import ( - PROVIDER_ANTHROPIC, - PROVIDER_GITHUB, - PROVIDER_OPENAI, - ModelRegistryEntry, - SlotDefinition, - apply_slot_env_overrides, - default_slots, - is_model_blocked, - load_model_registry, - load_slot_config, - normalize_provider, - registry_entry_for, - resolve_slots, - select_model_for_tier, -) logger = logging.getLogger(__name__) @@ -37,12 +22,15 @@ ENV_MODEL = "LANGCHAIN_MODEL" ENV_TIMEOUT = "LANGCHAIN_TIMEOUT" ENV_MAX_RETRIES = "LANGCHAIN_MAX_RETRIES" -ENV_SLOT_CONFIG = _llm_registry.ENV_SLOT_CONFIG -ENV_MODEL_REGISTRY_CONFIG = _llm_registry.ENV_MODEL_REGISTRY_CONFIG +ENV_SLOT_CONFIG = "LANGCHAIN_SLOT_CONFIG" ENV_SLOT_PREFIX = "LANGCHAIN_SLOT" ENV_ANTHROPIC_KEY = "CLAUDE_API_STRANSKE" -DEFAULT_SLOT_CONFIG_PATH = _llm_registry.DEFAULT_SLOT_CONFIG_PATH -DEFAULT_MODEL_REGISTRY_CONFIG_PATH = _llm_registry.DEFAULT_MODEL_REGISTRY_CONFIG_PATH + +PROVIDER_OPENAI = "openai" +PROVIDER_ANTHROPIC = "anthropic" +PROVIDER_GITHUB = "github-models" + +DEFAULT_SLOT_CONFIG_PATH = Path(__file__).resolve().parent.parent / "config" / "llm_slots.json" def _env_int(name: str, default: int) -> int: @@ -71,8 +59,24 @@ def provider_label(self) -> str: return f"{self.provider}/{self.model}" +@dataclass(frozen=True) +class SlotDefinition: + name: str + provider: str + model: str + + def _normalize_provider(value: str | None) -> str | None: - return normalize_provider(value) + if not value: + return None + normalized = value.strip().lower() + if normalized in {"github", "github_models", "github-models"}: + return PROVIDER_GITHUB + if normalized in {"anthropic", "claude"}: + return PROVIDER_ANTHROPIC + if normalized in {"openai"}: + return PROVIDER_OPENAI + return None def _resolve_provider(provider: str | None, *, force_openai: bool) -> tuple[str | None, bool]: @@ -89,53 +93,57 @@ def _resolve_model(model: str | None) -> str: return model or env_model or DEFAULT_MODEL -def _load_model_registry() -> list[ModelRegistryEntry]: - return load_model_registry() - - -def _registry_entry_for( - provider: str, model: str, registry: list[ModelRegistryEntry] | None = None -) -> ModelRegistryEntry | None: - return registry_entry_for(provider, model, registry=registry) - - -def _is_model_blocked( - provider: str, model: str, registry: list[ModelRegistryEntry] | None = None -) -> bool: - return is_model_blocked(provider, model, registry=registry) - - -def _select_model_for_tier( - *, - provider: str, - tier: str, - registry: list[ModelRegistryEntry] | None = None, -) -> str | None: - return select_model_for_tier(provider=provider, tier=tier, registry=registry) - - def _default_slots() -> list[SlotDefinition]: - return default_slots(github_default_model=DEFAULT_MODEL) + return [ + SlotDefinition(name="slot1", provider=PROVIDER_OPENAI, model="gpt-5.4"), + SlotDefinition(name="slot2", provider=PROVIDER_ANTHROPIC, model="claude-sonnet-4-6"), + SlotDefinition(name="slot3", provider=PROVIDER_GITHUB, model=DEFAULT_MODEL), + ] def _load_slot_config() -> list[SlotDefinition]: - return load_slot_config(github_default_model=DEFAULT_MODEL) + config_path = os.environ.get(ENV_SLOT_CONFIG) + path = Path(config_path) if config_path else DEFAULT_SLOT_CONFIG_PATH + if not path.is_file(): + return _default_slots() + try: + payload = json.loads(path.read_text(encoding="utf-8")) + except (OSError, json.JSONDecodeError): + return _default_slots() + + slots: list[SlotDefinition] = [] + for idx, entry in enumerate(payload.get("slots", []), start=1): + provider = _normalize_provider(str(entry.get("provider", ""))) + model = str(entry.get("model", "")).strip() + if not provider or not model: + continue + name = str(entry.get("name") or f"slot{idx}").strip() or f"slot{idx}" + slots.append(SlotDefinition(name=name, provider=provider, model=model)) + + return slots or _default_slots() def _apply_slot_env_overrides(slots: list[SlotDefinition]) -> list[SlotDefinition]: - return apply_slot_env_overrides( - slots, - env_model_name=ENV_MODEL, - env_slot_prefix=ENV_SLOT_PREFIX, - ) + updated: list[SlotDefinition] = [] + for idx, slot in enumerate(slots, start=1): + provider_key = f"{ENV_SLOT_PREFIX}{idx}_PROVIDER" + model_key = f"{ENV_SLOT_PREFIX}{idx}_MODEL" + provider_override = _normalize_provider(os.environ.get(provider_key)) + model_override = os.environ.get(model_key) + if idx == 1: + model_override = model_override or os.environ.get(ENV_MODEL) + updated.append( + SlotDefinition( + name=slot.name, + provider=provider_override or slot.provider, + model=(model_override or slot.model).strip(), + ) + ) + return updated def _resolve_slots() -> list[SlotDefinition]: - return resolve_slots( - github_default_model=DEFAULT_MODEL, - env_model_name=ENV_MODEL, - env_slot_prefix=ENV_SLOT_PREFIX, - ) + return _apply_slot_env_overrides(_load_slot_config()) def _is_reasoning_model(model: str) -> bool: @@ -226,9 +234,6 @@ def build_chat_client( selected_provider, provider_explicit = _resolve_provider(provider, force_openai=force_openai) if provider_explicit and selected_provider is None: return None - if selected_provider and _is_model_blocked(selected_provider, selected_model): - logger.warning("Refusing blocked LLM model: %s/%s", selected_provider, selected_model) - return None if selected_provider == PROVIDER_GITHUB: if not github_token: @@ -278,11 +283,6 @@ def build_chat_client( # Auto-select: slot order (OpenAI -> Claude -> GitHub Models by default). slots = _resolve_slots() model_override = model or os.environ.get(ENV_MODEL) - if model_override: - override_provider = selected_provider or (slots[0].provider if slots else "") - if override_provider and _is_model_blocked(override_provider, model_override): - logger.warning("Refusing blocked LLM model override: %s/%s", override_provider, model_override) - return None used_override = False for slot in slots: slot_model = model_override if model_override and not used_override else slot.model @@ -358,15 +358,6 @@ def build_chat_clients( selected_provider, provider_explicit = _resolve_provider(provider, force_openai=False) if provider_explicit and selected_provider is None: return [] - registry = _load_model_registry() - if selected_provider: - blocked_models = [candidate for candidate in (first_model, second_model) if candidate] - if any( - _is_model_blocked(selected_provider, candidate, registry=registry) - for candidate in blocked_models - ): - logger.warning("Refusing blocked LLM model for provider %s", selected_provider) - return [] clients: list[ClientInfo] = [] @@ -484,9 +475,6 @@ def build_chat_clients( for idx, slot in enumerate(candidate_slots): slot_model = model_overrides[idx] if idx < len(model_overrides) else None slot_model = slot_model or slot.model - if _is_model_blocked(slot.provider, slot_model, registry=registry): - logger.warning("Skipping blocked LLM model override: %s/%s", slot.provider, slot_model) - continue if slot.provider == PROVIDER_OPENAI and openai_token: with contextlib.suppress(Exception): clients.append( diff --git a/tools/llm_provider.py b/tools/llm_provider.py index 4b1a0cad3..7fb0603a2 100644 --- a/tools/llm_provider.py +++ b/tools/llm_provider.py @@ -29,13 +29,6 @@ from abc import ABC, abstractmethod from dataclasses import dataclass -from tools.llm_registry import ( - PROVIDER_ANTHROPIC, - PROVIDER_GITHUB, - PROVIDER_OPENAI, - configured_model_for_provider, -) - logger = logging.getLogger(__name__) # GitHub Models API endpoint (OpenAI-compatible) @@ -344,11 +337,8 @@ def _get_client(self): logger.warning("langchain_openai not installed") return None - model = configured_model_for_provider(PROVIDER_GITHUB, fallback="gpt-4.1") - if not model: - return None return ChatOpenAI( - model=model, + model="gpt-4.1", # Battle-tested, reliable, available on GitHub Models base_url=GITHUB_MODELS_BASE_URL, api_key=os.environ.get("GITHUB_TOKEN"), temperature=0.1, # Low temperature for consistent analysis @@ -560,7 +550,7 @@ def _parse_response( confidence=adjusted_confidence, reasoning=reasoning, provider_used=self.name, - model_name=configured_model_for_provider(PROVIDER_GITHUB, fallback="gpt-4.1"), + model_name="gpt-4.1", # Actual model used by GitHubModelsProvider raw_confidence=raw_confidence if adjusted_confidence != raw_confidence else None, confidence_adjusted=adjusted_confidence != raw_confidence, quality_warnings=warnings if warnings else None, @@ -575,7 +565,7 @@ def _parse_response( confidence=0.0, reasoning=f"Failed to parse response: {e}", provider_used=self.name, - model_name=configured_model_for_provider(PROVIDER_GITHUB, fallback="gpt-4.1"), + model_name="gpt-4.1", # Actual model used by GitHubModelsProvider ) @@ -600,11 +590,8 @@ def _get_client(self): logger.warning("langchain_openai not installed") return None - model = configured_model_for_provider(PROVIDER_OPENAI, fallback="gpt-5.1-codex") - if not model: - return None return ChatOpenAI( - model=model, + model="gpt-5.1-codex", # Purpose-built for analyzing Codex coding sessions api_key=os.environ.get("OPENAI_API_KEY"), temperature=0.1, ) @@ -639,7 +626,7 @@ def analyze_completion( confidence=result.confidence, reasoning=result.reasoning, provider_used=self.name, - model_name=configured_model_for_provider(PROVIDER_OPENAI, fallback="gpt-5.1-codex"), + model_name="gpt-5.1-codex", # Actual model used by OpenAIProvider raw_confidence=result.raw_confidence, confidence_adjusted=result.confidence_adjusted, quality_warnings=result.quality_warnings, @@ -669,14 +656,8 @@ def _get_client(self): logger.warning("langchain_anthropic not installed") return None - model = configured_model_for_provider( - PROVIDER_ANTHROPIC, - fallback="claude-sonnet-4-5-20250929", - ) - if not model: - return None return ChatAnthropic( - model=model, + model="claude-sonnet-4-5-20250929", anthropic_api_key=os.environ.get(ANTHROPIC_API_KEY_ENV), temperature=0.1, ) @@ -721,10 +702,7 @@ def analyze_completion( confidence=result.confidence, reasoning=result.reasoning, provider_used=self.name, - model_name=configured_model_for_provider( - PROVIDER_ANTHROPIC, - fallback="claude-sonnet-4-5-20250929", - ), + model_name="claude-sonnet-4-5-20250929", raw_confidence=result.raw_confidence, confidence_adjusted=result.confidence_adjusted, quality_warnings=result.quality_warnings,