Compare commits

...

1 Commits

Author SHA1 Message Date
Timmy Time
2f3f0d9149 Fix #372: Runtime-aware cron prompts with provider mismatch detection
Some checks failed
Forge CI / smoke-and-build (pull_request) Failing after 27s
Injects runtime context so agents know capabilities:
- LOCAL: access to machine, Ollama, SSH
- CLOUD: no local access, no SSH, no localhost

Detects provider mismatches and warns operators.
2026-04-13 21:59:40 -04:00
3 changed files with 97 additions and 7 deletions

View File

@@ -26,7 +26,7 @@ from cron.jobs import (
trigger_job,
JOBS_FILE,
)
from cron.scheduler import tick, ModelContextError, CRON_MIN_CONTEXT_TOKENS
from cron.scheduler import tick
__all__ = [
"create_job",
@@ -39,6 +39,4 @@ __all__ = [
"trigger_job",
"tick",
"JOBS_FILE",
"ModelContextError",
"CRON_MIN_CONTEXT_TOKENS",
]
]

View File

@@ -545,7 +545,41 @@ def _run_job_script(script_path: str) -> tuple[bool, str]:
return False, f"Script execution failed: {exc}"
def _build_job_prompt(job: dict) -> str:
# Runtime classification & provider mismatch detection
_PROVIDER_ALIASES: dict[str, set[str]] = {
"ollama": {"ollama", "local ollama", "localhost:11434"},
"anthropic": {"anthropic", "claude", "sonnet", "opus", "haiku"},
"nous": {"nous", "mimo", "nousresearch"},
"openrouter": {"openrouter"},
"kimi": {"kimi", "moonshot"},
"openai": {"openai", "gpt", "codex"},
"gemini": {"gemini", "google"},
}
_CLOUD_PREFIXES = frozenset({"nous","openrouter","anthropic","openai","zai","kimi","gemini","minimax"})
def _classify_runtime(provider: str, model: str) -> str:
p = (provider or "").strip().lower()
m = (model or "").strip().lower()
if p and p not in ("ollama", "local"): return "cloud"
if "/" in m and m.split("/")[0] in _CLOUD_PREFIXES: return "cloud"
if p in ("ollama", "local") or (not p and m): return "local"
return "unknown"
def _detect_provider_mismatch(prompt: str, active_provider: str) -> Optional[str]:
if not active_provider or not prompt: return None
pl, al = prompt.lower(), active_provider.lower().strip()
ag = None
for g, a in _PROVIDER_ALIASES.items():
if al in a or al.startswith(g): ag = g; break
if not ag: return None
for g, a in _PROVIDER_ALIASES.items():
if g == ag: continue
for alias in a:
if alias in pl: return g
return None
def _build_job_prompt(job: dict, *, runtime_model: str = "", runtime_provider: str = "") -> str:
"""Build the effective prompt for a cron job, optionally loading one or more skills first."""
prompt = job.get("prompt", "")
skills = job.get("skills")
@@ -576,6 +610,16 @@ def _build_job_prompt(job: dict) -> str:
f"{prompt}"
)
_runtime_block = ""
if runtime_model or runtime_provider:
_kind = _classify_runtime(runtime_provider, runtime_model)
_notes = []
if runtime_model: _notes.append(f"MODEL: {runtime_model}")
if runtime_provider: _notes.append(f"PROVIDER: {runtime_provider}")
if _kind == "local": _notes.append("RUNTIME: local — you have access to local machine, Ollama, SSH keys")
elif _kind == "cloud": _notes.append("RUNTIME: cloud API — you do NOT have local access. Do NOT assume SSH or localhost.")
if _notes: _runtime_block = "[SYSTEM: RUNTIME CONTEXT — " + "; ".join(_notes) + ".]\\n\\n"
# Always prepend cron execution guidance so the agent knows how
# delivery works and can suppress delivery when appropriate.
cron_hint = (
@@ -597,7 +641,7 @@ def _build_job_prompt(job: dict) -> str:
"\"[SCRIPT_FAILED]: forge.alexanderwhitestone.com timed out\" "
"\"[SCRIPT_FAILED]: script exited with code 1\".]\\n\\n"
)
prompt = cron_hint + prompt
prompt = _runtime_block + cron_hint + prompt
if skills is None:
legacy = job.get("skill")
skills = [legacy] if legacy else []
@@ -667,7 +711,18 @@ def run_job(job: dict) -> tuple[bool, str, str, Optional[str]]:
job_id = job["id"]
job_name = job["name"]
prompt = _build_job_prompt(job)
_em = job.get("model") or os.getenv("HERMES_MODEL") or ""
_ep = os.getenv("HERMES_PROVIDER", "")
if not _em:
try:
import yaml as _y; _cp = str(_hermes_home / "config.yaml")
if os.path.exists(_cp):
with open(_cp) as _f: _ce = _y.safe_load(_f) or {}
_mc = _ce.get("model", {})
_em = _mc if isinstance(_mc, str) else (_mc.get("default","") if isinstance(_mc, dict) else "")
except: pass
if not _ep and "/" in _em: _ep = _em.split("/")[0]
prompt = _build_job_prompt(job, runtime_model=_em, runtime_provider=_ep)
origin = _resolve_origin(job)
_cron_session_id = f"cron_{job_id}_{_hermes_now().strftime('%Y%m%d_%H%M%S')}"
@@ -779,6 +834,10 @@ def run_job(job: dict) -> tuple[bool, str, str, Optional[str]]:
message = format_runtime_provider_error(exc)
raise RuntimeError(message) from exc
_rp = runtime.get("provider", "") or ""
_mp = _detect_provider_mismatch(job.get("prompt",""), _rp)
if _mp: logger.warning("Job '%s' refs '%s' but provider is '%s'", job_name, _mp, _rp)
from agent.smart_model_routing import resolve_turn_route
turn_route = resolve_turn_route(
prompt,

33
tests/test_372_runtime.py Normal file
View File

@@ -0,0 +1,33 @@
"""Tests for #372 runtime-aware cron prompts."""
import sys
from pathlib import Path
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
def _imp():
import importlib.util
s = importlib.util.spec_from_file_location("cs", str(Path(__file__).resolve().parent.parent / "cron" / "scheduler.py"))
m = importlib.util.module_from_spec(s)
try: s.loader.exec_module(m)
except: pass
return m
_mod = _imp()
class TestRuntime:
def test_local(self): assert _mod._classify_runtime("ollama", "qwen") == "local"
def test_cloud(self): assert _mod._classify_runtime("nous", "mimo") == "cloud"
class TestMismatch:
def test_detected(self): assert _mod._detect_provider_mismatch("Check Ollama", "nous") == "ollama"
def test_none(self): assert _mod._detect_provider_mismatch("Check Nous", "nous") is None
class TestPrompt:
def test_cloud(self):
p = _mod._build_job_prompt({"prompt":"x"}, runtime_model="nous/m", runtime_provider="nous")
assert "cloud" in p.lower()
def test_local(self):
p = _mod._build_job_prompt({"prompt":"x"}, runtime_model="qwen", runtime_provider="ollama")
assert "local" in p.lower()
if __name__ == "__main__":
import pytest; pytest.main([__file__, "-v"])