Merge PR #2: fix Matrix bridge ModuleNotFoundError - install deps to venv with persistence

- 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-workspace/entrypoint-combined.sh

@@ -1,154 +0,0 @@
-#!/bin/bash
-# ── Hermes Workspace Combined Entrypoint ──
-# Waits for the Hermes gateway container (hermes:8642) to become healthy,
-# then starts the Hermes Workspace web UI in the foreground.
-# Supports graceful shutdown via SIGTERM/SIGINT.
-# ──────────────────────────────────────────
-
-set -euo pipefail
-
-# ── Configuration ──────────────────────────────────────────────
-GATEWAY_HOST="${GATEWAY_HOST:-hermes}"
-GATEWAY_PORT="${GATEWAY_PORT:-8642}"
-GATEWAY_URL="http://${GATEWAY_HOST}:${GATEWAY_PORT}"
-
-HEALTH_ENDPOINT="${HEALTH_ENDPOINT:-/health}"
-MAX_RETRIES="${HEALTH_MAX_RETRIES:-60}"
-RETRY_INTERVAL="${HEALTH_RETRY_INTERVAL:-2}"
-
-WORKSPACE_DIR="${WORKSPACE_DIR:-/workspace}"
-WORKSPACE_ENTRY="${WORKSPACE_ENTRY:-server-entry.js}"
-
-PID_FILE="${PID_FILE:-/tmp/workspace.pid}"
-
-# ── Logging ────────────────────────────────────────────────────
-log_info()  { echo "[$(date '+%Y-%m-%d %H:%M:%S')] [INFO]  $*"; }
-log_warn()  { echo "[$(date '+%Y-%m-%d %H:%M:%S')] [WARN]  $*"; }
-log_error() { echo "[$(date '+%Y-%m-%d %H:%M:%S')] [ERROR] $*"; }
-
-# ── Graceful Shutdown ──────────────────────────────────────────
-_workspace_pid=""
-_shutting_down=false
-
-cleanup() {
-    if [ "$_shutting_down" = true ]; then
-        return
-    fi
-    _shutting_down=true
-
-    log_info "Shutdown signal received, cleaning up..."
-
-    # Stop workspace process if running
-    if [ -n "$_workspace_pid" ] && kill -0 "$_workspace_pid" 2>/dev/null; then
-        log_info "Stopping workspace (PID: $_workspace_pid)..."
-        kill -TERM "$_workspace_pid" 2>/dev/null || true
-
-        # Give it time to shut down gracefully
-        local wait_sec=10
-        while kill -0 "$_workspace_pid" 2>/dev/null && [ "$wait_sec" -gt 0 ]; do
-            sleep 1
-            wait_sec=$((wait_sec - 1))
-        done
-
-        # Force kill if still running
-        if kill -0 "$_workspace_pid" 2>/dev/null; then
-            log_warn "Workspace did not shut down gracefully, force killing..."
-            kill -KILL "$_workspace_pid" 2>/dev/null || true
-        fi
-    fi
-
-    # Clean up PID file
-    [ -f "$PID_FILE" ] && rm -f "$PID_FILE"
-
-    log_info "Shutdown complete."
-    exit 0
-}
-
-# Trap termination signals for graceful shutdown
-trap cleanup SIGTERM SIGINT
-
-# ── Gateway Health Check ───────────────────────────────────────
-wait_for_gateway() {
-    local url="${GATEWAY_URL}${HEALTH_ENDPOINT}"
-    local retries="$MAX_RETRIES"
-    local interval="$RETRY_INTERVAL"
-    local attempt=0
-
-    log_info "Waiting for Hermes gateway at ${GATEWAY_URL}..."
-    log_info "Max retries: ${retries}, interval: ${interval}s"
-
-    while [ "$attempt" -lt "$retries" ]; do
-        attempt=$((attempt + 1))
-
-        if curl -fsS "${url}" >/dev/null 2>&1; then
-            log_info "Gateway is healthy after ${attempt} attempt(s) (${GATEWAY_URL})"
-            return 0
-        fi
-
-        if [ "$attempt" -lt "$retries" ]; then
-            log_info "Gateway not ready yet (attempt ${attempt}/${retries}), retrying in ${interval}s..."
-            sleep "$interval"
-        fi
-    done
-
-    log_error "Gateway did not become healthy after ${retries} attempts ($((retries * interval))s)"
-    return 1
-}
-
-# ── Workspace Startup ──────────────────────────────────────────
-start_workspace() {
-    local entry="${WORKSPACE_DIR}/${WORKSPACE_ENTRY}"
-
-    if [ ! -d "$WORKSPACE_DIR" ]; then
-        log_error "Workspace directory not found: ${WORKSPACE_DIR}"
-        return 1
-    fi
-
-    if [ ! -f "$entry" ]; then
-        log_error "Workspace entry point not found: ${entry}"
-        return 1
-    fi
-
-    log_info "Starting Hermes Workspace web UI..."
-    log_info "  Directory: ${WORKSPACE_DIR}"
-    log_info "  Entry:     ${entry}"
-
-    cd "$WORKSPACE_DIR"
-
-    # Start workspace in background so we can trap signals
-    node --max-old-space-size=2048 "${entry}" &
-    _workspace_pid=$!
-    echo "$_workspace_pid" > "$PID_FILE"
-
-    log_info "Workspace started (PID: ${_workspace_pid})"
-
-    # Wait for workspace process
-    wait "$_workspace_pid"
-    local exit_code=$?
-
-    log_info "Workspace exited with code ${exit_code}"
-    return "$exit_code"
-}
-
-# ── Main ───────────────────────────────────────────────────────
-main() {
-    log_info "=== Hermes Workspace Combined Entrypoint ==="
-    log_info "Gateway:   ${GATEWAY_URL}"
-    log_info "Workspace: ${WORKSPACE_DIR}/${WORKSPACE_ENTRY}"
-    log_info "PID file:  ${PID_FILE}"
-
-    # Wait for gateway to be healthy
-    if ! wait_for_gateway; then
-        log_warn "Proceeding without confirmed gateway health..."
-    fi
-
-    # Start the workspace
-    start_workspace
-    local exit_code=$?
-
-    log_info "Entrypoint exiting with code ${exit_code}"
-    return "$exit_code"
-}
-
-# Run main; exit with its return code
-main "$@"