feat: rename tak to int, add worldmonitor stack

.gitignore

@@ -0,0 +1,13 @@
+# Temp/scratch files — never commit these
+*.bak
+*.swp
+*.tmp
+*~
+scratch/
+.env
+.env.local
+tmp/
+temp/
+replace_compose.py
+entrypoint-*.sh
+copy_*.txt

ai/compose.yml

@@ -1,3 +1,4 @@
+version: "3.8"
 services:
 
   # webui:
@@ -71,8 +72,6 @@ services:
     networks:
       - ai_backend
       - ai_net
-    depends_on:
-      - honcho
     labels:
       - "traefik.enable=true"
       - "traefik.docker.network=ai_net"
@@ -126,7 +125,6 @@ services:
       - "traefik.http.routers.syncthing-https.tls.certresolver=njalla"
       - "traefik.http.services.syncthing.loadbalancer.server.port=8384"
 
-
   ollama:
     build:
       context: ./ollama
@@ -160,92 +158,6 @@ services:
       - "303"
       - "26"
 
-  # --- Honcho + OpenConcho combiné: API + Web UI nginx/FastAPI ---
-  honcho:
-    build:
-      context: ./honcho
-      ssh:
-        - default
-    container_name: honcho
-    restart: unless-stopped
-    environment:
-      - DB_CONNECTION_URI=postgresql+psycopg://honcho:honcho_pass@honcho-db:5432/honcho
-      - CACHE_URL=redis://honcho-redis:6379/0
-      - CACHE_ENABLED=true
-      - EMBEDDING_VECTOR_DIMENSIONS=1024
-      - AUTH_USE_AUTH=true
-      - AUTH_JWT_SECRET=${HONCHO_AUTH_JWT_SECRET}
-      # Needed by deriver/dream to make LLM calls (api_key_env = "HONCHO_OPENAI_API_KEY" in config.toml)
-      - HONCHO_OPENAI_API_KEY=${HONCHO_OPENAI_API_KEY}
-    volumes:
-      - honcho_data:/app/data
-      - /mnt/HoardingCow_docker_data/Honcho/config.toml:/app/config.toml:ro
-    networks:
-      - ai_backend
-      - ai_net
-    labels:
-      - "traefik.enable=true"
-      - "traefik.docker.network=ai_net"
-
-      # Router for HTTP + redirect to HTTPS
-      - "traefik.http.routers.honcho-http.rule=Host(`honcho.lazyworkhorse.net`)"
-      - "traefik.http.routers.honcho-http.entrypoints=web"
-      - "traefik.http.routers.honcho-http.middlewares=redirect-to-https"
-
-      # Router for HTTPS with TLS — protected by Authelia
-      - "traefik.http.routers.honcho-https.rule=Host(`honcho.lazyworkhorse.net`)"
-      - "traefik.http.routers.honcho-https.entrypoints=websecure"
-      - "traefik.http.routers.honcho-https.tls=true"
-      - "traefik.http.routers.honcho-https.tls.certresolver=njalla"
-      - "traefik.http.routers.honcho-https.middlewares=hermes-auth"
-
-      # Service Loadbalancer (nginx port)
-      - "traefik.http.services.honcho.loadbalancer.server.port=80"
-    depends_on:
-      honcho-db:
-        condition: service_healthy
-      honcho-redis:
-        condition: service_healthy
-
-  honcho-db:
-    image: pgvector/pgvector:pg15
-    container_name: honcho-db
-    restart: unless-stopped
-    ports:
-      - "127.0.0.1:5432:5432"
-    command: ["postgres", "-c", "max_connections=200"]
-    environment:
-      - POSTGRES_DB=honcho
-      - POSTGRES_USER=honcho
-      - POSTGRES_PASSWORD=honcho_pass
-      - PGDATA=/var/lib/postgresql/data/pgdata
-    volumes:
-      - /mnt/HoardingCow_docker_data/Honcho/postgres:/var/lib/postgresql/data
-      - ./honcho/init-db.sql:/docker-entrypoint-initdb.d/init.sql:ro
-    networks:
-      - ai_backend
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U honcho -d honcho"]
-      interval: 5s
-      timeout: 5s
-      retries: 5
-
-  honcho-redis:
-    image: redis:8
-    container_name: honcho-redis
-    restart: unless-stopped
-    ports:
-      - "127.0.0.1:6379:6379"
-    volumes:
-      - /mnt/HoardingCow_docker_data/Honcho/redis:/data
-    networks:
-      - ai_backend
-    healthcheck:
-      test: ["CMD-SHELL", "redis-cli ping"]
-      interval: 5s
-      timeout: 5s
-      retries: 5
-
 networks:
   ai_net:
     external: true
@@ -253,11 +165,6 @@ networks:
   ai_backend:
     driver: bridge
     name: ai_backend
-
-volumes:
-  honcho_data:
-    external: true
-    name: honcho_data
     
   # llama_cpp_devstral:
   #   image: ghcr.io/ggml-org/llama.cpp:server-rocm

ai/hermes/Dockerfile

@@ -43,14 +43,6 @@ RUN apt-get update && \
 # ---------- UV ----------
 COPY --chmod=0755 --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/
 
-# ---------- Matrix bridge + extra pip deps ----------
-# Previously installed inline at container startup and persisted via volume mount.
-# Now baked into the image so the fragile venv volume mount can be removed.
-RUN . /opt/hermes/.venv/bin/activate && \
-    uv pip install --no-cache-dir 'mautrix[encryption]' openai
-
-WORKDIR /opt/hermes
-
 # ---------- Matrix bridge + extra pip deps ----------
 # Previously installed inline at container startup and persisted via volume mount.
 # Now baked into the image so the fragile venv volume mount can be removed.

ai/honcho/Dockerfile

@@ -1,75 +0,0 @@
-# build stage — fetches and builds Honcho from source
-FROM python:3.13-slim-bookworm AS honcho-builder
-
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends git openssh-client && \
-    rm -rf /var/lib/apt/lists/*
-
-COPY --from=ghcr.io/astral-sh/uv:0.9.24 /uv /bin/uv
-
-ARG HONCHO_REPO=ssh://git@code.lazyworkhorse.net:2222/Hermes/honcho.git
-ARG HONCHO_REF=main
-RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan -p 2222 code.lazyworkhorse.net >> ~/.ssh/known_hosts 2>/dev/null
-RUN --mount=type=ssh git clone --depth 1 --branch ${HONCHO_REF} ${HONCHO_REPO} /app
-
-WORKDIR /app
-
-ENV UV_COMPILE_BYTECODE=1
-ENV UV_LINK_MODE=copy
-ENV UV_PYTHON=/usr/local/bin/python3.13
-
-RUN uv sync --frozen
-
-# build stage — builds OpenConcho SPA
-FROM node:22-bookworm AS openconcho-builder
-
-ENV PNPM_HOME=/pnpm
-ENV PATH=$PNPM_HOME:$PATH
-RUN corepack enable && corepack prepare pnpm@latest --activate
-
-WORKDIR /app
-RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/*
-
-ARG OPENCONCHO_SHA=3b5c3293fc18d768dbe85285264a8d66c896bd81
-RUN --mount=type=ssh git clone --depth 1 ssh://git@code.lazyworkhorse.net:2222/gortium/openconcho.git /app && \
-    git -C /app fetch --depth 1 origin ${OPENCONCHO_SHA} && \
-    git -C /app checkout ${OPENCONCHO_SHA}
-
-RUN pnpm install --frozen-lockfile
-RUN pnpm --filter @openconcho/web build
-
-# runtime stage — nginx + Honcho FastAPI
-FROM python:3.13-slim-bookworm
-
-# Install nginx and create runtime dirs before dropping permissions
-RUN apt-get update && apt-get install -y --no-install-recommends nginx && \
-    rm -rf /var/log/nginx/* && \
-    rm -rf /var/lib/apt/lists/* && \
-    rm -f /etc/nginx/sites-enabled/default
-
-# Patch nginx.conf: comment out "user www-data;" so nginx master stays as root
-# (workers inherit root inside a container — fine for single-service isolation)
-RUN sed -i 's/^user /# user /' /etc/nginx/nginx.conf
-
-# Pre-create nginx runtime directories with proper ownership
-RUN mkdir -p /var/lib/nginx/body /var/lib/nginx/proxy /var/lib/nginx/fastcgi \
-             /var/lib/nginx/uwsgi /var/lib/nginx/scgi /var/lib/nginx/proxy_temp \
-             /var/cache/nginx && \
-    chown -R root:root /var/lib/nginx /var/cache/nginx
-
-# Honcho
-COPY --from=honcho-builder /app /app
-WORKDIR /app
-ENV PATH="/app/.venv/bin:$PATH"
-ENV HOME=/app
-COPY config.toml /app/config.toml
-
-# OpenConcho SPA
-COPY --from=openconcho-builder /app/packages/web/dist /usr/share/nginx/html
-
-# nginx config (proxies /v3/, /v2/ to Honcho on localhost:8000)
-COPY honcho-nginx.conf /etc/nginx/conf.d/default.conf
-
-EXPOSE 80
-
-CMD ["bash", "-c", "nginx -g 'daemon off;' & fastapi run --host 127.0.0.1 --port 8000 src/main.py & python3 -m src.deriver & wait -n"]

ai/honcho/config.toml

@@ -1,132 +0,0 @@
-[app]
-LOG_LEVEL = "INFO"
-MAX_MESSAGE_SIZE = 25000
-EMBED_MESSAGES = true
-NAMESPACE = "honcho"
-
-[db]
-CONNECTION_URI = "postgresql+psycopg://honcho:honcho_pass@honcho-db:5432/honcho"
-SCHEMA = "public"
-POOL_SIZE = 10
-MAX_OVERFLOW = 20
-
-[auth]
-USE_AUTH = false
-
-[sentry]
-ENABLED = false
-
-[telemetry]
-ENABLED = false
-
-[webhook]
-ENABLED = false
-
-[cache]
-ENABLED = true
-URL = "redis://honcho-redis:6379/0"
-
-[llm]
-DEFAULT_MAX_TOKENS = 4096
-
-# Embeddings via Ollama — bge-m3 provides 1024-dim
-[embedding]
-VECTOR_DIMENSIONS = 1024
-MAX_INPUT_TOKENS = 8192
-
-[embedding.model_config]
-transport = "openai"
-model = "bge-m3"
-overrides = {base_url = "http://ollama:11434/v1", api_key = "ollama"}
-
-# --- Deriver ---
-[deriver]
-ENABLED = true
-WORKERS = 1
-POLLING_SLEEP_INTERVAL_SECONDS = 5.0
-FLUSH_ENABLED = true
-
-[deriver.model_config]
-overrides = {base_url = "https://opencode.ai/zen/go/v1", api_key_env = "HONCHO_OPENAI_API_KEY"}
-transport = "openai"
-model = "deepseek-v4-flash"
-
-# --- Dialectic ---
-[dialectic]
-MAX_INPUT_TOKENS = 4096
-SESSION_HISTORY_MAX_TOKENS = 8192
-
-[dialectic.levels.minimal]
-MAX_TOOL_ITERATIONS = 1
-MAX_OUTPUT_TOKENS = 512
-[dialectic.levels.minimal.model_config]
-overrides = {base_url = "https://opencode.ai/zen/go/v1", api_key_env = "HONCHO_OPENAI_API_KEY"}
-transport = "openai"
-model = "deepseek-v4-flash"
-
-[dialectic.levels.low]
-MAX_TOOL_ITERATIONS = 3
-[dialectic.levels.low.model_config]
-overrides = {base_url = "https://opencode.ai/zen/go/v1", api_key_env = "HONCHO_OPENAI_API_KEY"}
-transport = "openai"
-model = "deepseek-v4-flash"
-
-[dialectic.levels.medium]
-MAX_TOOL_ITERATIONS = 2
-[dialectic.levels.medium.model_config]
-overrides = {base_url = "https://opencode.ai/zen/go/v1", api_key_env = "HONCHO_OPENAI_API_KEY"}
-transport = "openai"
-model = "deepseek-v4-flash"
-
-[dialectic.levels.high]
-MAX_TOOL_ITERATIONS = 4
-[dialectic.levels.high.model_config]
-overrides = {base_url = "https://opencode.ai/zen/go/v1", api_key_env = "HONCHO_OPENAI_API_KEY"}
-transport = "openai"
-model = "deepseek-v4-flash"
-
-[dialectic.levels.max]
-MAX_TOOL_ITERATIONS = 10
-[dialectic.levels.max.model_config]
-overrides = {base_url = "https://opencode.ai/zen/go/v1", api_key_env = "HONCHO_OPENAI_API_KEY"}
-transport = "openai"
-model = "deepseek-v4-flash"
-
-# --- Summary ---
-[summary]
-ENABLED = true
-MESSAGES_PER_SHORT_SUMMARY = 20
-MESSAGES_PER_LONG_SUMMARY = 60
-
-[summary.model_config]
-overrides = {base_url = "https://opencode.ai/zen/go/v1", api_key_env = "HONCHO_OPENAI_API_KEY"}
-transport = "openai"
-model = "deepseek-v4-flash"
-
-# --- Dream ---
-[dream]
-ENABLED = true
-
-[dream.model_config]
-overrides = {base_url = "https://opencode.ai/zen/go/v1", api_key_env = "HONCHO_OPENAI_API_KEY"}
-transport = "openai"
-model = "deepseek-v4-flash"
-
-[dream.deduction_model_config]
-overrides = {base_url = "https://opencode.ai/zen/go/v1", api_key_env = "HONCHO_OPENAI_API_KEY"}
-transport = "openai"
-model = "deepseek-v4-flash"
-
-[dream.induction_model_config]
-overrides = {base_url = "https://opencode.ai/zen/go/v1", api_key_env = "HONCHO_OPENAI_API_KEY"}
-transport = "openai"
-model = "deepseek-v4-flash"
-
-# --- Peer Card ---
-[peer_card]
-ENABLED = true
-
-# --- Vector Store ---
-[vector_store]
-TYPE = "pgvector"
-# DIMENSIONS is deprecated — EMBEDDING.VECTOR_DIMENSIONS is authoritative

ai/honcho/honcho-nginx.conf

@@ -1,52 +0,0 @@
-server {
-    listen 80 default_server;
-    listen [::]:80 default_server;
-    server_name _;
-
-    root /usr/share/nginx/html;
-    index index.html;
-
-    # Honcho API proxy
-    location /v3/ {
-        proxy_pass http://127.0.0.1:8000;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
-    location /v2/ {
-        proxy_pass http://127.0.0.1:8000;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
-    # Honcho health
-    location /health {
-        proxy_pass http://127.0.0.1:8000;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
-    # OpenAPI docs
-    location /openapi.json {
-        proxy_pass http://127.0.0.1:8000;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
-    # SPA: fallback to index.html for client-side routing
-    location / {
-        try_files $uri $uri/ /index.html;
-    }
-}

ai/honcho/init-db.sql

@@ -1 +0,0 @@
-CREATE EXTENSION IF NOT EXISTS vector;

int/.env.example

@@ -0,0 +1,53 @@
+# =============================================================================
+# WorldMonitor — Environment Variables
+# =============================================================================
+# Copy this file to .env (gitignored) and fill in your keys.
+# All keys are optional — the dashboard works without them,
+# but the corresponding features will be disabled.
+#
+# Usage:
+#   cp .env.example .env.local   (docker-compose auto-loads .env from CWD)
+#
+# For production secrets, add these to the shared containers.env
+# agenix secret at: secrets/containers.env.age
+# =============================================================================
+
+# ── REQUIRED: These containers refuse to start without them ──
+# Generate with: openssl rand -hex 32
+REDIS_PASSWORD=
+REDIS_TOKEN=
+RELAY_SHARED_SECRET=
+
+# ── LLM / AI (for intelligence assessments) ──
+# Pick one or both
+GROQ_API_KEY=               # https://console.groq.com (free: 14,400 req/day)
+OPENROUTER_API_KEY=         # https://openrouter.ai (free: 50 req/day)
+
+# ── Markets & Economics (optional) ──
+FINNHUB_API_KEY=            # https://finnhub.io (free tier)
+FRED_API_KEY=               # https://fred.stlouisfed.org (free)
+EIA_API_KEY=                # https://www.eia.gov/opendata/ (free)
+
+# ── Aviation (optional) ──
+AVIATIONSTACK_API=          # https://aviationstack.com (free tier)
+WINGBITS_API_KEY=           # https://wingbits.com (contact them)
+
+# ── Maritime (optional) ──
+AISSTREAM_API_KEY=          # https://aisstream.io (free tier)
+
+# ── Conflict & Unrest (optional) ──
+ACLED_ACCESS_TOKEN=         # https://acleddata.com (free for researchers)
+
+# ── Earth Observation (optional) ──
+NASA_FIRMS_API_KEY=         # https://firms.modaps.eosdis.nasa.gov (free)
+
+# ── Infrastructure / Internet (optional) ──
+CLOUDFLARE_API_TOKEN=       # https://developers.cloudflare.com/fundamentals/api/
+
+# ── Port (optional, defaults to 3000) ──
+WM_PORT=3000
+
+# ── Convex (for cloud sync / auth — optional for self-host) ──
+CONVEX_URL=
+CLERK_SECRET_KEY=
+VITE_CLERK_PUBLISHABLE_KEY=

int/compose.yml

@@ -0,0 +1,177 @@
+# =============================================================================
+# Integrations stack
+# =============================================================================
+# Currently running: WorldMonitor
+# Planned: TAK server (commented out — needs fixing)
+# =============================================================================
+
+# ── TAK Server (FreeTAKServer) ──
+# Disabled: needs debugging. Was having connectivity/auth issues.
+# See: https://github.com/FreeTAKTeam/FreeTAKServer
+#
+# services:
+#   freetakserver:
+#     image: ghcr.io/freetakteam/freetakserver:master
+#     container_name: freetakserver
+#     hostname: freetakserver
+#     restart: always
+#     networks:
+#       - int_backend
+#     volumes:
+#       - /mnt/HoardingCow_docker_data/TAK/fts_data:/opt/fts:z,rw
+#     ports:
+#       - 8087:8087
+#       - 8089:8089
+#       - 8443:8443
+#       - 9000:9000
+#       - 19023:19023
+#     environment:
+#       FTS_FED_PASSWORD: "${FTS_FED_PASSWORD}"
+#       FTS_CLIENT_CERT_PASSWORD: "${FTS_CLIENT_CERT_PASSWORD}"
+#       FTS_WEBSOCKET_KEY: "${FTS_WEBSOCKET_KEY}"
+#       FTS_SECRET_KEY: "${FTS_SECRET_KEY}"
+#       FTS_CONNECTION_MESSAGE: "Welcome to FreeTAKServer. The Parrot is not dead. It's just resting"
+#       FTS_COT_PORT: 8087
+#       FTS_SSLCOT_PORT: 8089
+#       FTS_API_PORT: 19023
+#       FTS_FED_PORT: 9000
+#       FTS_DP_ADDRESS: 'freetakserver'
+#       FTS_USER_ADDRESS: 'freetakserver'
+#       FTS_API_ADDRESS: 'freetakserver'
+#       FTS_ROUTING_PROXY_SUBSCRIBE_PORT: 19030
+#       FTS_ROUTING_PROXY_SUBSCRIBE_IP: 'freetakserver'
+#       FTS_ROUTING_PROXY_PUBLISHER_PORT: 19032
+#       FTS_ROUTING_PROXY_PUBLISHER_IP: 'freetakserver'
+#       FTS_ROUTING_PROXY_SERVER_PORT: 19031
+#       FTS_ROUTING_PROXY_SERVER_IP: 'freetakserver'
+#       FTS_INTEGRATION_MANAGER_PULLER_PORT: 19033
+#       FTS_INTEGRATION_MANAGER_PULLER_ADDRESS: 'freetakserver'
+#       FTS_INTEGRATION_MANAGER_PUBLISHER_PORT: 19034
+#       FTS_INTEGRATION_MANAGER_PUBLISHER_ADDRESS: 'freetakserver'
+#       FTS_OPTIMIZE_API: "True"
+#       FTS_DATA_RECEPTION_BUFFER: 1024
+#       FTS_MAX_RECEPTION_TIME: 4
+#       FTS_NUM_ROUTING_WORKERS: 3
+#       FTS_COT_TO_DB: "True"
+#       FTS_MAINLOOP_DELAY: 100
+#       FTS_EMERGENCY_RADIUS: 0
+#       FTS_LOG_LEVEL: "info"
+#
+#   freetakserver-ui:
+#     image: ghcr.io/freetakteam/ui:latest
+#     container_name: freetakserver-ui
+#     hostname: freetakserver-ui
+#     restart: always
+#     networks:
+#       - int_net
+#     ports:
+#       - 5000:5000
+#     volumes:
+#       - /mnt/HoardingCow_docker_data/TAK/fts_ui_data:/home/freetak/data:z,rw
+#     environment:
+#       FTS_IP: "freetakserver" 
+#       FTS_API_PORT: 19023
+#       FTS_API_PROTO: 'http'
+#       FTS_UI_EXPOSED_IP: 'freetakserver-ui'
+#       FTS_MAP_EXPOSED_IP: '127.0.0.1'
+#       FTS_MAP_PORT: 8000
+#       FTS_MAP_PROTO: 'http'
+#       FTS_UI_PORT: 5000
+#       FTS_UI_WSKEY: "${FTS_WEBSOCKET_KEY}"
+#       FTS_API_KEY: 'Bearer token'
+#       FTS_UI_SQLALCHEMY_DATABASE_URI: 'sqlite:////home/freetak/data/FTSServer-UI.db'
+#     labels:
+#       - "traefik.enable=true"
+#       - "traefik.docker.network=traefik-net"
+#       - "traefik.http.routers.fts-ui-http.rule=Host(`tak.lazyworkhorse.net`)"
+#       - "traefik.http.routers.fts-ui-http.entrypoints=web"
+#       - "traefik.http.routers.fts-ui-http.middlewares=redirect-to-https"
+#       - "traefik.http.routers.fts-ui-https.rule=Host(`tak.lazyworkhorse.net`)"
+#       - "traefik.http.routers.fts-ui-https.entrypoints=websecure"
+#       - "traefik.http.routers.fts-ui-https.tls=true"
+#       - "traefik.http.routers.fts-ui-https.tls.certresolver=njalla"
+#       - "traefik.http.services.fts-ui.loadbalancer.server.port=5000"
+#       - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
+
+# ── WorldMonitor ──
+# Real-time global intelligence dashboard
+# Repo: https://github.com/koala73/worldmonitor
+# Self-hosted, map-first OSINT with MCP support (39 tools)
+services:
+
+  worldmonitor:
+    build:
+      context: https://github.com/koala73/worldmonitor.git
+      dockerfile: Dockerfile
+    image: worldmonitor:latest
+    container_name: worldmonitor
+    ports:
+      - "${WM_PORT:-3000}:8080"
+    environment:
+      UPSTASH_REDIS_REST_URL: "http://redis-rest:80"
+      UPSTASH_REDIS_REST_TOKEN: "${REDIS_TOKEN:?REDIS_TOKEN required}"
+      LOCAL_API_PORT: "46123"
+      LOCAL_API_MODE: "docker"
+      LOCAL_API_CLOUD_FALLBACK: "false"
+      WS_RELAY_URL: "http://ais-relay:3004"
+      # LLM providers (optional — features degrade gracefully)
+      LLM_API_URL: "${LLM_API_URL:-}"
+      LLM_API_KEY: "${LLM_API_KEY:-}"
+      LLM_MODEL: "${LLM_MODEL:-}"
+      GROQ_API_KEY: "${GROQ_API_KEY:-}"
+      # Data source API keys (optional — features degrade gracefully)
+      AISSTREAM_API_KEY: "${AISSTREAM_API_KEY:-}"
+      FINNHUB_API_KEY: "${FINNHUB_API_KEY:-}"
+      EIA_API_KEY: "${EIA_API_KEY:-}"
+      FRED_API_KEY: "${FRED_API_KEY:-}"
+      ACLED_ACCESS_TOKEN: "${ACLED_ACCESS_TOKEN:-}"
+      NASA_FIRMS_API_KEY: "${NASA_FIRMS_API_KEY:-}"
+      CLOUDFLARE_API_TOKEN: "${CLOUDFLARE_API_TOKEN:-}"
+      AVIATIONSTACK_API: "${AVIATIONSTACK_API:-}"
+    depends_on:
+      redis-rest:
+        condition: service_started
+      ais-relay:
+        condition: service_started
+    restart: unless-stopped
+
+  ais-relay:
+    build:
+      context: https://github.com/koala73/worldmonitor.git
+      dockerfile: Dockerfile.relay
+    image: worldmonitor-ais-relay:latest
+    container_name: worldmonitor-ais-relay
+    environment:
+      AISSTREAM_API_KEY: "${AISSTREAM_API_KEY:-}"
+      PORT: "3004"
+    restart: unless-stopped
+
+  redis:
+    image: docker.io/redis:7-alpine
+    container_name: worldmonitor-redis
+    command: >
+      redis-server
+      --requirepass "${REDIS_PASSWORD:?REDIS_PASSWORD required}"
+      --maxmemory 256mb
+      --maxmemory-policy allkeys-lru
+    volumes:
+      - wm-redis-data:/data
+    restart: unless-stopped
+
+  redis-rest:
+    build:
+      context: https://github.com/koala73/worldmonitor.git
+      dockerfile: docker/Dockerfile.redis-rest
+    image: worldmonitor-redis-rest:latest
+    container_name: worldmonitor-redis-rest
+    ports:
+      - "127.0.0.1:8079:80"
+    environment:
+      SRH_TOKEN: "${REDIS_TOKEN:?REDIS_TOKEN required}"
+      SRH_CONNECTION_STRING: "redis://:${REDIS_PASSWORD:?REDIS_PASSWORD required}@redis:6379"
+    depends_on:
+      - redis
+    restart: unless-stopped
+
+volumes:
+  wm-redis-data:

tak/compose.yml

@@ -1,98 +0,0 @@
-services:
-  freetakserver:
-    image: ghcr.io/freetakteam/freetakserver:master
-    container_name: freetakserver
-    hostname: freetakserver
-    restart: always
-    networks:
-      - tak_backend
-    volumes:
-      - /mnt/HoardingCow_docker_data/TAK/fts_data:/opt/fts:z,rw
-    ports:
-      - 8087:8087
-      - 8089:8089
-      - 8443:8443
-      - 9000:9000
-      - 19023:19023
-    environment:
-      FTS_FED_PASSWORD: "${FTS_FED_PASSWORD}"
-      FTS_CLIENT_CERT_PASSWORD: "${FTS_CLIENT_CERT_PASSWORD}"
-      FTS_WEBSOCKET_KEY: "${FTS_WEBSOCKET_KEY}"
-      FTS_SECRET_KEY: "${FTS_SECRET_KEY}"
-      FTS_CONNECTION_MESSAGE: "Welcome to FreeTAKServer. The Parrot is not dead. It's just resting"
-      FTS_COT_PORT: 8087
-      FTS_SSLCOT_PORT: 8089
-      FTS_API_PORT: 19023
-      FTS_FED_PORT: 9000
-      FTS_DP_ADDRESS: 'freetakserver'
-      FTS_USER_ADDRESS: 'freetakserver'
-      FTS_API_ADDRESS: 'freetakserver'
-      FTS_ROUTING_PROXY_SUBSCRIBE_PORT: 19030
-      FTS_ROUTING_PROXY_SUBSCRIBE_IP: 'freetakserver'
-      FTS_ROUTING_PROXY_PUBLISHER_PORT: 19032
-      FTS_ROUTING_PROXY_PUBLISHER_IP: 'freetakserver'
-      FTS_ROUTING_PROXY_SERVER_PORT: 19031
-      FTS_ROUTING_PROXY_SERVER_IP: 'freetakserver'
-      FTS_INTEGRATION_MANAGER_PULLER_PORT: 19033
-      FTS_INTEGRATION_MANAGER_PULLER_ADDRESS: 'freetakserver'
-      FTS_INTEGRATION_MANAGER_PUBLISHER_PORT: 19034
-      FTS_INTEGRATION_MANAGER_PUBLISHER_ADDRESS: 'freetakserver'
-      FTS_OPTIMIZE_API: "True"
-      FTS_DATA_RECEPTION_BUFFER: 1024
-      FTS_MAX_RECEPTION_TIME: 4
-      FTS_NUM_ROUTING_WORKERS: 3
-      FTS_COT_TO_DB: "True"
-      FTS_MAINLOOP_DELAY: 100
-      FTS_EMERGENCY_RADIUS: 0
-      FTS_LOG_LEVEL: "info"
-
-  freetakserver-ui:
-    image: ghcr.io/freetakteam/ui:latest
-    container_name: freetakserver-ui
-    hostname: freetakserver-ui
-    restart: always
-    networks:
-      - tak_net
-    ports:
-      - 5000:5000
-    volumes:
-      - /mnt/HoardingCow_docker_data/TAK/fts_ui_data:/home/freetak/data:z,rw
-    environment:
-      FTS_IP: "freetakserver" 
-      FTS_API_PORT: 19023
-      FTS_API_PROTO: 'http'
-      FTS_UI_EXPOSED_IP: 'freetakserver-ui'
-      FTS_MAP_EXPOSED_IP: '127.0.0.1'
-      FTS_MAP_PORT: 8000
-      FTS_MAP_PROTO: 'http'
-      FTS_UI_PORT: 5000
-      FTS_UI_WSKEY: "${FTS_WEBSOCKET_KEY}"
-      FTS_API_KEY: 'Bearer token'
-      FTS_UI_SQLALCHEMY_DATABASE_URI: 'sqlite:////home/freetak/data/FTSServer-UI.db'
-    labels:
-      - "traefik.enable=true"
-      - "traefik.docker.network=traefik-net"
-
-      # HTTP -> HTTPS Redirect
-      - "traefik.http.routers.fts-ui-http.rule=Host(`tak.lazyworkhorse.net`)"
-      - "traefik.http.routers.fts-ui-http.entrypoints=web"
-      - "traefik.http.routers.fts-ui-http.middlewares=redirect-to-https"
-
-      # HTTPS Router
-      - "traefik.http.routers.fts-ui-https.rule=Host(`tak.lazyworkhorse.net`)"
-      - "traefik.http.routers.fts-ui-https.entrypoints=websecure"
-      - "traefik.http.routers.fts-ui-https.tls=true"
-      - "traefik.http.routers.fts-ui-https.tls.certresolver=njalla"
-      
-      # Service & Port
-      - "traefik.http.services.fts-ui.loadbalancer.server.port=5000"
-
-      # Reuse your existing redirect middleware
-      - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
-
-networks:
-  tak_net:
-    external: true
-  tak_backend:
-    driver: bridge
-    name: tak_backend