Consolidate Odysseus agent harness and tool contracts

routes/skills_routes.py

@@ -1571,7 +1571,7 @@ async def _run_audit_all_job(key, skills_manager, names, url, model, headers, te
         job.pop("task", None)
 
 
-def _resolve_audit_models(owner=None, model_spec=None):
+def _resolve_audit_models(owner=None, model_spec=None, endpoint_url=None):
     """Resolve (url, model, headers, teacher) for an audit run from Settings.
 
     Worker = Utility model (falling back to Default, normalized to a served
@@ -1579,12 +1579,41 @@ def _resolve_audit_models(owner=None, model_spec=None):
     by the manual /audit-all route and scheduled/event audits. Raises
     ValueError if no worker model.
     """
-    from src.endpoint_resolver import resolve_endpoint
-    if model_spec:
+    from src.endpoint_resolver import resolve_endpoint, resolve_utility_fallback_candidates
+    if model_spec and endpoint_url:
+        # Scheduled tasks store the endpoint URL and model separately. Resolve
+        # the endpoint directly so an explicit task choice cannot be replaced
+        # by the global Utility setting.
+        from src.endpoint_resolver import build_headers, resolve_endpoint_runtime
+        from src.database import ModelEndpoint, SessionLocal
+        from src.endpoint_resolver import normalize_base, same_endpoint_base
+        from src.auth_helpers import owner_filter
+        url = endpoint_url
+        model = model_spec
+        headers = {}
+        db = SessionLocal()
+        try:
+            query = db.query(ModelEndpoint).filter(ModelEndpoint.is_enabled == True)
+            for ep in owner_filter(query, ModelEndpoint, owner).all():
+                base = normalize_base(getattr(ep, "base_url", "") or "")
+                if same_endpoint_base(url, base):
+                    runtime_base, api_key = resolve_endpoint_runtime(ep, owner=owner)
+                    headers = build_headers(api_key, runtime_base or base)
+                    break
+        finally:
+            db.close()
+    elif model_spec:
         from src.ai_interaction import _resolve_model
         url, model, headers = _resolve_model(str(model_spec), owner=owner)
     else:
         url, model, headers = resolve_endpoint("utility", owner=owner)
+    if not url or not model:
+        # Utility fallbacks are an explicit part of the user's model
+        # configuration. Audits must use the same chain as other background
+        # work instead of treating an empty primary Utility slot as fatal.
+        for fallback_url, fallback_model, fallback_headers in resolve_utility_fallback_candidates(owner=owner):
+            url, model, headers = fallback_url, fallback_model, fallback_headers
+            break
     if not url or not model:
         raise ValueError("No model configured — set a Default or Utility model in Settings.")
     try: