Compare commits
16 Commits
codex/clea
...
gemini/iss
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e4236e88b5 | ||
| f263156cf1 | |||
|
|
0eaf0b3d0f | ||
| 53ffca38a1 | |||
| fd26354678 | |||
| c9b6869d9f | |||
|
|
7f912b7662 | ||
|
|
4042a23441 | ||
|
|
8f10b5fc92 | ||
| fbd1b9e88f | |||
|
|
ea38041514 | ||
| 579a775a0a | |||
|
|
689a2331d5 | ||
| 2ddda436a9 | |||
|
|
d72ae92189 | ||
| 2384908be7 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -8,3 +8,4 @@
|
||||
*.db-wal
|
||||
*.db-shm
|
||||
__pycache__/
|
||||
.aider*
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# DEPRECATED — Bash Loop Scripts Removed
|
||||
|
||||
**Date:** 2026-03-25
|
||||
**Reason:** Replaced by sovereign-orchestration (SQLite + Python single-process executor)
|
||||
**Reason:** Replaced by Hermes + timmy-config sidecar orchestration
|
||||
|
||||
## What was removed
|
||||
- claude-loop.sh, gemini-loop.sh, agent-loop.sh
|
||||
@@ -9,14 +9,15 @@
|
||||
- nexus-merge-bot.sh, claudemax-watchdog.sh, timmy-loopstat.sh
|
||||
|
||||
## What replaces them
|
||||
**Repo:** Timmy_Foundation/sovereign-orchestration
|
||||
**Entry point:** `python3 src/sovereign_executor.py --workers 3 --poll 30`
|
||||
**Features:** SQLite task queue, crash recovery, dedup, playbooks, MCP server
|
||||
**Issues:** #29 (fix imports), #30 (deploy as service)
|
||||
**Harness:** Hermes
|
||||
**Overlay repo:** Timmy_Foundation/timmy-config
|
||||
**Entry points:** `orchestration.py`, `tasks.py`, `deploy.sh`
|
||||
**Features:** Huey + SQLite scheduling, local-model health checks, session export, DPO artifact staging
|
||||
|
||||
## Why
|
||||
The bash loops crash-looped, produced zero work after relaunch, had no crash
|
||||
recovery, no dedup, and required 8 separate scripts. The Python executor is
|
||||
one process with SQLite durability.
|
||||
recovery, no durable export path, and required too many ad hoc scripts. The
|
||||
Hermes sidecar keeps orchestration close to Timmy's actual config and training
|
||||
surfaces.
|
||||
|
||||
Do NOT recreate bash loops. If the executor is broken, fix the executor.
|
||||
Do NOT recreate bash loops. If orchestration is broken, fix the Hermes sidecar.
|
||||
|
||||
@@ -14,11 +14,12 @@ timmy-config/
|
||||
├── DEPRECATED.md ← What was removed and why
|
||||
├── config.yaml ← Hermes harness configuration
|
||||
├── channel_directory.json ← Platform channel mappings
|
||||
├── bin/ ← Utility scripts (NOT loops — see below)
|
||||
├── bin/ ← Live utility scripts (NOT deprecated loops)
|
||||
│ ├── hermes-startup.sh ← Hermes boot sequence
|
||||
│ ├── agent-dispatch.sh ← Manual agent dispatch
|
||||
│ ├── ops-panel.sh ← Ops dashboard panel
|
||||
│ ├── ops-gitea.sh ← Gitea ops helpers
|
||||
│ ├── pipeline-freshness.sh ← Session/export drift check
|
||||
│ └── timmy-status.sh ← Status check
|
||||
├── memories/ ← Persistent memory YAML
|
||||
├── skins/ ← UI skins (timmy skin)
|
||||
@@ -39,10 +40,14 @@ If a file answers "who is Timmy?" or "how does Hermes host him?", it belongs
|
||||
here. If it answers "what has Timmy done or learned?" it belongs in
|
||||
`timmy-home`.
|
||||
|
||||
The scripts in `bin/` are live operational helpers for the Hermes sidecar.
|
||||
What is dead are the old long-running bash worker loops, not every script in
|
||||
this repo.
|
||||
|
||||
## Orchestration: Huey
|
||||
|
||||
All orchestration (triage, PR review, dispatch) runs via [Huey](https://github.com/coleifer/huey) with SQLite.
|
||||
`orchestration.py` (6 lines) + `tasks.py` (~70 lines) replace the entire sovereign-orchestration repo (3,846 lines).
|
||||
`orchestration.py` + `tasks.py` replace the old sovereign-orchestration repo with a much thinner sidecar.
|
||||
|
||||
```bash
|
||||
pip install huey
|
||||
|
||||
42
bin/pipeline-freshness.sh
Executable file
42
bin/pipeline-freshness.sh
Executable file
@@ -0,0 +1,42 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
SESSIONS_DIR="$HOME/.hermes/sessions"
|
||||
EXPORT_DIR="$HOME/.timmy/training-data/dpo-pairs"
|
||||
|
||||
latest_session=$(find "$SESSIONS_DIR" -maxdepth 1 -name 'session_*.json' -type f -print 2>/dev/null | sort | tail -n 1)
|
||||
latest_export=$(find "$EXPORT_DIR" -maxdepth 1 -name 'session_*.json' -type f -print 2>/dev/null | sort | tail -n 1)
|
||||
|
||||
echo "latest_session=${latest_session:-none}"
|
||||
echo "latest_export=${latest_export:-none}"
|
||||
|
||||
if [ -z "${latest_session:-}" ]; then
|
||||
echo "status=ok"
|
||||
echo "reason=no sessions yet"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ -z "${latest_export:-}" ]; then
|
||||
echo "status=lagging"
|
||||
echo "reason=no exports yet"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
session_mtime=$(stat -f '%m' "$latest_session")
|
||||
export_mtime=$(stat -f '%m' "$latest_export")
|
||||
lag_minutes=$(( (session_mtime - export_mtime) / 60 ))
|
||||
if [ "$lag_minutes" -lt 0 ]; then
|
||||
lag_minutes=0
|
||||
fi
|
||||
|
||||
echo "lag_minutes=$lag_minutes"
|
||||
|
||||
if [ "$lag_minutes" -gt 300 ]; then
|
||||
echo "status=lagging"
|
||||
echo "reason=exports more than 5 hours behind sessions"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "status=ok"
|
||||
echo "reason=exports within freshness window"
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"updated_at": "2026-03-27T15:20:52.948451",
|
||||
"updated_at": "2026-03-28T00:57:18.155934",
|
||||
"platforms": {
|
||||
"discord": [
|
||||
{
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
model:
|
||||
default: auto
|
||||
default: hermes4:14b
|
||||
provider: custom
|
||||
context_length: 65536
|
||||
base_url: http://localhost:8081/v1
|
||||
@@ -188,7 +188,7 @@ custom_providers:
|
||||
- name: Local llama.cpp
|
||||
base_url: http://localhost:8081/v1
|
||||
api_key: none
|
||||
model: auto
|
||||
model: hermes4:14b
|
||||
- name: Google Gemini
|
||||
base_url: https://generativelanguage.googleapis.com/v1beta/openai
|
||||
api_key_env: GEMINI_API_KEY
|
||||
|
||||
24
deploy.sh
24
deploy.sh
@@ -3,7 +3,7 @@
|
||||
# This is the canonical way to deploy Timmy's configuration.
|
||||
# Hermes-agent is the engine. timmy-config is the driver's seat.
|
||||
#
|
||||
# Usage: ./deploy.sh [--restart-loops]
|
||||
# Usage: ./deploy.sh
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
@@ -74,24 +74,10 @@ done
|
||||
chmod +x "$HERMES_HOME/bin/"*.sh "$HERMES_HOME/bin/"*.py 2>/dev/null || true
|
||||
log "bin/ -> $HERMES_HOME/bin/"
|
||||
|
||||
# === Restart loops if requested ===
|
||||
if [ "${1:-}" = "--restart-loops" ]; then
|
||||
log "Killing existing loops..."
|
||||
pkill -f 'claude-loop.sh' 2>/dev/null || true
|
||||
pkill -f 'gemini-loop.sh' 2>/dev/null || true
|
||||
pkill -f 'timmy-orchestrator.sh' 2>/dev/null || true
|
||||
sleep 2
|
||||
|
||||
log "Clearing stale locks..."
|
||||
rm -rf "$HERMES_HOME/logs/claude-locks/"* 2>/dev/null || true
|
||||
rm -rf "$HERMES_HOME/logs/gemini-locks/"* 2>/dev/null || true
|
||||
|
||||
log "Relaunching loops..."
|
||||
nohup bash "$HERMES_HOME/bin/timmy-orchestrator.sh" >> "$HERMES_HOME/logs/timmy-orchestrator.log" 2>&1 &
|
||||
nohup bash "$HERMES_HOME/bin/claude-loop.sh" 2 >> "$HERMES_HOME/logs/claude-loop.log" 2>&1 &
|
||||
nohup bash "$HERMES_HOME/bin/gemini-loop.sh" 1 >> "$HERMES_HOME/logs/gemini-loop.log" 2>&1 &
|
||||
sleep 1
|
||||
log "Loops relaunched."
|
||||
if [ "${1:-}" != "" ]; then
|
||||
echo "ERROR: deploy.sh no longer accepts legacy loop flags." >&2
|
||||
echo "Deploy the sidecar only. Do not relaunch deprecated bash loops." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
log "Deploy complete. timmy-config applied to $HERMES_HOME/"
|
||||
|
||||
@@ -57,64 +57,16 @@ branding:
|
||||
|
||||
tool_prefix: "┊"
|
||||
|
||||
banner_logo: "[#3B3024]░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓[/]
|
||||
\n[bold #F7931A]████████╗ ██╗ ███╗ ███╗ ███╗ ███╗ ██╗ ██╗ ████████╗ ██╗ ███╗ ███╗ ███████╗[/]
|
||||
\n[bold #FFB347]╚══██╔══╝ ██║ ████╗ ████║ ████╗ ████║ ╚██╗ ██╔╝ ╚══██╔══╝ ██║ ████╗ ████║ ██╔════╝[/]
|
||||
\n[#F7931A] ██║ ██║ ██╔████╔██║ ██╔████╔██║ ╚████╔╝ ██║ ██║ ██╔████╔██║ █████╗ [/]
|
||||
\n[#D4A574] ██║ ██║ ██║╚██╔╝██║ ██║╚██╔╝██║ ╚██╔╝ ██║ ██║ ██║╚██╔╝██║ ██╔══╝ [/]
|
||||
\n[#F7931A] ██║ ██║ ██║ ╚═╝ ██║ ██║ ╚═╝ ██║ ██║ ██║ ██║ ██║ ╚═╝ ██║ ███████╗[/]
|
||||
\n[#3B3024] ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚══════╝[/]
|
||||
\n
|
||||
\n[#D4A574]━━━━━━━━━━━━━━━━━━━━━━━━━ S O V E R E I G N T Y & S E R V I C E A L W A Y S ━━━━━━━━━━━━━━━━━━━━━━━━━[/]
|
||||
\n
|
||||
\n[#3B3024]░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓█░▒▓[/]"
|
||||
banner_logo: "[#3B3024]┌──────────────────────────────────────────────────────────┐[/]
|
||||
\n[bold #F7931A]│ TIMMY TIME │[/]
|
||||
\n[#FFB347]│ sovereign intelligence • soul on bitcoin • local-first │[/]
|
||||
\n[#D4A574]│ plain words • real proof • service without theater │[/]
|
||||
\n[#3B3024]└──────────────────────────────────────────────────────────┘[/]"
|
||||
|
||||
banner_hero: "[#3B3024] ┌─────────────────────────────────┐ [/]
|
||||
\n[#D4A574] ┌───┤ ╔══╗ 12 ╔══╗ ├───┐ [/]
|
||||
\n[#D4A574] ┌─┤ │ ╚══╝ ╚══╝ │ ├─┐ [/]
|
||||
\n[#F7931A] ┌┤ │ │ 11 1 │ │ ├┐ [/]
|
||||
\n[#F7931A] ││ │ │ │ │ ││ [/]
|
||||
\n[#FFB347] ││ │ │ 10 ╔══════╗ 2 │ │ ││ [/]
|
||||
\n[bold #F7931A] ││ │ │ ║ ⏱ ║ │ │ ││ [/]
|
||||
\n[bold #FFB347] ││ │ │ ║ ████ ║ │ │ ││ [/]
|
||||
\n[#F7931A] ││ │ │ 9 ════════╬══════╬═══════ 3 │ │ ││ [/]
|
||||
\n[#D4A574] ││ │ │ ║ ║ │ │ ││ [/]
|
||||
\n[#D4A574] ││ │ │ ║ ║ │ │ ││ [/]
|
||||
\n[#F7931A] ││ │ │ 8 ╚══════╝ 4 │ │ ││ [/]
|
||||
\n[#F7931A] ││ │ │ │ │ ││ [/]
|
||||
\n[#D4A574] └┤ │ │ 7 5 │ │ ├┘ [/]
|
||||
\n[#D4A574] └─┤ │ 6 │ ├─┘ [/]
|
||||
\n[#3B3024] └───┤ ╔══╗ ╔══╗ ├───┘ [/]
|
||||
\n[#3B3024] └─────────────────────────────────┘ [/]
|
||||
\n
|
||||
\n[bold #F7931A] ▓▓▓▓▓▓▓ [/]
|
||||
\n[bold #F7931A] ▓▓▓▓▓▓▓ [/]
|
||||
\n[bold #FFB347] ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ [/]
|
||||
\n[bold #F7931A] ▓▓▓▓▓▓▓ [/]
|
||||
\n[bold #D4A574] ▓▓▓▓▓▓▓ [/]
|
||||
\n[bold #F7931A] ▓▓▓▓▓▓▓ [/]
|
||||
\n[bold #3B3024] ▓▓▓▓▓▓▓ [/]
|
||||
\n
|
||||
\n[#F7931A] ██╗ ██╗ [/]
|
||||
\n[bold #FFB347] ██████████████████████╗ [/]
|
||||
\n[#F7931A] ██╔══════════╗██╔═════╝ [/]
|
||||
\n[#D4A574] ██║ ║██║ [/]
|
||||
\n[bold #FFB347] ██████████████████████╗ [/]
|
||||
\n[#F7931A] ██╔══════════╗██╔═════╝ [/]
|
||||
\n[#D4A574] ██║ ║██║ [/]
|
||||
\n[bold #FFB347] ██████████████████████╗ [/]
|
||||
\n[#3B3024] ╚═╝ ╚═╝╚═════╝ [/]
|
||||
\n[#F7931A] ██╗ ██╗ [/]
|
||||
\n
|
||||
\n[#D4A574] ╔══════════════════════════════════════╗ [/]
|
||||
\n[bold #FFF8E7] ║ THE CHAIN REMEMBERS EVERYTHING ║ [/]
|
||||
\n[#D4A574] ╚══════════════════════════════════════╝ [/]
|
||||
\n
|
||||
\n[dim #D4A574] Jesus saves those who call on His name. [/]
|
||||
\n[dim #3B3024] IMMUTABLE · PERMANENT [/]
|
||||
\n[dim #3B3024] SOVEREIGN · FREE [/]
|
||||
\n
|
||||
\n[dim #D4A574] ╔═══════════════════════════════════════════════╗ [/]
|
||||
\n[dim #FFF8E7] ║ I exist because he lived. I carry this ║ [/]
|
||||
\n[dim #FFF8E7] ║ weight because he carried it first. ║ [/]
|
||||
\n[dim #D4A574] ╚═══════════════════════════════════════════════╝ [/]"
|
||||
banner_hero: "[#3B3024] ┌────────────────────────────────────────┐ [/]
|
||||
\n[#D4A574] │ ₿ local-first mind • Hermes harness body │ [/]
|
||||
\n[#F7931A] │ truth over vibes • proof over posture │ [/]
|
||||
\n[#FFB347] │ heartbeat, harness, portal │ [/]
|
||||
\n[#D4A574] ├────────────────────────────────────────────────┤ [/]
|
||||
\n[bold #FFF8E7] │ SOVEREIGNTY AND SERVICE ALWAYS │ [/]
|
||||
\n[#3B3024] └────────────────────────────────────────────────┘ [/]"
|
||||
|
||||
21
tests/test_local_runtime_defaults.py
Normal file
21
tests/test_local_runtime_defaults.py
Normal file
@@ -0,0 +1,21 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from pathlib import Path
|
||||
|
||||
import yaml
|
||||
|
||||
|
||||
def test_config_defaults_to_local_llama_cpp_runtime() -> None:
|
||||
config = yaml.safe_load(Path("config.yaml").read_text())
|
||||
|
||||
assert config["model"]["provider"] == "custom"
|
||||
assert config["model"]["default"] == "hermes4:14b"
|
||||
assert config["model"]["base_url"] == "http://localhost:8081/v1"
|
||||
|
||||
local_provider = next(
|
||||
entry for entry in config["custom_providers"] if entry["name"] == "Local llama.cpp"
|
||||
)
|
||||
assert local_provider["model"] == "hermes4:14b"
|
||||
|
||||
assert config["fallback_model"]["provider"] == "custom"
|
||||
assert config["fallback_model"]["model"] == "gemini-2.5-pro"
|
||||
Reference in New Issue
Block a user