fix: set legacy skill field from skills list in normalize_job

deploy-crons normalize_job() was normalizing model/provider fields
but ignoring skill/skills. Jobs with a `skills` list but no `skill`
field would be stored without the legacy field set, bypassing the
normalization that _apply_skill_fields() in cron/jobs.py provides.

Now normalize_job() deduplicates and sets both `skills` (list) and
`skill` (first element) using the same logic as _apply_skill_fields().

Fixes #579

cron/__init__.py

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

cron/scheduler.py

@@ -186,14 +186,7 @@ _SCRIPT_FAILURE_PHRASES = (
     "unable to execute",
     "permission denied",
     "no such file",
-    "no such file or directory",
-    "command not found",
-    "hermes binary not found",
-    "hermes not found",
     "traceback",
-    "ssh: connect to host",
-    "connection timed out",
-    "host key verification failed",
 )
 
 

cron/ssh_dispatch.py

@@ -1,192 +0,0 @@
-"""SSH dispatch utilities for VPS agent operations.
-
-Provides validated SSH execution with proper failure detection.
-Used by cron jobs that dispatch work to remote VPS agents.
-"""
-
-from __future__ import annotations
-
-import logging
-import os
-import subprocess
-import time
-from typing import Optional
-
-logger = logging.getLogger(__name__)
-
-_SSH_TIMEOUT = int(os.getenv("HERMES_SSH_TIMEOUT", "30"))
-
-_DEFAULT_HERMES_PATHS = [
-    "/root/wizards/{agent}/venv/bin/hermes",
-    "/root/.local/bin/hermes",
-    "/usr/local/bin/hermes",
-    "~/.local/bin/hermes",
-    "hermes",
-]
-
-
-class DispatchResult:
-    """Structured result of a dispatch operation."""
-
-    __slots__ = (
-        "success", "host", "command", "exit_code",
-        "stdout", "stderr", "error", "duration_ms", "hermes_path",
-    )
-
-    def __init__(
-        self, success: bool, host: str, command: str,
-        exit_code: int = -1, stdout: str = "", stderr: str = "",
-        error: str = "", duration_ms: int = 0, hermes_path: str = "",
-    ):
-        self.success = success
-        self.host = host
-        self.command = command
-        self.exit_code = exit_code
-        self.stdout = stdout
-        self.stderr = stderr
-        self.error = error
-        self.duration_ms = duration_ms
-        self.hermes_path = hermes_path
-
-    def to_dict(self) -> dict:
-        return {
-            "success": self.success, "host": self.host,
-            "exit_code": self.exit_code, "error": self.error,
-            "duration_ms": self.duration_ms, "hermes_path": self.hermes_path,
-            "stderr_tail": self.stderr[-200:] if self.stderr else "",
-        }
-
-    @property
-    def failure_reason(self) -> str:
-        if self.success:
-            return ""
-        if self.error:
-            return self.error
-        if "No such file" in self.stderr or "command not found" in self.stderr:
-            return f"Hermes binary not found on {self.host}"
-        if self.exit_code != 0:
-            return f"Remote command exited {self.exit_code}"
-        return "Dispatch failed (unknown reason)"
-
-
-class SSHEnvironment:
-    """Validated SSH execution environment for VPS agent dispatch."""
-
-    def __init__(
-        self, host: str, agent: str = "", ssh_key: str = "",
-        ssh_port: int = 22, timeout: int = _SSH_TIMEOUT,
-        hermes_path: str = "",
-    ):
-        self.host = host
-        self.agent = agent
-        self.ssh_key = ssh_key
-        self.ssh_port = ssh_port
-        self.timeout = timeout
-        self.hermes_path = hermes_path
-        self._validated_path: str = ""
-
-    def _ssh_base_cmd(self) -> list[str]:
-        cmd = ["ssh", "-o", "StrictHostKeyChecking=accept-new"]
-        cmd.extend(["-o", "ConnectTimeout=10", "-o", "BatchMode=yes"])
-        if self.ssh_key:
-            cmd.extend(["-i", self.ssh_key])
-        if self.ssh_port != 22:
-            cmd.extend(["-p", str(self.ssh_port)])
-        cmd.append(self.host)
-        return cmd
-
-    def _resolve_hermes_paths(self) -> list[str]:
-        if self.hermes_path:
-            return [self.hermes_path]
-        return [t.format(agent=self.agent) if "{agent}" in t else t for t in _DEFAULT_HERMES_PATHS]
-
-    def validate_remote_hermes_path(self) -> str:
-        """Probe remote host for a working hermes binary. Returns path or raises."""
-        if self._validated_path:
-            return self._validated_path
-        for path in self._resolve_hermes_paths():
-            try:
-                result = subprocess.run(
-                    self._ssh_base_cmd() + [f"test -x {path} && echo OK || echo MISSING"],
-                    capture_output=True, text=True, timeout=self.timeout,
-                )
-                if result.returncode == 0 and "OK" in (result.stdout or ""):
-                    logger.info("SSH %s: hermes validated at %s", self.host, path)
-                    self._validated_path = path
-                    return path
-            except subprocess.TimeoutExpired:
-                logger.warning("SSH %s: timeout probing %s", self.host, path)
-            except Exception as exc:
-                logger.debug("SSH %s: probe %s failed: %s", self.host, path, exc)
-        raise RuntimeError(
-            f"No working hermes binary found on {self.host}. "
-            f"Checked: {', '.join(self._resolve_hermes_paths())}."
-        )
-
-    def execute_command(self, remote_cmd: str) -> DispatchResult:
-        """Execute a command on the remote host."""
-        t0 = time.monotonic()
-        try:
-            result = subprocess.run(
-                self._ssh_base_cmd() + [remote_cmd],
-                capture_output=True, text=True, timeout=self.timeout,
-            )
-            elapsed = int((time.monotonic() - t0) * 1000)
-            stderr = (result.stderr or "").strip()
-            stdout = (result.stdout or "").strip()
-            if result.returncode != 0:
-                return DispatchResult(
-                    success=False, host=self.host, command=remote_cmd,
-                    exit_code=result.returncode, stdout=stdout, stderr=stderr,
-                    error=stderr.split("\n")[0] if stderr else f"exit code {result.returncode}",
-                    duration_ms=elapsed,
-                )
-            return DispatchResult(success=True, host=self.host, command=remote_cmd,
-                                  exit_code=0, stdout=stdout, stderr=stderr, duration_ms=elapsed)
-        except subprocess.TimeoutExpired:
-            return DispatchResult(success=False, host=self.host, command=remote_cmd,
-                                  error=f"SSH timed out after {self.timeout}s",
-                                  duration_ms=int((time.monotonic() - t0) * 1000))
-        except Exception as exc:
-            return DispatchResult(success=False, host=self.host, command=remote_cmd,
-                                  error=str(exc), duration_ms=int((time.monotonic() - t0) * 1000))
-
-    def dispatch(self, hermes_args: str, validate: bool = True) -> DispatchResult:
-        """Dispatch a hermes command. Only success=True if command actually ran."""
-        if validate:
-            try:
-                hermes_path = self.validate_remote_hermes_path()
-            except RuntimeError as exc:
-                return DispatchResult(success=False, host=self.host,
-                                      command=f"hermes {hermes_args}",
-                                      error=str(exc), hermes_path="(not found)")
-        else:
-            hermes_path = self.hermes_path or "hermes"
-        result = self.execute_command(f"{hermes_path} {hermes_args}")
-        result.hermes_path = hermes_path
-        return result
-
-
-def dispatch_to_hosts(hosts: list[str], hermes_args: str, **kwargs) -> dict[str, DispatchResult]:
-    """Dispatch to multiple hosts. Returns host -> DispatchResult."""
-    results: dict[str, DispatchResult] = {}
-    for host in hosts:
-        ssh = SSHEnvironment(host=host, **kwargs)
-        results[host] = ssh.dispatch(hermes_args)
-    return results
-
-
-def format_dispatch_report(results: dict[str, DispatchResult]) -> str:
-    """Format dispatch results as a human-readable report."""
-    ok = [r for r in results.values() if r.success]
-    failed = [r for r in results.values() if not r.success]
-    lines = [f"Dispatch report: {len(ok)} OK, {len(failed)} failed", ""]
-    for host, r in results.items():
-        s = "OK" if r.success else f"FAILED -- {r.failure_reason}"
-        lines.append(f"  {host}: {s}" + (f" ({r.duration_ms}ms)" if r.duration_ms else ""))
-    if failed:
-        lines += ["", "Failed dispatches:"]
-        for host, r in results.items():
-            if not r.success:
-                lines.append(f"  {host}: {r.failure_reason}")
-    return "\n".join(lines)

deploy-crons.py

@@ -18,9 +18,9 @@ from typing import Any, Dict, Optional
 
 def normalize_job(job: Dict[str, Any]) -> Dict[str, Any]:
     """
-    Normalize a job dict to ensure consistent model field types.
+    Normalize a job dict to ensure consistent model field types and aligned skill fields.
 
-    Before normalization:
+    Model normalization:
     - If model AND provider: model = raw string, provider = raw string (inconsistent)
     - If only model: model = raw string
     - If only provider: provider = raw string at top level
@@ -30,37 +30,61 @@ def normalize_job(job: Dict[str, Any]) -> Dict[str, Any]:
     - If provider exists: model = {"provider": "yyy"}
     - If both exist: model = {"model": "xxx", "provider": "yyy"}
     - If neither: model = None
+
+    Skill normalization:
+    - Aligns legacy `skill` (single string) with `skills` (list), setting skill = skills[0]
     """
     job = dict(job)  # Create a copy to avoid modifying the original
-    
+
+    # --- skill / skills normalization ---
+    raw_skill = job.get("skill")
+    raw_skills = job.get("skills")
+
+    if raw_skills is None:
+        skill_items = [raw_skill] if raw_skill else []
+    elif isinstance(raw_skills, str):
+        skill_items = [raw_skills]
+    else:
+        skill_items = list(raw_skills)
+
+    normalized_skills: list = []
+    for item in skill_items:
+        text = str(item or "").strip()
+        if text and text not in normalized_skills:
+            normalized_skills.append(text)
+
+    job["skills"] = normalized_skills
+    job["skill"] = normalized_skills[0] if normalized_skills else None
+
+    # --- model / provider normalization ---
     model = job.get("model")
     provider = job.get("provider")
-    
+
     # Skip if already normalized (model is a dict)
     if isinstance(model, dict):
         return job
-    
+
     # Build normalized model dict
     model_dict = {}
-    
+
     if model is not None and isinstance(model, str):
         model_dict["model"] = model.strip()
-    
+
     if provider is not None and isinstance(provider, str):
         model_dict["provider"] = provider.strip()
-    
+
     # Set model field
     if model_dict:
         job["model"] = model_dict
     else:
         job["model"] = None
-    
+
     # Remove top-level provider field if it was moved into model dict
     if provider is not None and "provider" in model_dict:
         # Keep provider field for backward compatibility but mark it as deprecated
         # This allows existing code that reads job["provider"] to continue working
         pass
-    
+
     return job
 
 
@@ -90,20 +114,26 @@ def normalize_jobs_file(jobs_file: Path, dry_run: bool = False) -> int:
     for i, job in enumerate(jobs):
         original_model = job.get("model")
         original_provider = job.get("provider")
-        
+        original_skill = job.get("skill")
+        original_skills = job.get("skills")
+
         normalized_job = normalize_job(job)
-        
+
         # Check if anything changed
         if (normalized_job.get("model") != original_model or
-            normalized_job.get("provider") != original_provider):
+                normalized_job.get("provider") != original_provider or
+                normalized_job.get("skill") != original_skill or
+                normalized_job.get("skills") != original_skills):
             jobs[i] = normalized_job
             modified_count += 1
-            
+
             job_id = job.get("id", "?")
             job_name = job.get("name", "(unnamed)")
             print(f"Normalized job {job_id} ({job_name}):")
             print(f"  model: {original_model!r} -> {normalized_job.get('model')!r}")
             print(f"  provider: {original_provider!r} -> {normalized_job.get('provider')!r}")
+            print(f"  skill: {original_skill!r} -> {normalized_job.get('skill')!r}")
+            print(f"  skills: {original_skills!r} -> {normalized_job.get('skills')!r}")
     
     if modified_count == 0:
         print("All jobs already have consistent model field types.")