Compare commits

..

7 Commits

Author SHA1 Message Date
9d2404d8f6 feat: add 7zz for CHM documentation extraction
Some checks failed
Build Hermes agent / build (pull_request) Has been cancelled
2026-05-20 14:26:06 -04:00
d3f2e3b7b9 Merge pull request 'feat: add Syncthing service for Hermes org-file sync' (#30) from feat/syncthing-org-sync into master
Some checks failed
Build Hermes agent / build (push) Has been cancelled
Build ollama (gfx906) / build (push) Has been cancelled
Reviewed-on: #30
2026-05-19 00:28:59 +00:00
6a44120b1a Fixed syncthing dir path
Some checks failed
Build Hermes agent / build (pull_request) Has been cancelled
Build ollama (gfx906) / build (pull_request) Has been cancelled
2026-05-18 20:25:18 -04:00
38a1451689 Merge branch 'master' into feat/syncthing-org-sync 2026-05-14 22:24:19 -04:00
f9fb28d560 fix: route Syncthing web UI through Traefik with HTTPS
Some checks failed
Build Hermes agent / build (pull_request) Has been cancelled
Build ollama (gfx906) / build (pull_request) Has been cancelled
2026-05-14 21:40:00 -04:00
bcc4b6d157 feat: add Syncthing service for Hermes org-file sync
Some checks failed
Build Hermes agent / build (pull_request) Has been cancelled
Build ollama (gfx906) / build (pull_request) Has been cancelled
2026-05-14 21:35:31 -04:00
8d1ae7e632 Remove the unsuported gitea action off 2026-05-13 13:11:11 -04:00
5 changed files with 66 additions and 218 deletions

View File

@@ -1,31 +0,0 @@
# AGENTS.md
Development conventions for the compose repository (Docker Compose stacks).
## Build & Deploy
- The ai stack is managed via `systemctl restart ai_stack.service` on the NixOS host
- Compose files are built from the git repo; apply via `nh os switch` or `systemctl restart ai_stack.service`
- Never `docker compose up -d` directly — it bypasses the systemd env file and breaks secrets
## Hermes Workers
- Paperclip Hermes workers are added via `ai/scripts/provision-hermes-worker.sh`
- The script appends only — never deletes or modifies existing content
- Workers are CPU-only containers on the `ai_backend` network with no GPU passthrough
## Workflow
- New feature → clean branch from `origin/master` → push → PR on Gitea
- Branch naming: `feat/description` (features), `fix/description` (bugs/docs)
- Always branch from `origin/master`, never from another feature branch
- Submodule changes (when this repo is consumed as a submodule): commit the submodule update in the parent repo
- PR title should describe the change; body should explain motivation + summary
- After PR merge, delete the feature branch
## YAML Conventions
- Use `x-*` extension fields for reusable anchors
- Comment out inactive services rather than deleting them
- Environment variables in dictionary format (`KEY: value`) for anchor compatibility
- List format (`- KEY=value`) works for standard services but doesn't merge with anchors

View File

@@ -1,35 +1,4 @@
version: "3.8"
# ── Hermes Worker Template ──────────────────────────────────
# Used by paperclip-worker-* Hermes containers via YAML anchor.
# Each worker = one isolated Hermes agent for a Paperclip employee.
# Override at service level: container_name, API_SERVER_PORT,
# API_SERVER_KEY, DISCORD_BOT_TOKEN, volumes.
# Workers have NO GPU — they use OpenCode Go or remote providers.
x-hermes-worker: &hermes-worker
build:
context: ./hermes
ssh:
- default
entrypoint: ["/bin/bash", "-c",
"bash /opt/data/hermes-tools/install.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
"hermes-entrypoint"]
command: gateway run
restart: always
environment:
API_SERVER_ENABLED: "true"
API_SERVER_HOST: "0.0.0.0"
OLLAMA_HOST: "http://ollama:11434"
OPENROUTER_API_KEY: ${OPENROUTER_API_KEY}
# Each worker needs its own OpenCode Go API key in .env
OPENCODE_GO_API_KEY: ${OPENCODE_GO_API_KEY}
GATEWAY_ALLOW_ALL_USERS: "true"
TZ: "America/Montreal"
networks:
ai_backend:
# NO devices — workers are CPU-only, no GPU passthrough
# ─────────────────────────────────────────────────────────────
services:
# webui:
@@ -85,6 +54,10 @@ services:
- TZ=America/Montreal
volumes:
- /mnt/HoardingCow_docker_data/Hermes/data:/opt/data
# Syncthing-shared org files — read-only view of user's agenda
- /mnt/HoardingCow_docker_data/Syncthing/telos-ro:/opt/data/telos-ro:ro
# Syncthing-shared inbox — write tasks here, they sync to user's laptop
- /mnt/HoardingCow_docker_data/Syncthing/telos-rw:/opt/data/telos-rw:rw
devices:
- /dev/kfd:/dev/kfd
- /dev/dri:/dev/dri
@@ -94,6 +67,35 @@ services:
networks:
- ai_backend
syncthing:
image: syncthing/syncthing:latest
container_name: syncthing
hostname: syncthing
restart: always
ports:
- "8384:8384"
- "22000:22000"
- "21027:21027/udp"
environment:
- TZ=America/Montreal
volumes:
- /mnt/HoardingCow_docker_data/Syncthing/config:/var/syncthing/config
- /mnt/HoardingCow_docker_data/Syncthing/telos-ro:/telos-ro
- /mnt/HoardingCow_docker_data/Syncthing/telos-rw:/telos-rw
networks:
- ai_backend
- ai_net
labels:
- "traefik.enable=true"
- "traefik.http.routers.syncthing-http.rule=Host(`syncthing.lazyworkhorse.net`)"
- "traefik.http.routers.syncthing-http.entrypoints=web"
- "traefik.http.routers.syncthing-http.middlewares=redirect-to-https"
- "traefik.http.routers.syncthing-https.rule=Host(`syncthing.lazyworkhorse.net`)"
- "traefik.http.routers.syncthing-https.entrypoints=websecure"
- "traefik.http.routers.syncthing-https.tls=true"
- "traefik.http.routers.syncthing-https.tls.certresolver=njalla"
- "traefik.http.services.syncthing.loadbalancer.server.port=8384"
ollama:
build:
context: ./ollama
@@ -127,24 +129,6 @@ services:
- "303"
- "26"
# ── Paperclip Worker Hermes Agents ──────────────────────────
# Each worker is an isolated Hermes agent for a Paperclip employee.
# Add new workers with: ./scripts/provision-hermes-worker.sh <name> <discord-token>
# The API server key and port are generated automatically.
# Workers are CPU-only — they use OpenCode Go or remote providers.
# ── Worker Template (commented — uncomment + configure to activate) ──
# hermes-worker-1:
# <<: *hermes-worker
# container_name: hermes-worker-1
# environment:
# API_SERVER_PORT: "8651"
# API_SERVER_KEY: "generated-by-provision-script"
# DISCORD_BOT_TOKEN: ${WORKER_1_DISCORD_BOT_TOKEN}
# volumes:
# - /mnt/HoardingCow_docker_data/Hermes/worker-1:/opt/data
# ─────────────────────────────────────────────────────────────
networks:
ai_net:
external: true

View File

@@ -79,6 +79,39 @@ PYEOF
COPY --chmod=0755 himalaya-ro.sh /usr/local/bin/himalaya-ro
# ---------- Install 7-Zip (7zz) for CHM extraction ----------
RUN /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
import urllib.request, tarfile, os, shutil, re, subprocess
# Scrape 7-zip.org for latest Linux x64 binary link
url = 'https://7-zip.org/download.html'
req = urllib.request.Request(url, headers={'User-Agent': 'Mozilla/5.0'})
r = urllib.request.urlopen(req, timeout=15)
html = r.read().decode()
match = re.search(r'href="(a/7z[\d]+-linux-x64\.tar\.xz)"', html)
if not match:
raise RuntimeError('Could not find 7z Linux x64 download link on 7-zip.org')
dl_url = f'https://7-zip.org/{match.group(1)}'
# Follow Himalaya pattern: download, extract, install, verify
xz = '/tmp/7z.tar.xz'
urllib.request.urlretrieve(dl_url, xz)
os.makedirs('/tmp/7z', exist_ok=True)
with tarfile.open(xz, 'r:xz') as t:
t.extractall('/tmp/7z')
shutil.move('/tmp/7z/7zz', '/usr/local/bin/7zz')
os.chmod('/usr/local/bin/7zz', 0o755)
shutil.rmtree('/tmp/7z', ignore_errors=True)
os.remove(xz)
# Verify
result = subprocess.run(['/usr/local/bin/7zz'], capture_output=True, text=True)
assert result.returncode == 0, f'7zz verify failed: {result.stderr}'
version = result.stdout.split()[2] if result.stdout else 'unknown'
print(f'7-Zip {version} installed successfully')
PYEOF
# ---------- Runtime ----------
USER hermes
ENV HERMES_HOME=/opt/data

View File

@@ -1,135 +0,0 @@
#!/usr/bin/env bash
set -euo pipefail
# ── Hermes Worker Provisioner ──────────────────────────────
# Adds a new Paperclip Hermes worker to the ai compose stack.
#
# Usage:
# ./provision-hermes-worker.sh <name> <discord_bot_token_var>
#
# Example:
# ./provision-hermes-worker.sh worker-1 WORKER_1_DISCORD_BOT_TOKEN
#
# The script APPENDS only — never modifies or removes existing
# content, even commented lines.
#
# Post-provision steps (manual):
# 1. Add secrets to agenix .env file
# 2. systemctl restart ai_stack.service
# 3. Configure Paperclip agent
# ─────────────────────────────────────────────────────────────
NAME="${1:?Usage: $0 <name> <discord_bot_token_var>}"
TOKEN_VAR="${2:?Usage: $0 <name> <discord_bot_token_var>}"
# ── Paths ───────────────────────────────────────────────────
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
COMPOSE_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
COMPOSE_FILE="${COMPOSE_DIR}/compose.yml"
# Each Hermes worker gets its own volume on the NFS HoardingCow
VOLUME_BASE="/mnt/HoardingCow_docker_data/Hermes"
VOLUME_DIR="${VOLUME_BASE}/${NAME}"
# The Hermes container runs as UID 10000 (hermes user from Dockerfile)
HERMES_UID=10000
# ── Validation ──────────────────────────────────────────────
if ! [ -f "$COMPOSE_FILE" ]; then
echo "❌ compose.yml not found at $COMPOSE_FILE"
exit 1
fi
if grep -q "^ ${NAME}:" "$COMPOSE_FILE"; then
echo "❌ Service '${NAME}' already exists in ${COMPOSE_FILE}"
exit 1
fi
# ── Generate unique API key ─────────────────────────────────
# Used by Paperclip to authenticate against this worker's
# Hermes API server (/v1/chat/completions)
API_KEY="pc_worker_$(openssl rand -hex 16)"
# ── Find next available API port ────────────────────────────
# Workers get sequential ports starting at 8650.
# Scans compose.yml for existing API_SERVER_PORT values and
# picks the next one.
BASE_PORT=8650
MAX_PORT=0
while IFS= read -r line; do
port="${line#*API_SERVER_PORT: \"}"
port="${port%%\"*}"
if [ -n "$port" ] && [ "$port" -gt "$MAX_PORT" ]; then
MAX_PORT="$port"
fi
done < <(grep -oP 'API_SERVER_PORT:\s*"\d+"' "$COMPOSE_FILE" 2>/dev/null)
NEW_PORT=$((MAX_PORT + 1))
if [ "$NEW_PORT" -lt "$BASE_PORT" ]; then
NEW_PORT=$BASE_PORT
fi
# ── Create volume directory (on NFS) ────────────────────────
echo "📁 Creating volume directory: ${VOLUME_DIR}"
mkdir -p "$VOLUME_DIR"
# Hermes container runs as UID 10000 — set ownership so the
# container can write its config, sessions, skills
if command -v chown &>/dev/null; then
chown -R "${HERMES_UID}:${HERMES_UID}" "$VOLUME_DIR" 2>/dev/null || \
echo "⚠ Could not chown ${VOLUME_DIR} — run with sudo if needed"
fi
# Make it group-readable for debugging
chmod 755 "$VOLUME_DIR" 2>/dev/null || true
# ── Append service to compose.yml ───────────────────────────
echo "📝 Appending service '${NAME}' to compose.yml ..."
TMPFILE=$(mktemp)
awk -v name="$NAME" \
-v port="$NEW_PORT" \
-v api_key="$API_KEY" \
-v token_var="$TOKEN_VAR" \
'
# Insert new worker service block just before the networks: section
/^networks:/ {
print ""
print " " name ":"
print " <<: *hermes-worker"
print " container_name: " name
print " environment:"
print " API_SERVER_PORT: \"" port "\""
print " API_SERVER_KEY: \"" api_key "\""
print " DISCORD_BOT_TOKEN: ${" token_var "}"
print " volumes:"
print " - /mnt/HoardingCow_docker_data/Hermes/" name ":/opt/data"
print ""
}
{ print }
' "$COMPOSE_FILE" > "$TMPFILE" && mv "$TMPFILE" "$COMPOSE_FILE"
# ── Done ────────────────────────────────────────────────────
echo ""
echo "✅ Worker '${NAME}' provisioned successfully"
echo ""
echo "────────────────────────────────────────────"
echo " NEXT STEPS"
echo "────────────────────────────────────────────"
echo ""
echo "1. Add secrets to the agenix .env stack file:"
echo ""
echo " # ${NAME}"
echo " ${TOKEN_VAR}=<paste-discord-bot-token-here>"
echo ""
echo "2. Restart the AI stack:"
echo ""
echo " systemctl restart ai_stack.service"
echo ""
echo "3. In Paperclip, create an agent with HTTP adapter:"
echo ""
echo " Endpoint: http://${NAME}:${NEW_PORT}/v1/chat/completions"
echo " API Key: ${API_KEY}"
echo ""
echo "────────────────────────────────────────────"

View File

@@ -8,13 +8,10 @@ services:
- USER_GID=1000
- GITEA__server__ROOT_URL=https://code.lazyworkhorse.net
- GITEA__actions__ENABLED=true
- GITEA__actions__DEFAULT_ACTIONS_URL=off
- SSH_PORT=2222
- SSH_LISTEN_PORT=2222
# Enable Gitea Actions (act_runner required on host)
- GITEA__actions__ENABLED=true
# Don't fetch actions from GitHub (offline mode + local only)
- GITEA__actions__DEFAULT_ACTIONS_URL=off
volumes:
- /mnt/HoardingCow_docker_data/Gitea:/data
networks: