Merge remote-tracking branch 'origin/fix/network-creation' into HEAD

- Integrate uv pip install of openai and mautrix[encryption] into entrypoint
- Add persistent volume mount for /opt/hermes/.venv
- Keep Syncthing volume mounts

ai/compose.yml

@@ -32,7 +32,7 @@ services:
         - default
     container_name: hermes
     entrypoint: ["/bin/bash", "-c",
-      "bash /opt/data/hermes-tools/install.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
+      "bash /opt/data/hermes-tools/install.sh && /opt/hermes/.venv/bin/uv pip install openai mautrix[encryption] --system -q && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
       "hermes-entrypoint"]
     restart: always
     # Gateway run enables the internal API server on port 8642
@@ -44,7 +44,7 @@ services:
       - API_SERVER_HOST=0.0.0.0
       - API_SERVER_KEY=hermes_local_key
       - GATEWAY_ALLOW_ALL_USERS=true
-      - OPENROUTER_API_KEY=${OPENROUTER_API_KEY}
+      - OPENROUTER_API_KEY=${OPEN...KEY}
       # ROCm for GPU-accelerated faster-whisper STT
       - HSA_OVERRIDE_GFX_VERSION=9.0.6
       - HCC_AMDGPU_TARGET=gfx906
@@ -58,6 +58,8 @@ services:
       - /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
+      # Persistent venv — Matrix bridge and other pip deps survive container rebuilds
+      - /mnt/HoardingCow_docker_data/Hermes/venv:/opt/hermes/.venv
     devices:
       - /dev/kfd:/dev/kfd
       - /dev/dri:/dev/dri
@@ -129,6 +131,62 @@ services:
       - "303"
       - "26"
 
+  paperclip-db:
+    image: postgres:17-alpine
+    container_name: paperclip-db
+    restart: always
+    environment:
+      POSTGRES_USER: paperclip
+      POSTGRES_PASSWORD: ${PAPERCLIP_DB_PASSWORD:?PAPERCLIP_DB_PASSWORD must be set}
+      POSTGRES_DB: paperclip
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U paperclip -d paperclip"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+    volumes:
+      - /mnt/HoardingCow_docker_data/Paperclip/pgdata:/var/lib/postgresql/data
+    networks:
+      - ai_backend
+
+  paperclip:
+    image: ghcr.io/paperclipai/paperclip:v2026.517.0
+    container_name: paperclip
+    restart: always
+    ports:
+      - "127.0.0.1:3100:3100"
+    environment:
+      - HOST=0.0.0.0
+      - PORT=3100
+      - SERVE_UI=true
+      - DATABASE_URL=postgres://paperclip:***@paperclip-db:5432/paperclip
+      - BETTER_AUTH_SECRET=${PAPE...CRET must be set}
+      - PAPERCLIP_PUBLIC_URL=https://paperclip.lazyworkhorse.net
+      - PAPERCLIP_DEPLOYMENT_MODE=authenticated
+      - PAPERCLIP_DEPLOYMENT_EXPOSURE=private
+    volumes:
+      - /mnt/HoardingCow_docker_data/Paperclip/data:/paperclip
+    depends_on:
+      paperclip-db:
+        condition: service_healthy
+    networks:
+      - ai_net
+      - ai_backend
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=ai_net"
+
+      - "traefik.http.routers.paperclip-http.rule=Host(`paperclip.lazyworkhorse.net`)"
+      - "traefik.http.routers.paperclip-http.entrypoints=web"
+      - "traefik.http.routers.paperclip-http.middlewares=redirect-to-https"
+
+      - "traefik.http.routers.paperclip-https.rule=Host(`paperclip.lazyworkhorse.net`)"
+      - "traefik.http.routers.paperclip-https.entrypoints=websecure"
+      - "traefik.http.routers.paperclip-https.tls=true"
+      - "traefik.http.routers.paperclip-https.tls.certresolver=njalla"
+
+      - "traefik.http.services.paperclip.loadbalancer.server.port=3100"
+
 networks:
   ai_net:
     external: true
@@ -280,8 +338,8 @@ networks:
   #     - /home/gortium/infra:/data/workspace/infra
   #   environment:
   #     - TZ=America/Toronto
-  #     - OPENCLAW_GATEWAY_TOKEN=${OPENCLAW_GATEWAY_TOKEN}
-  #     - OPENROUTER_API_KEY=${OPENROUTER_API_KEY}
+  #     - OPENCLAW_GATEWAY_TOKEN=${OPEN...KEN}
+  #     - OPENROUTER_API_KEY=${OPEN...KEY}
   #     # Point to the sidecar browser
   #     - BROWSER_CDP_URL=http://openclaw-browser:9222
   #     - BROWSER_EVALUATE_ENABLED=true
@@ -326,7 +384,7 @@ networks:
   #     - PGID=1000
   #     - PUBLIC_KEY_FILE=/config/ssh/authorized_keys
   #     - SUDO_ACCESS=false
-  #     - PASSWORD_ACCESS=false
+  #     - PASSWORD_ACCESS=***
   #   volumes:
   #     - /mnt/HoardingCow_docker_data/openclaw/ssh-config:/config
   #     - /home/gortium/infra:/data/workspace/infra:ro

ai/hermes/Dockerfile

@@ -1,106 +1,93 @@
 # syntax=docker/dockerfile:1
-# Hermes Agent with Chromium -- local browser tool support
-# Based on python:3.11-slim for minimal footprint.
-# Chromium installed via apt-get for system-level browser automation.
-#
-# Build:
-#   docker build -t hermes-agent:chromium .
-#
-# Environment variables:
-#   CHROME_EXECUTABLE  -- path to the Chromium binary
+# Hermes Agent -- custom fork build
+# Builds on top of official image + overlays our forked source from Gitea.
+# Requires Docker BuildKit. Pass SSH agent for git clone:
+#   docker compose build hermes
+# Or manually:
+#   DOCKER_BUILDKIT=1 docker build --ssh default -t hermes-agent:custom .
 
-# ---------- Base image ----------
-FROM python:3.11-slim
+# ---------- Base: official Hermes image (system deps, npm, uv, Playwright) ----------
+FROM nousresearch/hermes-agent:latest
 
-ENV DEBIAN_FRONTEND=noninteractive
-ENV PYTHONUNBUFFERED=1
+# ---------- Overlay our forked source ----------
+# Uses SSH agent forwarding from the build host (no key baked into image).
+# --exclude node_modules/.venv keeps the base image's pre-built layers intact.
+# Only the Python source, web UI source, and config change.
+RUN --mount=type=ssh \
+    mkdir -p /root/.ssh && \
+    ssh-keyscan -p 2222 code.lazyworkhorse.net >> /root/.ssh/known_hosts 2>/dev/null && \
+    cd /tmp && \
+    GIT_SSH_COMMAND='ssh -p 2222 -o StrictHostKeyChecking=no' \
+    git clone --depth 1 --branch main \
+    git@code.lazyworkhorse.net:gortium/hermes-agent.git fork && \
+    rsync -a --delete fork/ /opt/hermes/ \
+      --exclude node_modules \
+      --exclude .venv \
+      --exclude .git && \
+    rm -rf /tmp/fork /root/.ssh/
 
-# ---------- System dependencies for Chromium ----------
-# The minimum set required to run headless Chromium on Linux.
-# python:3.11-slim is Debian Bookworm (12) -- package names without t64 suffix.
+# ---------- Rebuild web UI ----------
+# Source files changed; node_modules (from base image) reused.
+RUN cd /opt/hermes && npm run build
+
+# ---------- Reinstall Python package (editable) ----------
+# Picks up source changes from our fork.
+RUN . /opt/hermes/.venv/bin/activate && \
+    uv pip install --no-cache-dir --no-deps -e /opt/hermes
+
+# ---------- Extra system deps ----------
+USER root
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-        # Chromium and its launcher
-        chromium \
-        chromium-common \
-        chromium-sandbox \
-        # Font rendering for proper page rendering
-        fonts-liberation \
-        fonts-noto-color-emoji \
-        fonts-dejavu-core \
-        # System libraries required by Chromium at runtime
-        libnss3 \
-        libnspr4 \
-        libatk1.0-0 \
-        libatk-bridge2.0-0 \
-        libcups2 \
-        libdrm2 \
-        libxdamage1 \
-        libxfixes3 \
-        libxcomposite1 \
-        libxrandr2 \
-        libgbm1 \
-        libpango-1.0-0 \
-        libcairo2 \
-        libasound2 \
-        libxkbcommon0 \
-        libxshmfence1 \
-        # Virtual framebuffer for headless operation
-        xvfb \
-        # Process supervisor for orphan reaping
-        tini \
-        # Git for Hermes source operations
-        git \
-        # SSL certificates for HTTPS connections
-        ca-certificates \
-        # Curl for health checks
-        curl \
-    && rm -rf /var/lib/apt/lists/*
+        libportaudio2 ca-certificates poppler-utils imagemagick \
+        texlive-latex-base texlive-latex-extra texlive-fonts-recommended \
+        texlive-xetex texlive-science \
+        qemu-user-static binfmt-support emacs-nox && \
+    rm -rf /var/lib/apt/lists/*
 
-# ---------- Hermes Agent installation ----------
-# Install uv (fast Python package manager)
-COPY --chmod=0755 --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/uv
-COPY --chmod=0755 --from=ghcr.io/astral-sh/uv:latest /uvx /usr/local/bin/uvx
+# ---------- UV ----------
+COPY --chmod=0755 --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/
 
-# Create hermes user (non-root runtime)
-RUN useradd -u 10000 -m -d /opt/data hermes
+# ---------- Piper TTS ----------
+RUN . /opt/hermes/.venv/bin/activate && \
+    uv pip install --no-cache-dir piper-tts sounddevice numpy && \
+    mkdir -p /opt/hermes/.venv/share/piper/voices
 
-# Install Hermes Agent from PyPI with gateway support for messaging
-RUN uv pip install --system --no-cache-dir \
-        'hermes-agent[gateway]' \
-        croniter && \
-    uv cache clean
+RUN /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
+import urllib.request
+base = '/opt/hermes/.venv/share/piper/voices'
+url = 'https://huggingface.co/rhasspy/piper-voices/resolve/main/en/en_US/ryan/high/en_US-ryan-high.onnx'
+urllib.request.urlretrieve(url, base + '/en_US-ryan-high.onnx')
+urllib.request.urlretrieve(url + '.json', base + '/en_US-ryan-high.onnx.json')
+PYEOF
 
-# Create the /opt/hermes directory structure expected by entrypoint
-RUN mkdir -p /opt/hermes/.venv/bin && \
-    mkdir -p /opt/hermes/docker && \
-    ln -sf /usr/local/bin/uv /opt/hermes/.venv/bin/uv && \
-    ln -sf /usr/local/bin/uvx /opt/hermes/.venv/bin/uvx
+# ---------- Install Himalaya email CLI ----------
+RUN /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
+import urllib.request, tarfile, os, shutil
+url = 'https://github.com/pimalaya/himalaya/releases/download/v1.2.0/himalaya.x86_64-linux.tgz'
+tgz = '/tmp/himalaya.tgz'
+urllib.request.urlretrieve(url, tgz)
+with tarfile.open(tgz) as t:
+    t.extractall('/tmp')
+shutil.move('/tmp/himalaya', '/usr/local/bin/himalaya')
+os.chmod('/usr/local/bin/himalaya', 0o755)
+os.remove(tgz)
+print('himalaya v1.2.0 installed')
+PYEOF
 
-# ---------- Entrypoint script ----------
-COPY entrypoint.sh /opt/hermes/docker/entrypoint.sh
-RUN chmod +x /opt/hermes/docker/entrypoint.sh
+# ---------- Install himalaya-ro wrapper ----------
+COPY --chmod=0755 himalaya-ro.sh /usr/local/bin/himalaya-ro
 
-# ---------- Environment variables ----------
-# Point browser tool to system Chromium (installed via apt-get)
-ENV CHROME_EXECUTABLE=/usr/bin/chromium
-
-# Hermes paths
-ENV HERMES_HOME=/opt/data
-ENV PATH="/opt/data/.local/bin:${PATH}"
-
-# Playwright browsers path (for agent-browser install at runtime)
-ENV PLAYWRIGHT_BROWSERS_PATH=/opt/hermes/.playwright
-
-# Virtual framebuffer display for headless Chromium
-ENV DISPLAY=:99
-
-# ---------- Data volume ----------
-VOLUME [ "/opt/data" ]
 
 # ---------- Runtime ----------
 USER hermes
-WORKDIR /opt/data
+ENV HERMES_HOME=/opt/data
+ENV PATH="/opt/data/.local/bin:${PATH}"
+# Point browser tool to Playwright's Chromium (already in base image)
+ENV CHROME_EXECUTABLE=/opt/hermes/.playwright/chromium/chrome-linux/chrome
 
-ENTRYPOINT [ "/opt/hermes/docker/entrypoint.sh" ]
-CMD [ "gateway", "run" ]
+# Ensure tools directory and toolsets.py are writable by the hermes runtime user
+# so custom tools can be injected from the persistent volume at startup.
+RUN chown -R hermes:hermes /opt/hermes/tools /opt/hermes/toolsets.py
+
+VOLUME [ "/opt/data" ]

ai/hermes/entrypoint.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-set -e
-
-# Hermes Agent entrypoint script
-# Installs custom tools and runtime dependencies,
-# then delegates to the passed command (usually "gateway run").
-
-# Install custom tools from persistent volume if available
-if [ -f /opt/data/hermes-tools/install.sh ]; then
-    bash /opt/data/hermes-tools/install.sh
-fi
-
-# Install additional runtime deps (idempotent)
-if command -v uv &>/dev/null; then
-    uv pip install --system --no-cache-dir --quiet \
-        openai mautrix[encryption] 2>/dev/null || true
-fi
-
-# Execute the passed command with tini for proper signal handling
-exec tini -g -- "$@"

backup/compose.yml

@@ -96,5 +96,5 @@ services:
 
 networks:
   backup_net:
-    external: true
+    driver: bridge
     name: backup_net

network/compose.yml

@@ -82,37 +82,37 @@ networks:
     driver: bridge
     name: traefik_backend
   ai_net:
-    external: true
+    driver: bridge
     name: ai_net
   auth_net:
-    external: true
+    driver: bridge
     name: auth_net
   backup_net:
-    external: true
+    driver: bridge
     name: backup_net
   cloud_net:
-    external: true
+    driver: bridge
     name: cloud_net
   coms_net:
-    external: true
+    driver: bridge
     name: coms_net
   finance_net:
-    external: true
+    driver: bridge
     name: finance_net
   home_auto_net:
-    external: true
+    driver: bridge
     name: home_auto_net
   homepage_net:
-    external: true
+    driver: bridge
     name: homepage_net
   passman_net:
-    external: true
+    driver: bridge
     name: passman_net
   tak_net:
-    external: true
+    driver: bridge
     name: tak_net
   vc_net:
-    external: true
+    driver: bridge
     name: vc_net
 
   # duckdns: