chore: combine the open PRs into one

.env.example

@@ -177,6 +177,7 @@ TRAIN_UPLOAD_LIMIT_MB=4096
 
 SEARCH_ENABLE_WEB_SEARCH=true
 SEARCH_RESULT_COUNT=5
+SEARCH_TIMEOUT_SECONDS=15
 SEARCH_SEARXNG_QUERY_URL="http://gluetun:8080/search?q=<query>&format=json"
 SEARCH_SEARXNG_SERVER_BASE_URL="http://localhost:8080"
 SEARCH_SEARXNG_INSTANCE_NAME="Zone Search"
@@ -282,8 +283,11 @@ ZONE_MCP_AUTO_MAGENTS=true
 # ZONE_NOTIFY_DISCORD_WEBHOOK=https://discord.com/api/webhooks/...
 # ZONE_NOTIFY_EMAIL_TO=alerts@example.com,ops@example.com
 # ZONE_NOTIFY_TIMEOUT_SECONDS=10
-# SMTP_* - The relay ZONE_NOTIFY_EMAIL_TO, sign-up verification, password
-# resets and invitations send through. ALERT_SMTP_* below is Grafana's own.
+# SMTP_* - The relay ZONE_NOTIFY_EMAIL_TO, sign-up verification and password
+# resets send through. Port 465 connects with implicit TLS; any other port,
+# 587 included, upgrades with STARTTLS before signing in. A blank value other
+# than SMTP_PASSWORD counts as unset, and an unreadable SMTP_PORT falls back
+# to 587. ALERT_SMTP_* below is Grafana's own.
 # SMTP_HOST=smtp.example.com
 # SMTP_PORT=587
 # SMTP_USER=

README.md

@@ -433,8 +433,6 @@ zone/
 │   │   ├── src/video.rs     # Training frames pulled out of a submitted clip
 │   │   ├── src/subject.rs   # Subject-aware framing for training crops
 │   │   └── src/caption.rs   # Vision captioning for training sets
-│   ├── zone_email/          # Transactional email over SMTP
-│   ├── zone_search/         # SearXNG web search client
 │   ├── zone_vcs/            # Local git operations and GitHub pull requests
 │   ├── zone_vision/         # Subject detection and subject-aware cropping
 │   ├── zone_server/         # HTTP/WS server

comfyui/custom_nodes/zone_lora/__init__.py

@@ -1,4 +1,4 @@
-from comfy_api.latest import ComfyExtension
+from comfy_api.latest import ComfyExtension, io
 
 from .cleanup_node import ZoneCleanupTrainingRun
 from .dataset_node import ZoneLoadTrainDataset
@@ -11,16 +11,13 @@
 
 install_all()
 
-NODE_CLASS_MAPPINGS = {
-    'ZoneIPAdapterFace': ZoneIPAdapterFace,
-}
-
 
 class ZoneLoraExtension(ComfyExtension):
-    async def get_node_list(self):
+    async def get_node_list(self) -> list[type[io.ComfyNode]]:
         return [
             ZoneLoadTrainDataset,
             ZoneCleanupTrainingRun,
+            ZoneIPAdapterFace,
             ZoneLoadTrainFolder,
             ZoneProbeGradient,
             ZoneProbeLoss,

comfyui/custom_nodes/zone_lora/face_node.py

@@ -11,6 +11,7 @@
 from comfy.ldm.modules.attention import optimized_attention
 import comfy.model_management as model_management
 import comfy.utils
+from comfy_api.latest import io
 
 PLUS_FACE = 'ip-adapter-plus-face_sdxl_vit-h.safetensors'
 
@@ -267,32 +268,30 @@ def patch_sdxl(model, ipa, cond, uncond, weight: float):
         number += 1
 
 
-class ZoneIPAdapterFace:
+class ZoneIPAdapterFace(io.ComfyNode):
     @classmethod
-    def INPUT_TYPES(cls):
-        names = folder_paths.get_filename_list('ipadapter')
-        if not names:
-            names = [PLUS_FACE]
-        return {
-            'required': {
-                'model': ('MODEL',),
-                'clip_vision': ('CLIP_VISION',),
-                'image': ('IMAGE',),
-                'ipadapter_name': (names,),
-                'strength': (
-                    'FLOAT',
-                    {'default': 0.4, 'min': 0.0, 'max': 2.0, 'step': 0.01},
-                ),
-            }
-        }
-
-    RETURN_TYPES = ('MODEL',)
-    FUNCTION = 'apply'
-    CATEGORY = 'zone'
-
-    def apply(self, model, clip_vision, image, ipadapter_name, strength):
+    def define_schema(cls) -> io.Schema:
+        names = folder_paths.get_filename_list('ipadapter') or [PLUS_FACE]
+        return io.Schema(
+            node_id='ZoneIPAdapterFace',
+            display_name='Zone IP-Adapter Face',
+            category='zone',
+            inputs=[
+                io.Model.Input('model'),
+                io.ClipVision.Input('clip_vision'),
+                io.Image.Input('image'),
+                io.Combo.Input('ipadapter_name', options=names),
+                io.Float.Input('strength', default=0.4, min=0.0, max=2.0, step=0.01),
+            ],
+            outputs=[io.Model.Output()],
+        )
+
+    @classmethod
+    def execute(
+        cls, model, clip_vision, image, ipadapter_name: str, strength: float
+    ) -> io.NodeOutput:
         if strength == 0:
-            return (model,)
+            return io.NodeOutput(model)
         path = folder_paths.get_full_path_or_raise('ipadapter', ipadapter_name)
         loaded = load_plus_face(path)
         if 'latents' not in loaded['image_proj']:
@@ -314,4 +313,4 @@ def apply(self, model, clip_vision, image, ipadapter_name, strength):
         uncond = uncond.to(device, dtype=dtype)
         work = model.clone()
         patch_sdxl(work, ipa, cond, uncond, float(strength))
-        return (work,)
+        return io.NodeOutput(work)

comfyui/tests/test_graph_contract.py

@@ -3,6 +3,7 @@
 import asyncio
 import json
 import os
+import re
 import subprocess
 import sys
 import tempfile
@@ -19,6 +20,7 @@
 ZONE_NODES = COMFYUI / 'custom_nodes' / 'zone_lora'
 TRAIN_SERVER = ROOT / 'runner/zone_comfy/src/train.rs'
 QUALITY_SERVER = ROOT / 'runner/zone_comfy/src/quality.rs'
+PEOPLE_SERVER = ROOT / 'runner/zone_comfy/src/people.rs'
 
 if not INSTALL.is_dir():
     raise RuntimeError('COMFYUI_INSTALL_DIR must point to the pinned ComfyUI checkout')
@@ -165,6 +167,53 @@ def rust_graphs() -> dict[str, dict]:
     }
 
 
+def resolve(value: object, constants: dict[str, str]) -> object:
+    if isinstance(value, Expression):
+        return constants.get(value.text, value)
+    if isinstance(value, list):
+        return [resolve(item, constants) for item in value]
+    if isinstance(value, dict):
+        return {name: resolve(item, constants) for name, item in value.items()}
+    return value
+
+
+def people_strings() -> dict[str, str]:
+    return dict(re.findall(r'const (\w+): &str = "([^"]*)";', PEOPLE_SERVER.read_text()))
+
+
+def people_numbers() -> dict[str, float]:
+    return {
+        name: float(value)
+        for name, value in re.findall(r'const (\w+): f64 = ([0-9.]+);', PEOPLE_SERVER.read_text())
+    }
+
+
+def rust_face_graph() -> dict:
+    source = PEOPLE_SERVER.read_text()
+    constants = people_strings()
+    start = source.find('fn inject_ipadapter(')
+    if start < 0:
+        raise AssertionError(f'{PEOPLE_SERVER}: inject_ipadapter is missing')
+    end = source.find('\n}\n', start)
+    if end <= start:
+        raise AssertionError(f'{PEOPLE_SERVER}: inject_ipadapter has no closing brace')
+    graph = {
+        '4': {
+            'class_type': 'CheckpointLoaderSimple',
+            'inputs': {'ckpt_name': 'model.safetensors'},
+        }
+    }
+    for insert in re.finditer(r'object\.insert\(\s*(\w+)\.into\(\),\s*json!\(', source[start:end]):
+        key = insert.group(1)
+        if key not in constants:
+            raise AssertionError(f'{PEOPLE_SERVER}: node key {key} is not a &str constant')
+        node = RustLiteral(source, start + insert.end(), PEOPLE_SERVER).object()
+        graph[constants[key]] = resolve(node, constants)
+    face = graph[constants['IPADAPTER_NODE']]
+    face['inputs']['model'] = ['4', 0]
+    return graph
+
+
 def flux() -> train_lora.TrainingModel:
     return train_lora.TrainingModel(architecture='flux', checkpoint='flux.safetensors')
 
@@ -371,13 +420,59 @@ def test_repository_extension_is_part_of_the_loaded_registry(self) -> None:
             'ZoneCleanupTrainingRun',
             'ZoneIPAdapterFace',
             'ZoneLoadTrainDataset',
+            'ZoneLoadTrainFolder',
             'ZoneProbeGradient',
             'ZoneProbeLoss',
             'ZoneStageTrainingArtifact',
             'ZoneTrainLoRA',
         }
         self.assertLessEqual(expected, set(self.nodes.NODE_CLASS_MAPPINGS))
 
+    def test_rust_face_graph_matches_the_pinned_registry(self) -> None:
+        graph = rust_face_graph()
+        self.assertEqual(
+            sorted(node['class_type'] for node in graph.values()),
+            ['CLIPVisionLoader', 'CheckpointLoaderSimple', 'LoadImage', 'ZoneIPAdapterFace'],
+        )
+        self.validate_graph('Rust face', graph)
+
+    def test_rust_face_constants_fit_the_face_node(self) -> None:
+        node_class = self.nodes.NODE_CLASS_MAPPINGS['ZoneIPAdapterFace']
+        inputs, _, _ = schema(node_class)
+        bounds = inputs['strength'][1]
+        strength = people_numbers()['IPADAPTER_STRENGTH']
+        self.assertGreaterEqual(strength, bounds['min'], f'{PEOPLE_SERVER}: IPADAPTER_STRENGTH')
+        self.assertLessEqual(strength, bounds['max'], f'{PEOPLE_SERVER}: IPADAPTER_STRENGTH')
+        self.assertEqual(
+            people_strings()['IPADAPTER_FILE'],
+            sys.modules[node_class.__module__].PLUS_FACE,
+            f'{PEOPLE_SERVER}: IPADAPTER_FILE',
+        )
+
+    def test_face_node_at_zero_strength_returns_the_model_untouched(self) -> None:
+        from execution import _async_map_node_over_list
+
+        node_class = self.nodes.NODE_CLASS_MAPPINGS['ZoneIPAdapterFace']
+        model = object()
+        results = asyncio.run(
+            _async_map_node_over_list(
+                'contract',
+                'face',
+                node_class,
+                {
+                    'model': [model],
+                    'clip_vision': [None],
+                    'image': [None],
+                    'ipadapter_name': ['missing.safetensors'],
+                    'strength': [0.0],
+                },
+                node_class.FUNCTION,
+                v3_data={},
+            )
+        )
+        self.assertEqual(len(results), 1)
+        self.assertIs(results[0].result[0], model)
+
     def test_sdxl_people_graphs_match_the_pinned_registry(self) -> None:
         for name in (
             'sdxl-api.json',

comfyui/tests/test_setup_macos.py

@@ -202,6 +202,20 @@ def test_install_trainer_inherits_comfy_site_packages(self) -> None:
                 text=True,
             )
             self.assertNotEqual(mlx.returncode, 0, mlx.stdout + mlx.stderr)
+            for trainer in (".venv-train", ".venv-train-llm"):
+                trainer_site = subprocess.check_output(
+                    [
+                        str(install / trainer / "bin" / "python"),
+                        "-c",
+                        "import sysconfig; print(sysconfig.get_path('purelib'))",
+                    ],
+                    text=True,
+                ).strip()
+                with self.subTest(venv=trainer):
+                    self.assertFalse(
+                        Path(trainer_site, "pip").exists(),
+                        "a skipped pip install still bootstrapped pip into the trainer venv",
+                    )
             plist = (home / "Library/LaunchAgents/ai.zone.train.plist").read_text(
                 encoding="utf-8"
             )

docker-compose.dev.yml

@@ -68,6 +68,7 @@ services:
       - VPN_OPENVPN_USER=${VPN_OPENVPN_USER:+1}
       - "SEARCH_SEARXNG_QUERY_URL=${SEARCH_SEARXNG_QUERY_URL:-http://gluetun:8080/search?q=<query>&format=json}"
       - SEARCH_RESULT_COUNT=${SEARCH_RESULT_COUNT:-5}
+      - SEARCH_TIMEOUT_SECONDS=${SEARCH_TIMEOUT_SECONDS:-15}
       - MODEL_SEARCH_PROXY_URL=${MODEL_SEARCH_PROXY_URL:-}
       - GITHUB_API_URL=${GITHUB_API_URL:-}
       - TOOL_RUNNER_PROXY_URL=${TOOL_RUNNER_PROXY_URL:-}

docker-compose.yml

@@ -387,6 +387,7 @@ services:
       - VPN_OPENVPN_USER=${VPN_OPENVPN_USER:+1}
       - "SEARCH_SEARXNG_QUERY_URL=${SEARCH_SEARXNG_QUERY_URL:-http://gluetun:8080/search?q=<query>&format=json}"
       - SEARCH_RESULT_COUNT=${SEARCH_RESULT_COUNT:-5}
+      - SEARCH_TIMEOUT_SECONDS=${SEARCH_TIMEOUT_SECONDS:-15}
       # Belt-and-suspenders HTTP proxy. `make up-vpn` also attaches this
       # container to Gluetun's network so non-HTTP traffic uses the tunnel.
       - MODEL_SEARCH_PROXY_URL=${MODEL_SEARCH_PROXY_URL:-}

docs/CONFIGURATION.md

@@ -1623,7 +1623,11 @@ details, and native macOS / bundled NVIDIA instructions.
 
 ### `SEARCH_RESULT_COUNT`
 - **Default**: `5`
-- **Description**: Number of search results supplied to chat
+- **Description**: Number of search results supplied to chat (held to 1–20).
+
+### `SEARCH_TIMEOUT_SECONDS`
+- **Default**: `15`
+- **Description**: Timeout for one SearXNG request, in whole seconds (held to 1–60).
 
 ### `SEARCH_SEARXNG_QUERY_URL`
 - **Default**: `"http://gluetun:8080/search?q=<query>&format=json"`
@@ -1841,8 +1845,8 @@ Every notice — an auto-project merge, pause or completion, a regression alert,
 - **Description**: How long one channel is given per notice.
 
 ### `SMTP_HOST`, `SMTP_PORT`, `SMTP_USER`, `SMTP_PASSWORD`, `SMTP_FROM`, `SMTP_FROM_NAME`
-- **Default**: *empty* (`SMTP_PORT` 587, `SMTP_FROM_NAME` Zone)
-- **Description**: The relay notices, sign-up verification, password resets and invitations send through. `ALERT_SMTP_*` is Grafana's relay and is separate.
+- **Default**: *empty* (`SMTP_PORT` 587, `SMTP_FROM_NAME` Zone; a blank value other than `SMTP_PASSWORD` counts as unset and an unreadable `SMTP_PORT` falls back to 587; sign-up and reset mail falls back to `noreply@zone.app` when `SMTP_FROM` is unset, email notices need it set)
+- **Description**: The relay notices, sign-up verification and password resets send through. Port 465 connects with implicit TLS; any other port, 587 included, must upgrade with STARTTLS before signing in. `ALERT_SMTP_*` is Grafana's relay and is separate.
 
 ---
 

docs/DEPLOY.md

@@ -58,7 +58,7 @@ Verified on `main` (`d3fb7cf`). Reuse is the default; each row says whether it's
 | MQTT broker | `~/Local/mqtt` (Swoole) | OTA substrate for `ota_fleet` |
 | Appwrite | Sites, Functions, Storage, Messaging | Delivery targets + backend provisioning (v1.5) |
 | Charts, cluster | `helm/zone-apps` (`_helpers.tpl` conventions, security contexts, HPA/PDB/NetworkPolicy), `k8s/kind-config.yaml` (`zone-dev`, ports 30000-30002 pre-mapped, CNPG, HAProxy default IngressClass) | New `helm/zone-app` copies conventions; kind is the first k8s target |
-| Notifications | None in the server. `ALERT_DISCORD_WEBHOOK_URL` is consumed only by Grafana (`grafana/entrypoint.sh`); `zone_email::EmailService` has three templated senders; reminders deliver as assistant messages into a chat (`db/reminders.rs:61-90`) | New `notify` module |
+| Notifications | None in the server. `ALERT_DISCORD_WEBHOOK_URL` is consumed only by Grafana (`grafana/entrypoint.sh`); `services::mail::AccountMail` sends two templated account messages (abnegate-notify `Mailer`); reminders deliver as assistant messages into a chat (`db/reminders.rs:61-90`) | New `notify` module |
 
 **Gaps that block the feature (phase 0):**
 
@@ -639,7 +639,7 @@ Stated tradeoff: while blocked, a task holds one of `MAX_CONCURRENT_TASKS = 5` p
 `Notifier` trait with three channels, fanned out with `join_all`, failures logged and never blocking the deployment:
 
 - `DiscordWebhook` — an embed with app, target, artifact kind, digest, requester, values digest, and a deep link to `/deployments?id=…` (the desktop/mobile shell opens it too). Webhook URL from the target's `notify` block, falling back to a server-level `ALERT_DISCORD_WEBHOOK_URL` that `config.rs` now reads as well as Grafana. Webhooks are one-way; one-tap approve from Discord needs bot interactions and is a later phase.
-- `Email` — new `zone_email::send_approval_request`.
+- `Email` — a new approval-request `services::mail::Template`, sent through `AccountMail`.
 - `InApp` — an assistant message into the originating chat, the reminders pattern (`db/reminders.rs:61-90`).
 
 ### 7.6 Agent tools — `runner/zone_server/src/agent/deploy.rs`