merge: resolve conflict with upstream main

Merge upstream changes (HeartbeatConfig addition) alongside LINEConfig. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-14 10:47:06 +09:00
parent f294a71bc5 6083168ab4
commit aa7a8b89c3
57 changed files with 6480 additions and 829 deletions
--- a/config/config.example.json
+++ b/config/config.example.json
@@ -109,6 +109,10 @@
      }
    }
  },
+  "heartbeat": {
+    "enabled": true,
+    "interval": 30
+  },
  "gateway": {
    "host": "0.0.0.0",
    "port": 18790