Compare commits
12 Commits
pre-agent-
...
gemini/iss
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
422d7700d6 | ||
|
|
49020b34d9 | ||
|
|
7468a6d063 | ||
|
|
f9155b28e3 | ||
|
|
16675abd79 | ||
|
|
1fce489364 | ||
|
|
7c7e19f6d2 | ||
|
|
8fd451fb52 | ||
|
|
0b63da1c9e | ||
|
|
20532819e9 | ||
|
|
27c1fb940d | ||
|
|
56364e62b4 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -8,3 +8,4 @@
|
|||||||
*.db-wal
|
*.db-wal
|
||||||
*.db-shm
|
*.db-shm
|
||||||
__pycache__/
|
__pycache__/
|
||||||
|
.aider*
|
||||||
|
|||||||
BIN
assets/Vassal Rising.mp3
Normal file
BIN
assets/Vassal Rising.mp3
Normal file
Binary file not shown.
62
autolora/manifest.yaml
Normal file
62
autolora/manifest.yaml
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
# Timmy Adapter Manifest
|
||||||
|
# Only version adapters, never base models. Base models are reproducible downloads.
|
||||||
|
# Adapters are the diff. The manifest is the record.
|
||||||
|
|
||||||
|
bases:
|
||||||
|
hermes3-8b-4bit:
|
||||||
|
source: mlx-community/Hermes-3-Llama-3.1-8B-4bit
|
||||||
|
local: ~/models/Hermes-3-Llama-3.1-8B-4bit
|
||||||
|
arch: llama3
|
||||||
|
params: 8B
|
||||||
|
quant: 4-bit MLX
|
||||||
|
|
||||||
|
hermes4-14b-4bit:
|
||||||
|
source: mlx-community/Hermes-4-14B-4bit
|
||||||
|
local: ~/models/hermes4-14b-mlx
|
||||||
|
arch: qwen3
|
||||||
|
params: 14.8B
|
||||||
|
quant: 4-bit MLX
|
||||||
|
|
||||||
|
adapters:
|
||||||
|
timmy-v0:
|
||||||
|
base: hermes3-8b-4bit
|
||||||
|
date: 2026-03-24
|
||||||
|
status: retired
|
||||||
|
data: 1154 sessions (technical only, no crisis/pastoral)
|
||||||
|
training: { lr: 2e-6, rank: 8, iters: 1000, best_iter: 800, val_loss: 2.134 }
|
||||||
|
eval: { identity: PASS, sovereignty: PASS, coding: PASS, crisis: FAIL, faith: FAIL }
|
||||||
|
notes: "First adapter. Crisis fails — data was 99% technical. Sacred rule: REJECTED."
|
||||||
|
|
||||||
|
timmy-v0-nan-run1:
|
||||||
|
base: hermes3-8b-4bit
|
||||||
|
date: 2026-03-24
|
||||||
|
status: rejected
|
||||||
|
notes: "NaN at iter 70. lr=1e-5 too high for 4-bit. Dead on arrival."
|
||||||
|
|
||||||
|
timmy-v0.1:
|
||||||
|
base: hermes3-8b-4bit
|
||||||
|
date: 2026-03-25
|
||||||
|
status: retired
|
||||||
|
data: 1203 train / 135 valid (enriched with 49 crisis/faith synthetic)
|
||||||
|
training: { lr: 5e-6, rank: 8, iters: 600, val_loss: 2.026 }
|
||||||
|
eval: { identity: PASS, sovereignty: PASS, coding: PASS, crisis: PARTIAL, faith: FAIL }
|
||||||
|
notes: "Crisis partial — mentions seeking help but no 988/gospel. Rank 8 can't override base priors."
|
||||||
|
|
||||||
|
timmy-v0.2:
|
||||||
|
base: hermes3-8b-4bit
|
||||||
|
date: 2026-03-25
|
||||||
|
status: rejected
|
||||||
|
data: 1214 train / 141 valid (12 targeted crisis/faith examples, 5x duplicated)
|
||||||
|
training: { lr: 5e-6, rank: 16, iters: 800 }
|
||||||
|
eval: "NaN at iter 100. Rank 16 + lr 5e-6 unstable on 4-bit."
|
||||||
|
notes: "Dead. Halve lr when doubling rank."
|
||||||
|
|
||||||
|
# NEXT
|
||||||
|
timmy-v1.0:
|
||||||
|
base: hermes4-14b-4bit
|
||||||
|
date: 2026-03-26
|
||||||
|
status: rejected
|
||||||
|
data: 1125 train / 126 valid (same curated set, reused from 8B — NOT re-tokenized)
|
||||||
|
training: { lr: 1e-6, rank: 16, iters: 800 }
|
||||||
|
eval: "Val NaN iter 100, train NaN iter 160. Dead."
|
||||||
|
notes: "Data was pre-truncated for Llama3 tokenizer, not Qwen3. Must re-run clean_data.py with 14B tokenizer before v1.1."
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# sync-up.sh — Push live ~/.hermes config changes UP to timmy-config repo.
|
# sync-up.sh — Push live ~/.hermes config changes UP to timmy-config repo.
|
||||||
# The harness is the source. The repo is the record.
|
# The harness is the source. The repo is the record.
|
||||||
# Run periodically or after significant config changes.
|
# Only commits when there are REAL changes (not empty syncs).
|
||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
@@ -12,31 +12,29 @@ log() { echo "[sync-up] $*"; }
|
|||||||
|
|
||||||
# === Copy live config into repo ===
|
# === Copy live config into repo ===
|
||||||
cp "$HERMES_HOME/config.yaml" "$REPO_DIR/config.yaml"
|
cp "$HERMES_HOME/config.yaml" "$REPO_DIR/config.yaml"
|
||||||
log "config.yaml"
|
|
||||||
|
|
||||||
# === Playbooks ===
|
|
||||||
for f in "$HERMES_HOME"/playbooks/*.yaml; do
|
for f in "$HERMES_HOME"/playbooks/*.yaml; do
|
||||||
[ -f "$f" ] && cp "$f" "$REPO_DIR/playbooks/"
|
[ -f "$f" ] && cp "$f" "$REPO_DIR/playbooks/"
|
||||||
done
|
done
|
||||||
log "playbooks/"
|
|
||||||
|
|
||||||
# === Skins ===
|
|
||||||
for f in "$HERMES_HOME"/skins/*; do
|
for f in "$HERMES_HOME"/skins/*; do
|
||||||
[ -f "$f" ] && cp "$f" "$REPO_DIR/skins/"
|
[ -f "$f" ] && cp "$f" "$REPO_DIR/skins/"
|
||||||
done
|
done
|
||||||
log "skins/"
|
|
||||||
|
|
||||||
# === Channel directory ===
|
|
||||||
[ -f "$HERMES_HOME/channel_directory.json" ] && cp "$HERMES_HOME/channel_directory.json" "$REPO_DIR/"
|
[ -f "$HERMES_HOME/channel_directory.json" ] && cp "$HERMES_HOME/channel_directory.json" "$REPO_DIR/"
|
||||||
log "channel_directory.json"
|
|
||||||
|
|
||||||
# === Commit and push if there are changes ===
|
# === Only commit if there are real diffs ===
|
||||||
cd "$REPO_DIR"
|
cd "$REPO_DIR"
|
||||||
if [ -n "$(git status --porcelain)" ]; then
|
git add -A
|
||||||
git add -A
|
|
||||||
git commit -m "sync: live config from ~/.hermes $(date +%Y-%m-%d_%H:%M)"
|
# Check if there are staged changes
|
||||||
git push
|
if git diff --cached --quiet; then
|
||||||
log "Pushed changes to Gitea."
|
|
||||||
else
|
|
||||||
log "No changes to sync."
|
log "No changes to sync."
|
||||||
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Build a meaningful commit message from what actually changed
|
||||||
|
CHANGED=$(git diff --cached --name-only | tr '\n' ', ' | sed 's/,$//')
|
||||||
|
git commit -m "config: update ${CHANGED}"
|
||||||
|
git push
|
||||||
|
log "Pushed: ${CHANGED}"
|
||||||
|
|||||||
252
bin/timmy-dashboard
Executable file
252
bin/timmy-dashboard
Executable file
@@ -0,0 +1,252 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Timmy Model Dashboard — where are my models, what are they doing.
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
timmy-dashboard # one-shot
|
||||||
|
timmy-dashboard --watch # live refresh every 30s
|
||||||
|
timmy-dashboard --hours=48 # look back 48h
|
||||||
|
"""
|
||||||
|
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import subprocess
|
||||||
|
import sys
|
||||||
|
import time
|
||||||
|
import urllib.request
|
||||||
|
from datetime import datetime, timezone, timedelta
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
HERMES_HOME = Path.home() / ".hermes"
|
||||||
|
TIMMY_HOME = Path.home() / ".timmy"
|
||||||
|
METRICS_DIR = TIMMY_HOME / "metrics"
|
||||||
|
|
||||||
|
# ── Data Sources ──────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
def get_ollama_models():
|
||||||
|
try:
|
||||||
|
req = urllib.request.Request("http://localhost:11434/api/tags")
|
||||||
|
with urllib.request.urlopen(req, timeout=5) as resp:
|
||||||
|
return json.loads(resp.read()).get("models", [])
|
||||||
|
except Exception:
|
||||||
|
return []
|
||||||
|
|
||||||
|
|
||||||
|
def get_loaded_models():
|
||||||
|
try:
|
||||||
|
req = urllib.request.Request("http://localhost:11434/api/ps")
|
||||||
|
with urllib.request.urlopen(req, timeout=5) as resp:
|
||||||
|
return json.loads(resp.read()).get("models", [])
|
||||||
|
except Exception:
|
||||||
|
return []
|
||||||
|
|
||||||
|
|
||||||
|
def get_huey_pid():
|
||||||
|
try:
|
||||||
|
r = subprocess.run(["pgrep", "-f", "huey_consumer"],
|
||||||
|
capture_output=True, text=True, timeout=5)
|
||||||
|
return r.stdout.strip().split("\n")[0] if r.returncode == 0 else None
|
||||||
|
except Exception:
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def get_hermes_sessions():
|
||||||
|
sessions_file = HERMES_HOME / "sessions" / "sessions.json"
|
||||||
|
if not sessions_file.exists():
|
||||||
|
return []
|
||||||
|
try:
|
||||||
|
data = json.loads(sessions_file.read_text())
|
||||||
|
return list(data.values())
|
||||||
|
except Exception:
|
||||||
|
return []
|
||||||
|
|
||||||
|
|
||||||
|
def get_heartbeat_ticks(date_str=None):
|
||||||
|
if not date_str:
|
||||||
|
date_str = datetime.now().strftime("%Y%m%d")
|
||||||
|
tick_file = TIMMY_HOME / "heartbeat" / f"ticks_{date_str}.jsonl"
|
||||||
|
if not tick_file.exists():
|
||||||
|
return []
|
||||||
|
ticks = []
|
||||||
|
for line in tick_file.read_text().strip().split("\n"):
|
||||||
|
if not line.strip():
|
||||||
|
continue
|
||||||
|
try:
|
||||||
|
ticks.append(json.loads(line))
|
||||||
|
except Exception:
|
||||||
|
continue
|
||||||
|
return ticks
|
||||||
|
|
||||||
|
|
||||||
|
def get_local_metrics(hours=24):
|
||||||
|
"""Read local inference metrics from jsonl files."""
|
||||||
|
records = []
|
||||||
|
cutoff = datetime.now(timezone.utc) - timedelta(hours=hours)
|
||||||
|
if not METRICS_DIR.exists():
|
||||||
|
return records
|
||||||
|
for f in sorted(METRICS_DIR.glob("local_*.jsonl")):
|
||||||
|
for line in f.read_text().strip().split("\n"):
|
||||||
|
if not line.strip():
|
||||||
|
continue
|
||||||
|
try:
|
||||||
|
r = json.loads(line)
|
||||||
|
ts = datetime.fromisoformat(r["timestamp"])
|
||||||
|
if ts >= cutoff:
|
||||||
|
records.append(r)
|
||||||
|
except Exception:
|
||||||
|
continue
|
||||||
|
return records
|
||||||
|
|
||||||
|
|
||||||
|
def get_cron_jobs():
|
||||||
|
"""Get Hermes cron job status."""
|
||||||
|
try:
|
||||||
|
r = subprocess.run(
|
||||||
|
["hermes", "cron", "list", "--json"],
|
||||||
|
capture_output=True, text=True, timeout=10
|
||||||
|
)
|
||||||
|
if r.returncode == 0:
|
||||||
|
return json.loads(r.stdout).get("jobs", [])
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
return []
|
||||||
|
|
||||||
|
|
||||||
|
# ── Rendering ─────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
DIM = "\033[2m"
|
||||||
|
BOLD = "\033[1m"
|
||||||
|
GREEN = "\033[32m"
|
||||||
|
YELLOW = "\033[33m"
|
||||||
|
RED = "\033[31m"
|
||||||
|
CYAN = "\033[36m"
|
||||||
|
RST = "\033[0m"
|
||||||
|
CLR = "\033[2J\033[H"
|
||||||
|
|
||||||
|
|
||||||
|
def render(hours=24):
|
||||||
|
models = get_ollama_models()
|
||||||
|
loaded = get_loaded_models()
|
||||||
|
huey_pid = get_huey_pid()
|
||||||
|
ticks = get_heartbeat_ticks()
|
||||||
|
metrics = get_local_metrics(hours)
|
||||||
|
sessions = get_hermes_sessions()
|
||||||
|
|
||||||
|
loaded_names = {m.get("name", "") for m in loaded}
|
||||||
|
now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
||||||
|
|
||||||
|
print(CLR, end="")
|
||||||
|
print(f"{BOLD}{'=' * 70}")
|
||||||
|
print(f" TIMMY MODEL DASHBOARD")
|
||||||
|
print(f" {now} | Huey: {GREEN}PID {huey_pid}{RST if huey_pid else f'{RED}DOWN{RST}'}")
|
||||||
|
print(f"{'=' * 70}{RST}")
|
||||||
|
|
||||||
|
# ── LOCAL MODELS ──
|
||||||
|
print(f"\n {BOLD}LOCAL MODELS (Ollama){RST}")
|
||||||
|
print(f" {DIM}{'-' * 55}{RST}")
|
||||||
|
if models:
|
||||||
|
for m in models:
|
||||||
|
name = m.get("name", "?")
|
||||||
|
size_gb = m.get("size", 0) / 1e9
|
||||||
|
if name in loaded_names:
|
||||||
|
status = f"{GREEN}IN VRAM{RST}"
|
||||||
|
else:
|
||||||
|
status = f"{DIM}on disk{RST}"
|
||||||
|
print(f" {name:35s} {size_gb:5.1f}GB {status}")
|
||||||
|
else:
|
||||||
|
print(f" {RED}(Ollama not responding){RST}")
|
||||||
|
|
||||||
|
# ── LOCAL INFERENCE ACTIVITY ──
|
||||||
|
print(f"\n {BOLD}LOCAL INFERENCE ({len(metrics)} calls, last {hours}h){RST}")
|
||||||
|
print(f" {DIM}{'-' * 55}{RST}")
|
||||||
|
if metrics:
|
||||||
|
by_caller = {}
|
||||||
|
for r in metrics:
|
||||||
|
caller = r.get("caller", "unknown")
|
||||||
|
if caller not in by_caller:
|
||||||
|
by_caller[caller] = {"count": 0, "success": 0, "errors": 0}
|
||||||
|
by_caller[caller]["count"] += 1
|
||||||
|
if r.get("success"):
|
||||||
|
by_caller[caller]["success"] += 1
|
||||||
|
else:
|
||||||
|
by_caller[caller]["errors"] += 1
|
||||||
|
for caller, stats in by_caller.items():
|
||||||
|
err = f" {RED}err:{stats['errors']}{RST}" if stats["errors"] else ""
|
||||||
|
print(f" {caller:25s} calls:{stats['count']:4d} "
|
||||||
|
f"{GREEN}ok:{stats['success']}{RST}{err}")
|
||||||
|
|
||||||
|
by_model = {}
|
||||||
|
for r in metrics:
|
||||||
|
model = r.get("model", "unknown")
|
||||||
|
by_model[model] = by_model.get(model, 0) + 1
|
||||||
|
print(f"\n {DIM}Models used:{RST}")
|
||||||
|
for model, count in sorted(by_model.items(), key=lambda x: -x[1]):
|
||||||
|
print(f" {model:30s} {count} calls")
|
||||||
|
else:
|
||||||
|
print(f" {DIM}(no local calls recorded yet){RST}")
|
||||||
|
|
||||||
|
# ── HEARTBEAT STATUS ──
|
||||||
|
print(f"\n {BOLD}HEARTBEAT ({len(ticks)} ticks today){RST}")
|
||||||
|
print(f" {DIM}{'-' * 55}{RST}")
|
||||||
|
if ticks:
|
||||||
|
last = ticks[-1]
|
||||||
|
decision = last.get("decision", last.get("actions", {}))
|
||||||
|
if isinstance(decision, dict):
|
||||||
|
severity = decision.get("severity", "unknown")
|
||||||
|
reasoning = decision.get("reasoning", "")
|
||||||
|
sev_color = GREEN if severity == "ok" else YELLOW if severity == "warning" else RED
|
||||||
|
print(f" Last tick: {last.get('tick_id', '?')}")
|
||||||
|
print(f" Severity: {sev_color}{severity}{RST}")
|
||||||
|
if reasoning:
|
||||||
|
print(f" Reasoning: {reasoning[:65]}")
|
||||||
|
else:
|
||||||
|
print(f" Last tick: {last.get('tick_id', '?')}")
|
||||||
|
actions = last.get("actions", [])
|
||||||
|
print(f" Actions: {actions if actions else 'none'}")
|
||||||
|
|
||||||
|
model_decisions = sum(1 for t in ticks
|
||||||
|
if isinstance(t.get("decision"), dict)
|
||||||
|
and t["decision"].get("severity") != "fallback")
|
||||||
|
fallback = len(ticks) - model_decisions
|
||||||
|
print(f" {CYAN}Model: {model_decisions}{RST} | {DIM}Fallback: {fallback}{RST}")
|
||||||
|
else:
|
||||||
|
print(f" {DIM}(no ticks today){RST}")
|
||||||
|
|
||||||
|
# ── HERMES SESSIONS ──
|
||||||
|
local_sessions = [s for s in sessions
|
||||||
|
if "localhost:11434" in str(s.get("base_url", ""))]
|
||||||
|
cloud_sessions = [s for s in sessions if s not in local_sessions]
|
||||||
|
print(f"\n {BOLD}HERMES SESSIONS{RST}")
|
||||||
|
print(f" {DIM}{'-' * 55}{RST}")
|
||||||
|
print(f" Total: {len(sessions)} | "
|
||||||
|
f"{GREEN}Local: {len(local_sessions)}{RST} | "
|
||||||
|
f"{YELLOW}Cloud: {len(cloud_sessions)}{RST}")
|
||||||
|
|
||||||
|
# ── ACTIVE LOOPS ──
|
||||||
|
print(f"\n {BOLD}ACTIVE LOOPS{RST}")
|
||||||
|
print(f" {DIM}{'-' * 55}{RST}")
|
||||||
|
print(f" {CYAN}heartbeat_tick{RST} 10m hermes4:14b DECIDE phase")
|
||||||
|
print(f" {DIM}model_health{RST} 5m (local check) Ollama ping")
|
||||||
|
print(f" {DIM}gemini_worker{RST} 20m gemini-2.5-pro aider")
|
||||||
|
print(f" {DIM}grok_worker{RST} 20m grok-3-fast opencode")
|
||||||
|
print(f" {DIM}cross_review{RST} 30m gemini+grok PR review")
|
||||||
|
|
||||||
|
print(f"\n{BOLD}{'=' * 70}{RST}")
|
||||||
|
print(f" {DIM}Refresh: timmy-dashboard --watch | History: --hours=N{RST}")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
watch = "--watch" in sys.argv
|
||||||
|
hours = 24
|
||||||
|
for a in sys.argv[1:]:
|
||||||
|
if a.startswith("--hours="):
|
||||||
|
hours = int(a.split("=")[1])
|
||||||
|
|
||||||
|
if watch:
|
||||||
|
try:
|
||||||
|
while True:
|
||||||
|
render(hours)
|
||||||
|
time.sleep(30)
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
print(f"\n{DIM}Dashboard stopped.{RST}")
|
||||||
|
else:
|
||||||
|
render(hours)
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"updated_at": "2026-03-26T06:59:37.300889",
|
"updated_at": "2026-03-26T10:19:33.045324",
|
||||||
"platforms": {
|
"platforms": {
|
||||||
"discord": [
|
"discord": [
|
||||||
{
|
{
|
||||||
|
|||||||
14
config.yaml
14
config.yaml
@@ -11,6 +11,7 @@ terminal:
|
|||||||
backend: local
|
backend: local
|
||||||
cwd: .
|
cwd: .
|
||||||
timeout: 180
|
timeout: 180
|
||||||
|
env_passthrough: []
|
||||||
docker_image: nikolaik/python-nodejs:python3.11-nodejs20
|
docker_image: nikolaik/python-nodejs:python3.11-nodejs20
|
||||||
docker_forward_env: []
|
docker_forward_env: []
|
||||||
singularity_image: docker://nikolaik/python-nodejs:python3.11-nodejs20
|
singularity_image: docker://nikolaik/python-nodejs:python3.11-nodejs20
|
||||||
@@ -25,6 +26,7 @@ terminal:
|
|||||||
persistent_shell: true
|
persistent_shell: true
|
||||||
browser:
|
browser:
|
||||||
inactivity_timeout: 120
|
inactivity_timeout: 120
|
||||||
|
command_timeout: 30
|
||||||
record_sessions: false
|
record_sessions: false
|
||||||
checkpoints:
|
checkpoints:
|
||||||
enabled: true
|
enabled: true
|
||||||
@@ -32,6 +34,8 @@ checkpoints:
|
|||||||
compression:
|
compression:
|
||||||
enabled: false
|
enabled: false
|
||||||
threshold: 0.5
|
threshold: 0.5
|
||||||
|
target_ratio: 0.2
|
||||||
|
protect_last_n: 20
|
||||||
summary_model: ''
|
summary_model: ''
|
||||||
summary_provider: ''
|
summary_provider: ''
|
||||||
summary_base_url: ''
|
summary_base_url: ''
|
||||||
@@ -142,6 +146,7 @@ delegation:
|
|||||||
provider: ''
|
provider: ''
|
||||||
base_url: ''
|
base_url: ''
|
||||||
api_key: ''
|
api_key: ''
|
||||||
|
max_iterations: 50
|
||||||
prefill_messages_file: ''
|
prefill_messages_file: ''
|
||||||
honcho: {}
|
honcho: {}
|
||||||
timezone: ''
|
timezone: ''
|
||||||
@@ -197,12 +202,13 @@ providers:
|
|||||||
base_url: http://localhost:11434/v1
|
base_url: http://localhost:11434/v1
|
||||||
model: hermes3:latest
|
model: hermes3:latest
|
||||||
mcp_servers:
|
mcp_servers:
|
||||||
orchestration:
|
|
||||||
command: /Users/apayne/.hermes/hermes-agent/venv/bin/python3
|
morrowind:
|
||||||
|
command: python3
|
||||||
args:
|
args:
|
||||||
- /Users/apayne/.hermes/hermes-agent/tools/orchestration_mcp_server.py
|
- /Users/apayne/.timmy/morrowind/mcp_server.py
|
||||||
env: {}
|
env: {}
|
||||||
timeout: 120
|
timeout: 30
|
||||||
fallback_model:
|
fallback_model:
|
||||||
provider: custom
|
provider: custom
|
||||||
model: gemini-2.5-pro
|
model: gemini-2.5-pro
|
||||||
|
|||||||
438
docs/local-model-integration-sketch.md
Normal file
438
docs/local-model-integration-sketch.md
Normal file
@@ -0,0 +1,438 @@
|
|||||||
|
# Local Model Integration Sketch v2
|
||||||
|
# Hermes4-14B in the Heartbeat Loop — No New Telemetry
|
||||||
|
|
||||||
|
## Principle
|
||||||
|
|
||||||
|
No new inference layer. Huey tasks call `hermes chat -q` pointed at
|
||||||
|
Ollama. Hermes handles sessions, token tracking, cost logging.
|
||||||
|
The dashboard reads what Hermes already stores.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Why Not Ollama Directly?
|
||||||
|
|
||||||
|
Ollama is fine as a serving backend. The issue isn't Ollama — it's that
|
||||||
|
calling Ollama directly with urllib bypasses the harness. The harness
|
||||||
|
already tracks sessions, tokens, model/provider, platform. Building a
|
||||||
|
second telemetry layer is owning code we don't need.
|
||||||
|
|
||||||
|
Ollama as a named provider isn't wired into the --provider flag yet,
|
||||||
|
but routing works via env vars:
|
||||||
|
|
||||||
|
HERMES_MODEL="hermes4:14b" \
|
||||||
|
HERMES_PROVIDER="custom" \
|
||||||
|
HERMES_BASE_URL="http://localhost:11434/v1" \
|
||||||
|
hermes chat -q "prompt here" -Q
|
||||||
|
|
||||||
|
This creates a tracked session, logs tokens, and returns the response.
|
||||||
|
That's our local inference call.
|
||||||
|
|
||||||
|
### Alternatives to Ollama for serving:
|
||||||
|
- **llama.cpp server** — lighter, no Python, raw HTTP. Good for single
|
||||||
|
model serving. Less convenient for model switching.
|
||||||
|
- **vLLM** — best throughput, but needs NVIDIA GPU. Not for M3 Mac.
|
||||||
|
- **MLX serving** — native Apple Silicon, but no OpenAI-compat API yet.
|
||||||
|
MLX is for training, not serving (our current policy).
|
||||||
|
- **llamafile** — single binary, portable. Good for distribution.
|
||||||
|
|
||||||
|
Verdict: Ollama is fine. It's the standard OpenAI-compat local server
|
||||||
|
on Mac. The issue was never Ollama — it was bypassing the harness.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 1. The Call Pattern
|
||||||
|
|
||||||
|
One function in tasks.py that all Huey tasks use:
|
||||||
|
|
||||||
|
```python
|
||||||
|
import subprocess
|
||||||
|
import json
|
||||||
|
|
||||||
|
HERMES_BIN = "hermes"
|
||||||
|
LOCAL_ENV = {
|
||||||
|
"HERMES_MODEL": "hermes4:14b",
|
||||||
|
"HERMES_PROVIDER": "custom",
|
||||||
|
"HERMES_BASE_URL": "http://localhost:11434/v1",
|
||||||
|
}
|
||||||
|
|
||||||
|
def hermes_local(prompt, caller_tag=None, max_retries=2):
|
||||||
|
"""Call hermes with local Ollama model. Returns response text.
|
||||||
|
|
||||||
|
Every call creates a hermes session with full telemetry.
|
||||||
|
caller_tag gets prepended to prompt for searchability.
|
||||||
|
"""
|
||||||
|
import os
|
||||||
|
env = os.environ.copy()
|
||||||
|
env.update(LOCAL_ENV)
|
||||||
|
|
||||||
|
tagged_prompt = prompt
|
||||||
|
if caller_tag:
|
||||||
|
tagged_prompt = f"[{caller_tag}] {prompt}"
|
||||||
|
|
||||||
|
for attempt in range(max_retries + 1):
|
||||||
|
try:
|
||||||
|
result = subprocess.run(
|
||||||
|
[HERMES_BIN, "chat", "-q", tagged_prompt, "-Q", "-t", "none"],
|
||||||
|
capture_output=True, text=True,
|
||||||
|
timeout=120, env=env,
|
||||||
|
)
|
||||||
|
if result.returncode == 0 and result.stdout.strip():
|
||||||
|
# Strip the session_id line from -Q output
|
||||||
|
lines = result.stdout.strip().split("\n")
|
||||||
|
response_lines = [l for l in lines if not l.startswith("session_id:")]
|
||||||
|
return "\n".join(response_lines).strip()
|
||||||
|
except subprocess.TimeoutExpired:
|
||||||
|
if attempt == max_retries:
|
||||||
|
return None
|
||||||
|
continue
|
||||||
|
return None
|
||||||
|
```
|
||||||
|
|
||||||
|
Notes:
|
||||||
|
- `-t none` disables all toolsets — the heartbeat model shouldn't
|
||||||
|
have terminal/file access. Pure reasoning only.
|
||||||
|
- `-Q` quiet mode suppresses banner/spinner, gives clean output.
|
||||||
|
- Every call creates a session in Hermes session store. Searchable,
|
||||||
|
exportable, countable.
|
||||||
|
- The `[caller_tag]` prefix lets you filter sessions by which Huey
|
||||||
|
task generated them: `hermes sessions list | grep heartbeat`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 2. Heartbeat DECIDE Phase
|
||||||
|
|
||||||
|
Replace the hardcoded if/else with a model call:
|
||||||
|
|
||||||
|
```python
|
||||||
|
# In heartbeat_tick(), replace the DECIDE + ACT section:
|
||||||
|
|
||||||
|
# DECIDE: let hermes4:14b reason about what to do
|
||||||
|
decide_prompt = f"""System state at {now.isoformat()}:
|
||||||
|
|
||||||
|
{json.dumps(perception, indent=2)}
|
||||||
|
|
||||||
|
Previous tick: {last_tick.get('tick_id', 'none')}
|
||||||
|
|
||||||
|
You are the heartbeat monitor. Based on this state:
|
||||||
|
1. List any actions needed (alerts, restarts, escalations). Empty if all OK.
|
||||||
|
2. Rate severity: ok, warning, or critical.
|
||||||
|
3. One sentence of reasoning.
|
||||||
|
|
||||||
|
Respond ONLY with JSON:
|
||||||
|
{{"actions": [], "severity": "ok", "reasoning": "..."}}"""
|
||||||
|
|
||||||
|
decision = None
|
||||||
|
try:
|
||||||
|
raw = hermes_local(decide_prompt, caller_tag="heartbeat_tick")
|
||||||
|
if raw:
|
||||||
|
# Try to parse JSON from the response
|
||||||
|
# Model might wrap it in markdown, so extract
|
||||||
|
for line in raw.split("\n"):
|
||||||
|
line = line.strip()
|
||||||
|
if line.startswith("{"):
|
||||||
|
decision = json.loads(line)
|
||||||
|
break
|
||||||
|
if not decision:
|
||||||
|
decision = json.loads(raw)
|
||||||
|
except (json.JSONDecodeError, Exception) as e:
|
||||||
|
decision = None
|
||||||
|
|
||||||
|
# Fallback to hardcoded logic if model fails or is down
|
||||||
|
if decision is None:
|
||||||
|
actions = []
|
||||||
|
if not perception.get("gitea_alive"):
|
||||||
|
actions.append("ALERT: Gitea unreachable")
|
||||||
|
health = perception.get("model_health", {})
|
||||||
|
if isinstance(health, dict) and not health.get("ollama_running"):
|
||||||
|
actions.append("ALERT: Ollama not running")
|
||||||
|
decision = {
|
||||||
|
"actions": actions,
|
||||||
|
"severity": "fallback",
|
||||||
|
"reasoning": "model unavailable, used hardcoded checks"
|
||||||
|
}
|
||||||
|
|
||||||
|
tick_record["decision"] = decision
|
||||||
|
actions = decision.get("actions", [])
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 3. DPO Candidate Collection
|
||||||
|
|
||||||
|
No new database. Hermes sessions ARE the DPO candidates.
|
||||||
|
|
||||||
|
Every `hermes_local()` call creates a session. To extract DPO pairs:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Export all local-model sessions
|
||||||
|
hermes sessions export --output /tmp/local-sessions.jsonl
|
||||||
|
|
||||||
|
# Filter for heartbeat decisions
|
||||||
|
grep "heartbeat_tick" /tmp/local-sessions.jsonl > heartbeat_decisions.jsonl
|
||||||
|
```
|
||||||
|
|
||||||
|
The existing `session_export` Huey task (runs every 4h) already extracts
|
||||||
|
user→assistant pairs. It just needs to be aware that some sessions are
|
||||||
|
now local-model decisions instead of human conversations.
|
||||||
|
|
||||||
|
For DPO annotation, add a simple review script:
|
||||||
|
|
||||||
|
```python
|
||||||
|
# review_decisions.py — reads heartbeat tick logs, shows model decisions,
|
||||||
|
# asks Alexander to mark chosen/rejected
|
||||||
|
# Writes annotations back to the tick log files
|
||||||
|
|
||||||
|
import json
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
TICK_DIR = Path.home() / ".timmy" / "heartbeat"
|
||||||
|
|
||||||
|
for log_file in sorted(TICK_DIR.glob("ticks_*.jsonl")):
|
||||||
|
for line in log_file.read_text().strip().split("\n"):
|
||||||
|
tick = json.loads(line)
|
||||||
|
decision = tick.get("decision", {})
|
||||||
|
if decision.get("severity") == "fallback":
|
||||||
|
continue # skip fallback entries
|
||||||
|
|
||||||
|
print(f"\n--- Tick {tick['tick_id']} ---")
|
||||||
|
print(f"Perception: {json.dumps(tick['perception'], indent=2)}")
|
||||||
|
print(f"Decision: {json.dumps(decision, indent=2)}")
|
||||||
|
|
||||||
|
rating = input("Rate (c=chosen, r=rejected, s=skip): ").strip()
|
||||||
|
if rating in ("c", "r"):
|
||||||
|
tick["dpo_label"] = "chosen" if rating == "c" else "rejected"
|
||||||
|
# write back... (append to annotated file)
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 4. Dashboard — Reads Hermes Data
|
||||||
|
|
||||||
|
```python
|
||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Timmy Model Dashboard — reads from Hermes, owns nothing."""
|
||||||
|
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import subprocess
|
||||||
|
import sys
|
||||||
|
import time
|
||||||
|
import urllib.request
|
||||||
|
from datetime import datetime
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
HERMES_HOME = Path.home() / ".hermes"
|
||||||
|
TIMMY_HOME = Path.home() / ".timmy"
|
||||||
|
|
||||||
|
|
||||||
|
def get_ollama_models():
|
||||||
|
"""What's available in Ollama."""
|
||||||
|
try:
|
||||||
|
req = urllib.request.Request("http://localhost:11434/api/tags")
|
||||||
|
with urllib.request.urlopen(req, timeout=5) as resp:
|
||||||
|
return json.loads(resp.read()).get("models", [])
|
||||||
|
except Exception:
|
||||||
|
return []
|
||||||
|
|
||||||
|
|
||||||
|
def get_loaded_models():
|
||||||
|
"""What's actually in VRAM right now."""
|
||||||
|
try:
|
||||||
|
req = urllib.request.Request("http://localhost:11434/api/ps")
|
||||||
|
with urllib.request.urlopen(req, timeout=5) as resp:
|
||||||
|
return json.loads(resp.read()).get("models", [])
|
||||||
|
except Exception:
|
||||||
|
return []
|
||||||
|
|
||||||
|
|
||||||
|
def get_huey_status():
|
||||||
|
try:
|
||||||
|
r = subprocess.run(["pgrep", "-f", "huey_consumer"],
|
||||||
|
capture_output=True, timeout=5)
|
||||||
|
return r.returncode == 0
|
||||||
|
except Exception:
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
def get_hermes_sessions(hours=24):
|
||||||
|
"""Read session metadata from Hermes session store."""
|
||||||
|
sessions_file = HERMES_HOME / "sessions" / "sessions.json"
|
||||||
|
if not sessions_file.exists():
|
||||||
|
return []
|
||||||
|
try:
|
||||||
|
data = json.loads(sessions_file.read_text())
|
||||||
|
return list(data.values())
|
||||||
|
except Exception:
|
||||||
|
return []
|
||||||
|
|
||||||
|
|
||||||
|
def get_heartbeat_ticks(date_str=None):
|
||||||
|
"""Read today's heartbeat ticks."""
|
||||||
|
if not date_str:
|
||||||
|
date_str = datetime.now().strftime("%Y%m%d")
|
||||||
|
tick_file = TIMMY_HOME / "heartbeat" / f"ticks_{date_str}.jsonl"
|
||||||
|
if not tick_file.exists():
|
||||||
|
return []
|
||||||
|
ticks = []
|
||||||
|
for line in tick_file.read_text().strip().split("\n"):
|
||||||
|
try:
|
||||||
|
ticks.append(json.loads(line))
|
||||||
|
except Exception:
|
||||||
|
continue
|
||||||
|
return ticks
|
||||||
|
|
||||||
|
|
||||||
|
def render(hours=24):
|
||||||
|
models = get_ollama_models()
|
||||||
|
loaded = get_loaded_models()
|
||||||
|
huey = get_huey_status()
|
||||||
|
sessions = get_hermes_sessions(hours)
|
||||||
|
ticks = get_heartbeat_ticks()
|
||||||
|
|
||||||
|
loaded_names = {m.get("name", "") for m in loaded}
|
||||||
|
|
||||||
|
print("\033[2J\033[H")
|
||||||
|
print("=" * 70)
|
||||||
|
print(" TIMMY MODEL DASHBOARD")
|
||||||
|
now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
||||||
|
print(f" {now} | Huey: {'UP' if huey else 'DOWN'} | Ollama models: {len(models)}")
|
||||||
|
print("=" * 70)
|
||||||
|
|
||||||
|
# DEPLOYMENTS
|
||||||
|
print("\n LOCAL MODELS")
|
||||||
|
print(" " + "-" * 55)
|
||||||
|
for m in models:
|
||||||
|
name = m.get("name", "?")
|
||||||
|
size_gb = m.get("size", 0) / 1e9
|
||||||
|
status = "IN VRAM" if name in loaded_names else "on disk"
|
||||||
|
print(f" {name:35s} {size_gb:5.1f}GB {status}")
|
||||||
|
if not models:
|
||||||
|
print(" (Ollama not responding)")
|
||||||
|
|
||||||
|
# HERMES SESSION ACTIVITY
|
||||||
|
# Count sessions by platform/provider
|
||||||
|
print(f"\n HERMES SESSIONS (recent)")
|
||||||
|
print(" " + "-" * 55)
|
||||||
|
local_sessions = [s for s in sessions
|
||||||
|
if "localhost" in str(s.get("origin", {}))]
|
||||||
|
cli_sessions = [s for s in sessions
|
||||||
|
if s.get("platform") == "cli" or s.get("origin", {}).get("platform") == "cli"]
|
||||||
|
|
||||||
|
total_tokens = sum(s.get("total_tokens", 0) for s in sessions)
|
||||||
|
print(f" Total sessions: {len(sessions)}")
|
||||||
|
print(f" CLI sessions: {len(cli_sessions)}")
|
||||||
|
print(f" Total tokens: {total_tokens:,}")
|
||||||
|
|
||||||
|
# HEARTBEAT STATUS
|
||||||
|
print(f"\n HEARTBEAT ({len(ticks)} ticks today)")
|
||||||
|
print(" " + "-" * 55)
|
||||||
|
if ticks:
|
||||||
|
last = ticks[-1]
|
||||||
|
decision = last.get("decision", {})
|
||||||
|
severity = decision.get("severity", "unknown")
|
||||||
|
reasoning = decision.get("reasoning", "no model decision yet")
|
||||||
|
print(f" Last tick: {last.get('tick_id', '?')}")
|
||||||
|
print(f" Severity: {severity}")
|
||||||
|
print(f" Reasoning: {reasoning[:60]}")
|
||||||
|
|
||||||
|
# Count model vs fallback decisions
|
||||||
|
model_decisions = sum(1 for t in ticks
|
||||||
|
if t.get("decision", {}).get("severity") != "fallback")
|
||||||
|
fallback = len(ticks) - model_decisions
|
||||||
|
print(f" Model decisions: {model_decisions} | Fallback: {fallback}")
|
||||||
|
|
||||||
|
# DPO labels if any
|
||||||
|
labeled = sum(1 for t in ticks if "dpo_label" in t)
|
||||||
|
if labeled:
|
||||||
|
chosen = sum(1 for t in ticks if t.get("dpo_label") == "chosen")
|
||||||
|
rejected = sum(1 for t in ticks if t.get("dpo_label") == "rejected")
|
||||||
|
print(f" DPO labeled: {labeled} (chosen: {chosen}, rejected: {rejected})")
|
||||||
|
else:
|
||||||
|
print(" (no ticks today)")
|
||||||
|
|
||||||
|
# ACTIVE LOOPS
|
||||||
|
print(f"\n ACTIVE LOOPS USING LOCAL MODELS")
|
||||||
|
print(" " + "-" * 55)
|
||||||
|
print(" heartbeat_tick 10m hermes4:14b DECIDE phase")
|
||||||
|
print(" (future) 15m hermes4:14b issue triage")
|
||||||
|
print(" (future) daily timmy:v0.1 morning report")
|
||||||
|
|
||||||
|
print(f"\n NON-LOCAL LOOPS (Gemini/Grok API)")
|
||||||
|
print(" " + "-" * 55)
|
||||||
|
print(" gemini_worker 20m gemini-2.5-pro aider")
|
||||||
|
print(" grok_worker 20m grok-3-fast opencode")
|
||||||
|
print(" cross_review 30m both PR review")
|
||||||
|
|
||||||
|
print("\n" + "=" * 70)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
watch = "--watch" in sys.argv
|
||||||
|
hours = 24
|
||||||
|
for a in sys.argv[1:]:
|
||||||
|
if a.startswith("--hours="):
|
||||||
|
hours = int(a.split("=")[1])
|
||||||
|
if watch:
|
||||||
|
while True:
|
||||||
|
render(hours)
|
||||||
|
time.sleep(30)
|
||||||
|
else:
|
||||||
|
render(hours)
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 5. Implementation Steps
|
||||||
|
|
||||||
|
### Step 1: Add hermes_local() to tasks.py
|
||||||
|
- One function, ~20 lines
|
||||||
|
- Calls `hermes chat -q` with Ollama env vars
|
||||||
|
- All telemetry comes from Hermes for free
|
||||||
|
|
||||||
|
### Step 2: Wire heartbeat_tick DECIDE phase
|
||||||
|
- Replace 6 lines of if/else with hermes_local() call
|
||||||
|
- Keep hardcoded fallback when model is down
|
||||||
|
- Decision stored in tick record for DPO review
|
||||||
|
|
||||||
|
### Step 3: Fix the MCP server warning
|
||||||
|
- The orchestration MCP server path is broken — harmless but noisy
|
||||||
|
- Either fix the path or remove from config
|
||||||
|
|
||||||
|
### Step 4: Drop model_dashboard.py in timmy-config/bin/
|
||||||
|
- Reads Ollama API, Hermes sessions, heartbeat ticks
|
||||||
|
- No new data stores — just views over existing ones
|
||||||
|
- `python3 model_dashboard.py --watch` for live view
|
||||||
|
|
||||||
|
### Step 5: Expand to more Huey tasks
|
||||||
|
- triage_issues: model reads issue, picks agent
|
||||||
|
- good_morning_report: model writes the "From Timmy" section
|
||||||
|
- Each expansion is just calling hermes_local() with a different prompt
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## What Gets Hotfixed in Hermes Config
|
||||||
|
|
||||||
|
If `hermes insights` is broken (the cache_read_tokens column error),
|
||||||
|
that needs a fix. The dashboard falls back to reading sessions.json
|
||||||
|
directly, but insights would be the better data source.
|
||||||
|
|
||||||
|
The `providers.ollama` section in config.yaml exists but isn't wired
|
||||||
|
to the --provider flag. Filing this upstream or patching locally would
|
||||||
|
let us do `hermes chat -q "..." --provider ollama` cleanly instead
|
||||||
|
of relying on env vars. Not blocking — env vars work today.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## What This Owns
|
||||||
|
|
||||||
|
- hermes_local() — 20-line wrapper around a subprocess call
|
||||||
|
- model_dashboard.py — read-only views over existing data
|
||||||
|
- review_decisions.py — optional DPO annotation CLI
|
||||||
|
|
||||||
|
## What This Does NOT Own
|
||||||
|
|
||||||
|
- Inference. Ollama does that.
|
||||||
|
- Telemetry. Hermes does that.
|
||||||
|
- Session storage. Hermes does that.
|
||||||
|
- Token counting. Hermes does that.
|
||||||
|
- Training pipeline. Already exists in timmy-config/training/.
|
||||||
530
gitea_client.py
Normal file
530
gitea_client.py
Normal file
@@ -0,0 +1,530 @@
|
|||||||
|
"""
|
||||||
|
Gitea API Client — typed, sovereign, zero-dependency.
|
||||||
|
|
||||||
|
Replaces raw curl calls scattered across 41 bash scripts.
|
||||||
|
Uses only stdlib (urllib) so it works on any Python install.
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
from tools.gitea_client import GiteaClient
|
||||||
|
|
||||||
|
client = GiteaClient() # reads token from ~/.hermes/gitea_token
|
||||||
|
issues = client.list_issues("Timmy_Foundation/the-nexus", state="open")
|
||||||
|
client.create_comment("Timmy_Foundation/the-nexus", 42, "PR created.")
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import urllib.request
|
||||||
|
import urllib.error
|
||||||
|
import urllib.parse
|
||||||
|
from dataclasses import dataclass, field
|
||||||
|
from datetime import datetime, timezone
|
||||||
|
from pathlib import Path
|
||||||
|
from typing import Any, Optional
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Configuration
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
def _read_token() -> str:
|
||||||
|
"""Read Gitea token from standard locations."""
|
||||||
|
for path in [
|
||||||
|
Path.home() / ".hermes" / "gitea_token",
|
||||||
|
Path.home() / ".hermes" / "gitea_token_vps",
|
||||||
|
Path.home() / ".config" / "gitea" / "token",
|
||||||
|
]:
|
||||||
|
if path.exists():
|
||||||
|
return path.read_text().strip()
|
||||||
|
raise FileNotFoundError(
|
||||||
|
"No Gitea token found. Checked: ~/.hermes/gitea_token, "
|
||||||
|
"~/.hermes/gitea_token_vps, ~/.config/gitea/token"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _read_base_url() -> str:
|
||||||
|
"""Read Gitea base URL. Defaults to the VPS."""
|
||||||
|
env = os.environ.get("GITEA_URL")
|
||||||
|
if env:
|
||||||
|
return env.rstrip("/")
|
||||||
|
return "http://143.198.27.163:3000"
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Data classes — typed responses
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class User:
|
||||||
|
id: int
|
||||||
|
login: str
|
||||||
|
full_name: str = ""
|
||||||
|
email: str = ""
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def from_dict(cls, d: dict) -> "User":
|
||||||
|
return cls(
|
||||||
|
id=d.get("id", 0),
|
||||||
|
login=d.get("login", ""),
|
||||||
|
full_name=d.get("full_name", ""),
|
||||||
|
email=d.get("email", ""),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class Label:
|
||||||
|
id: int
|
||||||
|
name: str
|
||||||
|
color: str = ""
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def from_dict(cls, d: dict) -> "Label":
|
||||||
|
return cls(id=d.get("id", 0), name=d.get("name", ""), color=d.get("color", ""))
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class Issue:
|
||||||
|
number: int
|
||||||
|
title: str
|
||||||
|
body: str
|
||||||
|
state: str
|
||||||
|
user: User
|
||||||
|
assignees: list[User] = field(default_factory=list)
|
||||||
|
labels: list[Label] = field(default_factory=list)
|
||||||
|
created_at: str = ""
|
||||||
|
updated_at: str = ""
|
||||||
|
comments: int = 0
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def from_dict(cls, d: dict) -> "Issue":
|
||||||
|
return cls(
|
||||||
|
number=d.get("number", 0),
|
||||||
|
title=d.get("title", ""),
|
||||||
|
body=d.get("body", "") or "",
|
||||||
|
state=d.get("state", ""),
|
||||||
|
user=User.from_dict(d.get("user", {})),
|
||||||
|
assignees=[User.from_dict(a) for a in d.get("assignees", []) or []],
|
||||||
|
labels=[Label.from_dict(lb) for lb in d.get("labels", []) or []],
|
||||||
|
created_at=d.get("created_at", ""),
|
||||||
|
updated_at=d.get("updated_at", ""),
|
||||||
|
comments=d.get("comments", 0),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class Comment:
|
||||||
|
id: int
|
||||||
|
body: str
|
||||||
|
user: User
|
||||||
|
created_at: str = ""
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def from_dict(cls, d: dict) -> "Comment":
|
||||||
|
return cls(
|
||||||
|
id=d.get("id", 0),
|
||||||
|
body=d.get("body", "") or "",
|
||||||
|
user=User.from_dict(d.get("user", {})),
|
||||||
|
created_at=d.get("created_at", ""),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class PullRequest:
|
||||||
|
number: int
|
||||||
|
title: str
|
||||||
|
body: str
|
||||||
|
state: str
|
||||||
|
user: User
|
||||||
|
head_branch: str = ""
|
||||||
|
base_branch: str = ""
|
||||||
|
mergeable: bool = False
|
||||||
|
merged: bool = False
|
||||||
|
changed_files: int = 0
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def from_dict(cls, d: dict) -> "PullRequest":
|
||||||
|
head = d.get("head", {}) or {}
|
||||||
|
base = d.get("base", {}) or {}
|
||||||
|
return cls(
|
||||||
|
number=d.get("number", 0),
|
||||||
|
title=d.get("title", ""),
|
||||||
|
body=d.get("body", "") or "",
|
||||||
|
state=d.get("state", ""),
|
||||||
|
user=User.from_dict(d.get("user", {})),
|
||||||
|
head_branch=head.get("ref", ""),
|
||||||
|
base_branch=base.get("ref", ""),
|
||||||
|
mergeable=d.get("mergeable", False),
|
||||||
|
merged=d.get("merged", False) or False,
|
||||||
|
changed_files=d.get("changed_files", 0),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class PRFile:
|
||||||
|
filename: str
|
||||||
|
status: str # added, modified, deleted
|
||||||
|
additions: int = 0
|
||||||
|
deletions: int = 0
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def from_dict(cls, d: dict) -> "PRFile":
|
||||||
|
return cls(
|
||||||
|
filename=d.get("filename", ""),
|
||||||
|
status=d.get("status", ""),
|
||||||
|
additions=d.get("additions", 0),
|
||||||
|
deletions=d.get("deletions", 0),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Client
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
class GiteaError(Exception):
|
||||||
|
"""Gitea API error with status code."""
|
||||||
|
def __init__(self, status: int, message: str, url: str = ""):
|
||||||
|
self.status = status
|
||||||
|
self.url = url
|
||||||
|
super().__init__(f"Gitea {status}: {message} [{url}]")
|
||||||
|
|
||||||
|
|
||||||
|
class GiteaClient:
|
||||||
|
"""
|
||||||
|
Typed Gitea API client. Sovereign, zero-dependency.
|
||||||
|
|
||||||
|
Covers all operations the agent loops need:
|
||||||
|
- Issues: list, get, create, update, close, assign, label, comment
|
||||||
|
- PRs: list, get, create, merge, update, close, files
|
||||||
|
- Repos: list org repos
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
base_url: Optional[str] = None,
|
||||||
|
token: Optional[str] = None,
|
||||||
|
):
|
||||||
|
self.base_url = base_url or _read_base_url()
|
||||||
|
self.token = token or _read_token()
|
||||||
|
self.api = f"{self.base_url}/api/v1"
|
||||||
|
|
||||||
|
# -- HTTP layer ----------------------------------------------------------
|
||||||
|
|
||||||
|
def _request(
|
||||||
|
self,
|
||||||
|
method: str,
|
||||||
|
path: str,
|
||||||
|
data: Optional[dict] = None,
|
||||||
|
params: Optional[dict] = None,
|
||||||
|
) -> Any:
|
||||||
|
"""Make an authenticated API request. Returns parsed JSON."""
|
||||||
|
url = f"{self.api}{path}"
|
||||||
|
if params:
|
||||||
|
url += "?" + urllib.parse.urlencode(params)
|
||||||
|
|
||||||
|
body = json.dumps(data).encode() if data else None
|
||||||
|
req = urllib.request.Request(url, data=body, method=method)
|
||||||
|
req.add_header("Authorization", f"token {self.token}")
|
||||||
|
req.add_header("Content-Type", "application/json")
|
||||||
|
req.add_header("Accept", "application/json")
|
||||||
|
|
||||||
|
try:
|
||||||
|
with urllib.request.urlopen(req, timeout=30) as resp:
|
||||||
|
raw = resp.read().decode()
|
||||||
|
if not raw:
|
||||||
|
return {}
|
||||||
|
return json.loads(raw)
|
||||||
|
except urllib.error.HTTPError as e:
|
||||||
|
body_text = ""
|
||||||
|
try:
|
||||||
|
body_text = e.read().decode()
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
raise GiteaError(e.code, body_text, url) from e
|
||||||
|
|
||||||
|
def _get(self, path: str, **params) -> Any:
|
||||||
|
# Filter out None values
|
||||||
|
clean = {k: v for k, v in params.items() if v is not None}
|
||||||
|
return self._request("GET", path, params=clean)
|
||||||
|
|
||||||
|
def _post(self, path: str, data: dict) -> Any:
|
||||||
|
return self._request("POST", path, data=data)
|
||||||
|
|
||||||
|
def _patch(self, path: str, data: dict) -> Any:
|
||||||
|
return self._request("PATCH", path, data=data)
|
||||||
|
|
||||||
|
def _delete(self, path: str) -> Any:
|
||||||
|
return self._request("DELETE", path)
|
||||||
|
|
||||||
|
def _repo_path(self, repo: str) -> str:
|
||||||
|
"""Convert 'owner/name' to '/repos/owner/name'."""
|
||||||
|
return f"/repos/{repo}"
|
||||||
|
|
||||||
|
# -- Health --------------------------------------------------------------
|
||||||
|
|
||||||
|
def ping(self) -> bool:
|
||||||
|
"""Check if Gitea is responding."""
|
||||||
|
try:
|
||||||
|
self._get("/version")
|
||||||
|
return True
|
||||||
|
except Exception:
|
||||||
|
return False
|
||||||
|
|
||||||
|
# -- Repos ---------------------------------------------------------------
|
||||||
|
|
||||||
|
def list_org_repos(self, org: str, limit: int = 50) -> list[dict]:
|
||||||
|
"""List repos in an organization."""
|
||||||
|
return self._get(f"/orgs/{org}/repos", limit=limit)
|
||||||
|
|
||||||
|
# -- Issues --------------------------------------------------------------
|
||||||
|
|
||||||
|
def list_issues(
|
||||||
|
self,
|
||||||
|
repo: str,
|
||||||
|
state: str = "open",
|
||||||
|
assignee: Optional[str] = None,
|
||||||
|
labels: Optional[str] = None,
|
||||||
|
sort: str = "created",
|
||||||
|
direction: str = "desc",
|
||||||
|
limit: int = 30,
|
||||||
|
page: int = 1,
|
||||||
|
) -> list[Issue]:
|
||||||
|
"""List issues for a repo."""
|
||||||
|
raw = self._get(
|
||||||
|
f"{self._repo_path(repo)}/issues",
|
||||||
|
state=state,
|
||||||
|
type="issues",
|
||||||
|
assignee=assignee,
|
||||||
|
labels=labels,
|
||||||
|
sort=sort,
|
||||||
|
direction=direction,
|
||||||
|
limit=limit,
|
||||||
|
page=page,
|
||||||
|
)
|
||||||
|
return [Issue.from_dict(i) for i in raw]
|
||||||
|
|
||||||
|
def get_issue(self, repo: str, number: int) -> Issue:
|
||||||
|
"""Get a single issue."""
|
||||||
|
return Issue.from_dict(
|
||||||
|
self._get(f"{self._repo_path(repo)}/issues/{number}")
|
||||||
|
)
|
||||||
|
|
||||||
|
def create_issue(
|
||||||
|
self,
|
||||||
|
repo: str,
|
||||||
|
title: str,
|
||||||
|
body: str = "",
|
||||||
|
labels: Optional[list[int]] = None,
|
||||||
|
assignees: Optional[list[str]] = None,
|
||||||
|
) -> Issue:
|
||||||
|
"""Create an issue."""
|
||||||
|
data: dict[str, Any] = {"title": title, "body": body}
|
||||||
|
if labels:
|
||||||
|
data["labels"] = labels
|
||||||
|
if assignees:
|
||||||
|
data["assignees"] = assignees
|
||||||
|
return Issue.from_dict(
|
||||||
|
self._post(f"{self._repo_path(repo)}/issues", data)
|
||||||
|
)
|
||||||
|
|
||||||
|
def update_issue(
|
||||||
|
self,
|
||||||
|
repo: str,
|
||||||
|
number: int,
|
||||||
|
title: Optional[str] = None,
|
||||||
|
body: Optional[str] = None,
|
||||||
|
state: Optional[str] = None,
|
||||||
|
assignees: Optional[list[str]] = None,
|
||||||
|
) -> Issue:
|
||||||
|
"""Update an issue (title, body, state, assignees)."""
|
||||||
|
data: dict[str, Any] = {}
|
||||||
|
if title is not None:
|
||||||
|
data["title"] = title
|
||||||
|
if body is not None:
|
||||||
|
data["body"] = body
|
||||||
|
if state is not None:
|
||||||
|
data["state"] = state
|
||||||
|
if assignees is not None:
|
||||||
|
data["assignees"] = assignees
|
||||||
|
return Issue.from_dict(
|
||||||
|
self._patch(f"{self._repo_path(repo)}/issues/{number}", data)
|
||||||
|
)
|
||||||
|
|
||||||
|
def close_issue(self, repo: str, number: int) -> Issue:
|
||||||
|
"""Close an issue."""
|
||||||
|
return self.update_issue(repo, number, state="closed")
|
||||||
|
|
||||||
|
def assign_issue(self, repo: str, number: int, assignees: list[str]) -> Issue:
|
||||||
|
"""Assign users to an issue."""
|
||||||
|
return self.update_issue(repo, number, assignees=assignees)
|
||||||
|
|
||||||
|
def add_labels(self, repo: str, number: int, label_ids: list[int]) -> list[Label]:
|
||||||
|
"""Add labels to an issue."""
|
||||||
|
raw = self._post(
|
||||||
|
f"{self._repo_path(repo)}/issues/{number}/labels",
|
||||||
|
{"labels": label_ids},
|
||||||
|
)
|
||||||
|
return [Label.from_dict(lb) for lb in raw]
|
||||||
|
|
||||||
|
# -- Comments ------------------------------------------------------------
|
||||||
|
|
||||||
|
def list_comments(
|
||||||
|
self, repo: str, number: int, since: Optional[str] = None
|
||||||
|
) -> list[Comment]:
|
||||||
|
"""List comments on an issue."""
|
||||||
|
raw = self._get(
|
||||||
|
f"{self._repo_path(repo)}/issues/{number}/comments",
|
||||||
|
since=since,
|
||||||
|
)
|
||||||
|
return [Comment.from_dict(c) for c in raw]
|
||||||
|
|
||||||
|
def create_comment(self, repo: str, number: int, body: str) -> Comment:
|
||||||
|
"""Add a comment to an issue."""
|
||||||
|
return Comment.from_dict(
|
||||||
|
self._post(
|
||||||
|
f"{self._repo_path(repo)}/issues/{number}/comments",
|
||||||
|
{"body": body},
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
# -- Pull Requests -------------------------------------------------------
|
||||||
|
|
||||||
|
def list_pulls(
|
||||||
|
self,
|
||||||
|
repo: str,
|
||||||
|
state: str = "open",
|
||||||
|
sort: str = "newest",
|
||||||
|
limit: int = 20,
|
||||||
|
page: int = 1,
|
||||||
|
) -> list[PullRequest]:
|
||||||
|
"""List pull requests."""
|
||||||
|
raw = self._get(
|
||||||
|
f"{self._repo_path(repo)}/pulls",
|
||||||
|
state=state,
|
||||||
|
sort=sort,
|
||||||
|
limit=limit,
|
||||||
|
page=page,
|
||||||
|
)
|
||||||
|
return [PullRequest.from_dict(p) for p in raw]
|
||||||
|
|
||||||
|
def get_pull(self, repo: str, number: int) -> PullRequest:
|
||||||
|
"""Get a single pull request."""
|
||||||
|
return PullRequest.from_dict(
|
||||||
|
self._get(f"{self._repo_path(repo)}/pulls/{number}")
|
||||||
|
)
|
||||||
|
|
||||||
|
def create_pull(
|
||||||
|
self,
|
||||||
|
repo: str,
|
||||||
|
title: str,
|
||||||
|
head: str,
|
||||||
|
base: str = "main",
|
||||||
|
body: str = "",
|
||||||
|
) -> PullRequest:
|
||||||
|
"""Create a pull request."""
|
||||||
|
return PullRequest.from_dict(
|
||||||
|
self._post(
|
||||||
|
f"{self._repo_path(repo)}/pulls",
|
||||||
|
{"title": title, "head": head, "base": base, "body": body},
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
def merge_pull(
|
||||||
|
self,
|
||||||
|
repo: str,
|
||||||
|
number: int,
|
||||||
|
method: str = "squash",
|
||||||
|
delete_branch: bool = True,
|
||||||
|
) -> bool:
|
||||||
|
"""Merge a pull request. Returns True on success."""
|
||||||
|
try:
|
||||||
|
self._post(
|
||||||
|
f"{self._repo_path(repo)}/pulls/{number}/merge",
|
||||||
|
{"Do": method, "delete_branch_after_merge": delete_branch},
|
||||||
|
)
|
||||||
|
return True
|
||||||
|
except GiteaError as e:
|
||||||
|
if e.status == 405: # not mergeable
|
||||||
|
return False
|
||||||
|
raise
|
||||||
|
|
||||||
|
def update_pull_branch(
|
||||||
|
self, repo: str, number: int, style: str = "rebase"
|
||||||
|
) -> bool:
|
||||||
|
"""Update a PR branch (rebase onto base). Returns True on success."""
|
||||||
|
try:
|
||||||
|
self._post(
|
||||||
|
f"{self._repo_path(repo)}/pulls/{number}/update",
|
||||||
|
{"style": style},
|
||||||
|
)
|
||||||
|
return True
|
||||||
|
except GiteaError:
|
||||||
|
return False
|
||||||
|
|
||||||
|
def close_pull(self, repo: str, number: int) -> PullRequest:
|
||||||
|
"""Close a pull request without merging."""
|
||||||
|
return PullRequest.from_dict(
|
||||||
|
self._patch(
|
||||||
|
f"{self._repo_path(repo)}/pulls/{number}",
|
||||||
|
{"state": "closed"},
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
def get_pull_files(self, repo: str, number: int) -> list[PRFile]:
|
||||||
|
"""Get files changed in a pull request."""
|
||||||
|
raw = self._get(f"{self._repo_path(repo)}/pulls/{number}/files")
|
||||||
|
return [PRFile.from_dict(f) for f in raw]
|
||||||
|
|
||||||
|
def find_pull_by_branch(
|
||||||
|
self, repo: str, branch: str
|
||||||
|
) -> Optional[PullRequest]:
|
||||||
|
"""Find an open PR for a given head branch."""
|
||||||
|
prs = self.list_pulls(repo, state="open", limit=50)
|
||||||
|
for pr in prs:
|
||||||
|
if pr.head_branch == branch:
|
||||||
|
return pr
|
||||||
|
return None
|
||||||
|
|
||||||
|
# -- Convenience ---------------------------------------------------------
|
||||||
|
|
||||||
|
def get_issue_with_comments(
|
||||||
|
self, repo: str, number: int, last_n: int = 5
|
||||||
|
) -> tuple[Issue, list[Comment]]:
|
||||||
|
"""Get an issue and its most recent comments."""
|
||||||
|
issue = self.get_issue(repo, number)
|
||||||
|
comments = self.list_comments(repo, number)
|
||||||
|
return issue, comments[-last_n:] if len(comments) > last_n else comments
|
||||||
|
|
||||||
|
def find_unassigned_issues(
|
||||||
|
self,
|
||||||
|
repo: str,
|
||||||
|
limit: int = 30,
|
||||||
|
exclude_labels: Optional[list[str]] = None,
|
||||||
|
exclude_title_patterns: Optional[list[str]] = None,
|
||||||
|
) -> list[Issue]:
|
||||||
|
"""Find open issues not assigned to anyone."""
|
||||||
|
issues = self.list_issues(repo, state="open", limit=limit)
|
||||||
|
result = []
|
||||||
|
for issue in issues:
|
||||||
|
if issue.assignees:
|
||||||
|
continue
|
||||||
|
if exclude_labels:
|
||||||
|
issue_label_names = {lb.name for lb in issue.labels}
|
||||||
|
if issue_label_names & set(exclude_labels):
|
||||||
|
continue
|
||||||
|
if exclude_title_patterns:
|
||||||
|
title_lower = issue.title.lower()
|
||||||
|
if any(p.lower() in title_lower for p in exclude_title_patterns):
|
||||||
|
continue
|
||||||
|
result.append(issue)
|
||||||
|
return result
|
||||||
|
|
||||||
|
def find_agent_issues(self, repo: str, agent: str, limit: int = 50) -> list[Issue]:
|
||||||
|
"""Find open issues assigned to a specific agent."""
|
||||||
|
return self.list_issues(repo, state="open", assignee=agent, limit=limit)
|
||||||
|
|
||||||
|
def find_agent_pulls(self, repo: str, agent: str) -> list[PullRequest]:
|
||||||
|
"""Find open PRs created by a specific agent."""
|
||||||
|
prs = self.list_pulls(repo, state="open", limit=50)
|
||||||
|
return [pr for pr in prs if pr.user.login == agent]
|
||||||
149
tasks.py
149
tasks.py
@@ -8,21 +8,95 @@ import sys
|
|||||||
from datetime import datetime, timezone
|
from datetime import datetime, timezone
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
# Gitea client lives in sovereign-orchestration
|
|
||||||
sys.path.insert(0, str(Path.home() / ".timmy" / "sovereign-orchestration" / "src"))
|
|
||||||
|
|
||||||
from orchestration import huey
|
from orchestration import huey
|
||||||
from huey import crontab
|
from huey import crontab
|
||||||
from gitea_client import GiteaClient
|
from gitea_client import GiteaClient
|
||||||
|
|
||||||
HERMES_HOME = Path.home() / ".hermes"
|
HERMES_HOME = Path.home() / ".hermes"
|
||||||
TIMMY_HOME = Path.home() / ".timmy"
|
TIMMY_HOME = Path.home() / ".timmy"
|
||||||
|
HERMES_AGENT_DIR = HERMES_HOME / "hermes-agent"
|
||||||
|
METRICS_DIR = TIMMY_HOME / "metrics"
|
||||||
REPOS = [
|
REPOS = [
|
||||||
"Timmy_Foundation/the-nexus",
|
"Timmy_Foundation/the-nexus",
|
||||||
"Timmy_Foundation/timmy-config",
|
"Timmy_Foundation/timmy-config",
|
||||||
]
|
]
|
||||||
NET_LINE_LIMIT = 10
|
NET_LINE_LIMIT = 10
|
||||||
|
|
||||||
|
# ── Local Model Inference via Hermes Harness ─────────────────────────
|
||||||
|
|
||||||
|
HEARTBEAT_MODEL = "hermes4:14b"
|
||||||
|
FALLBACK_MODEL = "hermes3:8b"
|
||||||
|
|
||||||
|
|
||||||
|
def hermes_local(prompt, model=None, caller_tag=None):
|
||||||
|
"""Call a local Ollama model through the Hermes harness.
|
||||||
|
|
||||||
|
Uses provider="local-ollama" which routes through the custom_providers
|
||||||
|
entry in config.yaml → Ollama at localhost:11434.
|
||||||
|
Returns response text or None on failure.
|
||||||
|
Every call creates a Hermes session with telemetry.
|
||||||
|
"""
|
||||||
|
_model = model or HEARTBEAT_MODEL
|
||||||
|
tagged = f"[{caller_tag}] {prompt}" if caller_tag else prompt
|
||||||
|
|
||||||
|
# Import hermes cli.main directly — no subprocess, no env vars
|
||||||
|
_agent_dir = str(HERMES_AGENT_DIR)
|
||||||
|
if _agent_dir not in sys.path:
|
||||||
|
sys.path.insert(0, _agent_dir)
|
||||||
|
old_cwd = os.getcwd()
|
||||||
|
os.chdir(_agent_dir)
|
||||||
|
|
||||||
|
try:
|
||||||
|
from cli import main as hermes_main
|
||||||
|
import io
|
||||||
|
from contextlib import redirect_stdout, redirect_stderr
|
||||||
|
|
||||||
|
buf = io.StringIO()
|
||||||
|
err = io.StringIO()
|
||||||
|
with redirect_stdout(buf), redirect_stderr(err):
|
||||||
|
hermes_main(
|
||||||
|
query=tagged,
|
||||||
|
model=_model,
|
||||||
|
provider="local-ollama",
|
||||||
|
quiet=True,
|
||||||
|
)
|
||||||
|
output = buf.getvalue().strip()
|
||||||
|
# Strip session_id line from quiet output
|
||||||
|
lines = [l for l in output.split("\n") if not l.startswith("session_id:")]
|
||||||
|
response = "\n".join(lines).strip()
|
||||||
|
|
||||||
|
# Log to metrics jsonl
|
||||||
|
METRICS_DIR.mkdir(parents=True, exist_ok=True)
|
||||||
|
metrics_file = METRICS_DIR / f"local_{datetime.now().strftime('%Y%m%d')}.jsonl"
|
||||||
|
record = {
|
||||||
|
"timestamp": datetime.now(timezone.utc).isoformat(),
|
||||||
|
"model": _model,
|
||||||
|
"caller": caller_tag or "unknown",
|
||||||
|
"prompt_len": len(prompt),
|
||||||
|
"response_len": len(response),
|
||||||
|
"success": bool(response),
|
||||||
|
}
|
||||||
|
with open(metrics_file, "a") as f:
|
||||||
|
f.write(json.dumps(record) + "\n")
|
||||||
|
|
||||||
|
return response if response else None
|
||||||
|
except Exception as e:
|
||||||
|
# Log failure
|
||||||
|
METRICS_DIR.mkdir(parents=True, exist_ok=True)
|
||||||
|
metrics_file = METRICS_DIR / f"local_{datetime.now().strftime('%Y%m%d')}.jsonl"
|
||||||
|
record = {
|
||||||
|
"timestamp": datetime.now(timezone.utc).isoformat(),
|
||||||
|
"model": _model,
|
||||||
|
"caller": caller_tag or "unknown",
|
||||||
|
"error": str(e),
|
||||||
|
"success": False,
|
||||||
|
}
|
||||||
|
with open(metrics_file, "a") as f:
|
||||||
|
f.write(json.dumps(record) + "\n")
|
||||||
|
return None
|
||||||
|
finally:
|
||||||
|
os.chdir(old_cwd)
|
||||||
|
|
||||||
|
|
||||||
# ── Existing: Orchestration ──────────────────────────────────────────
|
# ── Existing: Orchestration ──────────────────────────────────────────
|
||||||
|
|
||||||
@@ -70,7 +144,7 @@ def dispatch_assigned():
|
|||||||
for repo in REPOS:
|
for repo in REPOS:
|
||||||
for agent in agents:
|
for agent in agents:
|
||||||
for issue in g.find_agent_issues(repo, agent, limit=5):
|
for issue in g.find_agent_issues(repo, agent, limit=5):
|
||||||
comments = g.list_comments(repo, issue.number, limit=5)
|
comments = g.list_comments(repo, issue.number)
|
||||||
if any(c.body and "dispatched" in c.body.lower() for c in comments):
|
if any(c.body and "dispatched" in c.body.lower() for c in comments):
|
||||||
continue
|
continue
|
||||||
dispatch_work(repo, issue.number, agent)
|
dispatch_work(repo, issue.number, agent)
|
||||||
@@ -283,15 +357,49 @@ def heartbeat_tick():
|
|||||||
"previous_tick": last_tick.get("tick_id", "none"),
|
"previous_tick": last_tick.get("tick_id", "none"),
|
||||||
}
|
}
|
||||||
|
|
||||||
# DECIDE + ACT: check for problems
|
# DECIDE: let hermes4:14b reason about what to do
|
||||||
actions = []
|
decide_prompt = (
|
||||||
if not perception.get("gitea_alive"):
|
f"System state at {now.isoformat()}:\n\n"
|
||||||
actions.append("ALERT: Gitea unreachable")
|
f"{json.dumps(perception, indent=2)}\n\n"
|
||||||
health = perception.get("model_health", {})
|
f"Previous tick: {last_tick.get('tick_id', 'none')}\n\n"
|
||||||
if isinstance(health, dict) and not health.get("ollama_running"):
|
"You are the heartbeat monitor. Based on this state:\n"
|
||||||
actions.append("ALERT: Ollama not running")
|
"1. List any actions needed (alerts, restarts, escalations). Empty if all OK.\n"
|
||||||
|
"2. Rate severity: ok, warning, or critical.\n"
|
||||||
tick_record["actions"] = actions
|
"3. One sentence of reasoning.\n\n"
|
||||||
|
'Respond ONLY with JSON: {"actions": [], "severity": "ok", "reasoning": "..."}'
|
||||||
|
)
|
||||||
|
|
||||||
|
decision = None
|
||||||
|
try:
|
||||||
|
raw = hermes_local(decide_prompt, caller_tag="heartbeat_tick")
|
||||||
|
if raw:
|
||||||
|
# Model might wrap JSON in markdown, extract first { line
|
||||||
|
for line in raw.split("\n"):
|
||||||
|
line = line.strip()
|
||||||
|
if line.startswith("{"):
|
||||||
|
decision = json.loads(line)
|
||||||
|
break
|
||||||
|
if not decision:
|
||||||
|
decision = json.loads(raw)
|
||||||
|
except (json.JSONDecodeError, Exception):
|
||||||
|
decision = None
|
||||||
|
|
||||||
|
# Fallback to hardcoded logic if model fails or is down
|
||||||
|
if decision is None:
|
||||||
|
actions = []
|
||||||
|
if not perception.get("gitea_alive"):
|
||||||
|
actions.append("ALERT: Gitea unreachable")
|
||||||
|
health = perception.get("model_health", {})
|
||||||
|
if isinstance(health, dict) and not health.get("ollama_running"):
|
||||||
|
actions.append("ALERT: Ollama not running")
|
||||||
|
decision = {
|
||||||
|
"actions": actions,
|
||||||
|
"severity": "fallback",
|
||||||
|
"reasoning": "model unavailable, used hardcoded checks",
|
||||||
|
}
|
||||||
|
|
||||||
|
tick_record["decision"] = decision
|
||||||
|
actions = decision.get("actions", [])
|
||||||
|
|
||||||
# Save tick
|
# Save tick
|
||||||
last_tick_file.write_text(json.dumps(tick_record, indent=2))
|
last_tick_file.write_text(json.dumps(tick_record, indent=2))
|
||||||
@@ -610,7 +718,8 @@ AGENT_CONFIG = {
|
|||||||
|
|
||||||
|
|
||||||
def _get_agent_issue(agent_name):
|
def _get_agent_issue(agent_name):
|
||||||
"""Find the next issue assigned to this agent that hasn't been worked."""
|
"""Find the next issue assigned to this agent that hasn't been worked.
|
||||||
|
Only picks issues where this agent is the SOLE assignee (not shared)."""
|
||||||
token_file = AGENT_CONFIG[agent_name]["gitea_token_file"]
|
token_file = AGENT_CONFIG[agent_name]["gitea_token_file"]
|
||||||
if not token_file.exists():
|
if not token_file.exists():
|
||||||
return None, None
|
return None, None
|
||||||
@@ -620,8 +729,14 @@ def _get_agent_issue(agent_name):
|
|||||||
try:
|
try:
|
||||||
issues = g.find_agent_issues(repo, agent_name, limit=10)
|
issues = g.find_agent_issues(repo, agent_name, limit=10)
|
||||||
for issue in issues:
|
for issue in issues:
|
||||||
# Skip if already has a PR branch or "dispatched" comment
|
# Skip if assigned to multiple agents (avoid collisions)
|
||||||
comments = g.list_comments(repo, issue.number, limit=10)
|
assignees = [a.login for a in (issue.assignees or [])] if hasattr(issue, 'assignees') else []
|
||||||
|
other_agents = [a for a in assignees if a in AGENT_CONFIG and a != agent_name]
|
||||||
|
if other_agents:
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Skip if already being worked on by this agent
|
||||||
|
comments = g.list_comments(repo, issue.number)
|
||||||
if any(c.body and "working on" in c.body.lower() and agent_name in c.body.lower() for c in comments):
|
if any(c.body and "working on" in c.body.lower() and agent_name in c.body.lower() for c in comments):
|
||||||
continue
|
continue
|
||||||
return repo, issue
|
return repo, issue
|
||||||
@@ -798,7 +913,7 @@ def cross_review_prs():
|
|||||||
continue
|
continue
|
||||||
|
|
||||||
# Skip if already reviewed
|
# Skip if already reviewed
|
||||||
comments = g.list_comments(repo, pr.number, limit=10)
|
comments = g.list_comments(repo, pr.number)
|
||||||
if any(c.body and f"reviewed by {reviewer}" in c.body.lower() for c in comments):
|
if any(c.body and f"reviewed by {reviewer}" in c.body.lower() for c in comments):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user