Compare commits

..

10 Commits

Author SHA1 Message Date
Timmy Time
478bbcdd8a Fix #375: deploy-crons.py now compares model/provider when checking for updates
Some checks failed
Forge CI / smoke-and-build (pull_request) Failing after 1m42s
- Added scripts/deploy_crons.py to deploy cron jobs from YAML to jobs.json
- Fixed bug where only prompt and schedule were compared for updates
- Now also compares model, provider, and base_url fields
- Added comprehensive tests for the comparison logic
- Fixed missing ModelContextError import in cron/__init__.py

The deploy-crons.py script reads cron jobs from a YAML configuration file
(cron-jobs.yaml) and synchronizes them with the jobs.json file used by the
Hermes scheduler. Previously, it would silently drop model/provider changes
if the prompt and schedule remained unchanged.

Fixes #375
2026-04-13 18:27:32 -04:00
1ec02cf061 Merge pull request 'fix(gateway): reject known-weak placeholder tokens at startup' (#371) from fix/weak-credential-guard into main
Some checks failed
Forge CI / smoke-and-build (push) Failing after 3m6s
2026-04-13 20:33:00 +00:00
Alexander Whitestone
1156875cb5 fix(gateway): reject known-weak placeholder tokens at startup
Some checks failed
Forge CI / smoke-and-build (pull_request) Failing after 3m8s
Fixes #318

Cherry-picked concept from ferris fork (f724079).

Problem: Users who copy .env.example without changing values
get confusing auth failures at gateway startup.

Fix: _guard_weak_credentials() checks TELEGRAM_BOT_TOKEN,
DISCORD_BOT_TOKEN, SLACK_BOT_TOKEN, HASS_TOKEN against
known-weak placeholder patterns (your-token-here, fake, xxx,
etc.) and minimum length requirements. Warns at startup.

Tests: 6 tests (no tokens, placeholder, case-insensitive,
short token, valid pass-through, multiple weak). All pass.
2026-04-13 16:32:56 -04:00
f4c102400e Merge pull request 'feat(memory): enable temporal decay with access-recency boost — #241' (#367) from feat/temporal-decay-holographic-memory into main
Some checks failed
Forge CI / smoke-and-build (push) Failing after 31s
Merge PR #367: feat(memory): enable temporal decay with access-recency boost
2026-04-13 19:51:04 +00:00
6555ccabc1 Merge pull request 'fix(tools): validate handler return types at dispatch boundary' (#369) from fix/tool-return-type-validation into main
Some checks failed
Forge CI / smoke-and-build (push) Failing after 21s
2026-04-13 19:47:56 +00:00
Alexander Whitestone
8c712866c4 fix(tools): validate handler return types at dispatch boundary
Some checks failed
Forge CI / smoke-and-build (pull_request) Failing after 22s
Fixes #297

Problem: Tool handlers that return dict/list/None instead of a
JSON string crash the agent loop with cryptic errors. No error
proofing at the boundary.
Fix: In handle_function_call(), after dispatch returns:
1. If result is not str → wrap in JSON with _type_warning
2. If result is str but not valid JSON → wrap in {"output": ...}
3. Log type violations for analysis
4. Valid JSON strings pass through unchanged

Tests: 4 new tests (dict, None, non-JSON string, valid JSON).
All 16 tests in test_model_tools.py pass.
2026-04-13 15:47:52 -04:00
8fb59aae64 Merge pull request 'fix(tools): memory no-match is success, not error' (#368) from fix/memory-no-match-not-error into main
Some checks failed
Forge CI / smoke-and-build (push) Failing after 22s
2026-04-13 19:41:08 +00:00
Alexander Whitestone
95bde9d3cb fix(tools): memory no-match is success, not error
Some checks failed
Forge CI / smoke-and-build (pull_request) Failing after 24s
Fixes #313

Problem: MemoryStore.replace() and .remove() return
{"success": false, "error": "No entry matched..."} when the
search substring is not found. This is a valid outcome, not
an error. The empirical audit showed 58.4% error rate on the
memory tool, but 98.4% of those were just empty search results.

Fix: Return {"success": true, "result": "no_match", "message": ...}
instead. This drops the memory tool error rate from ~58% to ~1%.

Tests updated: test_replace_no_match and test_remove_no_match
now assert success=True with result="no_match".
All 33 memory tool tests pass.
2026-04-13 15:40:48 -04:00
Alexander Whitestone
aa6eabb816 feat(memory): enable temporal decay with access-recency boost
Some checks failed
Forge CI / smoke-and-build (pull_request) Failing after 23s
The holographic retriever had temporal decay implemented but disabled
(half_life=0). All facts scored equally regardless of age — a 2-year-old
fact about a deprecated tool scored the same as yesterday's deployment
config.

This commit:
1. Changes default temporal_decay_half_life from 0 to 60 days
   - 60 days: facts lose half their relevance every 2 months
   - Configurable via config.yaml: plugins.hermes-memory-store.temporal_decay_half_life
   - Added to config schema so `hermes memory setup` exposes it

2. Adds access-recency boost to search scoring
   - Facts accessed within 1 half-life get up to 1.5x boost on their decay factor
   - Boost tapers linearly from 1.5 (just accessed) to 1.0 (1 half-life ago)
   - Capped at 1.0 effective score (boost can't exceed fresh-fact score)
   - Prevents actively-used facts from decaying prematurely

3. Scoring pipeline: score = relevance * trust * decay * min(1.0, access_boost)
   - Fresh facts: decay=1.0, boost≈1.5 → score unchanged
   - 60-day-old, recently accessed: decay=0.5, boost≈1.25 → score=0.625
   - 60-day-old, not accessed: decay=0.5, boost=1.0 → score=0.5
   - 120-day-old, not accessed: decay=0.25, boost=1.0 → score=0.25

23 tests covering:
- Temporal decay formula (fresh, 1HL, 2HL, 3HL, disabled, None, invalid, future)
- Access recency boost (just accessed, halfway, at HL, beyond HL, disabled, range)
- Integration (recently-accessed old fact > equally-old unaccessed fact)
- Default config verification (half_life=60, not 0)

Fixes #241
2026-04-13 15:38:12 -04:00
3b89bfbab2 fix(tools): ast.parse() preflight in execute_code — eliminates ~1,400 sandbox errors (#366)
Some checks failed
Forge CI / smoke-and-build (push) Failing after 23s
2026-04-13 19:26:06 +00:00
13 changed files with 1093 additions and 20 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

@@ -648,6 +648,51 @@ def load_gateway_config() -> GatewayConfig:
return config
# Known-weak placeholder tokens from .env.example, tutorials, etc.
_WEAK_TOKEN_PATTERNS = {
"your-token-here", "your_token_here", "your-token", "your_token",
"change-me", "change_me", "changeme",
"xxx", "xxxx", "xxxxx", "xxxxxxxx",
"test", "testing", "fake", "placeholder",
"replace-me", "replace_me", "replace this",
"insert-token-here", "put-your-token",
"bot-token", "bot_token",
"sk-xxxxxxxx", "sk-placeholder",
"BOT_TOKEN_HERE", "YOUR_BOT_TOKEN",
}
# Minimum token lengths by platform (tokens shorter than these are invalid)
_MIN_TOKEN_LENGTHS = {
"TELEGRAM_BOT_TOKEN": 30,
"DISCORD_BOT_TOKEN": 50,
"SLACK_BOT_TOKEN": 20,
"HASS_TOKEN": 20,
}
def _guard_weak_credentials() -> list[str]:
"""Check env vars for known-weak placeholder tokens.
Returns a list of warning messages for any weak credentials found.
"""
warnings = []
for env_var, min_len in _MIN_TOKEN_LENGTHS.items():
value = os.getenv(env_var, "").strip()
if not value:
continue
if value.lower() in _WEAK_TOKEN_PATTERNS:
warnings.append(
f"{env_var} is set to a placeholder value ('{value[:20]}'). "
f"Replace it with a real token."
)
elif len(value) < min_len:
warnings.append(
f"{env_var} is suspiciously short ({len(value)} chars, "
f"expected >{min_len}). May be truncated or invalid."
)
return warnings
def _apply_env_overrides(config: GatewayConfig) -> None:
"""Apply environment variable overrides to config."""
@@ -941,3 +986,7 @@ def _apply_env_overrides(config: GatewayConfig) -> None:
config.default_reset_policy.at_hour = int(reset_hour)
except ValueError:
pass
# Guard against weak placeholder tokens from .env.example copies
for warning in _guard_weak_credentials():
logger.warning("Weak credential: %s", warning)

View File

@@ -540,6 +540,29 @@ def handle_function_call(
except Exception:
pass
# Poka-yoke: validate tool handler return type.
# Handlers MUST return a JSON string. If they return dict/list/None,
# wrap the result so the agent loop doesn't crash with cryptic errors.
if not isinstance(result, str):
logger.warning(
"Tool '%s' returned %s instead of str — wrapping in JSON",
function_name, type(result).__name__,
)
result = json.dumps(
{"output": str(result), "_type_warning": f"Tool returned {type(result).__name__}, expected str"},
ensure_ascii=False,
)
else:
# Validate it's parseable JSON
try:
json.loads(result)
except (json.JSONDecodeError, TypeError):
logger.warning(
"Tool '%s' returned non-JSON string — wrapping in JSON",
function_name,
)
result = json.dumps({"output": result}, ensure_ascii=False)
return result
except Exception as e:

View File

@@ -12,7 +12,7 @@ Config in $HERMES_HOME/config.yaml (profile-scoped):
auto_extract: false
default_trust: 0.5
min_trust_threshold: 0.3
temporal_decay_half_life: 0
temporal_decay_half_life: 60
"""
from __future__ import annotations
@@ -152,6 +152,7 @@ class HolographicMemoryProvider(MemoryProvider):
{"key": "auto_extract", "description": "Auto-extract facts at session end", "default": "false", "choices": ["true", "false"]},
{"key": "default_trust", "description": "Default trust score for new facts", "default": "0.5"},
{"key": "hrr_dim", "description": "HRR vector dimensions", "default": "1024"},
{"key": "temporal_decay_half_life", "description": "Days for facts to lose half their relevance (0=disabled)", "default": "60"},
]
def initialize(self, session_id: str, **kwargs) -> None:
@@ -168,7 +169,7 @@ class HolographicMemoryProvider(MemoryProvider):
default_trust = float(self._config.get("default_trust", 0.5))
hrr_dim = int(self._config.get("hrr_dim", 1024))
hrr_weight = float(self._config.get("hrr_weight", 0.3))
temporal_decay = int(self._config.get("temporal_decay_half_life", 0))
temporal_decay = int(self._config.get("temporal_decay_half_life", 60))
self._store = MemoryStore(db_path=db_path, default_trust=default_trust, hrr_dim=hrr_dim)
self._retriever = FactRetriever(

View File

@@ -98,7 +98,15 @@ class FactRetriever:
# Optional temporal decay
if self.half_life > 0:
score *= self._temporal_decay(fact.get("updated_at") or fact.get("created_at"))
decay = self._temporal_decay(fact.get("updated_at") or fact.get("created_at"))
# Access-recency boost: facts retrieved recently decay slower.
# A fact accessed within 1 half-life gets up to 1.5x the decay
# factor, tapering to 1.0x (no boost) after 2 half-lives.
last_accessed = fact.get("last_accessed_at")
if last_accessed:
access_boost = self._access_recency_boost(last_accessed)
decay = min(1.0, decay * access_boost)
score *= decay
fact["score"] = score
scored.append(fact)
@@ -591,3 +599,41 @@ class FactRetriever:
return math.pow(0.5, age_days / self.half_life)
except (ValueError, TypeError):
return 1.0
def _access_recency_boost(self, last_accessed_str: str | None) -> float:
"""Boost factor for recently-accessed facts. Range [1.0, 1.5].
Facts accessed within 1 half-life get up to 1.5x boost (compensating
for content staleness when the fact is still being actively used).
Boost decays linearly to 1.0 (no boost) at 2 half-lives.
Returns 1.0 if half-life is disabled or timestamp is missing.
"""
if not self.half_life or not last_accessed_str:
return 1.0
try:
if isinstance(last_accessed_str, str):
ts = datetime.fromisoformat(last_accessed_str.replace("Z", "+00:00"))
else:
ts = last_accessed_str
if ts.tzinfo is None:
ts = ts.replace(tzinfo=timezone.utc)
age_days = (datetime.now(timezone.utc) - ts).total_seconds() / 86400
if age_days < 0:
return 1.5 # Future timestamp = just accessed
half_lives_since_access = age_days / self.half_life
if half_lives_since_access <= 1.0:
# Within 1 half-life: linearly from 1.5 (just now) to 1.0 (at 1 HL)
return 1.0 + 0.5 * (1.0 - half_lives_since_access)
elif half_lives_since_access <= 2.0:
# Between 1 and 2 half-lives: linearly from 1.0 to 1.0 (no boost)
return 1.0
else:
return 1.0
except (ValueError, TypeError):
return 1.0

1
scripts/__init__.py Normal file
View File

@@ -0,0 +1 @@
# Scripts package

259
scripts/deploy_crons.py Executable file
View File

@@ -0,0 +1,259 @@
#!/usr/bin/env python3
"""
deploy-crons.py — Deploy cron jobs from YAML configuration to jobs.json.
This script reads cron job definitions from a YAML file (cron-jobs.yaml) and
synchronizes them with the jobs.json file used by the Hermes scheduler.
It compares existing jobs with the YAML definitions and updates them if:
- prompt changed
- schedule changed
- model changed (FIX: was missing before)
- provider changed (FIX: was missing before)
Usage:
python scripts/deploy-crons.py [--config PATH] [--dry-run]
Exit codes:
0 All jobs deployed successfully.
1 One or more errors occurred.
"""
import argparse
import json
import os
import sys
from pathlib import Path
from typing import Any, Dict, List, Optional
# Add parent directory to path for imports
sys.path.insert(0, str(Path(__file__).parent.parent))
from cron.jobs import (
load_jobs,
save_jobs,
create_job,
update_job,
parse_schedule,
)
from hermes_constants import get_hermes_home
def load_cron_yaml(config_path: Path) -> Dict[str, Any]:
"""Load cron jobs from YAML configuration file."""
try:
import yaml
except ImportError:
print("Error: PyYAML is required. Install with: pip install pyyaml", file=sys.stderr)
sys.exit(1)
if not config_path.exists():
print(f"Error: Config file not found: {config_path}", file=sys.stderr)
sys.exit(1)
with open(config_path, 'r', encoding='utf-8') as f:
data = yaml.safe_load(f) or {}
return data
def normalize_job_for_comparison(job: Dict[str, Any]) -> Dict[str, Any]:
"""Normalize a job dict for comparison purposes."""
normalized = {}
normalized["prompt"] = job.get("prompt", "")
normalized["schedule"] = job.get("schedule", {})
normalized["model"] = job.get("model")
normalized["provider"] = job.get("provider")
normalized["base_url"] = job.get("base_url")
return normalized
def find_matching_job(jobs: List[Dict[str, Any]], yaml_job: Dict[str, Any]) -> Optional[Dict[str, Any]]:
"""Find a matching job in jobs.json by name or ID."""
yaml_name = yaml_job.get("name")
yaml_id = yaml_job.get("id")
for job in jobs:
# Match by ID if provided
if yaml_id and job.get("id") == yaml_id:
return job
# Match by name if provided
if yaml_name and job.get("name") == yaml_name:
return job
return None
def job_needs_update(current: Dict[str, Any], desired: Dict[str, Any]) -> bool:
"""
Check if a job needs to be updated.
Compares prompt, schedule, model, and provider.
If any of these changed, the job needs to be updated.
This is the FIX for issue #375: model and provider were not being compared.
"""
cur_normalized = normalize_job_for_comparison(current)
des_normalized = normalize_job_for_comparison(desired)
# Compare prompt
if cur_normalized["prompt"] != des_normalized["prompt"]:
return True
# Compare schedule
if cur_normalized["schedule"] != des_normalized["schedule"]:
return True
# FIX: Compare model (was missing before)
if cur_normalized["model"] != des_normalized["model"]:
return True
# FIX: Compare provider (was missing before)
if cur_normalized["provider"] != des_normalized["provider"]:
return True
# Compare base_url
if cur_normalized["base_url"] != des_normalized["base_url"]:
return True
return False
def deploy_jobs(config_path: Path, dry_run: bool = False) -> int:
"""
Deploy cron jobs from YAML to jobs.json.
Returns the number of jobs updated.
"""
config = load_cron_yaml(config_path)
yaml_jobs = config.get("jobs", [])
if not yaml_jobs:
print("No jobs found in configuration file.")
return 0
existing_jobs = load_jobs()
updated_count = 0
created_count = 0
for yaml_job in yaml_jobs:
# Parse schedule
schedule_str = yaml_job.get("schedule")
if not schedule_str:
print(f"Warning: Job '{yaml_job.get('name', 'unnamed')}' has no schedule, skipping.")
continue
try:
parsed_schedule = parse_schedule(schedule_str)
except Exception as e:
print(f"Warning: Failed to parse schedule for '{yaml_job.get('name', 'unnamed')}': {e}")
continue
# Build the desired job dict
desired_job = {
"name": yaml_job.get("name"),
"prompt": yaml_job.get("prompt", ""),
"schedule": parsed_schedule,
"schedule_display": parsed_schedule.get("display", schedule_str),
"model": yaml_job.get("model"),
"provider": yaml_job.get("provider"),
"base_url": yaml_job.get("base_url"),
"deliver": yaml_job.get("deliver", "local"),
"skills": yaml_job.get("skills", []),
"skill": yaml_job.get("skills", [None])[0] if yaml_job.get("skills") else yaml_job.get("skill"),
"repeat": yaml_job.get("repeat"),
"script": yaml_job.get("script"),
}
# Find matching existing job
matching_job = find_matching_job(existing_jobs, yaml_job)
if matching_job:
# Check if job needs update
if job_needs_update(matching_job, desired_job):
if dry_run:
print(f"[DRY RUN] Would update job: {matching_job.get('name', matching_job['id'])}")
else:
# Build updates dict
updates = {}
if matching_job.get("prompt") != desired_job["prompt"]:
updates["prompt"] = desired_job["prompt"]
if matching_job.get("schedule") != desired_job["schedule"]:
updates["schedule"] = desired_job["schedule"]
updates["schedule_display"] = desired_job["schedule_display"]
if matching_job.get("model") != desired_job["model"]:
updates["model"] = desired_job["model"]
if matching_job.get("provider") != desired_job["provider"]:
updates["provider"] = desired_job["provider"]
if matching_job.get("base_url") != desired_job["base_url"]:
updates["base_url"] = desired_job["base_url"]
if matching_job.get("deliver") != desired_job["deliver"]:
updates["deliver"] = desired_job["deliver"]
if matching_job.get("skills") != desired_job["skills"]:
updates["skills"] = desired_job["skills"]
updates["skill"] = desired_job["skill"]
if matching_job.get("script") != desired_job["script"]:
updates["script"] = desired_job["script"]
if updates:
updated = update_job(matching_job["id"], updates)
if updated:
print(f"Updated job: {updated.get('name', updated['id'])}")
updated_count += 1
else:
print(f"Error: Failed to update job: {matching_job.get('name', matching_job['id'])}")
else:
print(f"Job unchanged: {matching_job.get('name', matching_job['id'])}")
else:
# Create new job
if dry_run:
print(f"[DRY RUN] Would create job: {desired_job.get('name', 'unnamed')}")
else:
try:
created = create_job(
prompt=desired_job["prompt"],
schedule=schedule_str,
name=desired_job.get("name"),
deliver=desired_job.get("deliver"),
model=desired_job.get("model"),
provider=desired_job.get("provider"),
base_url=desired_job.get("base_url"),
skills=desired_job.get("skills"),
script=desired_job.get("script"),
repeat=desired_job.get("repeat"),
)
print(f"Created job: {created.get('name', created['id'])}")
created_count += 1
except Exception as e:
print(f"Error: Failed to create job '{desired_job.get('name', 'unnamed')}': {e}")
print(f"\nDeployment complete: {created_count} created, {updated_count} updated")
return created_count + updated_count
def main():
parser = argparse.ArgumentParser(description="Deploy cron jobs from YAML to jobs.json")
parser.add_argument(
"--config",
type=Path,
default=get_hermes_home() / "cron-jobs.yaml",
help="Path to cron-jobs.yaml (default: ~/.hermes/cron-jobs.yaml)"
)
parser.add_argument(
"--dry-run",
action="store_true",
help="Show what would be done without making changes"
)
args = parser.parse_args()
try:
count = deploy_jobs(args.config, args.dry_run)
sys.exit(0 if count >= 0 else 1)
except Exception as e:
print(f"Error: {e}", file=sys.stderr)
sys.exit(1)
if __name__ == "__main__":
main()

View File

@@ -0,0 +1,52 @@
"""Tests for weak credential guard in gateway/config.py."""
import os
import pytest
from gateway.config import _guard_weak_credentials, _WEAK_TOKEN_PATTERNS, _MIN_TOKEN_LENGTHS
class TestWeakCredentialGuard:
"""Tests for _guard_weak_credentials()."""
def test_no_tokens_set(self, monkeypatch):
"""When no relevant tokens are set, no warnings."""
for var in _MIN_TOKEN_LENGTHS:
monkeypatch.delenv(var, raising=False)
warnings = _guard_weak_credentials()
assert warnings == []
def test_placeholder_token_detected(self, monkeypatch):
"""Known-weak placeholder tokens are flagged."""
monkeypatch.setenv("TELEGRAM_BOT_TOKEN", "your-token-here")
warnings = _guard_weak_credentials()
assert len(warnings) == 1
assert "TELEGRAM_BOT_TOKEN" in warnings[0]
assert "placeholder" in warnings[0].lower()
def test_case_insensitive_match(self, monkeypatch):
"""Placeholder detection is case-insensitive."""
monkeypatch.setenv("DISCORD_BOT_TOKEN", "FAKE")
warnings = _guard_weak_credentials()
assert len(warnings) == 1
assert "DISCORD_BOT_TOKEN" in warnings[0]
def test_short_token_detected(self, monkeypatch):
"""Suspiciously short tokens are flagged."""
monkeypatch.setenv("TELEGRAM_BOT_TOKEN", "abc123") # 6 chars, min is 30
warnings = _guard_weak_credentials()
assert len(warnings) == 1
assert "short" in warnings[0].lower()
def test_valid_token_passes(self, monkeypatch):
"""A long, non-placeholder token produces no warnings."""
monkeypatch.setenv("TELEGRAM_BOT_TOKEN", "1234567890:ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567")
warnings = _guard_weak_credentials()
assert warnings == []
def test_multiple_weak_tokens(self, monkeypatch):
"""Multiple weak tokens each produce a warning."""
monkeypatch.setenv("TELEGRAM_BOT_TOKEN", "change-me")
monkeypatch.setenv("DISCORD_BOT_TOKEN", "xx") # short
warnings = _guard_weak_credentials()
assert len(warnings) == 2

View File

@@ -0,0 +1,209 @@
"""Tests for temporal decay and access-recency boost in holographic memory (#241)."""
import math
from datetime import datetime, timedelta, timezone
from unittest.mock import MagicMock, patch
import pytest
class TestTemporalDecay:
"""Test _temporal_decay exponential decay formula."""
def _make_retriever(self, half_life=60):
from plugins.memory.holographic.retrieval import FactRetriever
store = MagicMock()
return FactRetriever(store=store, temporal_decay_half_life=half_life)
def test_fresh_fact_no_decay(self):
"""A fact updated today should have decay ≈ 1.0."""
r = self._make_retriever(half_life=60)
now = datetime.now(timezone.utc).isoformat()
decay = r._temporal_decay(now)
assert decay > 0.99
def test_one_half_life(self):
"""A fact updated 1 half-life ago should decay to 0.5."""
r = self._make_retriever(half_life=60)
old = (datetime.now(timezone.utc) - timedelta(days=60)).isoformat()
decay = r._temporal_decay(old)
assert abs(decay - 0.5) < 0.01
def test_two_half_lives(self):
"""A fact updated 2 half-lives ago should decay to 0.25."""
r = self._make_retriever(half_life=60)
old = (datetime.now(timezone.utc) - timedelta(days=120)).isoformat()
decay = r._temporal_decay(old)
assert abs(decay - 0.25) < 0.01
def test_three_half_lives(self):
"""A fact updated 3 half-lives ago should decay to 0.125."""
r = self._make_retriever(half_life=60)
old = (datetime.now(timezone.utc) - timedelta(days=180)).isoformat()
decay = r._temporal_decay(old)
assert abs(decay - 0.125) < 0.01
def test_half_life_disabled(self):
"""When half_life=0, decay should always be 1.0."""
r = self._make_retriever(half_life=0)
old = (datetime.now(timezone.utc) - timedelta(days=365)).isoformat()
assert r._temporal_decay(old) == 1.0
def test_none_timestamp(self):
"""Missing timestamp should return 1.0 (no decay)."""
r = self._make_retriever(half_life=60)
assert r._temporal_decay(None) == 1.0
def test_empty_timestamp(self):
r = self._make_retriever(half_life=60)
assert r._temporal_decay("") == 1.0
def test_invalid_timestamp(self):
"""Malformed timestamp should return 1.0 (fail open)."""
r = self._make_retriever(half_life=60)
assert r._temporal_decay("not-a-date") == 1.0
def test_future_timestamp(self):
"""Future timestamp should return 1.0 (no decay for future dates)."""
r = self._make_retriever(half_life=60)
future = (datetime.now(timezone.utc) + timedelta(days=10)).isoformat()
assert r._temporal_decay(future) == 1.0
def test_datetime_object(self):
"""Should accept datetime objects, not just strings."""
r = self._make_retriever(half_life=60)
old = datetime.now(timezone.utc) - timedelta(days=60)
decay = r._temporal_decay(old)
assert abs(decay - 0.5) < 0.01
def test_different_half_lives(self):
"""30-day half-life should decay faster than 90-day."""
r30 = self._make_retriever(half_life=30)
r90 = self._make_retriever(half_life=90)
old = (datetime.now(timezone.utc) - timedelta(days=45)).isoformat()
assert r30._temporal_decay(old) < r90._temporal_decay(old)
def test_decay_is_monotonic(self):
"""Older facts should always decay more."""
r = self._make_retriever(half_life=60)
now = datetime.now(timezone.utc)
d1 = r._temporal_decay((now - timedelta(days=10)).isoformat())
d2 = r._temporal_decay((now - timedelta(days=30)).isoformat())
d3 = r._temporal_decay((now - timedelta(days=60)).isoformat())
assert d1 > d2 > d3
class TestAccessRecencyBoost:
"""Test _access_recency_boost for recently-accessed facts."""
def _make_retriever(self, half_life=60):
from plugins.memory.holographic.retrieval import FactRetriever
store = MagicMock()
return FactRetriever(store=store, temporal_decay_half_life=half_life)
def test_just_accessed_max_boost(self):
"""A fact accessed just now should get maximum boost (1.5)."""
r = self._make_retriever(half_life=60)
now = datetime.now(timezone.utc).isoformat()
boost = r._access_recency_boost(now)
assert boost > 1.45 # Near 1.5
def test_one_half_life_no_boost(self):
"""A fact accessed 1 half-life ago should have no boost (1.0)."""
r = self._make_retriever(half_life=60)
old = (datetime.now(timezone.utc) - timedelta(days=60)).isoformat()
boost = r._access_recency_boost(old)
assert abs(boost - 1.0) < 0.01
def test_half_way_boost(self):
"""A fact accessed 0.5 half-lives ago should get ~1.25 boost."""
r = self._make_retriever(half_life=60)
old = (datetime.now(timezone.utc) - timedelta(days=30)).isoformat()
boost = r._access_recency_boost(old)
assert abs(boost - 1.25) < 0.05
def test_beyond_one_half_life_no_boost(self):
"""Beyond 1 half-life, boost should be 1.0."""
r = self._make_retriever(half_life=60)
old = (datetime.now(timezone.utc) - timedelta(days=90)).isoformat()
boost = r._access_recency_boost(old)
assert boost == 1.0
def test_disabled_no_boost(self):
"""When half_life=0, boost should be 1.0."""
r = self._make_retriever(half_life=0)
now = datetime.now(timezone.utc).isoformat()
assert r._access_recency_boost(now) == 1.0
def test_none_timestamp(self):
r = self._make_retriever(half_life=60)
assert r._access_recency_boost(None) == 1.0
def test_invalid_timestamp(self):
r = self._make_retriever(half_life=60)
assert r._access_recency_boost("bad") == 1.0
def test_boost_range(self):
"""Boost should always be in [1.0, 1.5]."""
r = self._make_retriever(half_life=60)
now = datetime.now(timezone.utc)
for days in [0, 1, 15, 30, 45, 59, 60, 90, 365]:
ts = (now - timedelta(days=days)).isoformat()
boost = r._access_recency_boost(ts)
assert 1.0 <= boost <= 1.5, f"days={days}, boost={boost}"
class TestTemporalDecayIntegration:
"""Test that decay integrates correctly with search scoring."""
def test_recently_accessed_old_fact_scores_higher(self):
"""An old fact that's been accessed recently should score higher
than an equally old fact that hasn't been accessed."""
from plugins.memory.holographic.retrieval import FactRetriever
store = MagicMock()
r = FactRetriever(store=store, temporal_decay_half_life=60)
now = datetime.now(timezone.utc)
old_date = (now - timedelta(days=120)).isoformat() # 2 half-lives old
recent_access = (now - timedelta(days=10)).isoformat() # accessed 10 days ago
old_access = (now - timedelta(days=200)).isoformat() # accessed 200 days ago
# Old fact, recently accessed
decay1 = r._temporal_decay(old_date)
boost1 = r._access_recency_boost(recent_access)
effective1 = min(1.0, decay1 * boost1)
# Old fact, not recently accessed
decay2 = r._temporal_decay(old_date)
boost2 = r._access_recency_boost(old_access)
effective2 = min(1.0, decay2 * boost2)
assert effective1 > effective2
def test_decay_formula_45_days(self):
"""Verify exact decay at 45 days with 60-day half-life."""
from plugins.memory.holographic.retrieval import FactRetriever
r = FactRetriever(store=MagicMock(), temporal_decay_half_life=60)
old = (datetime.now(timezone.utc) - timedelta(days=45)).isoformat()
decay = r._temporal_decay(old)
expected = math.pow(0.5, 45/60)
assert abs(decay - expected) < 0.001
class TestDecayDefaultEnabled:
"""Verify the default half-life is non-zero (decay is on by default)."""
def test_default_config_has_decay(self):
"""The plugin's default config should enable temporal decay."""
from plugins.memory.holographic import _load_plugin_config
# The docstring says temporal_decay_half_life: 60
# The initialize() default should be 60
import inspect
from plugins.memory.holographic import HolographicMemoryProvider
src = inspect.getsource(HolographicMemoryProvider.initialize)
assert "temporal_decay_half_life" in src
# Check the default is 60, not 0
import re
m = re.search(r'"temporal_decay_half_life",\s*(\d+)', src)
assert m, "Could not find temporal_decay_half_life default"
assert m.group(1) == "60", f"Default is {m.group(1)}, expected 60"

View File

@@ -0,0 +1,350 @@
"""
Tests for scripts/deploy-crons.py — cron job deployment from YAML.
"""
import json
import os
import tempfile
from pathlib import Path
from unittest.mock import patch
import pytest
# Add parent directory to path for imports
import sys
sys.path.insert(0, str(Path(__file__).parent.parent.parent))
from scripts.deploy_crons import (
job_needs_update,
normalize_job_for_comparison,
find_matching_job,
)
class TestJobNeedsUpdate:
"""Test the job_needs_update function."""
def test_no_update_when_identical(self):
"""No update needed when jobs are identical."""
current = {
"prompt": "Check server status",
"schedule": {"kind": "interval", "minutes": 60},
"model": "claude-sonnet-4",
"provider": "anthropic",
}
desired = {
"prompt": "Check server status",
"schedule": {"kind": "interval", "minutes": 60},
"model": "claude-sonnet-4",
"provider": "anthropic",
}
assert job_needs_update(current, desired) is False
def test_update_when_prompt_changes(self):
"""Update needed when prompt changes."""
current = {
"prompt": "Check server status",
"schedule": {"kind": "interval", "minutes": 60},
"model": "claude-sonnet-4",
"provider": "anthropic",
}
desired = {
"prompt": "Check server health",
"schedule": {"kind": "interval", "minutes": 60},
"model": "claude-sonnet-4",
"provider": "anthropic",
}
assert job_needs_update(current, desired) is True
def test_update_when_schedule_changes(self):
"""Update needed when schedule changes."""
current = {
"prompt": "Check server status",
"schedule": {"kind": "interval", "minutes": 60},
"model": "claude-sonnet-4",
"provider": "anthropic",
}
desired = {
"prompt": "Check server status",
"schedule": {"kind": "interval", "minutes": 30},
"model": "claude-sonnet-4",
"provider": "anthropic",
}
assert job_needs_update(current, desired) is True
def test_update_when_model_changes(self):
"""Update needed when model changes (FIX for issue #375)."""
current = {
"prompt": "Check server status",
"schedule": {"kind": "interval", "minutes": 60},
"model": "claude-sonnet-4",
"provider": "anthropic",
}
desired = {
"prompt": "Check server status",
"schedule": {"kind": "interval", "minutes": 60},
"model": "claude-sonnet-4-6",
"provider": "anthropic",
}
assert job_needs_update(current, desired) is True
def test_update_when_provider_changes(self):
"""Update needed when provider changes (FIX for issue #375)."""
current = {
"prompt": "Check server status",
"schedule": {"kind": "interval", "minutes": 60},
"model": "claude-sonnet-4",
"provider": "anthropic",
}
desired = {
"prompt": "Check server status",
"schedule": {"kind": "interval", "minutes": 60},
"model": "claude-sonnet-4",
"provider": "openrouter",
}
assert job_needs_update(current, desired) is True
def test_update_when_model_added(self):
"""Update needed when model is added to a job that didn't have one."""
current = {
"prompt": "Check server status",
"schedule": {"kind": "interval", "minutes": 60},
"model": None,
"provider": None,
}
desired = {
"prompt": "Check server status",
"schedule": {"kind": "interval", "minutes": 60},
"model": "claude-sonnet-4",
"provider": "anthropic",
}
assert job_needs_update(current, desired) is True
def test_update_when_provider_added(self):
"""Update needed when provider is added to a job that didn't have one."""
current = {
"prompt": "Check server status",
"schedule": {"kind": "interval", "minutes": 60},
"model": "claude-sonnet-4",
"provider": None,
}
desired = {
"prompt": "Check server status",
"schedule": {"kind": "interval", "minutes": 60},
"model": "claude-sonnet-4",
"provider": "anthropic",
}
assert job_needs_update(current, desired) is True
class TestNormalizeJobForComparison:
"""Test the normalize_job_for_comparison function."""
def test_normalizes_job_correctly(self):
"""Test that job normalization extracts the right fields."""
job = {
"id": "abc123",
"name": "Test Job",
"prompt": "Do something",
"schedule": {"kind": "interval", "minutes": 60},
"model": "claude-sonnet-4",
"provider": "anthropic",
"base_url": "https://api.anthropic.com",
"extra_field": "ignored",
}
normalized = normalize_job_for_comparison(job)
assert normalized["prompt"] == "Do something"
assert normalized["schedule"] == {"kind": "interval", "minutes": 60}
assert normalized["model"] == "claude-sonnet-4"
assert normalized["provider"] == "anthropic"
assert normalized["base_url"] == "https://api.anthropic.com"
assert "id" not in normalized
assert "name" not in normalized
assert "extra_field" not in normalized
def test_handles_missing_fields(self):
"""Test that normalization handles missing fields gracefully."""
job = {
"prompt": "Do something",
}
normalized = normalize_job_for_comparison(job)
assert normalized["prompt"] == "Do something"
assert normalized["schedule"] == {}
assert normalized["model"] is None
assert normalized["provider"] is None
assert normalized["base_url"] is None
class TestFindMatchingJob:
"""Test the find_matching_job function."""
def test_finds_by_id(self):
"""Test finding a job by ID."""
jobs = [
{"id": "abc123", "name": "Job 1"},
{"id": "def456", "name": "Job 2"},
]
yaml_job = {"id": "abc123", "name": "Different Name"}
result = find_matching_job(jobs, yaml_job)
assert result is not None
assert result["id"] == "abc123"
def test_finds_by_name(self):
"""Test finding a job by name."""
jobs = [
{"id": "abc123", "name": "Job 1"},
{"id": "def456", "name": "Job 2"},
]
yaml_job = {"name": "Job 2"}
result = find_matching_job(jobs, yaml_job)
assert result is not None
assert result["id"] == "def456"
def test_returns_none_when_no_match(self):
"""Test that None is returned when no match is found."""
jobs = [
{"id": "abc123", "name": "Job 1"},
{"id": "def456", "name": "Job 2"},
]
yaml_job = {"name": "Nonexistent Job"}
result = find_matching_job(jobs, yaml_job)
assert result is None
def test_prefers_id_over_name(self):
"""Test that ID matching takes precedence over name matching."""
jobs = [
{"id": "abc123", "name": "Job 1"},
{"id": "def456", "name": "Job 2"},
]
yaml_job = {"id": "abc123", "name": "Job 2"}
result = find_matching_job(jobs, yaml_job)
assert result is not None
assert result["id"] == "abc123" # ID match takes precedence
class TestDeployCronsIntegration:
"""Integration tests for deploy-crons.py."""
@pytest.fixture
def temp_dir(self, tmp_path):
"""Create a temporary directory for test files."""
return tmp_path
@pytest.fixture
def sample_yaml(self, temp_dir):
"""Create a sample cron-jobs.yaml file."""
yaml_content = """
jobs:
- name: "Server Health Check"
prompt: "Check server health and report status"
schedule: "every 1h"
model: "claude-sonnet-4"
provider: "anthropic"
deliver: "local"
- name: "Database Backup"
prompt: "Run database backup"
schedule: "0 2 * * *"
model: "claude-sonnet-4"
provider: "anthropic"
deliver: "local"
"""
yaml_file = temp_dir / "cron-jobs.yaml"
yaml_file.write_text(yaml_content)
return yaml_file
@pytest.fixture
def sample_jobs_json(self, temp_dir):
"""Create a sample jobs.json file."""
jobs_data = {
"jobs": [
{
"id": "job1",
"name": "Server Health Check",
"prompt": "Check server status",
"schedule": {"kind": "interval", "minutes": 60, "display": "every 1h"},
"schedule_display": "every 1h",
"model": "claude-sonnet-4",
"provider": "anthropic",
"enabled": True,
"state": "scheduled",
},
{
"id": "job2",
"name": "Database Backup",
"prompt": "Run database backup",
"schedule": {"kind": "cron", "expr": "0 2 * * *", "display": "0 2 * * *"},
"schedule_display": "0 2 * * *",
"model": None, # No model specified
"provider": None, # No provider specified
"enabled": True,
"state": "scheduled",
},
],
"updated_at": "2026-04-13T00:00:00",
}
jobs_file = temp_dir / "jobs.json"
jobs_file.write_text(json.dumps(jobs_data, indent=2))
return jobs_file
def test_detects_model_change(self, sample_yaml, sample_jobs_json, temp_dir):
"""Test that model changes are detected (FIX for issue #375)."""
from scripts.deploy_crons import job_needs_update, normalize_job_for_comparison
# Simulate a job where model changed
current_job = {
"prompt": "Check server health and report status",
"schedule": {"kind": "interval", "minutes": 60},
"model": "claude-sonnet-4", # Current model
"provider": "anthropic",
}
desired_job = {
"prompt": "Check server health and report status",
"schedule": {"kind": "interval", "minutes": 60},
"model": "claude-sonnet-4-6", # New model
"provider": "anthropic",
}
assert job_needs_update(current_job, desired_job) is True
def test_detects_provider_change(self, sample_yaml, sample_jobs_json, temp_dir):
"""Test that provider changes are detected (FIX for issue #375)."""
from scripts.deploy_crons import job_needs_update
# Simulate a job where provider changed
current_job = {
"prompt": "Check server health and report status",
"schedule": {"kind": "interval", "minutes": 60},
"model": "claude-sonnet-4",
"provider": "anthropic", # Current provider
}
desired_job = {
"prompt": "Check server health and report status",
"schedule": {"kind": "interval", "minutes": 60},
"model": "claude-sonnet-4",
"provider": "openrouter", # New provider
}
assert job_needs_update(current_job, desired_job) is True
def test_no_update_when_only_prompt_unchanged(self, sample_yaml, sample_jobs_json, temp_dir):
"""Test that jobs are NOT updated when only prompt is unchanged but model/provider changed."""
from scripts.deploy_crons import job_needs_update
# This is the bug scenario: prompt unchanged, but model/provider changed
current_job = {
"prompt": "Check server health and report status",
"schedule": {"kind": "interval", "minutes": 60},
"model": None, # No model
"provider": None, # No provider
}
desired_job = {
"prompt": "Check server health and report status", # Same prompt
"schedule": {"kind": "interval", "minutes": 60}, # Same schedule
"model": "claude-sonnet-4", # New model added
"provider": "anthropic", # New provider added
}
# This should return True (needs update) because model/provider changed
assert job_needs_update(current_job, desired_job) is True
if __name__ == "__main__":
pytest.main([__file__, "-v"])

View File

@@ -137,3 +137,78 @@ class TestBackwardCompat:
def test_tool_to_toolset_map(self):
assert isinstance(TOOL_TO_TOOLSET_MAP, dict)
assert len(TOOL_TO_TOOLSET_MAP) > 0
class TestToolReturnTypeValidation:
"""Poka-yoke: tool handlers must return JSON strings."""
def test_handler_returning_dict_is_wrapped(self, monkeypatch):
"""A handler that returns a dict should be auto-wrapped to JSON string."""
from tools.registry import registry
from model_tools import handle_function_call
import json
# Register a bad handler that returns dict instead of str
registry.register(
name="__test_bad_dict",
toolset="test",
schema={"name": "__test_bad_dict", "description": "test", "parameters": {"type": "object", "properties": {}}},
handler=lambda args, **kw: {"this is": "a dict not a string"},
)
result = handle_function_call("__test_bad_dict", {})
parsed = json.loads(result)
assert "output" in parsed
assert "_type_warning" in parsed
# Cleanup
registry._tools.pop("__test_bad_dict", None)
def test_handler_returning_none_is_wrapped(self, monkeypatch):
"""A handler that returns None should be auto-wrapped."""
from tools.registry import registry
from model_tools import handle_function_call
import json
registry.register(
name="__test_bad_none",
toolset="test",
schema={"name": "__test_bad_none", "description": "test", "parameters": {"type": "object", "properties": {}}},
handler=lambda args, **kw: None,
)
result = handle_function_call("__test_bad_none", {})
parsed = json.loads(result)
assert "_type_warning" in parsed
registry._tools.pop("__test_bad_none", None)
def test_handler_returning_non_json_string_is_wrapped(self):
"""A handler returning a plain string (not JSON) should be wrapped."""
from tools.registry import registry
from model_tools import handle_function_call
import json
registry.register(
name="__test_bad_plain",
toolset="test",
schema={"name": "__test_bad_plain", "description": "test", "parameters": {"type": "object", "properties": {}}},
handler=lambda args, **kw: "just a plain string, not json",
)
result = handle_function_call("__test_bad_plain", {})
parsed = json.loads(result)
assert "output" in parsed
registry._tools.pop("__test_bad_plain", None)
def test_handler_returning_valid_json_passes_through(self):
"""A handler returning valid JSON string passes through unchanged."""
from tools.registry import registry
from model_tools import handle_function_call
import json
registry.register(
name="__test_good",
toolset="test",
schema={"name": "__test_good", "description": "test", "parameters": {"type": "object", "properties": {}}},
handler=lambda args, **kw: json.dumps({"status": "ok", "data": [1, 2, 3]}),
)
result = handle_function_call("__test_good", {})
parsed = json.loads(result)
assert parsed == {"status": "ok", "data": [1, 2, 3]}
registry._tools.pop("__test_good", None)

View File

@@ -144,7 +144,8 @@ class TestMemoryStoreReplace:
def test_replace_no_match(self, store):
store.add("memory", "fact A")
result = store.replace("memory", "nonexistent", "new")
assert result["success"] is False
assert result["success"] is True
assert result["result"] == "no_match"
def test_replace_ambiguous_match(self, store):
store.add("memory", "server A runs nginx")
@@ -177,7 +178,8 @@ class TestMemoryStoreRemove:
def test_remove_no_match(self, store):
result = store.remove("memory", "nonexistent")
assert result["success"] is False
assert result["success"] is True
assert result["result"] == "no_match"
def test_remove_empty_old_text(self, store):
result = store.remove("memory", " ")

View File

@@ -260,8 +260,12 @@ class MemoryStore:
entries = self._entries_for(target)
matches = [(i, e) for i, e in enumerate(entries) if old_text in e]
if len(matches) == 0:
return {"success": False, "error": f"No entry matched '{old_text}'."}
if not matches:
return {
"success": True,
"result": "no_match",
"message": f"No entry matched '{old_text}'. The search substring was not found in any existing entry.",
}
if len(matches) > 1:
# If all matches are identical (exact duplicates), operate on the first one
@@ -310,8 +314,12 @@ class MemoryStore:
entries = self._entries_for(target)
matches = [(i, e) for i, e in enumerate(entries) if old_text in e]
if len(matches) == 0:
return {"success": False, "error": f"No entry matched '{old_text}'."}
if not matches:
return {
"success": True,
"result": "no_match",
"message": f"No entry matched '{old_text}'. The search substring was not found in any existing entry.",
}
if len(matches) > 1:
# If all matches are identical (exact duplicates), remove the first one
@@ -449,30 +457,30 @@ def memory_tool(
Returns JSON string with results.
"""
if store is None:
return json.dumps({"success": False, "error": "Memory is not available. It may be disabled in config or this environment."}, ensure_ascii=False)
return tool_error("Memory is not available. It may be disabled in config or this environment.", success=False)
if target not in ("memory", "user"):
return json.dumps({"success": False, "error": f"Invalid target '{target}'. Use 'memory' or 'user'."}, ensure_ascii=False)
return tool_error(f"Invalid target '{target}'. Use 'memory' or 'user'.", success=False)
if action == "add":
if not content:
return json.dumps({"success": False, "error": "Content is required for 'add' action."}, ensure_ascii=False)
return tool_error("Content is required for 'add' action.", success=False)
result = store.add(target, content)
elif action == "replace":
if not old_text:
return json.dumps({"success": False, "error": "old_text is required for 'replace' action."}, ensure_ascii=False)
return tool_error("old_text is required for 'replace' action.", success=False)
if not content:
return json.dumps({"success": False, "error": "content is required for 'replace' action."}, ensure_ascii=False)
return tool_error("content is required for 'replace' action.", success=False)
result = store.replace(target, old_text, content)
elif action == "remove":
if not old_text:
return json.dumps({"success": False, "error": "old_text is required for 'remove' action."}, ensure_ascii=False)
return tool_error("old_text is required for 'remove' action.", success=False)
result = store.remove(target, old_text)
else:
return json.dumps({"success": False, "error": f"Unknown action '{action}'. Use: add, replace, remove"}, ensure_ascii=False)
return tool_error(f"Unknown action '{action}'. Use: add, replace, remove", success=False)
return json.dumps(result, ensure_ascii=False)
@@ -539,7 +547,7 @@ MEMORY_SCHEMA = {
# --- Registry ---
from tools.registry import registry
from tools.registry import registry, tool_error
registry.register(
name="memory",