version 5.3.6

chore: remove redundant license classifier from pyproject.toml
The license expression field (PEP 639) supersedes the classifier. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-13 06:42:31 -04:00 · 2026-05-13 06:42:19 -04:00 · 2026-05-13 06:37:14 -04:00 · 2026-05-13 06:33:06 -04:00 · 2026-05-13 00:02:24 -04:00 · 2026-05-13 00:00:30 -04:00
47 changed files with 1395 additions and 6638 deletions
@@ -0,0 +1,20 @@
+{
+  "permissions": {
+    "allow": [
+      "Edit(*)",
+      "Bash(pytest *)",
+      "Bash(python *)",
+      "Bash(python3 *)",
+      "Bash(.venv/bin/pytest *)",
+      "Bash(npm *)",
+      "Bash(git *)",
+      "Bash(ls *)",
+      "Bash(cat *)",
+      "Bash(grep *)",
+      "Bash(find *)",
+      "Bash(mkdir *)",
+      "Bash(touch *)",
+      "Bash(uv *)"
+    ]
+  }
+}
@@ -11,13 +11,7 @@ jobs:
      - name: Checkout code
        uses: actions/checkout@v4
        
-#      - name: Set up Python
-#        uses: actions/setup-python@v5
-#        with:
-#          python-version: '3.11'
      - name: Set up Python
-        # Use a generic run step for FreeBSD if actions/setup-python
-        # fails in restricted environments.
        run: |
          python3 --version
          python3 -m ensurepip --upgrade
@@ -13,3 +13,5 @@ ssl/
 uv.lock
 .hb.yaml
 .superpowers/
+rndc-key
+docs/superpowers/
@@ -0,0 +1,21 @@
+# MIT License
+
+Copyright (c) 2002 - 2026 Andreas Wrede
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
@@ -1,602 +0,0 @@
-# Plugin Error Checking Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Improve plugin error checking in hbc, especially for nagios_runner, and fix logger messages silently discarded in daemon mode.
-
-**Architecture:** Three focused changes across three files: (1) `hbd/client/plugin.py` gains a `skip_reason` attribute on Plugin and updated PluginLoader messaging; (2) `hbd/client/plugins/nagios_runner.py` gains async subprocess execution, stderr capture, signal-killed process handling, and init-time command path validation; (3) `hbd/client/main.py` gains proper post-fork logging reconfiguration to syslog.
-
-**Tech Stack:** Python 3.11+, asyncio, `logging.handlers.SysLogHandler`, pytest
-
---
-
-## File Map
-
-| Action | Path | What changes |
-|---|---|---|
-| Modify | `hbd/client/plugin.py` | `Plugin.__init__` gains `skip_reason`; `PluginLoader` checks it |
-| Modify | `hbd/client/plugins/nagios_runner.py` | async subprocess, stderr, signal codes, init validation, `skip_reason` |
-| Modify | `hbd/client/main.py` | `_reconfigure_logging_for_daemon()` helper; remove redundant syslog calls |
-| Create | `tests/test_plugin.py` | PluginLoader messaging tests |
-| Create | `tests/test_nagios_runner.py` | NagiosRunnerPlugin behaviour tests |
-
-Run tests throughout with:
-```bash
-python -m pytest tests/test_plugin.py tests/test_nagios_runner.py -v
-```
-
---
-
-## Task 1: Plugin.skip_reason + PluginLoader messaging
-
-**Files:**
- Modify: `hbd/client/plugin.py:40-48` (Plugin.__init__)
- Modify: `hbd/client/plugin.py:369-381` (PluginLoader.load_from_directory)
- Create: `tests/test_plugin.py`
-
- [ ] **Step 1: Write failing tests**
-
-Create `tests/test_plugin.py`:
-
-```python
-import asyncio
-import logging
-import textwrap
-
-from hbd.client.plugin import Plugin, PluginLoader, PluginRegistry
-
-
-def test_plugin_skip_reason_defaults_none(tmp_path):
-    plugin_code = textwrap.dedent("""
-        from hbd.client.plugin import MonitorPlugin
-
-        class MinimalPlugin(MonitorPlugin):
-            name = "minimal"
-            version = "1.0.0"
-            interval = 60
-
-            async def initialize(self):
-                return True
-
-            async def _collect_metrics(self):
-                return {}
-    """)
-    (tmp_path / "minimal.py").write_text(plugin_code)
-    registry = PluginRegistry()
-    loader = PluginLoader(registry)
-    asyncio.run(loader.load_from_directory(tmp_path))
-    plugin = registry.get("minimal")
-    assert plugin is not None
-    assert plugin.skip_reason is None
-
-
-def test_loader_logs_info_when_skip_reason_set(tmp_path, caplog):
-    plugin_code = textwrap.dedent("""
-        from hbd.client.plugin import MonitorPlugin
-
-        class SkippablePlugin(MonitorPlugin):
-            name = "skippable"
-            version = "1.0.0"
-            interval = 60
-
-            async def initialize(self):
-                self.skip_reason = "not configured in yaml"
-                return False
-
-            async def _collect_metrics(self):
-                return {}
-    """)
-    (tmp_path / "skippable.py").write_text(plugin_code)
-    registry = PluginRegistry()
-    loader = PluginLoader(registry)
-
-    with caplog.at_level(logging.INFO, logger="plugin.loader"):
-        count = asyncio.run(loader.load_from_directory(tmp_path))
-
-    assert count == 0
-    assert any("skipped: not configured in yaml" in r.message for r in caplog.records)
-    assert not any("failed initialization" in r.message for r in caplog.records)
-
-
-def test_loader_logs_warning_when_no_skip_reason(tmp_path, caplog):
-    plugin_code = textwrap.dedent("""
-        from hbd.client.plugin import MonitorPlugin
-
-        class FailPlugin(MonitorPlugin):
-            name = "fail"
-            version = "1.0.0"
-            interval = 60
-
-            async def initialize(self):
-                return False
-
-            async def _collect_metrics(self):
-                return {}
-    """)
-    (tmp_path / "fail_plugin.py").write_text(plugin_code)
-    registry = PluginRegistry()
-    loader = PluginLoader(registry)
-
-    with caplog.at_level(logging.WARNING, logger="plugin.loader"):
-        count = asyncio.run(loader.load_from_directory(tmp_path))
-
-    assert count == 0
-    assert any("failed initialization" in r.message for r in caplog.records)
-```
-
- [ ] **Step 2: Run tests to verify they fail**
-
-```bash
-python -m pytest tests/test_plugin.py -v
-```
-Expected: `test_plugin_skip_reason_defaults_none` FAILS (attribute missing), others may error.
-
- [ ] **Step 3: Add `skip_reason` to `Plugin.__init__`**
-
-In `hbd/client/plugin.py`, in `Plugin.__init__` (around line 46), add one line:
-
-```python
-def __init__(self, config: Optional[Dict[str, Any]] = None):
-    self.config = config or {}
-    self.logger = logging.getLogger(f"plugin.{self.name}")
-    self._initialized = False
-    self.skip_reason: Optional[str] = None
-```
-
- [ ] **Step 4: Update PluginLoader messaging**
-
-In `hbd/client/plugin.py`, replace the `if not initialized:` block (around line 372):
-
-```python
-                    if not initialized:
-                        if plugin.skip_reason:
-                            self.logger.info(
-                                f"Plugin {plugin.name} skipped: {plugin.skip_reason}"
-                            )
-                        else:
-                            self.logger.warning(
-                                f"Plugin {plugin.name} failed initialization, skipping"
-                            )
-                        continue
-```
-
- [ ] **Step 5: Run tests to verify they pass**
-
-```bash
-python -m pytest tests/test_plugin.py -v
-```
-Expected: all 3 tests PASS.
-
- [ ] **Step 6: Commit**
-
-```bash
-git add hbd/client/plugin.py tests/test_plugin.py
-git commit -m "feat: add skip_reason to Plugin; improve PluginLoader init messaging"
-```
-
---
-
-## Task 2: NagiosRunnerPlugin — skip_reason when no commands
-
-**Files:**
- Modify: `hbd/client/plugins/nagios_runner.py:88-105` (initialize)
- Modify: `tests/test_nagios_runner.py` (create)
-
- [ ] **Step 1: Write failing test**
-
-Create `tests/test_nagios_runner.py`:
-
-```python
-import asyncio
-import logging
-import os
-import stat
-
-import pytest
-
-from hbd.client.plugins.nagios_runner import (
-    NagiosRunnerPlugin,
-    NAGIOS_OK,
-    NAGIOS_WARNING,
-    NAGIOS_CRITICAL,
-    NAGIOS_UNKNOWN,
-)
-
-
-def test_no_commands_sets_skip_reason():
-    plugin = NagiosRunnerPlugin(config={"commands": []})
-    result = asyncio.run(plugin.initialize())
-    assert result is False
-    assert plugin.skip_reason is not None
-    assert "nagios_runner.commands" in plugin.skip_reason
-```
-
- [ ] **Step 2: Run test to verify it fails**
-
-```bash
-python -m pytest tests/test_nagios_runner.py::test_no_commands_sets_skip_reason -v
-```
-Expected: FAIL — `plugin.skip_reason` is `None`.
-
- [ ] **Step 3: Set skip_reason in NagiosRunnerPlugin.initialize()**
-
-In `hbd/client/plugins/nagios_runner.py`, replace the early-return block in `initialize()` (around line 96):
-
-```python
-        if not self.commands:
-            self.skip_reason = "no commands configured (add nagios_runner.commands to config)"
-            self.logger.info("No Nagios commands configured")
-            return False
-```
-
- [ ] **Step 4: Run test to verify it passes**
-
-```bash
-python -m pytest tests/test_nagios_runner.py::test_no_commands_sets_skip_reason -v
-```
-Expected: PASS.
-
- [ ] **Step 5: Commit**
-
-```bash
-git add hbd/client/plugins/nagios_runner.py tests/test_nagios_runner.py
-git commit -m "feat: set skip_reason on nagios_runner when no commands configured"
-```
-
---
-
-## Task 3: NagiosRunnerPlugin — async subprocess, stderr capture, negative return codes
-
-**Files:**
- Modify: `hbd/client/plugins/nagios_runner.py` (imports + `_run_nagios_plugin`)
- Modify: `tests/test_nagios_runner.py`
-
- [ ] **Step 1: Write failing tests**
-
-Append to `tests/test_nagios_runner.py`:
-
-```python
-def test_stderr_used_when_stdout_empty(tmp_path):
-    script = tmp_path / "check_err.sh"
-    script.write_text("#!/bin/sh\necho 'error from stderr' >&2\nexit 2\n")
-    script.chmod(script.stat().st_mode | stat.S_IEXEC)
-
-    config = {"commands": [{"name": "t", "command": str(script)}], "timeout": 5}
-    plugin = NagiosRunnerPlugin(config=config)
-    asyncio.run(plugin.initialize())
-    data = asyncio.run(plugin._collect_metrics())
-
-    assert "error from stderr" in data["t_output"]
-    assert data["t_status_code"] == NAGIOS_CRITICAL
-
-
-def test_stderr_appended_when_both_present(tmp_path):
-    script = tmp_path / "check_both.sh"
-    script.write_text("#!/bin/sh\necho 'OK - all good'\necho 'extra detail' >&2\nexit 0\n")
-    script.chmod(script.stat().st_mode | stat.S_IEXEC)
-
-    config = {"commands": [{"name": "t", "command": str(script)}], "timeout": 5}
-    plugin = NagiosRunnerPlugin(config=config)
-    asyncio.run(plugin.initialize())
-    data = asyncio.run(plugin._collect_metrics())
-
-    assert "OK - all good" in data["t_output"]
-    assert "extra detail" in data["t_output"]
-    assert data["t_status_code"] == NAGIOS_OK
-
-
-def test_negative_returncode_maps_to_unknown():
-    # kill -9 $$ kills the shell itself; asyncio sees returncode -9
-    config = {"commands": [{"name": "t", "command": "kill -9 $$"}], "timeout": 5}
-    plugin = NagiosRunnerPlugin(config=config)
-    asyncio.run(plugin.initialize())
-    data = asyncio.run(plugin._collect_metrics())
-
-    assert data["t_status_code"] == NAGIOS_UNKNOWN
-    assert "signal" in data["t_output"].lower()
-```
-
- [ ] **Step 2: Run tests to verify they fail**
-
-```bash
-python -m pytest tests/test_nagios_runner.py::test_stderr_used_when_stdout_empty \
-    tests/test_nagios_runner.py::test_stderr_appended_when_both_present \
-    tests/test_nagios_runner.py::test_negative_returncode_maps_to_unknown -v
-```
-Expected: all FAIL — current implementation ignores stderr and doesn't handle negative codes.
-
- [ ] **Step 3: Update imports in nagios_runner.py**
-
-Replace the import block at the top of `hbd/client/plugins/nagios_runner.py`:
-
-```python
-import asyncio
-import os
-import re
-from typing import Any, Dict, List, Optional, Tuple
-
-from hbd.client.plugin import MonitorPlugin
-```
-
-(Remove `import subprocess`; add `import asyncio` and `import os`.)
-
- [ ] **Step 4: Upgrade collection log level from DEBUG to INFO**
-
-In `hbd/client/plugins/nagios_runner.py`, in `_collect_metrics()`, change the debug log (around line 144) so results are visible at INFO level:
-
-```python
-                self.logger.info(
-                    f"Executed {name}: {STATUS_NAMES.get(status_code, 'UNKNOWN')} - {output[:50]}"
-                )
-```
-
- [ ] **Step 5: Replace `_run_nagios_plugin` with async implementation**
-
-Replace the entire `_run_nagios_plugin` method in `hbd/client/plugins/nagios_runner.py`:
-
-```python
-    async def _run_nagios_plugin(
-        self,
-        command: str
-    ) -> Tuple[int, str, Dict[str, Any]]:
-        """Execute a Nagios plugin and parse its output."""
-        try:
-            proc = await asyncio.create_subprocess_shell(
-                command,
-                stdout=asyncio.subprocess.PIPE,
-                stderr=asyncio.subprocess.PIPE,
-            )
-            try:
-                stdout_bytes, stderr_bytes = await asyncio.wait_for(
-                    proc.communicate(), timeout=self.timeout
-                )
-            except asyncio.TimeoutError:
-                proc.kill()
-                await proc.communicate()
-                self.logger.error(f"Command timed out: {command}")
-                return NAGIOS_UNKNOWN, f"Command timed out after {self.timeout}s", {}
-
-            status_code = proc.returncode
-
-            if status_code < 0:
-                return NAGIOS_UNKNOWN, f"Process killed by signal {-status_code}", {}
-
-            if status_code > 3:
-                status_code = NAGIOS_UNKNOWN
-
-            stdout = stdout_bytes.decode(errors="replace").strip()
-            stderr = stderr_bytes.decode(errors="replace").strip()
-
-            # Parse perfdata from stdout before mixing in stderr
-            perfdata = self._parse_perfdata(stdout)
-
-            # Build status message
-            status_part = stdout.split('|')[0].strip() if '|' in stdout else stdout
-
-            if not stdout and stderr:
-                output_msg = stderr
-            elif stdout and stderr:
-                output_msg = f"{status_part} [stderr: {stderr}]"
-            else:
-                output_msg = status_part
-
-            return status_code, output_msg, perfdata
-
-        except Exception as e:
-            self.logger.error(f"Error executing command: {e}")
-            return NAGIOS_UNKNOWN, f"Execution error: {str(e)}", {}
-```
-
-Also remove the now-unused `self.shell` line from `__init__` (the `shell` config key is no longer used since `create_subprocess_shell` always uses a shell):
-
-In `NagiosRunnerPlugin.__init__`, remove:
-```python
-        self.shell: bool = config.get("shell", True) if config else True
-```
-
- [ ] **Step 6: Run tests to verify they pass**
-
-```bash
-python -m pytest tests/test_nagios_runner.py -v
-```
-Expected: all tests PASS including the 3 new ones.
-
- [ ] **Step 7: Commit**
-
-```bash
-git add hbd/client/plugins/nagios_runner.py tests/test_nagios_runner.py
-git commit -m "feat: async subprocess in nagios_runner with stderr capture and signal handling"
-```
-
---
-
-## Task 4: NagiosRunnerPlugin — command path validation at init
-
-**Files:**
- Modify: `hbd/client/plugins/nagios_runner.py` (initialize)
- Modify: `tests/test_nagios_runner.py`
-
- [ ] **Step 1: Write failing tests**
-
-Append to `tests/test_nagios_runner.py`:
-
-```python
-def test_absolute_path_not_found_warns(caplog):
-    fake_cmd = "/nonexistent_hbc_test_path/check_something"
-    config = {"commands": [{"name": "t", "command": fake_cmd}]}
-    plugin = NagiosRunnerPlugin(config=config)
-
-    with caplog.at_level(logging.WARNING, logger="plugin.nagios_runner"):
-        asyncio.run(plugin.initialize())
-
-    assert any("not found" in r.message for r in caplog.records)
-
-
-def test_absolute_path_not_executable_warns(caplog, tmp_path):
-    non_exec = tmp_path / "check_test"
-    non_exec.write_text("#!/bin/sh\necho OK\n")
-    non_exec.chmod(0o644)  # readable but not executable
-
-    config = {"commands": [{"name": "t", "command": str(non_exec)}]}
-    plugin = NagiosRunnerPlugin(config=config)
-
-    with caplog.at_level(logging.WARNING, logger="plugin.nagios_runner"):
-        asyncio.run(plugin.initialize())
-
-    assert any("not executable" in r.message for r in caplog.records)
-
-
-def test_relative_path_not_checked(caplog):
-    # Relative paths (resolved via PATH) must not generate warnings
-    config = {"commands": [{"name": "t", "command": "echo OK"}]}
-    plugin = NagiosRunnerPlugin(config=config)
-
-    with caplog.at_level(logging.WARNING, logger="plugin.nagios_runner"):
-        asyncio.run(plugin.initialize())
-
-    assert not any(
-        "not found" in r.message or "not executable" in r.message
-        for r in caplog.records
-    )
-```
-
- [ ] **Step 2: Run tests to verify they fail**
-
-```bash
-python -m pytest tests/test_nagios_runner.py::test_absolute_path_not_found_warns \
-    tests/test_nagios_runner.py::test_absolute_path_not_executable_warns \
-    tests/test_nagios_runner.py::test_relative_path_not_checked -v
-```
-Expected: `test_absolute_path_not_found_warns` and `test_absolute_path_not_executable_warns` FAIL (no warnings logged); `test_relative_path_not_checked` may pass.
-
- [ ] **Step 3: Add command path validation to `initialize()`**
-
-In `hbd/client/plugins/nagios_runner.py`, extend `initialize()` by adding validation after the existing "log each command" loop (after line 103, before `return True`):
-
-```python
-        # Validate absolute command paths early
-        for cmd_config in self.commands:
-            name = cmd_config.get("name", "unnamed")
-            command = cmd_config.get("command", "")
-            if not command:
-                continue
-            exe = command.split()[0]
-            if os.path.isabs(exe):
-                if not os.path.isfile(exe):
-                    self.logger.warning(
-                        f"Command '{name}': executable not found: {exe}"
-                    )
-                elif not os.access(exe, os.X_OK):
-                    self.logger.warning(
-                        f"Command '{name}': executable not executable: {exe}"
-                    )
-```
-
- [ ] **Step 4: Run full test suite to verify all pass**
-
-```bash
-python -m pytest tests/test_plugin.py tests/test_nagios_runner.py -v
-```
-Expected: all tests PASS.
-
- [ ] **Step 5: Commit**
-
-```bash
-git add hbd/client/plugins/nagios_runner.py tests/test_nagios_runner.py
-git commit -m "feat: validate absolute command paths at nagios_runner init"
-```
-
---
-
-## Task 5: Daemon mode logging — route to syslog after fork
-
-**Files:**
- Modify: `hbd/client/main.py` (new helper + updated daemon block)
-
-No automated test for daemonization itself (fork behaviour is hard to unit-test). Manual verification steps are provided below.
-
- [ ] **Step 1: Add `_reconfigure_logging_for_daemon` helper**
-
-In `hbd/client/main.py`, add this function just before `def build_parser()` (around line 589):
-
-```python
-def _reconfigure_logging_for_daemon(log_level: int) -> None:
-    """Replace StreamHandlers (now writing to /dev/null) with a SysLogHandler."""
-    from logging.handlers import SysLogHandler
-
-    root = logging.getLogger()
-    for handler in root.handlers[:]:
-        root.removeHandler(handler)
-        handler.close()
-
-    try:
-        syslog_handler = SysLogHandler(
-            address="/dev/log",
-            facility=SysLogHandler.LOG_DAEMON,
-        )
-    except OSError:
-        syslog_handler = SysLogHandler(
-            address=("localhost", 514),
-            facility=SysLogHandler.LOG_DAEMON,
-        )
-        # Attach the fallback first so the warning reaches syslog
-        syslog_handler.setFormatter(
-            logging.Formatter("hbc[%(process)d]: %(name)s %(levelname)s: %(message)s")
-        )
-        root.addHandler(syslog_handler)
-        root.setLevel(log_level)
-        logging.warning("/dev/log not found, using syslog UDP localhost:514")
-        return
-
-    syslog_handler.setFormatter(
-        logging.Formatter("hbc[%(process)d]: %(name)s %(levelname)s: %(message)s")
-    )
-    root.addHandler(syslog_handler)
-    root.setLevel(log_level)
-```
-
- [ ] **Step 2: Update the daemon block in `main()`**
-
-In `hbd/client/main.py`, replace the entire `if args.daemon:` block (lines 664–675):
-
-```python
-    if args.daemon:
-        print("Daemonizing...")
-        daemonize()
-        _reconfigure_logging_for_daemon(log_level)
-        logging.info(f"hbc starting, sending heartbeat to {', '.join(args.hosts)}")
-```
-
-This removes the `import syslog`, `syslog.openlog()`, and `syslog.syslog()` calls (now handled by the logging system) and removes the no-op second `logging.basicConfig()` call.
-
- [ ] **Step 3: Run existing test suite to confirm no regressions**
-
-```bash
-python -m pytest tests/test_plugin.py tests/test_nagios_runner.py -v
-```
-Expected: all tests still PASS.
-
- [ ] **Step 4: Manual smoke test — verify syslog output in daemon mode**
-
-```bash
-# In one terminal, tail syslog
-sudo journalctl -f -t hbc
-
-# In another terminal, start hbc in daemon mode (replace HOST with a real or dummy host)
-python -m hbd.client.main -d -v localhost
-
-# Expected in journalctl output:
-#   hbc[<pid>]: hbc.main INFO: Starting hbc for <hostname> -> ['localhost']
-#   hbc[<pid>]: hbc.main INFO: hbc starting, sending heartbeat to localhost
-#   hbc[<pid>]: plugin.loader INFO: ...
-
-# Stop the daemon
-pkill -f "hbd.client.main"
-```
-
- [ ] **Step 5: Commit**
-
-```bash
-git add hbd/client/main.py
-git commit -m "fix: reconfigure logging to syslog after daemonize() instead of no-op basicConfig"
-```
@@ -1,781 +0,0 @@
-# Gitea OAuth2 Authentication Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Add Gitea as an OAuth2 login provider that coexists with password auth, auto-provisioning new users on first login.
-
-**Architecture:** A new `oauth.py` module owns all Gitea-specific logic (CSRF state, URL building, token exchange, user-info fetch). `users.py` gains one function to upsert an OAuth-sourced user. `http.py` gets two new route handlers and a small login-page change. No new dependencies — `aiohttp.ClientSession` is already used in the codebase.
-
-**Tech Stack:** Python 3.12, aiohttp 3.x, pytest, pytest-asyncio
-
---
-
-## File Map
-
-| Action | Path | Responsibility |
-|--------|------|----------------|
-| Modify | `hbd/server/config.py` | Add `"oauth": {}` default |
-| Create | `hbd/server/oauth.py` | CSRF state, URL builder, token exchange, user-info fetch |
-| Modify | `hbd/server/users.py` | Add `provision_oauth_user()` |
-| Modify | `hbd/server/http.py` | Import oauth, two new routes, login page button |
-| Create | `tests/test_oauth.py` | All new unit tests |
-
---
-
-## Task 1: Add config default and `is_enabled()`
-
-**Files:**
- Modify: `hbd/server/config.py:34` (after the `"users"` line)
- Create: `hbd/server/oauth.py`
- Create: `tests/test_oauth.py`
-
- [ ] **Step 1: Write the failing test**
-
-Create `tests/test_oauth.py`:
-
-```python
-import pytest
-from hbd.server import oauth
-
-
-CFG_OFF = {}
-CFG_ON = {
-    "oauth": {
-        "gitea": {
-            "url": "https://git.example.com",
-            "client_id": "cid",
-            "client_secret": "csec",
-        }
-    }
-}
-CFG_PARTIAL = {"oauth": {"gitea": {"url": "https://git.example.com"}}}
-
-
-def test_is_enabled_when_all_keys_present():
-    assert oauth.is_enabled(CFG_ON) is True
-
-
-def test_is_enabled_false_when_no_oauth_key():
-    assert oauth.is_enabled(CFG_OFF) is False
-
-
-def test_is_enabled_false_when_partial_config():
-    assert oauth.is_enabled(CFG_PARTIAL) is False
-```
-
- [ ] **Step 2: Run to confirm failure**
-
-```
-pytest tests/test_oauth.py -v
-```
-
-Expected: `ModuleNotFoundError: No module named 'hbd.server.oauth'`
-
- [ ] **Step 3: Add config default**
-
-In `hbd/server/config.py`, add after the `"default_owner"` line (currently line 35):
-
-```python
-    # OAuth2 providers
-    "oauth": {},                 # oauth.gitea.{url,client_id,client_secret}
-```
-
- [ ] **Step 4: Create `hbd/server/oauth.py` with `is_enabled`**
-
-```python
-"""Gitea OAuth2 support.
-
-Config shape (in ~/.hb.yaml):
-
-    oauth:
-      gitea:
-        url: https://git.example.com
-        client_id: <client-id>
-        client_secret: <client-secret>
-
-Register a Gitea OAuth2 application at:
-  Gitea → Settings → Applications → OAuth2
-Set the redirect URI to:
-  https://<hbd-host>/login/oauth/gitea/callback
-"""
-
-import logging
-import secrets
-import time
-
-import aiohttp
-
-logger = logging.getLogger(__name__)
-
-STATE_TTL = 600  # 10 minutes
-
-# state_token -> expiry timestamp
-_states: dict[str, float] = {}
-
-
-class OAuthError(Exception):
-    """Raised when the OAuth2 flow fails for any reason."""
-
-
-def _gitea_cfg(config: dict) -> dict:
-    """Return the gitea sub-dict or {} if absent/incomplete."""
-    return config.get("oauth", {}).get("gitea", {})
-
-
-def is_enabled(config: dict) -> bool:
-    """Return True when all three required Gitea OAuth keys are present."""
-    g = _gitea_cfg(config)
-    return bool(g.get("url") and g.get("client_id") and g.get("client_secret"))
-```
-
- [ ] **Step 5: Run to confirm tests pass**
-
-```
-pytest tests/test_oauth.py -v
-```
-
-Expected: 3 passed
-
- [ ] **Step 6: Commit**
-
-```bash
-git add hbd/server/config.py hbd/server/oauth.py tests/test_oauth.py
-git commit -m "feat: add oauth module skeleton and is_enabled()"
-```
-
---
-
-## Task 2: CSRF state management
-
-**Files:**
- Modify: `hbd/server/oauth.py` (add `make_state`, `validate_state`)
- Modify: `tests/test_oauth.py` (add state tests)
-
- [ ] **Step 1: Write the failing tests**
-
-Append to `tests/test_oauth.py`:
-
-```python
-import time as time_mod
-
-
-def test_make_state_returns_unique_tokens():
-    s1 = oauth.make_state()
-    s2 = oauth.make_state()
-    assert s1 != s2
-    assert len(s1) == 64  # 32 bytes hex
-
-
-def test_validate_state_valid():
-    state = oauth.make_state()
-    assert oauth.validate_state(state) is True
-
-
-def test_validate_state_consumed_on_use():
-    state = oauth.make_state()
-    oauth.validate_state(state)
-    assert oauth.validate_state(state) is False  # replay rejected
-
-
-def test_validate_state_unknown():
-    assert oauth.validate_state("notastate") is False
-
-
-def test_validate_state_expired(monkeypatch):
-    state = oauth.make_state()
-    # Wind expiry into the past
-    monkeypatch.setitem(oauth._states, state, time_mod.time() - 1)
-    assert oauth.validate_state(state) is False
-```
-
- [ ] **Step 2: Run to confirm failure**
-
-```
-pytest tests/test_oauth.py -v -k "state"
-```
-
-Expected: `AttributeError: module 'hbd.server.oauth' has no attribute 'make_state'`
-
- [ ] **Step 3: Implement state functions**
-
-Add to `hbd/server/oauth.py` after the `_states` dict definition:
-
-```python
-def make_state() -> str:
-    """Generate a CSRF state token, store it with TTL, and return it."""
-    _purge_states()
-    token = secrets.token_hex(32)
-    _states[token] = time.time() + STATE_TTL
-    return token
-
-
-def validate_state(state: str) -> bool:
-    """Return True if *state* is known and unexpired; always removes it."""
-    expiry = _states.pop(state, None)
-    if expiry is None:
-        return False
-    return time.time() < expiry
-
-
-def _purge_states() -> None:
-    now = time.time()
-    expired = [k for k, exp in list(_states.items()) if exp < now]
-    for k in expired:
-        del _states[k]
-```
-
- [ ] **Step 4: Run to confirm tests pass**
-
-```
-pytest tests/test_oauth.py -v
-```
-
-Expected: 8 passed
-
- [ ] **Step 5: Commit**
-
-```bash
-git add hbd/server/oauth.py tests/test_oauth.py
-git commit -m "feat: add OAuth2 CSRF state management"
-```
-
---
-
-## Task 3: `provision_oauth_user` in users.py
-
-**Files:**
- Modify: `hbd/server/users.py` (add `provision_oauth_user`)
- Modify: `tests/test_oauth.py` (add provisioning tests)
-
- [ ] **Step 1: Write the failing tests**
-
-Append to `tests/test_oauth.py`:
-
-```python
-from hbd.server import users as users_mod
-from hbd.server.users import User
-
-
-def _reset_users(entries=None):
-    users_mod.users = entries or {}
-
-
-def test_provision_oauth_user_new():
-    _reset_users()
-    user = users_mod.provision_oauth_user("gituser", "Git User", "https://example.com/avatar.png")
-    assert user.username == "gituser"
-    assert user.full_name == "Git User"
-    assert user.avatar == "https://example.com/avatar.png"
-    assert user.admin is False
-    assert user.password_hash == ""
-    assert "gituser" in users_mod.users
-
-
-def test_provision_oauth_user_no_password_login():
-    _reset_users()
-    user = users_mod.provision_oauth_user("gituser", "Git User", "")
-    assert user.check_password("anything") is False
-
-
-def test_provision_oauth_user_existing_updates_profile():
-    existing = User(
-        username="alice",
-        full_name="Old Name",
-        avatar="old.png",
-        password_hash="pbkdf2:sha256:1:salt:abc",
-        admin=True,
-        notification_channels=["chan1"],
-    )
-    _reset_users({"alice": existing})
-    user = users_mod.provision_oauth_user("alice", "New Name", "new.png")
-    assert user.full_name == "New Name"
-    assert user.avatar == "new.png"
-    # Preserved
-    assert user.admin is True
-    assert user.password_hash == "pbkdf2:sha256:1:salt:abc"
-    assert user.notification_channels == ["chan1"]
-
-
-def test_provision_oauth_user_does_not_overwrite_with_empty():
-    existing = User(username="bob", full_name="Bob", avatar="bob.png")
-    _reset_users({"bob": existing})
-    user = users_mod.provision_oauth_user("bob", "", "")
-    assert user.full_name == "Bob"
-    assert user.avatar == "bob.png"
-```
-
- [ ] **Step 2: Run to confirm failure**
-
-```
-pytest tests/test_oauth.py -v -k "provision"
-```
-
-Expected: `AttributeError: module 'hbd.server.users' has no attribute 'provision_oauth_user'`
-
- [ ] **Step 3: Implement `provision_oauth_user`**
-
-Add to `hbd/server/users.py` after the `authenticate()` function (after line 187):
-
-```python
-def provision_oauth_user(username: str, full_name: str, avatar: str) -> "User":
-    """Create or update a user sourced from an OAuth2 provider.
-
-    New users are inserted with no password_hash — they can only authenticate
-    via OAuth.  Existing users (e.g. defined in config with a password) have
-    their display name and avatar refreshed; all other attributes are preserved.
-    """
-    user = users.get(username)
-    if user is None:
-        user = User(username=username, full_name=full_name, avatar=avatar)
-        users[username] = user
-        logger.info("Provisioned OAuth user %r", username)
-    else:
-        if full_name:
-            user.full_name = full_name
-        if avatar:
-            user.avatar = avatar
-    return user
-```
-
- [ ] **Step 4: Run to confirm tests pass**
-
-```
-pytest tests/test_oauth.py -v
-```
-
-Expected: 12 passed
-
- [ ] **Step 5: Commit**
-
-```bash
-git add hbd/server/users.py tests/test_oauth.py
-git commit -m "feat: add provision_oauth_user() to users module"
-```
-
---
-
-## Task 4: URL builder, token exchange, and user-info fetch
-
-**Files:**
- Modify: `hbd/server/oauth.py` (add `authorization_url`, `exchange_code`, `fetch_user`)
- Modify: `tests/test_oauth.py` (add async tests with mocked HTTP)
-
- [ ] **Step 1: Write the failing tests**
-
-Append to `tests/test_oauth.py`:
-
-```python
-import pytest
-from unittest.mock import AsyncMock, MagicMock, patch
-from urllib.parse import urlparse, parse_qs
-
-
-def test_authorization_url_shape():
-    state = "teststate"
-    redirect_uri = "https://hbd.example.com/login/oauth/gitea/callback"
-    url = oauth.authorization_url(CFG_ON, state, redirect_uri)
-    parsed = urlparse(url)
-    qs = parse_qs(parsed.query)
-    assert parsed.scheme == "https"
-    assert parsed.netloc == "git.example.com"
-    assert parsed.path == "/login/oauth/authorize"
-    assert qs["client_id"] == ["cid"]
-    assert qs["state"] == ["teststate"]
-    assert qs["redirect_uri"] == [redirect_uri]
-    assert qs["scope"] == ["user:email"]
-    assert qs["response_type"] == ["code"]
-
-
-@pytest.mark.asyncio
-async def test_exchange_code_returns_token():
-    redirect_uri = "https://hbd.example.com/login/oauth/gitea/callback"
-    mock_response = AsyncMock()
-    mock_response.status = 200
-    mock_response.json = AsyncMock(return_value={"access_token": "tok123"})
-
-    mock_session = MagicMock()
-    mock_session.post = MagicMock(return_value=AsyncMock(
-        __aenter__=AsyncMock(return_value=mock_response),
-        __aexit__=AsyncMock(return_value=False),
-    ))
-
-    with patch("hbd.server.oauth.aiohttp.ClientSession", return_value=AsyncMock(
-        __aenter__=AsyncMock(return_value=mock_session),
-        __aexit__=AsyncMock(return_value=False),
-    )):
-        token = await oauth.exchange_code(CFG_ON, "mycode", redirect_uri)
-    assert token == "tok123"
-
-
-@pytest.mark.asyncio
-async def test_exchange_code_raises_on_error_status():
-    redirect_uri = "https://hbd.example.com/login/oauth/gitea/callback"
-    mock_response = AsyncMock()
-    mock_response.status = 401
-    mock_response.text = AsyncMock(return_value="unauthorized")
-
-    mock_session = MagicMock()
-    mock_session.post = MagicMock(return_value=AsyncMock(
-        __aenter__=AsyncMock(return_value=mock_response),
-        __aexit__=AsyncMock(return_value=False),
-    ))
-
-    with patch("hbd.server.oauth.aiohttp.ClientSession", return_value=AsyncMock(
-        __aenter__=AsyncMock(return_value=mock_session),
-        __aexit__=AsyncMock(return_value=False),
-    )):
-        with pytest.raises(oauth.OAuthError):
-            await oauth.exchange_code(CFG_ON, "badcode", redirect_uri)
-
-
-@pytest.mark.asyncio
-async def test_fetch_user_returns_profile():
-    mock_response = AsyncMock()
-    mock_response.status = 200
-    mock_response.json = AsyncMock(return_value={
-        "login": "alice",
-        "full_name": "Alice Smith",
-        "avatar_url": "https://git.example.com/avatars/alice.png",
-    })
-
-    mock_session = MagicMock()
-    mock_session.get = MagicMock(return_value=AsyncMock(
-        __aenter__=AsyncMock(return_value=mock_response),
-        __aexit__=AsyncMock(return_value=False),
-    ))
-
-    with patch("hbd.server.oauth.aiohttp.ClientSession", return_value=AsyncMock(
-        __aenter__=AsyncMock(return_value=mock_session),
-        __aexit__=AsyncMock(return_value=False),
-    )):
-        profile = await oauth.fetch_user(CFG_ON, "tok123")
-    assert profile == {
-        "login": "alice",
-        "full_name": "Alice Smith",
-        "avatar_url": "https://git.example.com/avatars/alice.png",
-    }
-```
-
- [ ] **Step 2: Run to confirm failure**
-
-```
-pytest tests/test_oauth.py -v -k "url or exchange or fetch"
-```
-
-Expected: `AttributeError: module 'hbd.server.oauth' has no attribute 'authorization_url'`
-
- [ ] **Step 3: Implement the three functions**
-
-Add to `hbd/server/oauth.py`:
-
-```python
-import urllib.parse
-
-
-def authorization_url(config: dict, state: str, redirect_uri: str) -> str:
-    """Return the Gitea OAuth2 authorization URL to redirect the browser to."""
-    g = _gitea_cfg(config)
-    params = urllib.parse.urlencode({
-        "client_id": g["client_id"],
-        "redirect_uri": redirect_uri,
-        "response_type": "code",
-        "scope": "user:email",
-        "state": state,
-    })
-    return f"{g['url'].rstrip('/')}/login/oauth/authorize?{params}"
-
-
-async def exchange_code(config: dict, code: str, redirect_uri: str) -> str:
-    """Exchange an authorization *code* for a Gitea access token.
-
-    Returns the access token string.  Raises OAuthError on any failure.
-    """
-    g = _gitea_cfg(config)
-    url = f"{g['url'].rstrip('/')}/login/oauth/access_token"
-    payload = {
-        "client_id": g["client_id"],
-        "client_secret": g["client_secret"],
-        "code": code,
-        "grant_type": "authorization_code",
-        "redirect_uri": redirect_uri,
-    }
-    timeout = aiohttp.ClientTimeout(total=10)
-    try:
-        async with aiohttp.ClientSession(timeout=timeout) as session:
-            async with session.post(url, json=payload, headers={"Accept": "application/json"}) as resp:
-                if resp.status != 200:
-                    text = await resp.text()
-                    raise OAuthError(f"Token exchange failed ({resp.status}): {text}")
-                data = await resp.json()
-    except aiohttp.ClientError as exc:
-        raise OAuthError(f"Token exchange network error: {exc}") from exc
-    token = data.get("access_token")
-    if not token:
-        raise OAuthError(f"No access_token in response: {data}")
-    return token
-
-
-async def fetch_user(config: dict, token: str) -> dict:
-    """Fetch the authenticated user's profile from Gitea.
-
-    Returns a dict with keys: login, full_name, avatar_url.
-    Raises OAuthError on any failure.
-    """
-    g = _gitea_cfg(config)
-    url = f"{g['url'].rstrip('/')}/api/v1/user"
-    timeout = aiohttp.ClientTimeout(total=10)
-    try:
-        async with aiohttp.ClientSession(timeout=timeout) as session:
-            async with session.get(url, headers={"Authorization": f"token {token}"}) as resp:
-                if resp.status != 200:
-                    text = await resp.text()
-                    raise OAuthError(f"User fetch failed ({resp.status}): {text}")
-                data = await resp.json()
-    except aiohttp.ClientError as exc:
-        raise OAuthError(f"User fetch network error: {exc}") from exc
-    return {
-        "login": data.get("login", ""),
-        "full_name": data.get("full_name", ""),
-        "avatar_url": data.get("avatar_url", ""),
-    }
-```
-
-Also add `import urllib.parse` at the top of `oauth.py` (alongside the existing imports).
-
- [ ] **Step 4: Run to confirm tests pass**
-
-```
-pytest tests/test_oauth.py -v
-```
-
-Expected: 17 passed
-
- [ ] **Step 5: Commit**
-
-```bash
-git add hbd/server/oauth.py tests/test_oauth.py
-git commit -m "feat: add authorization_url, exchange_code, fetch_user to oauth module"
-```
-
---
-
-## Task 5: HTTP routes — redirect and callback
-
-**Files:**
- Modify: `hbd/server/http.py`
-
-`http.py` defines all handlers inside `async def start(...)`. The two new handlers go in the same block, just before the `app = web.Application()` line (~line 900). The import goes at the top of the file.
-
- [ ] **Step 1: Add the import**
-
-In `hbd/server/http.py`, add after the existing local imports (after `from . import users as users_mod`):
-
-```python
-from . import oauth as oauth_mod
-```
-
- [ ] **Step 2: Add the two route handlers**
-
-In `hbd/server/http.py`, add the two handlers immediately before the `app = web.Application()` line:
-
-```python
-    async def oauth_gitea_redirect(request):
-        """GET /login/oauth/gitea — kick off the Gitea OAuth2 flow."""
-        if not oauth_mod.is_enabled(config):
-            return web.Response(status=404, text="OAuth not configured")
-        state = oauth_mod.make_state()
-        redirect_uri = f"{request.url.origin()}/login/oauth/gitea/callback"
-        raise web.HTTPFound(oauth_mod.authorization_url(config, state, redirect_uri))
-
-    async def oauth_gitea_callback(request):
-        """GET /login/oauth/gitea/callback — handle Gitea's redirect back."""
-        if not oauth_mod.is_enabled(config):
-            return web.Response(status=404, text="OAuth not configured")
-        code = request.rel_url.query.get("code", "")
-        state = request.rel_url.query.get("state", "")
-        if not code or not state:
-            return web.Response(status=400, text="Missing code or state")
-        if not oauth_mod.validate_state(state):
-            raise web.HTTPFound("/login?error=1")
-        redirect_uri = f"{request.url.origin()}/login/oauth/gitea/callback"
-        try:
-            token = await oauth_mod.exchange_code(config, code, redirect_uri)
-            profile = await oauth_mod.fetch_user(config, token)
-        except oauth_mod.OAuthError as exc:
-            logger.warning("OAuth error: %s", exc)
-            raise web.HTTPFound("/login?error=1")
-        user = users_mod.provision_oauth_user(
-            profile["login"],
-            profile["full_name"],
-            profile["avatar_url"],
-        )
-        session_token = users_mod.create_session(user.username)
-        resp = web.HTTPFound("/")
-        resp.set_cookie(
-            SESSION_COOKIE,
-            session_token,
-            max_age=users_mod.SESSION_TTL,
-            httponly=True,
-            samesite="Lax",
-        )
-        raise resp
-```
-
- [ ] **Step 3: Register the routes**
-
-In `hbd/server/http.py`, add to the route list after the existing auth routes (after `web.post("/api/0/auth/logout", api_logout)`):
-
-```python
-            web.get("/login/oauth/gitea",          oauth_gitea_redirect),
-            web.get("/login/oauth/gitea/callback", oauth_gitea_callback),
-```
-
- [ ] **Step 4: Manual smoke test**
-
-Start the server locally with OAuth configured in `~/.hb.yaml`:
-
-```yaml
-oauth:
-  gitea:
-    url: https://your-gitea-instance.example.com
-    client_id: your-client-id
-    client_secret: your-client-secret
-```
-
-Visit `http://localhost:50004/login/oauth/gitea` — confirm you are redirected to Gitea's authorization page.
-
- [ ] **Step 5: Commit**
-
-```bash
-git add hbd/server/http.py
-git commit -m "feat: add Gitea OAuth2 redirect and callback routes"
-```
-
---
-
-## Task 6: Login page — "Sign in with Gitea" button
-
-**Files:**
- Modify: `hbd/server/http.py` (update `login_page` handler, ~line 625)
-
- [ ] **Step 1: Replace the login page HTML**
-
-In `hbd/server/http.py`, find the `html = f"""` block inside `login_page` and replace it with:
-
-```python
-        gitea_button = ""
-        if oauth_mod.is_enabled(config):
-            gitea_url = _gitea_cfg_url(config)
-            gitea_button = f"""
-    <div class="divider">or</div>
-    <a href="/login/oauth/gitea" class="gitea-btn">
-      Sign in with Gitea
-    </a>"""
-
-        html = f"""<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Heartbeat — Login</title>
-  <style>
-    body {{ font-family: sans-serif; background: #f5f5f5; display: flex;
-            justify-content: center; align-items: center; height: 100vh; margin: 0; }}
-    .box {{ background: #fff; padding: 2em 2.5em; border-radius: 8px;
-             box-shadow: 0 2px 12px rgba(0,0,0,.15); min-width: 300px; }}
-    h2 {{ margin: 0 0 1.2em; color: #333; font-size: 1.4em; }}
-    label {{ display: block; margin-bottom: .3em; font-size: .9em; color: #555; }}
-    input {{ width: 100%; padding: .5em .7em; border: 1px solid #ccc;
-              border-radius: 4px; font-size: 1em; box-sizing: border-box; }}
-    button {{ margin-top: 1.2em; width: 100%; padding: .6em; background: #0066cc;
-               color: #fff; border: none; border-radius: 4px; font-size: 1em; cursor: pointer; }}
-    button:hover {{ background: #0055aa; }}
-    .error {{ color: #c00; font-size: .9em; margin-bottom: .8em; }}
-    .field {{ margin-bottom: .9em; }}
-    .divider {{ text-align: center; margin: 1.2em 0 .8em; color: #999;
-                font-size: .85em; border-top: 1px solid #eee; padding-top: .8em; }}
-    .gitea-btn {{ display: block; width: 100%; padding: .6em; background: #609926;
-                  color: #fff; border-radius: 4px; font-size: 1em; text-align: center;
-                  text-decoration: none; box-sizing: border-box; }}
-    .gitea-btn:hover {{ background: #4e7d1e; }}
-  </style>
-</head>
-<body>
-  <div class="box">
-    <h2>Heartbeat</h2>
-    {'<p class="error">Invalid username, password, or OAuth error.</p>' if error else ''}
-    <form method="post">
-      <div class="field"><label>Username</label><input name="username" autofocus></div>
-      <div class="field"><label>Password</label><input name="password" type="password"></div>
-      <button type="submit">Sign in</button>
-    </form>{gitea_button}
-  </div>
-</body>
-</html>"""
-```
-
- [ ] **Step 2: Add the `_gitea_cfg_url` helper**
-
-Add this small helper in `hbd/server/http.py` just before the `login_page` handler (around line 600) so the template can read the Gitea display URL without importing internal oauth details:
-
-```python
-def _gitea_cfg_url(config: dict) -> str:
-    return config.get("oauth", {}).get("gitea", {}).get("url", "")
-```
-
-Also update the `login_page` handler's `error` logic to show the error when the `?error=1` query param is present (set by the callback on OAuth failure):
-
-```python
-    async def login_page(request):
-        """GET /login — show login form; POST /login — process and redirect."""
-        if not users_mod.users_enabled():
-            raise web.HTTPFound("/")
-
-        error = ""
-        if request.method == "POST":
-            form = await request.post()
-            username = form.get("username", "")
-            password = form.get("password", "")
-            user = users_mod.authenticate(username, password)
-            if user:
-                token = users_mod.create_session(username)
-                redirect_to = request.rel_url.query.get("next", "/")
-                resp = web.HTTPFound(redirect_to)
-                resp.set_cookie(
-                    SESSION_COOKIE,
-                    token,
-                    max_age=users_mod.SESSION_TTL,
-                    httponly=True,
-                    samesite="Lax",
-                )
-                raise resp
-            error = "Invalid username or password."
-        elif request.rel_url.query.get("error"):
-            error = "Sign-in failed. Please try again."
-```
-
- [ ] **Step 3: Manual verification**
-
-Start the server with OAuth configured. Visit `/login`. Confirm:
- The "Sign in with Gitea" button appears (green, below a divider)
- Clicking it redirects to Gitea
- After authorising on Gitea, you are redirected back and land on `/` with a valid session cookie
-
-Without OAuth configured, confirm the button does not appear.
-
- [ ] **Step 4: Commit**
-
-```bash
-git add hbd/server/http.py
-git commit -m "feat: add Sign in with Gitea button to login page"
-```
-
---
-
-## Self-Review Notes
-
- All 5 spec requirements covered: coexist ✓, auto-provision ✓, regular user ✓, any Gitea user ✓, config-driven ✓
- `exchange_code` signature in Task 4 matches usage in Task 5 (`config, code, redirect_uri`) ✓
- `fetch_user` returns `{login, full_name, avatar_url}` — matched in callback handler ✓
- `validate_state` removes state on use (replay protection) ✓
- `provision_oauth_user` skips empty strings so existing avatar/name aren't erased ✓
- `_gitea_cfg_url` is a plain `def`, not `async` — safe to call in template prep ✓
@@ -1,539 +0,0 @@
-# Host Overview Info Section — Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Add an always-visible info section to each host card on `/plugins`, showing owner, managers, agent version/type, last packet timestamp, and effective thresholds; move hbc_version/hbc_type out of the os_info accordion.
-
-**Architecture:** A new `_build_host_info` module-level helper in `http.py` assembles the info dict from the host object and threshold_checker. A new `GET /api/0/hosts/{hostname}/info` closure inside `serve()` calls it and returns JSON. The `plugins.html` template adds a static placeholder div per host; JS fetches the endpoint on first card expand, caches the result, and renders it.
-
-**Tech Stack:** Python/aiohttp (backend), Jinja2 (template), vanilla JS/HTML/CSS (frontend). Tests with pytest and unittest.mock.
-
---
-
-### Task 1: `_build_host_info` helper — tests first
-
-**Files:**
- Create: `tests/test_http_host_info.py`
- Modify: `hbd/server/http.py` (add module-level helper after `_mask_config_for_api`, around line 128)
-
- [ ] **Step 1: Write the failing tests**
-
-Create `tests/test_http_host_info.py`:
-
-```python
-"""Tests for _build_host_info helper in http.py."""
-import pytest
-from unittest.mock import MagicMock
-from hbd.server.http import _build_host_info
-
-
-class _FakeConn:
-    def __init__(self, lastbeat):
-        self.lastbeat = lastbeat
-
-
-class _FakeHost:
-    def __init__(self, name="myhost", owner=None, managers=None,
-                 connections=None, os_data=None):
-        self.name = name
-        self.owner = owner
-        self.managers = managers or []
-        self.connections = connections or {}
-        self._os_data = os_data
-
-    def get_latest_plugin_data(self, plugin_name):
-        if plugin_name == "os_info" and self._os_data is not None:
-            return (1234567890.0, self._os_data)
-        return None
-
-
-def test_build_host_info_basic_fields():
-    host = _FakeHost(owner="alice", managers=["bob", "carol"])
-    result = _build_host_info(host)
-    assert result["owner"] == "alice"
-    assert result["managers"] == ["bob", "carol"]
-    assert result["hbc_version"] is None
-    assert result["hbc_type"] is None
-    assert result["last_packet"] is None
-    assert result["thresholds"] is None
-
-
-def test_build_host_info_no_owner():
-    host = _FakeHost()
-    result = _build_host_info(host)
-    assert result["owner"] is None
-    assert result["managers"] == []
-
-
-def test_build_host_info_reads_hbc_from_os_info():
-    host = _FakeHost(os_data={"hbc_version": "5.3.0", "hbc_type": "full"})
-    result = _build_host_info(host)
-    assert result["hbc_version"] == "5.3.0"
-    assert result["hbc_type"] == "full"
-
-
-def test_build_host_info_hbc_none_when_no_os_info():
-    host = _FakeHost(os_data=None)
-    result = _build_host_info(host)
-    assert result["hbc_version"] is None
-    assert result["hbc_type"] is None
-
-
-def test_build_host_info_last_packet_is_max_lastbeat():
-    host = _FakeHost(connections={
-        "IPv4": _FakeConn(1000.0),
-        "IPv6": _FakeConn(2000.0),
-    })
-    result = _build_host_info(host)
-    assert result["last_packet"] == 2000.0
-
-
-def test_build_host_info_last_packet_none_when_no_connections():
-    host = _FakeHost(connections={})
-    result = _build_host_info(host)
-    assert result["last_packet"] is None
-
-
-def test_build_host_info_thresholds_none_without_checker():
-    host = _FakeHost()
-    result = _build_host_info(host, threshold_checker=None)
-    assert result["thresholds"] is None
-
-
-def test_build_host_info_thresholds_sorted_by_metric():
-    from hbd.server.threshold import ThresholdConfig
-    tc_cpu = ThresholdConfig("cpu_monitor.cpu_percent", warning=80.0, critical=95.0)
-    tc_mem = ThresholdConfig("memory_monitor.memory_percent", warning=85.0, critical=98.0)
-
-    checker = MagicMock()
-    checker.get_thresholds_for_host.return_value = {
-        "memory_monitor.memory_percent": tc_mem,
-        "cpu_monitor.cpu_percent": tc_cpu,
-    }
-
-    host = _FakeHost()
-    result = _build_host_info(host, threshold_checker=checker)
-
-    assert result["thresholds"] is not None
-    assert len(result["thresholds"]) == 2
-    assert result["thresholds"][0]["metric"] == "cpu_monitor.cpu_percent"
-    assert result["thresholds"][0]["warning"] == 80.0
-    assert result["thresholds"][0]["critical"] == 95.0
-    assert result["thresholds"][0]["operator"] == ">"
-    assert result["thresholds"][1]["metric"] == "memory_monitor.memory_percent"
-
-
-def test_build_host_info_thresholds_empty_list_when_no_thresholds():
-    checker = MagicMock()
-    checker.get_thresholds_for_host.return_value = {}
-    host = _FakeHost()
-    result = _build_host_info(host, threshold_checker=checker)
-    assert result["thresholds"] == []
-
-
-def test_build_host_info_threshold_null_warning_critical():
-    from hbd.server.threshold import ThresholdConfig
-    tc = ThresholdConfig("rtt.myhost", warning=None, critical=500.0)
-    checker = MagicMock()
-    checker.get_thresholds_for_host.return_value = {"rtt.myhost": tc}
-    host = _FakeHost()
-    result = _build_host_info(host, threshold_checker=checker)
-    assert result["thresholds"][0]["warning"] is None
-    assert result["thresholds"][0]["critical"] == 500.0
-```
-
- [ ] **Step 2: Run tests to confirm they fail**
-
-```bash
-pytest tests/test_http_host_info.py -v
-```
-
-Expected: `ImportError` or `AttributeError` — `_build_host_info` does not exist yet.
-
- [ ] **Step 3: Implement `_build_host_info` in `hbd/server/http.py`**
-
-Insert after `_mask_config_for_api` (around line 128, before `def serve(`):
-
-```python
-def _build_host_info(host, threshold_checker=None):
-    """Assemble the info payload for GET /api/0/hosts/{hostname}/info."""
-    hbc_version = None
-    hbc_type = None
-    latest_os = host.get_latest_plugin_data("os_info")
-    if latest_os:
-        _, os_data = latest_os
-        hbc_version = os_data.get("hbc_version")
-        hbc_type = os_data.get("hbc_type")
-
-    last_packet = None
-    if host.connections:
-        last_packet = max(conn.lastbeat for conn in host.connections.values())
-
-    thresholds = None
-    if threshold_checker is not None:
-        raw = threshold_checker.get_thresholds_for_host(host.name)
-        thresholds = sorted(
-            [
-                {
-                    "metric": tc.metric_path,
-                    "warning": tc.warning,
-                    "critical": tc.critical,
-                    "operator": tc.operator.value,
-                }
-                for tc in raw.values()
-            ],
-            key=lambda x: x["metric"],
-        )
-
-    return {
-        "owner": getattr(host, "owner", None),
-        "managers": list(getattr(host, "managers", [])),
-        "hbc_version": hbc_version,
-        "hbc_type": hbc_type,
-        "last_packet": last_packet,
-        "thresholds": thresholds,
-    }
-```
-
- [ ] **Step 4: Run tests to confirm they pass**
-
-```bash
-pytest tests/test_http_host_info.py -v
-```
-
-Expected: all 11 tests PASS.
-
- [ ] **Step 5: Commit**
-
-```bash
-git add tests/test_http_host_info.py hbd/server/http.py
-git commit -m "feat: add _build_host_info helper for host info endpoint"
-```
-
---
-
-### Task 2: `api_host_info` route handler
-
-**Files:**
- Modify: `hbd/server/http.py`
-  - Add `api_host_info` closure inside `serve()` (after `api_host_access_put`, around line 829)
-  - Register route (around line 1271)
-
- [ ] **Step 1: Add `api_host_info` closure inside `serve()`**
-
-Insert after `api_host_access_put` (after line 829, before the comment `# User profile page`):
-
-```python
-    # -------------------------------------------------------------------------
-    # Host info endpoint
-    # -------------------------------------------------------------------------
-
-    async def api_host_info(request):
-        """GET /api/0/hosts/{hostname}/info"""
-        user, err = _require_auth(request)
-        if err:
-            return err
-        hostname = request.match_info.get("hostname")
-        if hostname not in hbdclass.Host.hosts:
-            return web.json_response({"error": f"Host '{hostname}' not found"}, status=404)
-        host = hbdclass.Host.hosts[hostname]
-        if not _can_view_host(user, host):
-            return web.json_response({"error": "Forbidden"}, status=403)
-        return web.json_response(_build_host_info(host, threshold_checker=threshold_checker))
-```
-
- [ ] **Step 2: Register the route**
-
-In the route list (around line 1271, after the existing `/api/0/hosts/{hostname}/access` routes):
-
-```python
-            web.get("/api/0/hosts/{hostname}/info", api_host_info),
-```
-
- [ ] **Step 3: Verify the full test suite still passes**
-
-```bash
-pytest tests/ -q
-```
-
-Expected: all tests PASS (no regressions).
-
- [ ] **Step 4: Smoke-test the endpoint manually** (if a dev server is running)
-
-```bash
-curl -s http://localhost:50004/api/0/hosts/<hostname>/info | python3 -m json.tool
-```
-
-Expected: JSON with `owner`, `managers`, `hbc_version`, `hbc_type`, `last_packet`, `thresholds` keys.
-
- [ ] **Step 5: Commit**
-
-```bash
-git add hbd/server/http.py
-git commit -m "feat: add GET /api/0/hosts/{hostname}/info endpoint"
-```
-
---
-
-### Task 3: Info section HTML and CSS in `plugins.html`
-
-**Files:**
- Modify: `hbd/server/templates/plugins.html`
-
- [ ] **Step 1: Add CSS for the info section**
-
-In the `<style>` block (find the closing `</style>` tag around line 391 and insert before it):
-
-```css
-    /* ── Host info section ──────────────────────────────────────────────────── */
-    .host-info-section {
-      padding: 12px 16px;
-      background: #fafafa;
-      border-bottom: 1px solid #e0e0e0;
-      font-size: 0.85em;
-    }
-    .info-meta {
-      display: grid;
-      grid-template-columns: max-content 1fr;
-      gap: 3px 14px;
-      margin-bottom: 10px;
-    }
-    .info-label { font-weight: 600; color: #555; white-space: nowrap; }
-    .info-value { color: #222; }
-    .info-thresholds-title {
-      font-weight: 600;
-      color: #555;
-      margin-bottom: 6px;
-    }
-    .info-note { color: #888; font-style: italic; }
-    .info-loading { color: #bbb; font-style: italic; }
-```
-
- [ ] **Step 2: Add info section placeholder to each host card**
-
-Inside the host loop, at the very start of `.host-body` (before the `{% set plugin_order %}` line, around line 438):
-
-```html
-          <div class="host-body">
-            <div class="host-info-section" id="info-{{ host.name }}">
-              <div class="info-loading">Loading…</div>
-            </div>
-```
-
-The existing `{% set plugin_order %}` line and everything after stays unchanged. Only add the two new lines between `<div class="host-body">` and `{% set plugin_order %}`.
-
- [ ] **Step 3: Verify the page still renders without JS errors**
-
-Start the dev server and open `/plugins` in a browser. Expand any host card — you should see the "Loading…" italic line above the plugin accordions (it will not be replaced yet, that comes in Task 4).
-
- [ ] **Step 4: Commit**
-
-```bash
-git add hbd/server/templates/plugins.html
-git commit -m "feat: add host info section placeholder and CSS to plugins.html"
-```
-
---
-
-### Task 4: JS — `infoCache`, `fetchHostInfo`, `renderInfoSection`
-
-**Files:**
- Modify: `hbd/server/templates/plugins.html` (JS `<script>` block)
-
- [ ] **Step 1: Add `infoCache` constant**
-
-After the `pluginCache` declaration (after `const pluginCache = {};`, around line 489), add:
-
-```javascript
-      // infoCache[hostname] = info data object from /api/0/hosts/{hostname}/info
-      const infoCache = {};
-```
-
- [ ] **Step 2: Add `fetchHostInfo` function**
-
-After the existing `fetchPlugin` function (around line 522, before `fetchHostGlance`), add:
-
-```javascript
-      async function fetchHostInfo(hostname) {
-        const r = await fetch(`/api/0/hosts/${encodeURIComponent(hostname)}/info`);
-        if (!r.ok) throw new Error(`HTTP ${r.status}`);
-        return r.json();
-      }
-```
-
- [ ] **Step 3: Add `renderInfoSection` function**
-
-After `fetchHostInfo` (before `fetchHostGlance`), add:
-
-```javascript
-      function renderInfoSection(hostname, data) {
-        const el = document.getElementById(`info-${hostname}`);
-        if (!el) return;
-
-        const owner    = data.owner ? escHtml(data.owner) : '—';
-        const managers = data.managers && data.managers.length
-          ? data.managers.map(escHtml).join(', ') : '—';
-        const hbcVer  = data.hbc_version ? escHtml(String(data.hbc_version)) : '—';
-        const hbcType = data.hbc_type    ? escHtml(String(data.hbc_type))    : '—';
-        const lastPkt = data.last_packet
-          ? new Date(data.last_packet * 1000).toLocaleString() : '—';
-
-        let html = `<div class="info-meta">
-          <span class="info-label">Owner</span><span class="info-value">${owner}</span>
-          <span class="info-label">Managers</span><span class="info-value">${managers}</span>
-          <span class="info-label">Agent Version</span><span class="info-value">${hbcVer}</span>
-          <span class="info-label">Agent Type</span><span class="info-value">${hbcType}</span>
-          <span class="info-label">Last Packet</span><span class="info-value">${lastPkt}</span>
-        </div>`;
-
-        if (data.thresholds === null) {
-          html += `<div class="info-note">Threshold alerting not configured.</div>`;
-        } else if (data.thresholds.length === 0) {
-          html += `<div class="info-note">No thresholds defined.</div>`;
-        } else {
-          html += `<div class="info-thresholds-title">Effective Thresholds</div>
-            <table class="data-table"><thead><tr>
-              <th>Metric</th><th>Op</th><th>Warning</th><th>Critical</th>
-            </tr></thead><tbody>`;
-          for (const t of data.thresholds) {
-            const w = t.warning  !== null && t.warning  !== undefined ? t.warning  : '—';
-            const c = t.critical !== null && t.critical !== undefined ? t.critical : '—';
-            html += `<tr>
-              <td class="key">${escHtml(t.metric)}</td>
-              <td>${escHtml(t.operator)}</td>
-              <td>${w}</td>
-              <td>${c}</td>
-            </tr>`;
-          }
-          html += `</tbody></table>`;
-        }
-
-        el.innerHTML = html;
-      }
-```
-
- [ ] **Step 4: Commit**
-
-```bash
-git add hbd/server/templates/plugins.html
-git commit -m "feat: add fetchHostInfo and renderInfoSection JS functions"
-```
-
---
-
-### Task 5: Wire `fetchHostInfo` into `toggleHost`
-
-**Files:**
- Modify: `hbd/server/templates/plugins.html` (the `toggleHost` function, around line 643)
-
- [ ] **Step 1: Replace `toggleHost` with the updated version**
-
-Find the existing `toggleHost` function:
-
-```javascript
-      function toggleHost(hostname) {
-        const card = document.querySelector(`.host-card[data-hostname="${hostname}"]`);
-        const wasCollapsed = card.classList.contains('collapsed');
-        card.classList.toggle('collapsed');
-        if (wasCollapsed && !pluginCache[hostname]) {
-          fetchHostGlance(hostname);
-        }
-      }
-```
-
-Replace with:
-
-```javascript
-      function toggleHost(hostname) {
-        const card = document.querySelector(`.host-card[data-hostname="${hostname}"]`);
-        const wasCollapsed = card.classList.contains('collapsed');
-        card.classList.toggle('collapsed');
-        if (wasCollapsed) {
-          if (!pluginCache[hostname]) {
-            fetchHostGlance(hostname);
-          }
-          if (!infoCache[hostname]) {
-            const infoEl = document.getElementById(`info-${hostname}`);
-            if (infoEl) infoEl.innerHTML = '<div class="info-loading">Loading…</div>';
-            fetchHostInfo(hostname).then(data => {
-              infoCache[hostname] = data;
-              renderInfoSection(hostname, data);
-            }).catch(() => {
-              const el = document.getElementById(`info-${hostname}`);
-              if (el) el.innerHTML = '<div class="info-loading">Could not load host info.</div>';
-            });
-          }
-        }
-      }
-```
-
- [ ] **Step 2: Test in browser**
-
-Open `/plugins`, expand a host card. Verify:
- The info section appears above the plugin accordions.
- Owner, managers (or "—"), agent version, agent type, last packet render correctly.
- Threshold table renders (or the appropriate "not configured" / "none defined" message).
- Collapsing and re-expanding does not re-fetch (no second network request).
-
- [ ] **Step 3: Commit**
-
-```bash
-git add hbd/server/templates/plugins.html
-git commit -m "feat: fetch and render host info section on card expand"
-```
-
---
-
-### Task 6: Remove `hbc_version` and `hbc_type` from `renderOsInfoTable`
-
-**Files:**
- Modify: `hbd/server/templates/plugins.html` (the `renderOsInfoTable` function, around line 794)
-
- [ ] **Step 1: Update `renderOsInfoTable`**
-
-Find the existing function:
-
-```javascript
-      function renderOsInfoTable(d) {
-        const ORDER = ['distro_pretty_name','system','release','version','machine',
-                       'processor','architecture','node','python_version',
-                       'python_implementation','hbc_version',
-                       'distro_name','distro_version','distro_id','distro_version_id'];
-        const shown = new Set(ORDER);
-        const keys = [...ORDER, ...Object.keys(d).filter(k => !shown.has(k) && !SKIP_FIELDS.has(k))];
-```
-
-Replace with:
-
-```javascript
-      function renderOsInfoTable(d) {
-        const ORDER = ['distro_pretty_name','system','release','version','machine',
-                       'processor','architecture','node','python_version',
-                       'python_implementation',
-                       'distro_name','distro_version','distro_id','distro_version_id'];
-        const INFO_FIELDS = new Set(['hbc_version', 'hbc_type']);
-        const shown = new Set(ORDER);
-        const keys = [...ORDER, ...Object.keys(d).filter(k => !shown.has(k) && !SKIP_FIELDS.has(k) && !INFO_FIELDS.has(k))];
-```
-
- [ ] **Step 2: Verify in browser**
-
-Expand a host card, then expand the "Os Info" accordion. Confirm:
- `hbc_version` no longer appears in the os_info table.
- `hbc_type` no longer appears in the os_info table.
- Both values are shown correctly in the info section at the top.
-
- [ ] **Step 3: Run the full test suite**
-
-```bash
-pytest tests/ -q
-```
-
-Expected: all tests PASS.
-
- [ ] **Step 4: Commit**
-
-```bash
-git add hbd/server/templates/plugins.html
-git commit -m "feat: move hbc_version and hbc_type out of os_info into host info section"
-```
@@ -1,92 +0,0 @@
-# Plugin Error Checking & Daemon Logging — Design Spec
-
-**Date:** 2026-04-25  
-**Scope:** hbc client — daemon mode logging, nagios_runner plugin robustness, PluginLoader messaging  
-**Files affected:** `hbd/client/main.py`, `hbd/client/plugins/nagios_runner.py`, `hbd/client/plugin.py`
-
---
-
-## 1. Daemon Mode Logging
-
-### Problem
-In `main()`, `logging.basicConfig()` is called before `daemonize()` (establishing a StreamHandler to stderr), then called again after `daemonize()`. The second call is a no-op — Python ignores `basicConfig()` when handlers are already configured. After daemonization, stderr is redirected to `/dev/null`, so all subsequent log output is silently discarded.
-
-The existing `syslog.openlog()` / `syslog.syslog()` calls (lines 666–668) write a single startup message but do not integrate with the `logging` system, so plugin and connection log messages never reach syslog.
-
-### Fix
-After `daemonize()`, explicitly reconfigure the root logger:
-
-1. Remove all existing handlers (they now write to `/dev/null`).
-2. Add `logging.handlers.SysLogHandler(address='/dev/log', facility=LOG_DAEMON)`.
-3. Set formatter: `hbc[%(process)d]: %(name)s %(levelname)s: %(message)s`
-4. Preserve the `log_level` already determined from `-v`/`-x` CLI flags.
-
-Remove the redundant `syslog.openlog()` / `syslog.syslog()` calls — the logging system handles routing.
-
-**Fallback:** If `/dev/log` does not exist (containers, some BSDs), fall back to `SysLogHandler(address=('localhost', 514))`. Log one warning (to stderr, before handlers are replaced) so the operator knows.
-
---
-
-## 2. Nagios Runner Improvements
-
-### 2a — Async Subprocess
-`_run_nagios_plugin()` is declared `async def` but calls `subprocess.run()` synchronously, blocking the event loop for the full command duration.
-
-**Fix:** Replace with `asyncio.create_subprocess_shell()` + `await proc.communicate()`. Enforce timeout with `asyncio.wait_for(..., timeout=self.timeout)` and catch `asyncio.TimeoutError`.
-
-### 2b — Stderr Capture
-Subprocess stderr is currently discarded (`capture_output=True` only captures stdout in the sync call; stderr content is lost).
-
-**Fix:** Pass `stderr=asyncio.subprocess.PIPE` to `create_subprocess_shell`. After `communicate()`, if stdout is empty but stderr has content, use stderr as the output message. If both have content, append stderr to the output for visibility.
-
-### 2c — Negative Return Codes
-A negative `returncode` means the process was killed by a signal (SIGKILL, OOM, etc.). The current code treats these as-is, which may produce unexpected status values.
-
-**Fix:** If `returncode < 0`, map to `NAGIOS_UNKNOWN` with message `"Process killed by signal {-returncode}"`.
-
-### 2d — Command Path Validation at Init
-`initialize()` currently only checks that the commands list is non-empty.
-
-**Fix:** For each command entry during `initialize()`:
- Warn and skip the entry if `name` or `command` is missing.
- Extract the executable (first whitespace-delimited token of the command string).
- If the executable is an absolute path, check `os.path.isfile()` and `os.access(..., os.X_OK)`. Log a `WARNING` if either check fails.
- Commands with relative paths or shell builtins are not checked (they may be on PATH) — just noted.
- Validation warns only; all original entries in `self.commands` are retained and still attempted at collection time (where the existing missing-name/command guard already skips them). The plugin initializes successfully as long as the commands list is non-empty.
-
---
-
-## 3. PluginLoader Messaging
-
-### Problem
-When `initialize()` returns `False`, the loader always logs:
-> `WARNING: Plugin X failed initialization, skipping`
-
-This is alarming when the real reason is simply "no commands configured". There is no API to distinguish "not configured" from "genuinely broken".
-
-### Fix
-Add an optional `skip_reason` attribute to `Plugin.__init__()` (defaults to `None`).
-
-In `PluginLoader.load_from_directory()`, after `initialize()` returns `False`:
- If `plugin.skip_reason` is set → `logger.info(f"Plugin {plugin.name} skipped: {plugin.skip_reason}")`
- If `plugin.skip_reason` is `None` → `logger.warning(f"Plugin {plugin.name} failed initialization, skipping")` (existing behaviour)
-
-In `NagiosRunnerPlugin.initialize()`, when no commands are configured:
-```python
-self.skip_reason = "no commands configured (add nagios_runner.commands to config)"
-return False
-```
-
-Genuine failures (exceptions) continue to go through the existing `except` block in the loader, logging at `ERROR` with traceback — unchanged.
-
---
-
-## Decisions
-
-| Topic | Decision |
-|---|---|
-| Daemon log destination | syslog only (LOG_DAEMON facility) |
-| Syslog fallback | localhost:514 UDP if `/dev/log` absent |
-| Nagios result log level | INFO for all statuses (OK/WARNING/CRITICAL/UNKNOWN) |
-| Invalid command handling at init | Warn and continue; still attempt at collection time |
-| PluginLoader API change | `skip_reason` attribute on Plugin base class, checked by loader |
@@ -1,184 +0,0 @@
-# Gitea OAuth2 Authentication — Design Spec
-
-Date: 2026-05-08
-
-## Overview
-
-Add Gitea as an OAuth2 login provider alongside the existing username/password
-authentication. Any user on the configured Gitea instance can sign in; their
-local account is auto-provisioned on first login as a regular (non-admin) user.
-Password login continues to work unchanged.
-
---
-
-## Config
-
-A new optional `oauth.gitea` block in `~/.hb.yaml`. OAuth is disabled when the
-block is absent or any of the three required keys is missing.
-
-```yaml
-oauth:
-  gitea:
-    url: https://git.example.com   # Gitea base URL, no trailing slash
-    client_id: <gitea-app-client-id>
-    client_secret: <gitea-app-client-secret>
-```
-
-**Gitea setup:** Create an OAuth2 application in Gitea under
-*Settings → Applications → OAuth2*. Set the redirect URI to
-`https://<hbd-host>/login/oauth/gitea/callback`.
-
-`config.py` default:
-
-```python
-"oauth": {},
-```
-
---
-
-## New module: `hbd/server/oauth.py`
-
-Owns all OAuth2 logic. No new dependencies — uses `aiohttp.ClientSession`
-already present in the codebase.
-
-### CSRF state store
-
-```python
-# state -> expires (float)
-_states: dict[str, float] = {}
-STATE_TTL = 600  # 10 minutes
-```
-
-`_states` is an in-memory dict. Entries are created on redirect and deleted on
-use or expiry. A purge runs on every new state generation.
-
-### Public API
-
-| Function | Description |
-|---|---|
-| `is_enabled(config)` | Returns `True` when url, client_id, and client_secret are all set |
-| `make_state()` | Generates a random state token, stores it with TTL, returns it |
-| `validate_state(state)` | Returns `True` and removes the state if valid and unexpired |
-| `authorization_url(config, state, redirect_uri)` | Builds the Gitea `/login/oauth/authorize` redirect URL with `client_id`, `redirect_uri`, `scope=user:email`, `state` |
-| `exchange_code(config, code, redirect_uri)` async | POSTs to Gitea `/login/oauth/access_token` with code and redirect_uri, returns the access token string or raises `OAuthError` |
-| `fetch_user(config, token)` async | GETs Gitea `/api/v1/user` with Bearer token, returns `{"login", "full_name", "avatar_url"}` or raises `OAuthError` |
-
-### Error handling
-
-`OAuthError(message)` is a module-level exception. The callback route catches it
-and renders the login page with an error message — identical to an invalid
-password error in UX terms.
-
-Network timeouts use a 10-second `aiohttp` timeout. Any non-2xx response from
-Gitea raises `OAuthError`.
-
---
-
-## Change: `hbd/server/users.py`
-
-One new function added to the public API:
-
-```python
-def provision_oauth_user(username: str, full_name: str, avatar: str) -> User:
-```
-
- If the username does not exist in the live `users` dict, creates a `User`
-  with no `password_hash` (so password login is impossible for this account)
-  and inserts it.
- If the username already exists (e.g. was defined in config with a password),
-  updates `full_name` and `avatar` from the OAuth profile and returns the
-  existing user unchanged in all other respects (preserving admin flag,
-  notification channels, etc.).
- Logs a one-line INFO message on first provision.
-
---
-
-## Changes: `hbd/server/http.py`
-
-### Two new route handlers
-
-**`GET /login/oauth/gitea`**
-
-1. Checks `oauth.is_enabled(config)` — returns 404 if not.
-2. Calls `oauth.make_state()`.
-3. Constructs `redirect_uri` as `{request.url.origin()}/login/oauth/gitea/callback` using aiohttp's `request.url.origin()`.
-4. Redirects the browser to `oauth.authorization_url(config, state, redirect_uri)`.
-
-**`GET /login/oauth/gitea/callback`**
-
-1. Reads `code` and `state` query params; returns 400 if either is missing.
-2. Calls `oauth.validate_state(state)` — redirects to `/login` with error if
-   invalid (CSRF or replay protection).
-3. Reconstructs the same `redirect_uri` as the redirect handler (required by OAuth2 spec for token exchange).
-4. Calls `await oauth.exchange_code(config, code, redirect_uri)` to get the access token.
-4. Calls `await oauth.fetch_user(config, token)` to get the Gitea user profile.
-5. Calls `users_mod.provision_oauth_user(login, full_name, avatar_url)`.
-6. Calls `users_mod.create_session(username)` to get a session token.
-7. Sets `hbd_session` cookie (same flags as password login: httponly, Lax,
-   24h TTL).
-8. Redirects to `/`.
-9. Any `OAuthError` re-renders the login page with a generic error message.
-
-### Login page change
-
-When `oauth.is_enabled(config)` is `True`, the existing login form gains a
-separator and a "Sign in with Gitea" link button pointing to
-`/login/oauth/gitea`. The password form is always rendered regardless.
-
-### Route registration
-
-```python
-web.get("/login/oauth/gitea",          oauth_redirect),
-web.get("/login/oauth/gitea/callback", oauth_callback),
-```
-
-Added alongside the existing `/login` and `/logout` routes.
-
---
-
-## Data flow
-
-```
-Browser                    hbd                        Gitea
-  |                          |                           |
-  |-- GET /login ----------->|                           |
-  |<- login page (+ button) -|                           |
-  |                          |                           |
-  |-- GET /login/oauth/gitea>|                           |
-  |<- 302 Gitea /authorize --|                           |
-  |                          |                           |
-  |-- GET /login/oauth/authorize ----------------------->|
-  |<- 302 /login/oauth/gitea/callback?code=..&state=.. --|
-  |                          |                           |
-  |-- GET /callback -------->|                           |
-  |                          |-- POST /access_token ---->|
-  |                          |<- {access_token} ---------|
-  |                          |-- GET /api/v1/user ------>|
-  |                          |<- {login, name, avatar} --|
-  |                          | provision_oauth_user()    |
-  |                          | create_session()          |
-  |<- 302 / (set cookie) ----|                           |
-```
-
---
-
-## Testing
-
- `test_oauth_state`: `make_state` + `validate_state` happy path; expired state
-  returns False; replay (double-use) returns False.
- `test_provision_oauth_user_new`: new username creates User with no password.
- `test_provision_oauth_user_existing`: existing config user updates name/avatar,
-  preserves admin flag and notification_channels.
- `test_oauth_callback_invalid_state`: callback with bad state redirects to login.
- Integration: mock Gitea endpoints with `aiohttp_client` fixture; full
-  redirect → callback → session cookie flow.
-
---
-
-## Out of scope
-
- Restricting login to specific Gitea organisations or teams.
- Making OAuth users admin automatically.
- Multiple OAuth providers.
- Token refresh (Gitea access tokens are long-lived; the hbd session TTL governs
-  re-authentication).
@@ -1,210 +0,0 @@
-# Config Editor — Design Spec
-
-**Date:** 2026-05-09
-**Status:** Approved
-
-## Goal
-
-Allow admins to edit the full `.hb.yaml` config through the Settings page UI, and allow regular users to manage their own notification channels and profile fields through the Profile page. The YAML file remains the single authoritative source; comments are preserved on every write.
-
---
-
-## Architecture Overview
-
-```
-Browser (admin)                     Browser (user)
-  staged edits (JS state)             form fields
-        │                                  │
-        │ POST /api/0/config               │ PUT /api/0/users/me
-        ▼                                  ▼
-  http.py handlers ────────────────────────┘
-        │
-        ▼
-  configio.py   ←── ruamel.yaml (round-trip, comment-preserving)
-        │
-        ├── backup .hb.yaml.bak.YYYYMMDD-HHMMSS  (keep last 10)
-        ├── write atomically (temp file → os.replace)
-        └── ReloadableConfig.reload()
-```
-
---
-
-## New Dependency
-
-Add `ruamel.yaml>=0.18` to `[project.optional-dependencies] server` in `pyproject.toml`. `PyYAML` stays (used by the client and config loader for reads); `ruamel.yaml` is used only for write-back.
-
---
-
-## New Module: `hbd/server/configio.py`
-
-Single responsibility: all YAML read/write for `.hb.yaml`.
-
-```python
-_write_lock = threading.Lock()
-
-def read_roundtrip(path: str) -> CommentedMap:
-    """Load .hb.yaml with ruamel.yaml, preserving comments and ordering."""
-
-def write_config(path: str, data: CommentedMap) -> None:
-    """Backup current file, then atomically write data.
-
-    Backup naming: {path}.bak.YYYYMMDD-HHMMSS
-    Rotation: keep the 10 most recent backups, delete older ones.
-    Atomic write: write to {path}.tmp, then os.replace({path}.tmp, path).
-    Acquires _write_lock for the full backup+write sequence.
-    """
-
-def list_backups(path: str) -> list[str]:
-    """Return backup paths sorted newest-first."""
-
-def apply_structured_section(data: CommentedMap, section: str, values: dict) -> None:
-    """Merge a dict of scalar/list values into data[section], key by key.
-    Preserves comments on unmodified keys.
-    """
-
-def apply_yaml_section(data: CommentedMap, section: str, yaml_text: str) -> None:
-    """Replace data[section] entirely by parsing yaml_text.
-    Used for YAML-editor sections (notification_channels, thresholds, hosts, dns).
-    """
-```
-
---
-
-## API Endpoints
-
-All endpoints require authentication. Admin-only endpoints return 403 for non-admins.
-
-| Method | Path | Auth | Purpose |
-|--------|------|------|---------|
-| GET | `/api/0/config` | admin | Full config as JSON (secrets masked) |
-| POST | `/api/0/config` | admin | Publish staged changes to `.hb.yaml` |
-| GET | `/api/0/config/section/{name}` | admin | Raw YAML text for one section (for YAML editors) |
-| GET | `/api/0/config/backups` | admin | List of backup timestamps, newest first |
-| POST | `/api/0/config/rollback` | admin | `{"backup": "…"}` → restore backup and reload |
-| PUT | `/api/0/users/me` | any user | Update own `full_name`, `avatar`, `notification_channels`, `password` |
-
-### `POST /api/0/config` payload
-
-```json
-{
-  "server":                 { "hbd_port": 50004, "interval": 20, ... },
-  "users":                  { "alice": { "full_name": "Alice", "admin": true, ... }, ... },
-  "oauth":                  { "gitea": { "type": "gitea", "url": "...", ... }, ... },
-  "notification_channels":  "<raw yaml text>",
-  "thresholds":             "<raw yaml text>",
-  "hosts":                  "<raw yaml text>",
-  "dns":                    "<raw yaml text>"
-}
-```
-
-Only sections present in the payload are updated; omitted sections are left unchanged in the file.
-
-**Section-to-key mapping:** Most config fields are top-level keys in `.hb.yaml` (not nested under a section key). The API uses logical section names that map to specific top-level keys:
-
-| Logical section | Top-level YAML keys covered |
-|---|---|
-| `server` | `hbd_port`, `hbd_host`, `ws_port`, `wss_port`, `hb_port`, `interval`, `grace`, `base_url`, `threshold_renotify_interval`, `logfile`, `pidfile`, `pickfile`, `journal_enabled`, `journal_dir`, `journal_max_size`, `journal_max_backups`, `default_owner` |
-| `users` | `users` (top-level dict) |
-| `oauth` | `oauth` (top-level dict) |
-| `notification_channels` | `notification_channels` (top-level dict, YAML text) |
-| `thresholds` | `threshold_configs` (top-level dict if present, YAML text) |
-| `hosts` | `hosts` (top-level dict, YAML text) |
-| `dns` | `nsupdate_bin`, `dyndomains`, `dyndnshosts`, `drophosts` (YAML text of just these keys) |
-
-`apply_structured_section` for `server` iterates the known key list and updates each present key individually, preserving comments on unchanged keys. `apply_yaml_section` for dict-valued sections (notification_channels, hosts, oauth) replaces the entire subtree. For `dns`, it replaces each of the four top-level keys listed.
-
-### `PUT /api/0/users/me` payload
-
-```json
-{
-  "full_name": "Alice Smith",
-  "avatar": "/avatars/alice.png",
-  "notification_channels": ["pushover_ops", "matrix_alerts"],
-  "password": { "current": "oldpass", "new": "newpass" }
-}
-```
-
-All fields are optional. `password` change requires `current` to match; server re-hashes with PBKDF2-HMAC-SHA256 before writing. Both `full_name`/`avatar`/`notification_channels` and password can be sent in one request or separately.
-
---
-
-## Settings Page Changes (`/settings`)
-
-### Section split
-
-| Section | Edit mode | Notes |
-|---------|-----------|-------|
-| Server settings | Form | Scalar fields: ports, intervals, base_url, grace, renotify interval, log/pid/pickle paths, journal settings |
-| Users | Form | CRUD list: add/edit/delete users; fields: username, full_name, avatar, admin toggle, notification_channels multiselect. Password field: leave blank to keep existing hash; enter a new plain-text password to replace it (server hashes before writing). New users require a password. |
-| OAuth providers | Form | CRUD list: add/edit/delete providers; fields: name (slug), type, url, client_id, client_secret, label, logo |
-| Notification channels | YAML editor | Too many provider-specific credential shapes for typed forms |
-| Thresholds | YAML editor | Complex nested rules |
-| Hosts | YAML editor | Complex per-host config |
-| DNS / DynDNS | YAML editor | nsupdate settings, dyndomains, drophosts |
-
-### Publish flow
-
-1. Each section has a **"Stage changes"** button. Clicking it stores that section's current form/editor values in browser JS state. A banner appears: *"N pending changes — not yet saved to .hb.yaml"*.
-2. **"Publish to .hb.yaml"** sends `POST /api/0/config` with all staged sections.
-3. On success: banner clears, page reloads to show current saved state.
-4. **"Discard all"** clears JS state and reloads from server without writing.
-
-### Rollback UI
-
-A "View backups / rollback" link at the bottom of the settings sidebar opens a modal listing available backups (timestamp + approximate age). Clicking a backup shows a confirmation prompt before calling `POST /api/0/config/rollback`.
-
-### `settings.py` changes
-
- Set `"editable": True` on all fields that now have form inputs.
- The existing field descriptor structure (`key`, `type`, `label`, `value`, `sensitive`) is already designed for this — no structural changes needed.
- Add `"section_mode": "form" | "yaml"` per section, used by the template to render the appropriate editor.
-
---
-
-## Profile Page Changes (`/profile`)
-
-New editable fields alongside the existing read-only display:
-
-**Identity card** (saves via `PUT /api/0/users/me`):
- Display name — text input, current `full_name`
- Avatar — text input, current `avatar` URL or path
- Save button → immediate write, no publish step
-
-**Change password** (saves via `PUT /api/0/users/me`):
- Current password, new password inputs
- Save button → validates current password server-side, re-hashes new password, writes
-
-**Notification channels** (saves via `PUT /api/0/users/me`):
- Checkbox list of all globally-defined channels (from `config["notification_channels"]`)
- Shows channel type and `min_level` as secondary text
- Pre-checked based on user's current `notification_channels` list
- Save button → writes user's channel list immediately
-
-Host access list remains read-only (existing behaviour).
-
---
-
-## Write Safety
-
- `configio._write_lock` serializes all writes (admin publish and user self-service can race if multiple requests arrive simultaneously).
- All writes are atomic: temp file written in same directory as `.hb.yaml`, then `os.replace()`. A crash mid-write leaves the backup intact and the original file unchanged.
- If `.hb.yaml` cannot be written (permissions, disk full), the API returns `500` with an error message; no partial write occurs.
-
---
-
-## Secrets Handling
-
- `GET /api/0/config` masks sensitive fields (passwords, tokens, API keys) with `"•••"` — same logic as the existing read-only settings page.
- `GET /api/0/config/section/{name}` for YAML-editor sections returns the raw YAML text including real credential values, since the admin needs to edit them. This endpoint requires admin auth and must only be served over HTTPS in production.
- Secrets in backups are unmasked (they are copies of the real file). Backup directory should have the same file permissions as `.hb.yaml` itself.
-
---
-
-## Out of Scope
-
- Conflict detection if `.hb.yaml` is modified externally between page load and publish (the last write wins; the previous state is always recoverable from a backup)
- Multi-admin concurrent edit awareness
- Config validation UI beyond what the server returns as errors
- Diff view before publish
- Audit log of who published what (beyond the event log entry already added for login/logout)
- Per-host threshold editing via UI (thresholds section uses YAML editor)
@@ -1,149 +0,0 @@
-# Multi-Provider OAuth2 — Design Spec
-
-**Date:** 2026-05-09
-**Status:** Approved
-
-## Goal
-
-Allow multiple OAuth2 providers to be configured simultaneously. All enabled providers appear as login buttons on the login panel. Supported provider types: Gitea, GitHub, Nextcloud. Existing single-Gitea configs continue to work without changes.
-
---
-
-## Config Format
-
-Each entry in the `oauth` dict is a named provider instance. The dict key becomes the route slug.
-
-```yaml
-oauth:
-  work-gitea:          # /login/oauth/work-gitea
-    type: gitea        # optional — defaults to "gitea" when absent (backward compat)
-    url: https://git.example.com
-    client_id: xxx
-    client_secret: yyy
-    label: "Work Gitea"   # optional display name; falls back to provider default
-    logo: https://…       # optional logo URL for button
-  github:
-    type: github       # no url needed — fixed SaaS endpoints
-    client_id: xxx
-    client_secret: yyy
-  nextcloud:
-    type: nextcloud
-    url: https://cloud.example.com
-    client_id: xxx
-    client_secret: yyy
-```
-
-**Backward compatibility:** The existing `oauth.gitea.{url,client_id,client_secret}` config (no `type` field) is treated as `type: gitea`. No migration required.
-
-**Validation:** Entries missing `client_id`, `client_secret`, or `url` (when the provider type requires it) are skipped with a warning log. This prevents a misconfigured entry from disabling all OAuth.
-
---
-
-## Provider Registry (`oauth.py`)
-
-A `PROVIDER_DEFS` dict holds static knowledge about each supported provider type:
-
-| | gitea | github | nextcloud |
-|---|---|---|---|
-| authorize URL | `{url}/login/oauth/authorize` | `https://github.com/login/oauth/authorize` | `{url}/apps/oauth2/authorize` |
-| token URL | `{url}/login/oauth/access_token` | `https://github.com/login/oauth/access_token` | `{url}/apps/oauth2/api/v1/token` |
-| profile URL | `{url}/api/v1/user` | `https://api.github.com/user` | `{url}/ocs/v2.php/cloud/user?format=json` |
-| scope | `user:email` | `read:user` | *(empty)* |
-| username field | `login` | `login` | nested: `ocs.data.id` |
-| display name field | `full_name` | `name` | nested: `ocs.data.display-name` |
-| avatar field | `avatar_url` | `avatar_url` | *(absent — left empty)* |
-| requires `url` | yes | no | yes |
-| default label | `Gitea` | `GitHub` | `Nextcloud` |
-
-Nextcloud's profile response is nested (`ocs → data`). The registry entry includes a `profile_data_path: ["ocs", "data"]` that is navigated before field extraction.
-
---
-
-## New / Changed API in `oauth.py`
-
-### `ResolvedProvider` (new dataclass)
-
-All endpoint URLs are pre-computed strings (no more template substitution at call time):
-
-```python
-@dataclass
-class ResolvedProvider:
-    name: str            # route slug (dict key)
-    type: str            # "gitea" | "github" | "nextcloud"
-    label: str           # display name for login button
-    logo: str            # URL or ""
-    authorize_url: str
-    token_url: str
-    profile_url: str
-    scope: str
-    client_id: str
-    client_secret: str
-    field_map: dict      # {"username": "<provider_field>", "full_name": ..., "avatar": ...}
-    profile_data_path: list[str]  # e.g. ["ocs", "data"] or []
-```
-
-### `get_providers(config) → list[ResolvedProvider]` (new)
-
-Iterates `config.get("oauth", {})`, resolves each valid entry against `PROVIDER_DEFS`, skips invalid entries. Returns providers in config declaration order (determines button order on login page).
-
-### `build_auth_url(provider, state, redirect_uri)` (updated signature)
-
-Takes a `ResolvedProvider`. Uses `provider.authorize_url`, `provider.scope`, `provider.client_id`.
-
-### `exchange_code(provider, code, redirect_uri)` (updated signature)
-
-Takes a `ResolvedProvider`. Sets `Accept: application/json` on all token requests (required for GitHub, harmless for others).
-
-### `fetch_user(provider, access_token)` (updated signature)
-
-Takes a `ResolvedProvider`. After fetching the profile JSON, navigates `provider.profile_data_path` before applying `provider.field_map`. Missing fields (e.g., Nextcloud avatar) are mapped to `""`.
-
-### `is_enabled(config)` (updated)
-
-Returns `True` if `get_providers(config)` returns at least one provider.
-
---
-
-## Routes (`http.py`)
-
-Replace the two hardcoded Gitea routes with generic ones:
-
-```
-GET /login/oauth/{name}            initiate OAuth flow
-GET /login/oauth/{name}/callback   receive code, provision user, set session
-```
-
-Both handlers resolve `{name}` via `get_providers(config)`. If the name is not found, return 404. Existing `/login/oauth/gitea` URLs continue to work as long as the config has a `gitea` key.
-
---
-
-## Login Page (`http.py`)
-
-The "or" divider appears once if any providers are configured. Below it, one button per provider stacks vertically. Button appearance mirrors the current Gitea button (same CSS class, optional logo img). Button `href` is `/login/oauth/{provider.name}`.
-
---
-
-## Tests (`tests/test_oauth.py`)
-
-**Updated:** Existing tests for `build_auth_url`, `exchange_code`, `fetch_user`, `is_enabled` ported to new `ResolvedProvider`-based signatures.
-
-**New:**
- `get_providers()` with old single-Gitea config (no `type`) → one provider, backward compat confirmed
- `get_providers()` with Gitea + GitHub + Nextcloud → correct count, types, and labels
- `get_providers()` skips entry missing `client_id` or `client_secret`
- `get_providers()` skips Gitea/Nextcloud entry missing `url`
- `get_providers()` skips entry with unknown `type` (logs warning)
- `build_auth_url` for each provider type → correct authorize URL
- `exchange_code` for GitHub → `Accept: application/json` header present
- `fetch_user` for Nextcloud → `ocs.data` navigation, missing avatar handled as `""`
- Login page HTML → one button per provider; no buttons when `oauth` is empty
-
---
-
-## Out of Scope
-
- Generic/custom provider with user-specified endpoints
- OIDC / token introspection
- Restricting login to specific GitHub orgs or Nextcloud groups
- Automatic admin promotion from OAuth
- Token refresh
@@ -1,135 +0,0 @@
-# Host Overview Info Section
-
-**Date:** 2026-05-10  
-**Status:** Approved
-
-## Summary
-
-Add an always-visible info section to each host card on the Host Overview (`/plugins`) page. The section shows owner, managers, agent version/type, last packet timestamp, and the host's effective alert thresholds. The fields `hbc_version` and `hbc_type` are moved out of the `os_info` plugin accordion into this section.
-
---
-
-## Backend: New API Endpoint
-
-**Route:** `GET /api/0/hosts/{hostname}/info`
-
-**Auth:** Same as other per-host endpoints (`_can_view_host`).
-
-**Response schema:**
-
-```json
-{
-  "owner":       "alice",
-  "managers":    ["bob", "carol"],
-  "hbc_version": "5.3.0",
-  "hbc_type":    "full",
-  "last_packet": 1746894000.0,
-  "thresholds": [
-    {
-      "metric":    "cpu_monitor.cpu_percent",
-      "warning":   80.0,
-      "critical":  95.0,
-      "operator":  ">"
-    }
-  ]
-}
-```
-
-**Field details:**
-
- `owner` — `host.owner`, or `null` if unset.
- `managers` — `host.managers` list (may be empty).
- `hbc_version` — from `host.get_latest_plugin_data("os_info")`, key `hbc_version`; `null` if no os_info data.
- `hbc_type` — same source, key `hbc_type`; `null` if unavailable.
- `last_packet` — `max(conn.lastbeat for conn in host.connections.values())`, or `null` if no connections.
- `thresholds` — list derived from `threshold_checker.get_thresholds_for_host(hostname)`, sorted by `metric` ascending. Each entry includes `metric`, `warning` (null if unset), `critical` (null if unset), `operator`. Returns `null` (not `[]`) if no `threshold_checker` is configured, so the frontend can distinguish "not configured" from "configured but empty".
-
-**Location:** `hbd/server/http.py`, added alongside the other `api_host_*` functions. Registered as `web.get("/api/0/hosts/{hostname}/info", api_host_info)`.
-
---
-
-## Frontend: Info Section
-
-### HTML structure
-
-Inserted as the first child of `.host-body`, before the plugin accordions. It is not a collapsible accordion — it is always visible when the host card is expanded.
-
-```html
-<div class="host-info-section" id="info-{hostname}">
-  <div class="loading">Loading…</div>
-</div>
-```
-
-### Fetch lifecycle
-
- Fetched once per host on the first expansion of the host card (same trigger as the glance/plugin data).
- Result cached in a new per-host `infoCache` object (parallel to `pluginCache`).
- On subsequent expansions the cached data is rendered immediately without a new request.
-
-### Rendered layout
-
-Two logical areas rendered client-side from the JSON:
-
-**Meta row** — a CSS-grid or simple `<dl>` showing:
-
-| Label         | Value                        |
-|---------------|------------------------------|
-| Owner         | alice (or "—" if null)       |
-| Managers      | bob, carol (or "—" if empty) |
-| Agent Version | 5.3.0 (or "—")               |
-| Agent Type    | full (or "—")                |
-| Last Packet   | localized datetime string (or "—") |
-
-**Threshold table** — rendered with the existing `data-table` CSS class:
-
-| Metric | Operator | Warning | Critical |
-|--------|----------|---------|----------|
-| cpu_monitor.cpu_percent | > | 80 | 95 |
-| … | … | … | … |
-
- If `thresholds` is `null`: show "Threshold alerting not configured."
- If `thresholds` is `[]`: show "No thresholds defined."
- Numeric threshold values rendered as-is (no units); `null` warning/critical shown as "—".
-
-### CSS
-
-New `.host-info-section` styles added in the `<style>` block of `plugins.html`. The section gets a subtle background (e.g. `#fafafa`) and a bottom border to separate it visually from the plugin accordions below. The meta row uses a two-column grid layout for compactness.
-
---
-
-## Changes to `renderOsInfoTable()`
-
- Remove `hbc_version` from the `ORDER` array.
- Add `hbc_type` to the `SKIP_FIELDS` set (or the local `shown` set) so it is excluded from the os_info table.
-
-Both fields will now appear only in the info section.
-
---
-
-## Data Flow Summary
-
-```
-User expands host card
-  → toggleHost()
-    → fetchGlanceData(hostname)   [existing, unchanged]
-    → fetchInfoData(hostname)     [new]
-        GET /api/0/hosts/{hostname}/info
-        → renderInfoSection(hostname, data)
-          → writes into #info-{hostname}
-```
-
---
-
-## Error Handling
-
- If the info fetch fails (non-200), show a one-line error message in the info section ("Could not load host info.").
- If `hbc_version`/`hbc_type` are null (host has never sent os_info), display "—".
- If `last_packet` is null (no connections recorded), display "—".
-
---
-
-## Out of Scope
-
- Editing owner/managers from this section (covered by existing profile/access UI).
- Editing thresholds from this section.
- Monitors list (not shown — monitors are operational, not informational in this context).
@@ -14,4 +14,4 @@ Install options:
 """

 __all__ = ["__version__"]
-__version__ = "5.3.2"
+__version__ = "5.3.6"
@@ -146,8 +146,9 @@ thresholds:
        status:
          warning: 1           # Alert WARNING when pool is DEGRADED
          critical: 2           # Alert CRITICAL when pool is SUSPENDED/FAULTED/UNAVAIL
-          operator: ">"
-          hysteresis: 0.0       # No hysteresis — a degraded pool is always critical
+          operator: ">="
+          hysteresis: 0.0       # No hysteresis — a degraded pool is always alerting
+          grace: 0              # Fire immediately — don't wait for a second collection
          display: "ZFS pool {pool_name} is {health}"

      # Per-pool capacity thresholds (optional; add pools you care about)
@@ -39,12 +39,10 @@ SERVER_DEFAULTS = {

    # Host management
    "hosts": {},                # Unified host definitions
-    "dyndnshosts": [],          # Hosts with dynamic DNS (legacy)
-    "drophosts": [],            # Hosts to ignore
-    "dyndomains": ["wrede.org"],
+    "dyndomains": ["example.org"], # Domains to update via nsupdate when a host with dyndns: true is updated

    # DNS updates
-    "nsupdate_bin": "/usr/bin/nsupdate",
+    "nsupdate_bin": "/usr/bin/nsupdate", # Path to nsupdate binary
    
    # WebSocket settings
    "ws_port": 50005, 
@@ -115,8 +113,9 @@ THRESHOLD_DEFAULTS = {
                        'status': {
                            'warning': 1,
                            'critical': 2,
-                            'operator': '>',
+                            'operator': '>=',
                            'hysteresis': 0.0,
+                            'grace': 0,
                            'display': 'ZFS pool {pool_name} is {health}'
                        },
                        'capacity': {
@@ -249,7 +248,7 @@ def get_watchhosts(config):
    """Extract watched hostnames from config (hosts with watch: true).

    Returns:
-        List of hostnames to watch
+#        List of hostnames to watch
    """
    watchhosts = []
    hosts_config = config.get("hosts", {})
@@ -261,31 +260,14 @@ def get_watchhosts(config):


 def get_dyndnshosts(config):
-    """Extract dyndnshosts from config, supporting both new and legacy formats.
-    
-    Args:
-        config: Configuration dictionary
-        
-    Returns:
-        List of hostnames with dynamic DNS
-    """
-    dyndnshosts = []
-    
-    # New format: hosts section with dyndns attribute
-    if "hosts" in config:
-        hosts_config = config["hosts"]
-        if isinstance(hosts_config, dict):
-            for host_name, host_attrs in hosts_config.items():
-                if isinstance(host_attrs, dict) and host_attrs.get("dyndns", False):
-                    dyndnshosts.append(host_name)
-    
-    # Legacy format: dyndnshosts list/set
-    if "dyndnshosts" in config:
-        legacy_dyndnshosts = config.get("dyndnshosts", [])
-        if isinstance(legacy_dyndnshosts, (list, set)):
-            dyndnshosts.extend(legacy_dyndnshosts)
-    
-    return list(set(dyndnshosts))  # Remove duplicates
+    """Return hostnames that have a dyndns setting in the hosts section."""
+    hosts_config = config.get("hosts", {})
+    if not isinstance(hosts_config, dict):
+        return []
+    return [
+        name for name, attrs in hosts_config.items()
+        if isinstance(attrs, dict) and attrs.get("dyndns")
+    ]


 def get_host_config(config, hostname):
@@ -21,10 +21,11 @@ _SERVER_KEYS = [
    "interval", "grace", "base_url", "threshold_renotify_interval",
    "logfile", "pidfile", "pickfile", "journal_enabled", "journal_dir",
    "journal_max_size", "journal_max_backups", "default_owner",
+    "default_threshold_config",
 ]

 # Top-level keys managed by the 'dns' logical section
-_DNS_KEYS = ["nsupdate_bin", "dyndomains", "dyndnshosts", "drophosts"]
+_DNS_KEYS = ["nsupdate_bin", "rndc_key", "dyndomains"]


 def read_roundtrip(path: str):
@@ -4,6 +4,9 @@ from __future__ import annotations
 from subprocess import Popen, PIPE, STDOUT
 from typing import Optional
 import asyncio
+import logging
+
+logger = logging.getLogger(__name__)


 def create_nsupdate_payload(
@@ -123,7 +126,6 @@ async def dns_update_worker(
                pass
            continue

-        m = f"changed address to {addr}"
        for dyndomain in cfg.get("dyndomains", []):
            err = await loop.run_in_executor(
                None,
@@ -135,28 +137,29 @@ async def dns_update_worker(
                cfg.get("rndc_key", "/etc/dhcpc/rndc-key"),
            )
            if err:
-                m += f", DNS update failed: {err}"
+                m = f"DNS update failed for {addr} ({dyndomain}): {err}"
                logger.error("DNS update failed for %s: %s", name, err)
+                if log:
+                    try:
+                        await loop.run_in_executor(None, log, name, "ERROR", m)
+                    except Exception:
+                        pass
            else:
-                m += ", DNS updated."
+                m = f"DNS updated {name}.dy.{dyndomain} → {addr}"
+                if log:
+                    try:
+                        await loop.run_in_executor(None, log, name, "INFO", m)
+                    except Exception:
+                        pass
+
+        if not cfg.get("dyndomains"):
+            logger.warning("DNS update triggered for %s but no dyndomains configured", name)

        try:
            dnsq.task_done()
        except Exception:
            pass

-        if log:
-            try:
-                await loop.run_in_executor(None, log, name, m)
-            except Exception:
-                pass
-
-    if log:
-        try:
-            await loop.run_in_executor(None, log, None, "dns_update_worker exiting")
-        except Exception:
-            pass
-

 def start_dns_worker(
    hbdclass,
@@ -25,6 +25,81 @@ logger = logging.getLogger(__name__)

 eventlog = notify_mod.eventlog

+
+def _build_threshold_configs_from_form(form_data: dict) -> dict:
+    """Convert form-submitted flat threshold data to nested threshold_configs YAML structure.
+
+    Input:  {config_name: {metric_path: {warning, critical, operator, hysteresis, enabled, count, display}}}
+    Output: {config_name: {thresholds: {plugin: {metric: {warning, critical, ...}}}}}
+    """
+    result = {}
+    for config_name, metrics in form_data.items():
+        if not isinstance(metrics, dict):
+            continue
+        thresholds = {}
+        for metric_path, values in metrics.items():
+            _insert_threshold_metric(thresholds, metric_path, values)
+        result[config_name] = {"thresholds": thresholds}
+    return result
+
+
+def _insert_threshold_metric(thresholds: dict, metric_path: str, values: dict) -> None:
+    """Insert a single metric into the nested threshold YAML structure."""
+    if not isinstance(values, dict):
+        return
+
+    cfg = {}
+    op = values.get("operator", ">")
+    if op and op != ">":
+        cfg["operator"] = op
+
+    for key, cast in (("warning", float), ("critical", float), ("hysteresis", float)):
+        v = values.get(key)
+        if v is not None:
+            try:
+                cfg[key] = cast(v)
+            except (TypeError, ValueError):
+                pass
+
+    grace = values.get("grace")
+    if grace is not None:
+        try:
+            cfg["grace"] = float(grace)
+        except (TypeError, ValueError):
+            pass
+
+    count = values.get("count")
+    if count is not None:
+        try:
+            cfg["count"] = int(count)
+        except (TypeError, ValueError):
+            pass
+
+    display = values.get("display", "")
+    if display:
+        cfg["display"] = display
+
+    if not values.get("enabled", True):
+        cfg["enabled"] = False
+
+    parts = metric_path.split(".", 2)
+
+    if len(parts) == 1:
+        # e.g. "rtt"
+        thresholds[metric_path] = cfg
+    elif len(parts) == 2:
+        plugin, metric = parts
+        thresholds.setdefault(plugin, {})[metric] = cfg
+    else:
+        plugin, intermediate, leaf = parts
+        thresholds.setdefault(plugin, {})
+        if plugin == "disk_monitor":
+            thresholds[plugin].setdefault("partitions", {}).setdefault(intermediate, {})[leaf] = cfg
+        elif plugin == "zfs_monitor":
+            thresholds[plugin].setdefault("pools", {}).setdefault(intermediate, {})[leaf] = cfg
+        else:
+            thresholds[plugin].setdefault(intermediate, {})[leaf] = cfg
+
 def _render_template(html_str: str, **context) -> str:
    tmpl = jinja2.Template(html_str)
    return tmpl.render(**context)
@@ -196,6 +271,7 @@ async def start(
    get_now=None,
    VER="",
    threshold_checker=None,
+    reload_callback=None,
 ):
    """Start an aiohttp web server and block until cancelled.

@@ -1228,10 +1304,17 @@ async def start(
                            attrs.pop("client_secret", None)
                data["oauth"] = new_oauth

-            for section in ("notification_channels", "thresholds", "dns"):
+            for section in ("notification_channels", "dns"):
                if section in payload:
                    configio_mod.apply_yaml_section(data, section, payload[section])

+            if "thresholds" in payload:
+                tc = payload["thresholds"]
+                if isinstance(tc, str):
+                    configio_mod.apply_yaml_section(data, "thresholds", tc)
+                elif isinstance(tc, dict):
+                    data["threshold_configs"] = _build_threshold_configs_from_form(tc)
+
            if "hosts" in payload:
                h = payload["hosts"]
                if isinstance(h, dict):
@@ -1244,7 +1327,9 @@ async def start(
            logger.error("Config write failed: %s", exc)
            return web.json_response({"error": str(exc)}, status=500)

-        if hasattr(config, "reload"):
+        if reload_callback:
+            await reload_callback()
+        elif hasattr(config, "reload"):
            await config.reload()
            users_mod.load_users(config)

@@ -1275,7 +1360,9 @@ async def start(
            logger.error("Rollback failed: %s", exc)
            return web.json_response({"error": str(exc)}, status=500)

-        if hasattr(config, "reload"):
+        if reload_callback:
+            await reload_callback()
+        elif hasattr(config, "reload"):
            await config.reload()
            users_mod.load_users(config)

@@ -1399,7 +1486,9 @@ async def start(
            logger.error("Channel create failed: %s", exc)
            return web.json_response({"error": str(exc)}, status=500)

-        if hasattr(config, "reload"):
+        if reload_callback:
+            await reload_callback()
+        elif hasattr(config, "reload"):
            await config.reload()
        return web.json_response({"ok": True, "name": name})

@@ -1465,7 +1554,9 @@ async def start(
            logger.error("Channel update failed: %s", exc)
            return web.json_response({"error": str(exc)}, status=500)

-        if hasattr(config, "reload"):
+        if reload_callback:
+            await reload_callback()
+        elif hasattr(config, "reload"):
            await config.reload()
        return web.json_response({"ok": True})

@@ -1497,7 +1588,9 @@ async def start(
            logger.error("Channel delete failed: %s", exc)
            return web.json_response({"error": str(exc)}, status=500)

-        if hasattr(config, "reload"):
+        if reload_callback:
+            await reload_callback()
+        elif hasattr(config, "reload"):
            await config.reload()
        return web.json_response({"ok": True})

@@ -1556,7 +1649,9 @@ async def start(
            logger.error("User self-update failed: %s", exc)
            return web.json_response({"error": str(exc)}, status=500)

-        if hasattr(config, "reload"):
+        if reload_callback:
+            await reload_callback()
+        elif hasattr(config, "reload"):
            await config.reload()
            users_mod.load_users(config)

@@ -78,9 +78,7 @@ async def reload_configuration(config_obj, config_path, components):
        True if reload succeeded, False otherwise
    """
    try:
-        logger.info("=" * 60)
        logger.info("Starting configuration reload...")
-        logger.info("=" * 60)
        
        # Reload config file
        new_config = await config_obj.reload(config_path)
@@ -115,13 +113,11 @@ async def reload_configuration(config_obj, config_path, components):
        # These are reloadable and effective immediately:
        # - notification_channels
        # - threshold_configs
-        # - hosts (watchhosts, dyndnshosts, notification_channels)
+        # - hosts (watchhosts, dyndns, notification_channels)
        # - grace period (used on next heartbeat)
        # - debug/verbose flags (used on next message)
        
-        logger.info("=" * 60)
        logger.info("Configuration reload completed successfully")
-        logger.info("=" * 60)
        return True
        
    except Exception as e:
@@ -246,6 +242,9 @@ async def _run_async(config, config_path=None):
    # upgrade or config change between runs).
    threshold_checker.purge_stale_alerts(hbdclass)

+    async def _http_reload_callback():
+        await reload_configuration(config, config_path, components)
+
    # HTTP server (asyncio-based via aiohttp)
    try:
        http_task = asyncio.create_task(
@@ -259,6 +258,7 @@ async def _run_async(config, config_path=None):
                verbose=config.get("verbose", False),
                get_now=lambda: time.time(),
                VER="",
+                reload_callback=_http_reload_callback,
            )
        )
        logger.info(
@@ -422,7 +422,6 @@ def load_pickled_hosts(config, hbdclass):
    pickfile = config.get("pickfile", "hbd.pickle")
    dyndnshosts = config_mod.get_dyndnshosts(config)
    watchhosts = config_mod.get_watchhosts(config)
-    drophosts = config.get("drophosts", [])
    if 1 and os.path.exists(pickfile):
        if config.get("verbose", False):
            logger.info("opening pickls %s", pickfile)
@@ -448,9 +447,6 @@ def load_pickled_hosts(config, hbdclass):
            hbdclass.Host.hosts[h].apply_access(
                access["owner"], access["managers"], access["monitors"]
            )
-        for h in drophosts:
-            if h in hbdclass.Host.hosts:
-                del hbdclass.Host.hosts[h]
        if config.get("verbose", False):
            logger.info("%s pickled hosts loaded", len(hbdclass.Host.hosts))
    else:
@@ -247,6 +247,8 @@ def get_settings_sections(config: dict, threshold_checker=None) -> list:
            "hysteresis": tc.hysteresis,
            "count": tc.count,
            "enabled": tc.enabled,
+            "display": tc.display or "",
+            "grace": tc.grace,
        }

    threshold_config_list = []
@@ -448,12 +450,12 @@ def get_settings_sections(config: dict, threshold_checker=None) -> list:
            "id": "thresholds",
            "title": "Threshold Configurations",
            "description": "Named alert threshold sets. Each defines warning/critical levels per metric.",
-            "section_mode": "yaml",
+            "section_mode": "thresholds",
            "api_section": "thresholds",
            "threshold_configs": threshold_config_list,
            "fields": [
                field("default_threshold_config", "Default config", "text",
-                      "Threshold config used for hosts with no explicit mapping."),
+                      "Threshold config used for hosts with no explicit mapping.", editable=True),
            ],
        },
        {
@@ -163,7 +163,7 @@
        </div>
        <div class="info-row">
          <span class="info-label">Email</span>
-          <span class="info-value"><a href="mailto:aew@wrede.ca">aew@wrede.ca</a></span>
+          <span class="info-value"><a href="mailto:aew.hbd@wrede.ca">aew.hbd@wrede.ca</a></span>
        </div>
        <div class="info-row">
          <span class="info-label">Repository</span>
@@ -1,5 +1,5 @@
 <footer>
 <div id="copyright">
-    &copy;2002-2026 <A HREF="mailto:andreas@wrede.ca">Andreas Wrede</A> All Rights Reserved.</p>
+    &copy;2002-2026 <A HREF="mailto:aew.hbd@wrede.ca">Andreas Wrede</A> All Rights Reserved.</p>
    </div>
 </footer>
@@ -125,6 +125,23 @@
        .nav-links a { margin-right: 0; padding: 6px 0; font-size: 1em; }
      }

+      /* Pending config publish button */
+      .nav-publish-btn {
+        background: #e65100;
+        color: #fff;
+        border: none;
+        border-radius: 4px;
+        padding: 4px 10px;
+        font-size: 0.82em;
+        font-weight: 600;
+        cursor: pointer;
+        flex-shrink: 0;
+        white-space: nowrap;
+        margin-left: auto;
+      }
+      .nav-publish-btn:hover { background: #bf360c; }
+      .nav-publish-btn:disabled { opacity: 0.7; cursor: default; }
+
      /* Swiss railway clock — nav */
      .nav-pie {
        flex-shrink: 0;
@@ -201,6 +201,43 @@
    .log-recover .log-level  { color: #2a7a2a; }
    .log-info .log-level     { color: #555; }

+    .log-section-header {
+      display: flex;
+      align-items: center;
+      gap: 12px;
+      flex-wrap: wrap;
+      margin-bottom: 10px;
+      background: white;
+      border-radius: 6px;
+      box-shadow: 0 1px 4px rgba(0,0,0,0.1);
+      padding: 8px 15px;
+    }
+
+    .log-section-title {
+      font-size: 1.2em;
+      font-weight: bold;
+      color: #333;
+      white-space: nowrap;
+    }
+
+    .log-filter-bar {
+      display: flex;
+      gap: 6px;
+      align-items: center;
+      flex-wrap: wrap;
+    }
+
+    .log-filter-bar input[type="text"],
+    .log-filter-bar select {
+      padding: 3px 7px;
+      border: 1px solid #ccc;
+      border-radius: 4px;
+      font-size: 0.85em;
+      color: #333;
+    }
+
+    .log-filter-bar input[type="text"] { width: 110px; }
+
    /* Modal for connection status messages */
    .connection-modal {
      display: none;
@@ -445,6 +482,22 @@
      updateRowAlert(name_idx[data.name], data);
    }

+    function applyLogFilters() {
+      var hostFilter = document.getElementById('filter-host').value.toLowerCase().trim();
+      var levelFilter = document.getElementById('filter-level').value;
+      var msgFilter = document.getElementById('filter-msg').value.toLowerCase().trim();
+      document.querySelectorAll('#messages .log-entry').forEach(function(entry) {
+        var show = true;
+        if (hostFilter && !(entry.dataset.host || '').toLowerCase().includes(hostFilter)) show = false;
+        if (levelFilter && entry.dataset.level !== levelFilter) show = false;
+        if (msgFilter) {
+          var msgEl = entry.querySelector('.log-msg');
+          if (!msgEl || !msgEl.textContent.toLowerCase().includes(msgFilter)) show = false;
+        }
+        entry.style.display = show ? '' : 'none';
+      });
+    }
+
    function WS_Connect() {
      if ("WebSocket" in window) {
        //N.B: subprotocol field causes chrome to error 1006
@@ -479,7 +532,8 @@
            var ts_str = _d.getFullYear() + '-' + _p(_d.getMonth()+1) + '-' + _p(_d.getDate())
                       + ' ' + _p(_d.getHours()) + ':' + _p(_d.getMinutes()) + ':' + _p(_d.getSeconds());
            var lvl = (msg.level || "INFO").toLowerCase();
-            var html = '<div class="log-entry log-' + lvl + '">';
+            var hostVal = msg.host || '';
+            var html = '<div class="log-entry log-' + lvl + '" data-level="' + lvl + '" data-host="' + hostVal.replace(/"/g, '&quot;') + '">';
            html += '<span class="log-ts">' + ts_str + '</span>';
            html += '<span class="log-level">' + (msg.level || "") + '</span>';
            if (msg.host) html += '<span class="log-host">' + msg.host + '</span>';
@@ -487,6 +541,7 @@
            html += '<span class="log-msg">' + msg.message + '</span>';
            html += '</div>';
            msgs.insertAdjacentHTML("afterbegin", html);
+            applyLogFilters();
          }
          cnt++;
        };
@@ -575,7 +630,20 @@
      </div>
      
      <div class="log-section">
-        <h2>Log of Events</h2>
+        <div class="log-section-header">
+          <span class="log-section-title">Log of Events</span>
+          <div class="log-filter-bar">
+            <input type="text" id="filter-host" placeholder="Host…" title="Filter by host" />
+            <select id="filter-level" title="Filter by level">
+              <option value="">All levels</option>
+              <option value="info">INFO</option>
+              <option value="warning">WARNING</option>
+              <option value="critical">CRITICAL</option>
+              <option value="recover">RECOVER</option>
+            </select>
+            <input type="text" id="filter-msg" placeholder="Message…" title="Filter by message text" />
+          </div>
+        </div>
        <div id="messages"></div>
      </div>
    </div>
@@ -591,6 +659,9 @@
    
    <script>
      setup();
+      document.getElementById('filter-host').addEventListener('input', applyLogFilters);
+      document.getElementById('filter-level').addEventListener('change', applyLogFilters);
+      document.getElementById('filter-msg').addEventListener('input', applyLogFilters);
    </script>
  </body>
 </html>
@@ -11,6 +11,9 @@
    {% endif %}
    <a href="/about"{% if active_page == "about" %} class="active"{% endif %}>About</a>
  </div>
+  {% if current_user and current_user.admin %}
+  <button id="nav-publish-btn" class="nav-publish-btn" onclick="navPublishConfig()" style="display:none" title="Publish pending config changes to .hb.yaml">&#9888; Publish Config</button>
+  {% endif %}
  <div class="nav-pie" title="Host alert status">
    <canvas id="alert-pie" width="44" height="44"></canvas>
  </div>
@@ -92,5 +95,40 @@
  document.addEventListener('DOMContentLoaded', function() {
    updateAlertPie();
    setInterval(updateAlertPie, 30000);
+    navCheckPendingConfig();
+    window.addEventListener('storage', navCheckPendingConfig);
  });
+
+  function navCheckPendingConfig() {
+    var btn = document.getElementById('nav-publish-btn');
+    if (!btn) return;
+    btn.style.display = localStorage.getItem('hbd_pending_config') ? '' : 'none';
+  }
+
+  async function navPublishConfig() {
+    var btn = document.getElementById('nav-publish-btn');
+    var pending = localStorage.getItem('hbd_pending_config');
+    if (!pending) return;
+    var staged;
+    try { staged = JSON.parse(pending); } catch(e) { return; }
+    if (btn) { btn.disabled = true; btn.textContent = 'Saving…'; }
+    try {
+      var resp = await fetch('/api/0/config', {
+        method: 'POST',
+        headers: {'Content-Type': 'application/json'},
+        body: pending
+      });
+      if (resp.ok) {
+        localStorage.removeItem('hbd_pending_config');
+        window.location.reload();
+      } else {
+        var err = await resp.json().catch(function() { return {}; });
+        alert('Error: ' + (err.error || resp.statusText));
+        if (btn) { btn.disabled = false; btn.textContent = '⚠ Publish Config'; }
+      }
+    } catch(e) {
+      alert('Network error: ' + e.message);
+      if (btn) { btn.disabled = false; btn.textContent = '⚠ Publish Config'; }
+    }
+  }
 </script>
@@ -6,7 +6,7 @@
    html, body { overflow: visible; }

    .container {
-      max-width: 960px;
+      max-width: none;
    }

    h1 { color: #333; margin-bottom: 5px; margin-top: 15px; font-size: 1.5em; }
@@ -298,8 +298,6 @@

    /* ---- Editable inputs ---- */
    .field-input {
-      width: 100%;
-      max-width: 360px;
      border: 1px solid #ccc;
      border-radius: 4px;
      padding: 4px 8px;
@@ -367,7 +365,7 @@
    .crud-table th { background: #f5f5f5; padding: 6px 10px; text-align: left; font-weight: 600; color: #555; font-size: .78em; text-transform: uppercase; letter-spacing: .03em; border-bottom: 1px solid #e0e0e0; }
    .crud-table td { padding: 6px 10px; border-bottom: 1px solid #f0f0f0; vertical-align: top; }
    .crud-table tbody tr:last-child td { border-bottom: none; }
-    .crud-table .field-input { max-width: none; }
+    .crud-table .field-input { width: 100%; }

    /* ---- Rollback modal ---- */
    .modal-overlay {
@@ -382,9 +380,88 @@
    .modal-box h3 { margin: 0 0 12px; font-size: 1em; }
    .backup-row { display: flex; align-items: center; justify-content: space-between; padding: 6px 0; border-bottom: 1px solid #f0f0f0; font-size: .87em; }
    .backup-row:last-child { border-bottom: none; }
+
+    /* ---- Threshold config cards ---- */
+    .thresh-cfg-card {
+      margin-bottom: 14px;
+      border: 1px solid #e0e0e0;
+      border-radius: 6px;
+      overflow: hidden;
+    }
+    .thresh-cfg-header {
+      background: #f5f5f5;
+      padding: 8px 14px;
+      display: flex;
+      align-items: center;
+      gap: 10px;
+      border-bottom: 1px solid #e0e0e0;
+    }
+    .thresh-cfg-name-label {
+      font-weight: 600;
+      font-size: 0.9em;
+      color: #1a237e;
+    }
+    .thresh-metric-table { width: 100%; }
+    .thresh-metric-table th { white-space: nowrap; }
+
+    /* ---- Multi-picker ---- */
+    .mpick-wrapper { display: block; }
+    .mpick-display {
+      display: flex; align-items: center; gap: 4px; flex-wrap: nowrap;
+      cursor: pointer; padding: 3px 7px; border: 1px solid #ccc; border-radius: 4px;
+      min-height: 26px; min-width: 80px; width: 100%; box-sizing: border-box;
+      background: #fff; user-select: none; overflow: hidden;
+    }
+    .mpick-display:hover { border-color: #0066cc; background: #f8fbff; }
+    .mpick-tag {
+      padding: 1px 6px; background: #e8eaf6; color: #283593;
+      border-radius: 10px; font-size: 0.82em; white-space: nowrap; flex-shrink: 0;
+    }
+    .mpick-more { color: #888; font-size: 0.82em; white-space: nowrap; flex-shrink: 0; }
+    .mpick-empty { color: #bbb; font-style: italic; font-size: 0.82em; }
+    .mpick-panel {
+      position: fixed; background: #fff; border: 1px solid #d0d0d0;
+      border-radius: 6px; box-shadow: 0 4px 20px rgba(0,0,0,.18);
+      z-index: 2000; width: 360px; overflow: hidden;
+    }
+    .mpick-panel-header {
+      padding: 6px 12px; font-size: 0.78em; font-weight: 700;
+      text-transform: uppercase; letter-spacing: 0.04em; color: #555;
+      border-bottom: 1px solid #eee; display: flex;
+      justify-content: space-between; align-items: center; background: #f5f5f5;
+    }
+    .mpick-panel-body { display: flex; }
+    .mpick-col { flex: 1; min-width: 0; max-height: 200px; overflow-y: auto; }
+    .mpick-col-header {
+      padding: 4px 10px; font-size: 0.72em; font-weight: 700;
+      text-transform: uppercase; letter-spacing: 0.04em; color: #888;
+      border-bottom: 1px solid #f0f0f0; background: #fafafa;
+      position: sticky; top: 0; z-index: 1;
+    }
+    .mpick-col:first-child { border-right: 1px solid #eee; }
+    .mpick-item {
+      padding: 5px 10px; font-size: 0.85em; cursor: pointer;
+      display: flex; align-items: center; justify-content: space-between;
+      border-bottom: 1px solid #f8f8f8; gap: 4px;
+    }
+    .mpick-item:last-child { border-bottom: none; }
+    .mpick-item-avail:hover { background: #e8f5e9; }
+    .mpick-item-sel:hover { background: #fce4ec; }
+    .mpick-arrow { font-size: 1.1em; opacity: 0.4; flex-shrink: 0; line-height: 1; }
+    .mpick-item:hover .mpick-arrow { opacity: 1; }
+    .mpick-item-avail .mpick-arrow { color: #2a7a2a; }
+    .mpick-item-sel .mpick-arrow { color: #c62828; }
+    .mpick-panel-footer {
+      padding: 6px 10px; border-top: 1px solid #eee;
+      display: flex; justify-content: flex-end; background: #f8f8f8;
+    }
+    .mpick-none { padding: 10px; font-size: .82em; color: #aaa; text-align: center; }
  </style>

  <body>
+  {%- macro mpick(all_items, sel, cls) -%}
+  <div class="mpick-wrapper"><div class="mpick-display" onclick="openMpick(this)" title="{{ sel | join(', ') | e }}">{%- if sel -%}{%- for v in sel[:2] -%}<span class="mpick-tag">{{ v | e }}</span>{%- endfor -%}{%- if sel|length > 2 %}<span class="mpick-more">+{{ sel|length - 2 }}</span>{%- endif -%}{%- else -%}<span class="mpick-empty">(none)</span>{%- endif -%}</div><select class="{{ cls }}" multiple hidden>{%- for item in all_items %}<option value="{{ item | e }}"{% if item in sel %} selected{% endif %}>{{ item | e }}</option>{%- endfor %}</select></div>
+  {%- endmacro %}
    {% include 'nav.html' %}

    <div class="container">
@@ -501,11 +578,7 @@
                    <td><input class="field-input user-avatar" value="{{ u.avatar | e }}"></td>
                    <td style="text-align:center"><input type="checkbox" class="user-admin" {% if u.admin %}checked{% endif %}></td>
                    <td style="min-width:140px">
-                      <select class="field-input user-ch-select" multiple size="{{ [all_channel_names|length, 4]|min }}" style="min-width:130px">
-                        {% for ch in all_channel_names %}
-                        <option value="{{ ch | e }}" {% if ch in u.notification_channels %}selected{% endif %}>{{ ch | e }}</option>
-                        {% endfor %}
-                      </select>
+                      {{ mpick(all_channel_names, u.notification_channels, 'user-ch-select') }}
                    </td>
                    <td><input type="password" class="field-input user-password" placeholder="(leave blank to keep)"></td>
                    <td><button class="btn-danger" onclick="toggleDeleteRow(this)">✕</button></td>
@@ -576,34 +649,10 @@
                    <td style="text-align:center"><input type="checkbox" class="host-watch" {% if h.watch %}checked{% endif %}></td>
                    <td style="text-align:center"><input type="checkbox" class="host-dyndns" {% if h.dyndns %}checked{% endif %}></td>
                    <td><input class="field-input host-owner" value="{{ h.owner | e }}" placeholder="(none)" style="min-width:90px"></td>
-                    <td>
-                      <select class="field-input host-managers" multiple size="{{ [all_usernames|length, 4]|min or 2 }}">
-                        {% for u in all_usernames %}
-                        <option value="{{ u | e }}" {% if u in h.managers %}selected{% endif %}>{{ u | e }}</option>
-                        {% endfor %}
-                      </select>
-                    </td>
-                    <td>
-                      <select class="field-input host-monitors" multiple size="{{ [all_usernames|length, 4]|min or 2 }}">
-                        {% for u in all_usernames %}
-                        <option value="{{ u | e }}" {% if u in h.monitors %}selected{% endif %}>{{ u | e }}</option>
-                        {% endfor %}
-                      </select>
-                    </td>
-                    <td>
-                      <select class="field-input host-tc" multiple size="{{ [all_threshold_configs|length, 4]|min or 2 }}">
-                        {% for tc in all_threshold_configs %}
-                        <option value="{{ tc | e }}" {% if tc in h.threshold_configs %}selected{% endif %}>{{ tc | e }}</option>
-                        {% endfor %}
-                      </select>
-                    </td>
-                    <td>
-                      <select class="field-input host-channels" multiple size="{{ [all_channel_names|length, 4]|min or 2 }}">
-                        {% for ch in all_channel_names %}
-                        <option value="{{ ch | e }}" {% if ch in h.notification_channels %}selected{% endif %}>{{ ch | e }}</option>
-                        {% endfor %}
-                      </select>
-                    </td>
+                    <td>{{ mpick(all_usernames, h.managers, 'host-managers') }}</td>
+                    <td>{{ mpick(all_usernames, h.monitors, 'host-monitors') }}</td>
+                    <td>{{ mpick(all_threshold_configs, h.threshold_configs, 'host-tc') }}</td>
+                    <td>{{ mpick(all_channel_names, h.notification_channels, 'host-channels') }}</td>
                    <td><button class="btn-danger" onclick="toggleDeleteRow(this)">✕</button></td>
                  </tr>
                  {% endfor %}
@@ -661,6 +710,84 @@
              <button class="btn btn-primary" onclick="openChannelModal()">+ Add channel</button>
            </div>

+            {# ---- Threshold configurations (form-based) ---- #}
+            {% elif section.section_mode == 'thresholds' %}
+            {% for f in section.fields %}
+            <div class="field-row" style="border-bottom:1px solid #f0f0f0">
+              <div class="field-label">{{ f.label }}</div>
+              <div class="field-body">
+                <input type="text" class="field-input thresh-default-config"
+                       value="{{ f.raw if f.raw is not none else '' }}"
+                       placeholder="default"
+                       list="thresh-cfg-names-{{ section.id }}">
+                <datalist id="thresh-cfg-names-{{ section.id }}">
+                  {% for tc in section.threshold_configs %}<option value="{{ tc.name | e }}">{% endfor %}
+                </datalist>
+                {% if f.description %}<p class="field-desc">{{ f.description }}</p>{% endif %}
+              </div>
+            </div>
+            {% endfor %}
+            <div id="thresh-cfgs-{{ section.id }}" style="padding:8px 20px 0">
+              {% for tc in section.threshold_configs %}
+              <div class="thresh-cfg-card" data-config-name="{{ tc.name | e }}">
+                <div class="thresh-cfg-header">
+                  <span class="thresh-cfg-name-label">{{ tc.name | e }}</span>
+                  {% if tc.name != 'default' %}
+                  <button class="btn-danger" style="margin-left:auto" onclick="deleteThresholdConfigCard(this)">✕ Delete</button>
+                  {% endif %}
+                </div>
+                <div style="overflow-x:auto">
+                  <table class="crud-table thresh-metric-table">
+                    <thead><tr>
+                      <th>Metric path</th><th>Op</th>
+                      <th>Warning</th><th>Critical</th>
+                      <th>Hysteresis</th><th>Count</th>
+                      <th style="max-width:160px">Display</th>
+                      <th>En</th><th></th>
+                    </tr></thead>
+                    <tbody>
+                      {% for m in tc.metrics %}
+                      <tr data-metric-row="true" data-metric-path="{{ m.metric | e }}">
+                        <td style="font-family:monospace;font-size:.85em;white-space:nowrap">{{ m.metric | e }}</td>
+                        <td>
+                          <select class="field-input thresh-op" style="width:80px" onchange="onThreshOpChange(this)">
+                            {% for op in ['>', '>=', '<', '<=', '==', '!=', 'nagios'] %}
+                            <option value="{{ op }}" {% if m.operator == op %}selected{% endif %}>{{ op }}</option>
+                            {% endfor %}
+                          </select>
+                        </td>
+                        <td><input type="number" class="field-input thresh-warn" step="any" style="width:80px"
+                                   value="{{ m.warning if m.warning is not none else '' }}"
+                                   {% if m.operator == 'nagios' %}disabled{% endif %}></td>
+                        <td><input type="number" class="field-input thresh-crit" step="any" style="width:80px"
+                                   value="{{ m.critical if m.critical is not none else '' }}"
+                                   {% if m.operator == 'nagios' %}disabled{% endif %}></td>
+                        <td><input type="number" class="field-input thresh-hyst" step="any" style="width:72px"
+                                   value="{{ m.hysteresis if m.hysteresis is not none else 0.02 }}"></td>
+                        <td><input type="number" class="field-input thresh-count" step="1" min="1" style="width:52px"
+                                   value="{{ m.count if m.count is not none else 1 }}"></td>
+                        <td><input type="text" class="field-input thresh-display" style="width:150px"
+                                   value="{{ m.display | e }}" placeholder="(default)"></td>
+                        <td style="text-align:center"><input type="checkbox" class="thresh-enabled"
+                                   {% if m.enabled %}checked{% endif %}></td>
+                        <td><button class="btn-danger" onclick="this.closest('tr').remove()">✕</button></td>
+                      </tr>
+                      {% endfor %}
+                    </tbody>
+                  </table>
+                </div>
+                <div style="padding:6px 14px 8px;border-top:1px solid #f0f0f0">
+                  <button class="btn btn-secondary" style="font-size:.8em;padding:3px 10px"
+                          onclick="addThresholdMetricRow(this.closest('.thresh-cfg-card').querySelector('tbody'))">+ Add metric</button>
+                </div>
+              </div>
+              {% endfor %}
+            </div>
+            <div class="section-footer" style="justify-content:space-between">
+              <button class="btn btn-secondary" onclick="addThresholdConfigCard('thresh-cfgs-{{ section.id }}')">+ Add config</button>
+              <button class="btn btn-primary" onclick="stageThresholdsSection('{{ section.id }}')">Stage changes</button>
+            </div>
+
            {# ---- YAML editor section ---- #}
            {% elif section.section_mode == 'yaml' %}
            <div style="padding: 12px 20px">
@@ -871,9 +998,13 @@
        if (count > 0) {
          document.getElementById('pending-count').textContent = count;
          banner.style.display = 'flex';
+          localStorage.setItem('hbd_pending_config', JSON.stringify(_staged));
        } else {
          banner.style.display = 'none';
+          localStorage.removeItem('hbd_pending_config');
        }
+        const navBtn = document.getElementById('nav-publish-btn');
+        if (navBtn) navBtn.style.display = count > 0 ? '' : 'none';
      }

      function stageFormSection(sectionId, apiSection) {
@@ -1004,10 +1135,6 @@

      function addHostRow() {
        const tbody = document.getElementById('hosts-tbody');
-        const sz = n => Math.min(Math.max(n, 1), 4);
-        const usersOpts = _allUsers.map(u => `<option value="${escHtml(u)}">${escHtml(u)}</option>`).join('');
-        const tcOpts = _allThresholdConfigs.map(t => `<option value="${escHtml(t)}">${escHtml(t)}</option>`).join('');
-        const chOpts = _allChannels.map(c => `<option value="${escHtml(c)}">${escHtml(c)}</option>`).join('');
        const row = document.createElement('tr');
        row.setAttribute('data-new-host', 'true');
        row.innerHTML = `
@@ -1015,10 +1142,10 @@
          <td style="text-align:center"><input type="checkbox" class="host-watch" checked></td>
          <td style="text-align:center"><input type="checkbox" class="host-dyndns"></td>
          <td><input class="field-input host-owner" placeholder="(none)" style="min-width:90px"></td>
-          <td><select class="field-input host-managers" multiple size="${sz(_allUsers.length)}">${usersOpts}</select></td>
-          <td><select class="field-input host-monitors" multiple size="${sz(_allUsers.length)}">${usersOpts}</select></td>
-          <td><select class="field-input host-tc" multiple size="${sz(_allThresholdConfigs.length)}">${tcOpts}</select></td>
-          <td><select class="field-input host-channels" multiple size="${sz(_allChannels.length)}">${chOpts}</select></td>
+          <td>${makeMpickHTML(_allUsers, [], 'host-managers')}</td>
+          <td>${makeMpickHTML(_allUsers, [], 'host-monitors')}</td>
+          <td>${makeMpickHTML(_allThresholdConfigs, [], 'host-tc')}</td>
+          <td>${makeMpickHTML(_allChannels, [], 'host-channels')}</td>
          <td><button class="btn-danger" onclick="this.closest('tr').remove()">✕</button></td>`;
        tbody.appendChild(row);
      }
@@ -1050,6 +1177,7 @@

      function discardAll() {
        Object.keys(_staged).forEach(k => delete _staged[k]);
+        localStorage.removeItem('hbd_pending_config');
        updatePendingBanner();
        window.location.reload();
      }
@@ -1092,8 +1220,6 @@

      function addUserRow() {
        const tbody = document.getElementById('users-tbody');
-        const opts = _allChannels.map(ch => `<option value="${escHtml(ch)}">${escHtml(ch)}</option>`).join('');
-        const chHtml = `<select class="field-input user-ch-select" multiple size="${Math.min(_allChannels.length, 4)}" style="min-width:130px">${opts}</select>`;
        const row = document.createElement('tr');
        row.setAttribute('data-new-user', 'true');
        row.innerHTML = `
@@ -1101,7 +1227,7 @@
          <td><input class="field-input user-full-name" placeholder="Display Name"></td>
          <td><input class="field-input user-avatar" placeholder="Avatar URL or path"></td>
          <td style="text-align:center"><input type="checkbox" class="user-admin"></td>
-          <td>${chHtml}</td>
+          <td>${makeMpickHTML(_allChannels, [], 'user-ch-select')}</td>
          <td><input type="password" class="field-input user-password" placeholder="(required)"></td>
          <td><button class="btn-danger" onclick="this.closest('tr').remove()">✕</button></td>`;
        tbody.appendChild(row);
@@ -1181,6 +1307,121 @@
        return s.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;').replace(/'/g,'&#39;');
      }

+      // ---- Multi-picker ----
+      let _mpickPanel = null;
+      let _mpickTarget = null;
+
+      function _initMpickPanel() {
+        if (_mpickPanel) return;
+        const p = document.createElement('div');
+        p.className = 'mpick-panel';
+        p.style.display = 'none';
+        p.innerHTML = `
+          <div class="mpick-panel-header">
+            <span>Select items</span>
+            <button style="background:none;border:none;cursor:pointer;color:#888;font-size:1.1em;padding:0 2px;line-height:1" onclick="closeMpick()">✕</button>
+          </div>
+          <div class="mpick-panel-body">
+            <div class="mpick-col" id="mpick-avail-col">
+              <div class="mpick-col-header">Available</div>
+              <div id="mpick-avail"></div>
+            </div>
+            <div class="mpick-col" id="mpick-sel-col">
+              <div class="mpick-col-header">Selected</div>
+              <div id="mpick-sel"></div>
+            </div>
+          </div>
+          <div class="mpick-panel-footer">
+            <button class="btn btn-primary" style="font-size:.82em;padding:4px 12px" onclick="closeMpick()">Done</button>
+          </div>`;
+        document.body.appendChild(p);
+        _mpickPanel = p;
+        document.addEventListener('mousedown', e => {
+          if (!_mpickPanel || _mpickPanel.style.display === 'none') return;
+          if (!_mpickPanel.contains(e.target) && !e.target.closest('.mpick-display')) closeMpick();
+        }, true);
+        document.addEventListener('keydown', e => {
+          if (e.key === 'Escape' && _mpickPanel && _mpickPanel.style.display !== 'none') closeMpick();
+        });
+      }
+
+      function openMpick(displayEl) {
+        if (displayEl.closest('tr')?.dataset.deleted === 'true') return;
+        _initMpickPanel();
+        _mpickTarget = displayEl.closest('.mpick-wrapper');
+        _rerenderMpick();
+        _mpickPanel.style.display = 'block';
+        const rect = displayEl.getBoundingClientRect();
+        const pw = _mpickPanel.offsetWidth || 360;
+        const ph = _mpickPanel.offsetHeight || 280;
+        let top = rect.bottom + 4;
+        let left = rect.left;
+        if (left + pw > window.innerWidth - 8) left = Math.max(8, window.innerWidth - pw - 8);
+        if (top + ph > window.innerHeight - 8) top = Math.max(8, rect.top - ph - 4);
+        _mpickPanel.style.top = top + 'px';
+        _mpickPanel.style.left = left + 'px';
+      }
+
+      function _rerenderMpick() {
+        const sel = _mpickTarget.querySelector('select');
+        const allOpts = [...sel.options];
+        const selVals = new Set([...sel.selectedOptions].map(o => o.value));
+        const avail = allOpts.filter(o => !selVals.has(o.value));
+        const chosen = allOpts.filter(o => selVals.has(o.value));
+        document.getElementById('mpick-avail').innerHTML = avail.length
+          ? avail.map(o => `<div class="mpick-item mpick-item-avail" data-val="${escHtml(o.value)}" onclick="_mpickToggle(this,true)"><span>${escHtml(o.value)}</span><span class="mpick-arrow">+</span></div>`).join('')
+          : '<div class="mpick-none">All selected</div>';
+        document.getElementById('mpick-sel').innerHTML = chosen.length
+          ? chosen.map(o => `<div class="mpick-item mpick-item-sel" data-val="${escHtml(o.value)}" onclick="_mpickToggle(this,false)"><span>${escHtml(o.value)}</span><span class="mpick-arrow">−</span></div>`).join('')
+          : '<div class="mpick-none">None selected</div>';
+      }
+
+      function _mpickToggle(itemEl, toSelected) {
+        const val = itemEl.dataset.val;
+        const sel = _mpickTarget.querySelector('select');
+        const opt = [...sel.options].find(o => o.value === val);
+        if (opt) opt.selected = toSelected;
+        _updateMpickDisplay(_mpickTarget);
+        _rerenderMpick();
+      }
+
+      function _updateMpickDisplay(wrapper) {
+        const sel = wrapper.querySelector('select');
+        const display = wrapper.querySelector('.mpick-display');
+        const selected = [...sel.selectedOptions].map(o => o.value);
+        if (!selected.length) {
+          display.innerHTML = '<span class="mpick-empty">(none)</span>';
+          display.title = '';
+          return;
+        }
+        const MAX = 2;
+        let html = selected.slice(0, MAX).map(v => `<span class="mpick-tag">${escHtml(v)}</span>`).join('');
+        if (selected.length > MAX) html += `<span class="mpick-more">+${selected.length - MAX}</span>`;
+        display.innerHTML = html;
+        display.title = selected.join(', ');
+      }
+
+      function closeMpick() {
+        if (_mpickPanel) _mpickPanel.style.display = 'none';
+        _mpickTarget = null;
+      }
+
+      function makeMpickHTML(allItems, selectedItems, cls) {
+        const selSet = new Set(selectedItems);
+        const opts = allItems.map(v => `<option value="${escHtml(v)}"${selSet.has(v) ? ' selected' : ''}>${escHtml(v)}</option>`).join('');
+        const selected = allItems.filter(v => selSet.has(v));
+        const MAX = 2;
+        let dispHtml;
+        if (!selected.length) {
+          dispHtml = '<span class="mpick-empty">(none)</span>';
+        } else {
+          dispHtml = selected.slice(0, MAX).map(v => `<span class="mpick-tag">${escHtml(v)}</span>`).join('');
+          if (selected.length > MAX) dispHtml += `<span class="mpick-more">+${selected.length - MAX}</span>`;
+        }
+        const title = escHtml(selected.join(', '));
+        return `<div class="mpick-wrapper"><div class="mpick-display" onclick="openMpick(this)" title="${title}">${dispHtml}</div><select class="${cls}" multiple hidden>${opts}</select></div>`;
+      }
+
      // Highlight sidebar link for the section currently in view
      const sections = document.querySelectorAll('.section');
      const navLinks = document.querySelectorAll('.sidebar-nav a');
@@ -1209,6 +1450,122 @@
        });
      }

+      // ---- Threshold configurations form ----
+      function stageThresholdsSection(sectionId) {
+        const section = document.getElementById(sectionId);
+        const configs = {};
+
+        function readMetrics(card) {
+          const metrics = {};
+          card.querySelectorAll('tbody tr').forEach(row => {
+            if (row.dataset.deleted === 'true') return;
+            const metric = row.dataset.metricPath
+              || (row.querySelector('.new-metric-path')?.value || '').trim();
+            if (!metric) return;
+            const op = row.querySelector('.thresh-op')?.value || '>';
+            const warn = row.querySelector('.thresh-warn')?.value;
+            const crit = row.querySelector('.thresh-crit')?.value;
+            const hyst = row.querySelector('.thresh-hyst')?.value;
+            const count = row.querySelector('.thresh-count')?.value;
+            const display = row.querySelector('.thresh-display')?.value || '';
+            const enabled = row.querySelector('.thresh-enabled')?.checked ?? true;
+            const entry = { operator: op, enabled: enabled };
+            if (warn !== '' && warn !== undefined) entry.warning = parseFloat(warn);
+            if (crit !== '' && crit !== undefined) entry.critical = parseFloat(crit);
+            if (hyst !== '' && hyst !== undefined) entry.hysteresis = parseFloat(hyst);
+            if (count !== '' && count !== undefined) entry.count = parseInt(count, 10);
+            if (display) entry.display = display;
+            metrics[metric] = entry;
+          });
+          return metrics;
+        }
+
+        const cfgsContainer = document.getElementById('thresh-cfgs-' + sectionId);
+        cfgsContainer.querySelectorAll('.thresh-cfg-card').forEach(card => {
+          const configName = card.dataset.configName
+            || (card.querySelector('.new-config-name')?.value || '').trim();
+          if (!configName) return;
+          configs[configName] = readMetrics(card);
+        });
+
+        _staged['thresholds'] = configs;
+
+        const defInput = section.querySelector('.thresh-default-config');
+        if (defInput) {
+          if (!_staged['server']) _staged['server'] = {};
+          _staged['server']['default_threshold_config'] = defInput.value || 'default';
+        }
+
+        updatePendingBanner();
+        flashStaged(sectionId);
+      }
+
+      function onThreshOpChange(select) {
+        const row = select.closest('tr');
+        const isNagios = select.value === 'nagios';
+        const w = row.querySelector('.thresh-warn');
+        const c = row.querySelector('.thresh-crit');
+        if (w) w.disabled = isNagios;
+        if (c) c.disabled = isNagios;
+      }
+
+      function _threshOpSelect(selected) {
+        const ops = ['>', '>=', '<', '<=', '==', '!=', 'nagios'];
+        return '<select class="field-input thresh-op" style="width:80px" onchange="onThreshOpChange(this)">' +
+          ops.map(op => `<option value="${escHtml(op)}"${op === selected ? ' selected' : ''}>${escHtml(op)}</option>`).join('') +
+          '</select>';
+      }
+
+      function addThresholdMetricRow(tbody) {
+        const row = document.createElement('tr');
+        row.innerHTML = `
+          <td><input type="text" class="field-input new-metric-path" placeholder="plugin.metric" style="min-width:160px;font-family:monospace;font-size:.85em" required></td>
+          <td>${_threshOpSelect('>')}</td>
+          <td><input type="number" class="field-input thresh-warn" step="any" style="width:80px"></td>
+          <td><input type="number" class="field-input thresh-crit" step="any" style="width:80px"></td>
+          <td><input type="number" class="field-input thresh-hyst" step="any" style="width:72px" value="0.02"></td>
+          <td><input type="number" class="field-input thresh-count" step="1" min="1" style="width:52px" value="1"></td>
+          <td><input type="text" class="field-input thresh-display" style="width:150px" placeholder="(default)"></td>
+          <td style="text-align:center"><input type="checkbox" class="thresh-enabled" checked></td>
+          <td><button class="btn-danger" onclick="this.closest('tr').remove()">✕</button></td>`;
+        tbody.appendChild(row);
+      }
+
+      function addThresholdConfigCard(containerId) {
+        const container = document.getElementById(containerId);
+        const card = document.createElement('div');
+        card.className = 'thresh-cfg-card';
+        card.innerHTML = `
+          <div class="thresh-cfg-header">
+            <input type="text" class="field-input new-config-name" placeholder="Config name (e.g. servers)" style="max-width:220px">
+            <button class="btn-danger" style="margin-left:auto" onclick="this.closest('.thresh-cfg-card').remove()">✕ Delete</button>
+          </div>
+          <div style="overflow-x:auto">
+            <table class="crud-table thresh-metric-table">
+              <thead><tr>
+                <th>Metric path</th><th>Op</th>
+                <th>Warning</th><th>Critical</th>
+                <th>Hysteresis</th><th>Count</th>
+                <th style="max-width:160px">Display</th>
+                <th>En</th><th></th>
+              </tr></thead>
+              <tbody></tbody>
+            </table>
+          </div>
+          <div style="padding:6px 14px 8px;border-top:1px solid #f0f0f0">
+            <button class="btn btn-secondary" style="font-size:.8em;padding:3px 10px"
+                    onclick="addThresholdMetricRow(this.closest('.thresh-cfg-card').querySelector('tbody'))">+ Add metric</button>
+          </div>`;
+        container.appendChild(card);
+      }
+
+      function deleteThresholdConfigCard(btn) {
+        const card = btn.closest('.thresh-cfg-card');
+        const name = card.dataset.configName || 'this config';
+        if (!confirm(`Delete config "${name}"?`)) return;
+        card.remove();
+      }
+
      function closeSidebar() {
        var sidebarNav = document.getElementById('sidebar-nav');
        var sidebarToggle = document.getElementById('sidebar-toggle');
@@ -195,6 +195,7 @@ class ThresholdConfig:
        hysteresis: float = 0.0,
        enabled: bool = True,
        count: int = 1,
+        grace: Optional[float] = None,
    ):
        """
        Initialize threshold configuration.
@@ -207,6 +208,7 @@ class ThresholdConfig:
            hysteresis: Hysteresis percentage to prevent flapping (0.0-1.0)
            enabled: Whether this threshold is enabled
            count: Number of consecutive exceedances required before alerting (default 1)
+            grace: Per-metric grace period in seconds; overrides global grace when set
        """
        self.metric_path = metric_path
        self.warning = warning
@@ -215,6 +217,7 @@ class ThresholdConfig:
        self.hysteresis = hysteresis
        self.display = display
        self.count = max(1, int(count))
+        self.grace = float(grace) if grace is not None else None
        
        # Parse operator
        try:
@@ -624,6 +627,7 @@ class ThresholdChecker:
            display = threshold_config.get("display", default_display)
            hysteresis = threshold_config.get("hysteresis", 0.0 if is_nagios_op else 0.02)
            enabled = threshold_config.get("enabled", True)
+            grace = threshold_config.get("grace", None)

            if warning is None and critical is None and not is_nagios_op:
                logger.warning("No thresholds defined for %s, skipping", metric_path)
@@ -636,7 +640,8 @@ class ThresholdChecker:
                operator=operator,
                hysteresis=hysteresis,
                enabled=enabled,
-                display=display
+                display=display,
+                grace=grace,
            )
            
            target_dict[metric_path] = threshold
@@ -681,6 +686,7 @@ class ThresholdChecker:
                hysteresis = threshold_config.get("hysteresis", 0.1)
                enabled = threshold_config.get("enabled", True)
                display = threshold_config.get("display")
+                grace = threshold_config.get("grace", None)
                if warning is None and critical is None:
                    continue

@@ -691,7 +697,8 @@ class ThresholdChecker:
                    operator=operator,
                    hysteresis=hysteresis,
                    enabled=enabled,
-                    display=display 
+                    display=display,
+                    grace=grace,
                )
                
                target_dict[metric_path] = threshold
@@ -734,6 +741,7 @@ class ThresholdChecker:
                hysteresis = threshold_config.get("hysteresis", 0.02)
                enabled = threshold_config.get("enabled", True)
                display = threshold_config.get("display")
+                grace = threshold_config.get("grace", None)
                if warning is None and critical is None:
                    continue
                target_dict[metric_path] = ThresholdConfig(
@@ -744,6 +752,7 @@ class ThresholdChecker:
                    hysteresis=hysteresis,
                    enabled=enabled,
                    display=display,
+                    grace=grace,
                )

    def _parse_rtt_thresholds(
@@ -779,6 +788,7 @@ class ThresholdChecker:
        enabled = rtt_thresholds.get("enabled", True)
        display = rtt_thresholds.get("display")
        count = rtt_thresholds.get("count", 1)
+        grace = rtt_thresholds.get("grace", None)

        if warning is None and critical is None:
            logger.warning("No RTT thresholds defined, skipping")
@@ -793,6 +803,7 @@ class ThresholdChecker:
            enabled=enabled,
            display=display,
            count=count,
+            grace=grace,
        )

        target_dict[metric_path] = threshold
@@ -1353,7 +1364,9 @@ class ThresholdChecker:
    ) -> None:
        """Handle a state-change transition with grace-period logic.

-        Transitioning INTO alert (worsening): defers the notification for grace_seconds.
+        Transitioning INTO alert (worsening): defers the notification for the effective
+        grace period (threshold.grace if set, else self.grace_seconds). Grace of 0 fires
+        the notification immediately with no deferral.
        De-escalation within alert states (e.g. CRITICAL→WARNING): no new notification;
          the metric is still alerting so no RECOVER was sent.
        Transitioning TO OK:
@@ -1361,6 +1374,8 @@ class ThresholdChecker:
            and the recovery — the spike never warranted a page.
          - Past grace: fires the RECOVER notification normally.
        """
+        effective_grace = threshold.grace if threshold.grace is not None else self.grace_seconds
+
        lvl, message, formatted_msg = self._trigger_notification(
            host_name, metric_path, old_level, new_level, value, threshold, plugin_data,
            check_name=check_name, metric_name=metric_name,
@@ -1371,17 +1386,24 @@ class ThresholdChecker:
            if alert_state.pending_since is not None:
                logger.info(
                    "Alert suppressed (recovered within %.0fs grace): %s on %s",
-                    self.grace_seconds, metric_path, host_name,
+                    effective_grace, metric_path, host_name,
                )
                alert_state.pending_since = None
            else:
                self._send_notification(host_name, lvl, message, metric_path, old_level, new_level, value)
        elif new_level.value > old_level.value:
-            # Worsening (OK→WARNING, OK→CRITICAL, WARNING→CRITICAL): schedule notification.
+            # Worsening (OK→WARNING, OK→CRITICAL, WARNING→CRITICAL).
+            if effective_grace <= 0:
+                # No grace period — fire immediately.
+                self._send_notification(host_name, lvl, message, metric_path, old_level, new_level, value)
+                now = time.time()
+                alert_state.last_notification = now
+                alert_state.notification_count = 1
+            else:
                alert_state.pending_since = time.time()
                logger.debug(
                    "Alert deferred (%.0fs grace): %s on %s = %s",
-                self.grace_seconds, metric_path, host_name, value,
+                    effective_grace, metric_path, host_name, value,
                )
        else:
            # De-escalation within alert states (e.g. CRITICAL→WARNING): metric is still
@@ -1407,8 +1429,9 @@ class ThresholdChecker:
        If a deferred notification is pending and grace_seconds have elapsed,
        fires it now. Otherwise falls through to normal reminder logic.
        """
+        effective_grace = threshold.grace if threshold.grace is not None else self.grace_seconds
        if alert_state.pending_since is not None:
-            if time.time() - alert_state.pending_since >= self.grace_seconds:
+            if time.time() - alert_state.pending_since >= effective_grace:
                lvl, message, formatted_msg = self._trigger_notification(
                    host_name, metric_path, AlertLevel.OK, alert_state.level, value, threshold, plugin_data,
                    check_name=check_name, metric_name=metric_name,
@@ -377,7 +377,7 @@ def handle_datagram(msg: dict, addr, transport, ctx: dict):
                default_owner = config_mod.get_default_owner(cfg)
                inferred_owner = plugin_data.get("owner", config_owner or default_owner)    
                host.owner = inferred_owner
-                logger.info(f"owner for {uname} is '{host.owner}")
+                logger.info(f"owner for {uname} is {host.owner}")
            if DEBUG > 1:
                print(f"Stored plugin data for {uname}: {plugin_name}")
            
@@ -4,20 +4,32 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "hbd"
-version = "5.3.2"
+version = "5.3.6"
 description = "Heartbeat monitoring system — client (hbc) and server (hbd)"
 readme = "README.md"
 requires-python = ">=3.11"
-license = "MIT" 
-keywords = ["heartbeat", "monitoring", "dns", "websocket", "system-monitoring"]
-authors = [
-  { name = "heartbeat contributors" }
-]
-
-# Core dependencies (required for both client and server)
 dependencies = [
  "PyYAML>=6.0",
 ]
+license = "MIT"
+license-files = ["LICENSE.md"]
+keywords = ["heartbeat", "monitoring", "dns", "websocket", "system-monitoring"]
+authors = [
+  { name = "Andreas Wrede" }
+]
+classifiers = [
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+  "Operating System :: POSIX :: Linux",
+  "Operating System :: POSIX :: BSD",
+  "Topic :: System :: Monitoring",
+  "Topic :: System :: Networking :: Monitoring",
+]
+
+[project.urls]
+Repository = "https://git.wrede.ca/andreas/heartbeat"

 [project.optional-dependencies]
 # Client-only dependencies (hbc - system monitoring client)
@@ -1,4 +0,0 @@
-key "rndc-key" {
-      algorithm hmac-md5;
-      secret "qlGa+AYKtyOgWNuozqECMw==";
-};
@@ -41,7 +41,7 @@ from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple

 # updated by scripts/bumpminor.sh
-__version__ = "5.3.2"
+__version__ = "5.3.6"

 # ---------------------------------------------------------------------------
 # Protocol  (mirrors hbd/common/proto.py)
@@ -20,7 +20,7 @@ def test_handle_cmd_sends_command():
    import hbdclass

    ctx = {
-        "config": {"watchhosts": [], "dyndnshosts": []},
+        "config": {"watchhosts": []},
        "hbdclass": hbdclass,
        "log": dummy_noop,
        "email": dummy_noop,
@@ -1,9 +1,8 @@
 [tox]
 envlist = py, lint, mypy
-skipsdist = True

 [testenv]
-deps = -rrequirements-dev.txt
+extras = dev
 commands =
    pytest -q
Author	SHA1	Message	Date
Andreas Wrede	756b2323be	version 5.3.6 Release / release (push) Successful in 5s Details	2026-05-13 06:42:31 -04:00
Andreas Wrede	6e7156b42d	chore: remove redundant license classifier from pyproject.toml The license expression field (PEP 639) supersedes the classifier. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-13 06:42:19 -04:00
Andreas Wrede	928035df50	fix: move dependencies back under [project] in pyproject.toml The key had drifted below [project.urls], making setuptools interpret it as a URL entry and failing validation. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-13 06:37:14 -04:00
Andreas Wrede	0f90be659e	fix: correct ZFS pool status threshold operator and add per-metric grace The default zfs_monitor..status threshold used operator '>' with warning=1, so a DEGRADED pool (status=1) never alerted (1 > 1 is false) and a FAULTED pool (status=2) only triggered WARNING instead of CRITICAL. Fix the operator to '>=' in THRESHOLD_DEFAULTS and the example config. Also adds a per-metric grace period override (ThresholdConfig.grace) so individual thresholds can bypass or shorten the global grace delay. Alerts with grace=0 fire immediately on state change rather than waiting for a second collection cycle. Sets grace=0 on zfs_monitor..status so pool degradation alerts fire on the first data report after the event. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-13 06:33:06 -04:00
Andreas Wrede	4160e34a96	chore: remove commented-out step from release workflow Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-13 00:02:24 -04:00
Andreas Wrede	6430d2ddf3	chore: add classifiers and project URL to pyproject.toml Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-13 00:00:30 -04:00
Andreas Wrede	4b87a90e76	chore: declare license-files in pyproject.toml Associates LICENSE.md with the package for pip/PyPI. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-12 23:58:25 -04:00
Andreas Wrede	450814daca	chore: remove docs/superpowers from repo Add to .gitignore to keep local copies untracked. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-12 23:56:56 -04:00
Andreas Wrede	e7786ac5da	chore: rename "CLAUDE. md" to CLAUDE.md Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-12 23:56:21 -04:00
Andreas Wrede	fed71d97d6	chore: clean up dev scratch files from project root - Remove rndc-key from tracking, add to .gitignore - Move async_sms_send.py, demo_threshold.py, nagios_bad.sh to scripts/ Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-12 23:54:27 -04:00
Andreas Wrede	ba96da9622	refactor: move loose test files out of project root - tests/test_threshold.py: has proper pytest test functions - scripts/test_*.py: manual run scripts with no test functions Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-12 23:52:34 -04:00
Andreas Wrede	7f17ddc2ff	chore: fix tox.ini to install dev deps from pyproject.toml Replace the missing requirements-dev.txt reference with extras = dev, which installs the [dev] optional dependencies declared in pyproject.toml. Also remove skipsdist so tox installs the package before running tests. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-12 23:50:47 -04:00
Andreas Wrede	7750c5a303	chore: set author to Andreas Wrede in pyproject.toml Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-12 23:49:46 -04:00
Andreas Wrede	e58530df7d	docs: add MIT license Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-12 23:45:55 -04:00
Andreas Wrede	fe7143759c	docs: rewrite README from source code Replace the previous README with documentation derived from reading the actual code, including a new section covering the C client (scripts/c/hbc_mini.c). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-12 23:42:24 -04:00
Andreas Wrede	236b40cfe4	fix: email and domain normalize	2026-05-12 17:02:02 -04:00
Andreas Wrede	4e5bafd26c	version 5.3.4 Release / release (push) Successful in 5s Details	2026-05-12 15:06:24 -04:00
Andreas Wrede	817ae064af	fix: run full reload after HTTP config publish, not just config.reload() HTTP config-mutating endpoints (publish, rollback, channel CRUD, user self-update) were calling config.reload() directly, which only refreshed the in-memory config dict. This skipped re-applying host.dyn/host.watched flags to live Host objects, so enabling dyndns via the UI had no effect until a SIGHUP was sent. Wire a reload_callback through http.start() that calls the same reload_configuration() function used by the SIGHUP handler, ensuring host attributes, notify module, users, and threshold checker are all updated on every config publish. Also fix unmatched quote in udp.py f-string log message. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-12 15:05:52 -04:00
Andreas Wrede	a00282913b	version 5.3.3 Release / release (push) Successful in 5s Details	2026-05-12 14:34:58 -04:00
Andreas Wrede	d699a29fa9	refactor: remove dyndnshosts/drophosts legacy config keys, fix DNS event logging - Remove dyndnshosts legacy list; dyndns is now set per-host in the hosts section - Remove drophosts config key and load-time deletion loop - Simplify get_dyndnshosts() to only read per-host dyndns attributes - Fix dns_update_worker to call eventlog with correct (host, level, msg) signature - Log INFO/ERROR events per domain on each DNS update instead of one batched message - Add logger to dns.py (was missing, causing NameError on update failure) - Update README and tests to reflect removed config keys Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-12 14:34:11 -04:00
Andreas Wrede	4ce7eacfdd	fix: remove container max-width and stop stretching inputs on settings page Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-12 11:42:54 -04:00
Andreas Wrede	1cefc2676e	feat: replace YAML editor with form UI for threshold configurations Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-12 10:57:03 -04:00
Andreas Wrede	668a135e53	feat: replace multi-select fields with dual-panel picker on settings page Replaces the 5 native <select multiple> fields (Managers, Monitors, Threshold config, Channels in Hosts; Channels in Users) with a compact picker widget: a truncated pill display with tooltip, and a click-to-open panel split into Available / Selected columns for moving items between sides. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-12 10:10:18 -04:00
Andreas Wrede	59e256a042	feat: add nav bar button to publish pending config changes Shows an orange "Publish Config" button to the left of the alert-pie for admin users when there are staged config changes. Uses localStorage to persist staged changes across page navigations so the button appears on any page, not just settings. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-12 09:32:32 -04:00
Andreas Wrede	708508157f	feat: add host, level, and message filters to Log of Events Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-12 08:29:26 -04:00