ci: учитывать несколько коммитов в одном пуше при detect paths

Co-authored-by: Cursor <cursoragent@cursor.com>

.agents/skills/reui/SKILL.md

@@ -5,7 +5,7 @@ user-invocable: false
 allowed-tools: Bash(npx shadcn@latest *), Bash(pnpm dlx shadcn@latest *), Bash(bunx --bun shadcn@latest *)
 ---
 
-> **ReUI skill version `668fb463eb`.** If the ReUI MCP's `get_agent_skill` reports a newer `version`, re-run the ReUI installer (see `get_agent_skill` -> `install.recommended`) to update this skill. Cloud/tools-only agents have no local file and always read the latest - they can ignore this.
+> **ReUI skill version `3bdbad788a`.** If the ReUI MCP's `get_agent_skill` reports a newer `version`, re-run the ReUI installer (see `get_agent_skill` -> `install.recommended`) to update this skill. Cloud/tools-only agents have no local file and always read the latest - they can ignore this.
 
 # ReUI for Agents
 

.agents/skills/reui/rules/components.md

@@ -1,6 +1,6 @@
 # ReUI components
 
-The 20 ReUI building blocks: `alert`, `autocomplete`, `badge`, `data-grid`, `date-selector`, `event-calendar`, `filters`, `frame`, `gantt`, `icon-stack`, `icon-tile`, `kanban`, `number-field`, `phone-input`, `rating`, `scrollspy`, `sortable`, `stepper`, `timeline`, `tree`. Examples and blocks are composed from these.
+The 21 ReUI building blocks: `alert`, `autocomplete`, `badge`, `cascader`, `data-grid`, `date-selector`, `event-calendar`, `filters`, `frame`, `gantt`, `icon-stack`, `icon-tile`, `kanban`, `number-field`, `phone-input`, `rating`, `scrollspy`, `sortable`, `stepper`, `timeline`, `tree`. Examples and blocks are composed from these.
 
 **Rule one: never guess a component's API. Read it first.** Call **`get_component(name)`** for its inline `api` (props + usage, no web fetch), and **share the result's `docsUrl`** (the component's API documentation page) with the user whenever you work with that component's API, so they have the full reference (the `/llms.txt` index is a further fallback). Then call **`get_examples(name)`** to install a worked example and copy real composition. The contracts below are first-try orientation (required props, composition shape, the one gotcha); the inline `api` is the full reference. No single block fits? Compose: search the components you need, read each `get_component`, install a `get_examples` example per component, and adapt.
 
@@ -106,22 +106,60 @@ Common mistakes:
 
 ## filters
 
-**Required:** `filters` (`Filter[]`), `fields` (`FilterFieldConfig[]`), `onChange`
+**Required:** `fields` (`FilterField[]`). The value is ONE `FilterQuery` tree - `query` + `onQueryChange`, or uncontrolled `defaultQuery`.
 **Shape:**
 
 ```tsx
-const [filters, setFilters] = useState<Filter[]>([
-  createFilter("priority", "is_any_of", ["low"]),
-])
-const fields: FilterFieldConfig[] = [
-  { key: "priority", label: "Priority", type: "multiselect",
-    options: [{ value: "low", label: "Low" }, { value: "high", label: "High" }] },
+const fields: FilterField[] = [
+  { id: "title", label: "Title", type: "text" },
+  {
+    id: "status",
+    label: "Status",
+    type: "select",
+    options: [
+      { value: "active", label: "Active" },
+      { value: "archived", label: "Archived" },
+    ],
+  },
 ]
+const [query, setQuery] = useState<FilterQuery>(() => createFilterQuery())
 
-<Filters filters={filters} fields={fields} onChange={setFilters} />
+<Filters fields={fields} query={query} onQueryChange={setQuery} />
 ```
 
-**Gotcha:** always build initial filters with `createFilter(field, operator, values)` - it generates the required `id`. Never hand-construct a `Filter` object. Pairs naturally with `data-grid`.
+**Gotcha:** the state is a TREE, not a list of chips. `FilterQuery` is a group of rules joined by `and`/`or` and a group may hold another group, so `(A and B) or C` is expressible; a rule is `{ id, type: "rule", path: ["status"], operator, value }` and `path` is the whole nested attribute path, root first. The pre-rewrite API is GONE: there is no `filters`/`onChange` prop, no `FilterFieldConfig` (fields are `FilterField`, nested through their own `fields`, keyed `id` not `key`), and no `createFilter()` - it minted ids inside a pure function and broke hydration, so ids now come from `createFilterIdFactory(seed)` seeded off `useId`, and `createFilterQuery()` / `createFilterRule()` take one. Read the query back with `flattenFilterConditions` (`{ path, field, operator, values, negated }` per rule, incomplete rules skipped) and walk the tree yourself when the parentheses carry meaning - the primitive compiles nothing, no SQL, no query string.
+
+`variant` picks the chrome over that one query: `"basic"`, the default, is the flat chip row for a toolbar over a table; `"advanced"` is the condition builder, hung off a trigger or rendered in place with `advancedMode="inline"`. Both read and write the same tree, so a saved view built in one opens in the other. Other props worth knowing before you hand-roll them: `size` is two rungs, `"sm" | "default"`, resolved per style (there is no `lg`); `reorderable` turns on drag and Alt+Arrow row moves in the builder; `onBeforeQueryChange` is the ONE veto point for every write (return `false` to refuse, it cannot rewrite); `editors` registers custom value editors a field selects by `editor` name; `labels` / `operatorLabels` own every rendered string; `pathCollapse` + `maxPathSegments` shorten deep attribute paths; `renderChip` / `renderValue` / `renderEmpty` replace rendered parts. On a field, `loadOptions` supplies async options with paging and `resolveValues` renders a chip restored from a saved view whose option was never loaded. Pairs naturally with `data-grid`.
+
+## cascader
+
+**Required:** `items` (a tree of `{ value, label, children? }`), plus the panel parts inside `CascaderContent`.
+**Shape:**
+
+```tsx
+<Cascader items={items} value={value} onValueChange={setValue}>
+  <CascaderTrigger render={<Button variant="outline" />}>
+    <CascaderValue placeholder="Select an attribute" />
+  </CascaderTrigger>
+  <CascaderContent className="w-80">
+    <CascaderPanel>
+      <CascaderNav>
+        <CascaderBreadcrumb />
+        <CascaderInput />
+      </CascaderNav>
+      <CascaderEmpty />
+      <CascaderList maxHeight={288}>
+        <CascaderItems />
+      </CascaderList>
+      <CascaderStatus />
+    </CascaderPanel>
+  </CascaderContent>
+</Cascader>
+```
+
+**Gotcha:** pressing a branch NAVIGATES, it does not select - only leaves are selectable until you pass `selectable="any"` or a predicate, and once a branch is selectable its chevron becomes the only way to open it. `CascaderInput` must stay inside `CascaderContent` (Base UI refills the query from the selection when the input sits outside the popup). Always include `CascaderStatus`: it is the live region announcing level changes, which the visual breadcrumb does not provide to screen readers. Accepts a flat adjacency list via `getParent` as well as nested `children`. `searchScope="deep"` searches every level and annotates results with their path; `multiple` gives checkbox rows; `inline` + a bare `CascaderPanel` embeds it with no popover.
+
+The shape above is `mode="drill"`, the default. `mode="tree"` keeps the same parts (drop `CascaderBreadcrumb`, pass `showBack={false}`, drive expansion with `expanded`/`onExpandedChange`); `mode="columns"` REPLACES `CascaderList` + `CascaderItems` with a single `CascaderColumns`, and has no breadcrumb. Other props worth knowing before you hand-roll them: `cascade` (multi-select only, parent/child selection with indeterminate branches - pair it with `selectable="any"`, since a leaf-only tree can never cascade), `indicator={false}` to drop the single-select check and its gutter (visual only, no-op with `multiple`), `virtualize`/`virtualizeThreshold` plus `CascaderVirtualItems` for long levels, and `getChildren` for async levels with cursor paging, retry on failure and optional `prefetch`. `CascaderFooter` pins commands below the list (`actions` is the quick path) and `CascaderSubmenu` opens one as a side-anchored flyout with the full menu keyboard model. To head a run of rows use `CascaderGroup` wrapping a `CascaderLabel` - a bare label inside a listbox names nothing and is dropped from the accessibility tree - and `CascaderSeparator` for the rule between runs. Every rendered string comes from `labels`, and the panel is RTL-correct under a `DirectionProvider` or `dir="rtl"`.
 
 ## date-selector
 

.claude/skills/reui/SKILL.md

@@ -5,7 +5,7 @@ user-invocable: false
 allowed-tools: Bash(npx shadcn@latest *), Bash(pnpm dlx shadcn@latest *), Bash(bunx --bun shadcn@latest *)
 ---
 
-> **ReUI skill version `668fb463eb`.** If the ReUI MCP's `get_agent_skill` reports a newer `version`, re-run the ReUI installer (see `get_agent_skill` -> `install.recommended`) to update this skill. Cloud/tools-only agents have no local file and always read the latest - they can ignore this.
+> **ReUI skill version `3bdbad788a`.** If the ReUI MCP's `get_agent_skill` reports a newer `version`, re-run the ReUI installer (see `get_agent_skill` -> `install.recommended`) to update this skill. Cloud/tools-only agents have no local file and always read the latest - they can ignore this.
 
 # ReUI for Agents
 

.claude/skills/reui/rules/components.md

@@ -1,6 +1,6 @@
 # ReUI components
 
-The 20 ReUI building blocks: `alert`, `autocomplete`, `badge`, `data-grid`, `date-selector`, `event-calendar`, `filters`, `frame`, `gantt`, `icon-stack`, `icon-tile`, `kanban`, `number-field`, `phone-input`, `rating`, `scrollspy`, `sortable`, `stepper`, `timeline`, `tree`. Examples and blocks are composed from these.
+The 21 ReUI building blocks: `alert`, `autocomplete`, `badge`, `cascader`, `data-grid`, `date-selector`, `event-calendar`, `filters`, `frame`, `gantt`, `icon-stack`, `icon-tile`, `kanban`, `number-field`, `phone-input`, `rating`, `scrollspy`, `sortable`, `stepper`, `timeline`, `tree`. Examples and blocks are composed from these.
 
 **Rule one: never guess a component's API. Read it first.** Call **`get_component(name)`** for its inline `api` (props + usage, no web fetch), and **share the result's `docsUrl`** (the component's API documentation page) with the user whenever you work with that component's API, so they have the full reference (the `/llms.txt` index is a further fallback). Then call **`get_examples(name)`** to install a worked example and copy real composition. The contracts below are first-try orientation (required props, composition shape, the one gotcha); the inline `api` is the full reference. No single block fits? Compose: search the components you need, read each `get_component`, install a `get_examples` example per component, and adapt.
 
@@ -106,22 +106,60 @@ Common mistakes:
 
 ## filters
 
-**Required:** `filters` (`Filter[]`), `fields` (`FilterFieldConfig[]`), `onChange`
+**Required:** `fields` (`FilterField[]`). The value is ONE `FilterQuery` tree - `query` + `onQueryChange`, or uncontrolled `defaultQuery`.
 **Shape:**
 
 ```tsx
-const [filters, setFilters] = useState<Filter[]>([
-  createFilter("priority", "is_any_of", ["low"]),
-])
-const fields: FilterFieldConfig[] = [
-  { key: "priority", label: "Priority", type: "multiselect",
-    options: [{ value: "low", label: "Low" }, { value: "high", label: "High" }] },
+const fields: FilterField[] = [
+  { id: "title", label: "Title", type: "text" },
+  {
+    id: "status",
+    label: "Status",
+    type: "select",
+    options: [
+      { value: "active", label: "Active" },
+      { value: "archived", label: "Archived" },
+    ],
+  },
 ]
+const [query, setQuery] = useState<FilterQuery>(() => createFilterQuery())
 
-<Filters filters={filters} fields={fields} onChange={setFilters} />
+<Filters fields={fields} query={query} onQueryChange={setQuery} />
 ```
 
-**Gotcha:** always build initial filters with `createFilter(field, operator, values)` - it generates the required `id`. Never hand-construct a `Filter` object. Pairs naturally with `data-grid`.
+**Gotcha:** the state is a TREE, not a list of chips. `FilterQuery` is a group of rules joined by `and`/`or` and a group may hold another group, so `(A and B) or C` is expressible; a rule is `{ id, type: "rule", path: ["status"], operator, value }` and `path` is the whole nested attribute path, root first. The pre-rewrite API is GONE: there is no `filters`/`onChange` prop, no `FilterFieldConfig` (fields are `FilterField`, nested through their own `fields`, keyed `id` not `key`), and no `createFilter()` - it minted ids inside a pure function and broke hydration, so ids now come from `createFilterIdFactory(seed)` seeded off `useId`, and `createFilterQuery()` / `createFilterRule()` take one. Read the query back with `flattenFilterConditions` (`{ path, field, operator, values, negated }` per rule, incomplete rules skipped) and walk the tree yourself when the parentheses carry meaning - the primitive compiles nothing, no SQL, no query string.
+
+`variant` picks the chrome over that one query: `"basic"`, the default, is the flat chip row for a toolbar over a table; `"advanced"` is the condition builder, hung off a trigger or rendered in place with `advancedMode="inline"`. Both read and write the same tree, so a saved view built in one opens in the other. Other props worth knowing before you hand-roll them: `size` is two rungs, `"sm" | "default"`, resolved per style (there is no `lg`); `reorderable` turns on drag and Alt+Arrow row moves in the builder; `onBeforeQueryChange` is the ONE veto point for every write (return `false` to refuse, it cannot rewrite); `editors` registers custom value editors a field selects by `editor` name; `labels` / `operatorLabels` own every rendered string; `pathCollapse` + `maxPathSegments` shorten deep attribute paths; `renderChip` / `renderValue` / `renderEmpty` replace rendered parts. On a field, `loadOptions` supplies async options with paging and `resolveValues` renders a chip restored from a saved view whose option was never loaded. Pairs naturally with `data-grid`.
+
+## cascader
+
+**Required:** `items` (a tree of `{ value, label, children? }`), plus the panel parts inside `CascaderContent`.
+**Shape:**
+
+```tsx
+<Cascader items={items} value={value} onValueChange={setValue}>
+  <CascaderTrigger render={<Button variant="outline" />}>
+    <CascaderValue placeholder="Select an attribute" />
+  </CascaderTrigger>
+  <CascaderContent className="w-80">
+    <CascaderPanel>
+      <CascaderNav>
+        <CascaderBreadcrumb />
+        <CascaderInput />
+      </CascaderNav>
+      <CascaderEmpty />
+      <CascaderList maxHeight={288}>
+        <CascaderItems />
+      </CascaderList>
+      <CascaderStatus />
+    </CascaderPanel>
+  </CascaderContent>
+</Cascader>
+```
+
+**Gotcha:** pressing a branch NAVIGATES, it does not select - only leaves are selectable until you pass `selectable="any"` or a predicate, and once a branch is selectable its chevron becomes the only way to open it. `CascaderInput` must stay inside `CascaderContent` (Base UI refills the query from the selection when the input sits outside the popup). Always include `CascaderStatus`: it is the live region announcing level changes, which the visual breadcrumb does not provide to screen readers. Accepts a flat adjacency list via `getParent` as well as nested `children`. `searchScope="deep"` searches every level and annotates results with their path; `multiple` gives checkbox rows; `inline` + a bare `CascaderPanel` embeds it with no popover.
+
+The shape above is `mode="drill"`, the default. `mode="tree"` keeps the same parts (drop `CascaderBreadcrumb`, pass `showBack={false}`, drive expansion with `expanded`/`onExpandedChange`); `mode="columns"` REPLACES `CascaderList` + `CascaderItems` with a single `CascaderColumns`, and has no breadcrumb. Other props worth knowing before you hand-roll them: `cascade` (multi-select only, parent/child selection with indeterminate branches - pair it with `selectable="any"`, since a leaf-only tree can never cascade), `indicator={false}` to drop the single-select check and its gutter (visual only, no-op with `multiple`), `virtualize`/`virtualizeThreshold` plus `CascaderVirtualItems` for long levels, and `getChildren` for async levels with cursor paging, retry on failure and optional `prefetch`. `CascaderFooter` pins commands below the list (`actions` is the quick path) and `CascaderSubmenu` opens one as a side-anchored flyout with the full menu keyboard model. To head a run of rows use `CascaderGroup` wrapping a `CascaderLabel` - a bare label inside a listbox names nothing and is dropped from the accessibility tree - and `CascaderSeparator` for the rule between runs. Every rendered string comes from `labels`, and the panel is RTL-correct under a `DirectionProvider` or `dir="rtl"`.
 
 ## date-selector
 

.cursor/rules/reui.mdc

@@ -6,18 +6,18 @@ alwaysApply: false
 
 ---
 name: reui
-description: Use the ReUI registry from your AI agent - find, install, and correctly use ReUI components (the 17 free building blocks like data-grid, kanban, filters), their free examples, premium blocks, and Motion Icons. Applies in any project using ReUI, the @reui registry, REUI_LICENSE_KEY, or any shadcn project where the user asks for premium blocks, data grids, kanban boards, dashboards, or full pages. Pairs with the free ReUI MCP server for live, scored registry search and inline component APIs.
+description: Use the ReUI registry from your AI agent - find, install, and correctly use ReUI components (the 20 free building blocks like data-grid, kanban, filters), their free examples, premium blocks, and Motion Icons. Applies in any project using ReUI, the @reui registry, REUI_LICENSE_KEY, or any shadcn project where the user asks for premium blocks, data grids, kanban boards, dashboards, or full pages. Pairs with the free ReUI MCP server for live, scored registry search and inline component APIs.
 user-invocable: false
 allowed-tools: Bash(npx shadcn@latest *), Bash(pnpm dlx shadcn@latest *), Bash(bunx --bun shadcn@latest *)
 ---
 
-> **ReUI skill version `42d70dcc3d`.** If the ReUI MCP's `get_agent_skill` reports a newer `version`, re-run the ReUI installer (see `get_agent_skill` -> `install.recommended`) to update this skill. Cloud/tools-only agents have no local file and always read the latest - they can ignore this.
+> **ReUI skill version `3bdbad788a`.** If the ReUI MCP's `get_agent_skill` reports a newer `version`, re-run the ReUI installer (see `get_agent_skill` -> `install.recommended`) to update this skill. Cloud/tools-only agents have no local file and always read the latest - they can ignore this.
 
 # ReUI for Agents
 
 ReUI is a shadcn-compatible registry. It ships four things you **reuse** - never redesign:
 
-- **components** - the 17 ReUI building blocks with real APIs: `data-grid`, `kanban`, `filters`, `date-selector`, `tree`, `stepper`, ... (free)
+- **components** - the 20 ReUI building blocks with real APIs: `data-grid`, `kanban`, `filters`, `date-selector`, `tree`, `stepper`, ... (free)
 - **examples** - free `c-*` single-pattern use-cases of a component (`c-kanban-1`); install one and read it to see exact composition
 - **blocks** - premium full-page sections that compose components (`data-grid-2`, `pricing-page-1`); Pro or Ultimate license at install
 - **icons** - Motion Icons in 4 styles, static + hover-animated variants; Ultimate license at install
@@ -64,7 +64,7 @@ Invocation differs slightly per agent (`/mcp__reui__build` in Claude Code/Cursor
 
 - [rules/registry.md](./rules/registry.md) - the four types, the @reui registry, base/radix, free vs premium + license
 - [rules/workflow.md](./rules/workflow.md) - the find -> install -> read-API -> adapt loop (most important)
-- [rules/components.md](./rules/components.md) - the 17 components, the data-grid contract, base vs radix
+- [rules/components.md](./rules/components.md) - the 20 components, the data-grid contract, base vs radix
 - [rules/adapting.md](./rules/adapting.md) - reuse-first: preserve the design (no over-customizing), reuse examples + a block's own elements, real data, don't invent APIs
 - [rules/craft.md](./rules/craft.md) - make it exceptional: point of view, hierarchy, density, states, responsive, motion, the bar
 - [rules/quality.md](./rules/quality.md) - security, accessibility, and scroll gates (the done gate)

.cursor/skills/reui/SKILL.md

@@ -5,7 +5,7 @@ user-invocable: false
 allowed-tools: Bash(npx shadcn@latest *), Bash(pnpm dlx shadcn@latest *), Bash(bunx --bun shadcn@latest *)
 ---
 
-> **ReUI skill version `668fb463eb`.** If the ReUI MCP's `get_agent_skill` reports a newer `version`, re-run the ReUI installer (see `get_agent_skill` -> `install.recommended`) to update this skill. Cloud/tools-only agents have no local file and always read the latest - they can ignore this.
+> **ReUI skill version `3bdbad788a`.** If the ReUI MCP's `get_agent_skill` reports a newer `version`, re-run the ReUI installer (see `get_agent_skill` -> `install.recommended`) to update this skill. Cloud/tools-only agents have no local file and always read the latest - they can ignore this.
 
 # ReUI for Agents
 

.cursor/skills/reui/rules/components.md

@@ -1,6 +1,6 @@
 # ReUI components
 
-The 20 ReUI building blocks: `alert`, `autocomplete`, `badge`, `data-grid`, `date-selector`, `event-calendar`, `filters`, `frame`, `gantt`, `icon-stack`, `icon-tile`, `kanban`, `number-field`, `phone-input`, `rating`, `scrollspy`, `sortable`, `stepper`, `timeline`, `tree`. Examples and blocks are composed from these.
+The 21 ReUI building blocks: `alert`, `autocomplete`, `badge`, `cascader`, `data-grid`, `date-selector`, `event-calendar`, `filters`, `frame`, `gantt`, `icon-stack`, `icon-tile`, `kanban`, `number-field`, `phone-input`, `rating`, `scrollspy`, `sortable`, `stepper`, `timeline`, `tree`. Examples and blocks are composed from these.
 
 **Rule one: never guess a component's API. Read it first.** Call **`get_component(name)`** for its inline `api` (props + usage, no web fetch), and **share the result's `docsUrl`** (the component's API documentation page) with the user whenever you work with that component's API, so they have the full reference (the `/llms.txt` index is a further fallback). Then call **`get_examples(name)`** to install a worked example and copy real composition. The contracts below are first-try orientation (required props, composition shape, the one gotcha); the inline `api` is the full reference. No single block fits? Compose: search the components you need, read each `get_component`, install a `get_examples` example per component, and adapt.
 
@@ -106,22 +106,60 @@ Common mistakes:
 
 ## filters
 
-**Required:** `filters` (`Filter[]`), `fields` (`FilterFieldConfig[]`), `onChange`
+**Required:** `fields` (`FilterField[]`). The value is ONE `FilterQuery` tree - `query` + `onQueryChange`, or uncontrolled `defaultQuery`.
 **Shape:**
 
 ```tsx
-const [filters, setFilters] = useState<Filter[]>([
-  createFilter("priority", "is_any_of", ["low"]),
-])
-const fields: FilterFieldConfig[] = [
-  { key: "priority", label: "Priority", type: "multiselect",
-    options: [{ value: "low", label: "Low" }, { value: "high", label: "High" }] },
+const fields: FilterField[] = [
+  { id: "title", label: "Title", type: "text" },
+  {
+    id: "status",
+    label: "Status",
+    type: "select",
+    options: [
+      { value: "active", label: "Active" },
+      { value: "archived", label: "Archived" },
+    ],
+  },
 ]
+const [query, setQuery] = useState<FilterQuery>(() => createFilterQuery())
 
-<Filters filters={filters} fields={fields} onChange={setFilters} />
+<Filters fields={fields} query={query} onQueryChange={setQuery} />
 ```
 
-**Gotcha:** always build initial filters with `createFilter(field, operator, values)` - it generates the required `id`. Never hand-construct a `Filter` object. Pairs naturally with `data-grid`.
+**Gotcha:** the state is a TREE, not a list of chips. `FilterQuery` is a group of rules joined by `and`/`or` and a group may hold another group, so `(A and B) or C` is expressible; a rule is `{ id, type: "rule", path: ["status"], operator, value }` and `path` is the whole nested attribute path, root first. The pre-rewrite API is GONE: there is no `filters`/`onChange` prop, no `FilterFieldConfig` (fields are `FilterField`, nested through their own `fields`, keyed `id` not `key`), and no `createFilter()` - it minted ids inside a pure function and broke hydration, so ids now come from `createFilterIdFactory(seed)` seeded off `useId`, and `createFilterQuery()` / `createFilterRule()` take one. Read the query back with `flattenFilterConditions` (`{ path, field, operator, values, negated }` per rule, incomplete rules skipped) and walk the tree yourself when the parentheses carry meaning - the primitive compiles nothing, no SQL, no query string.
+
+`variant` picks the chrome over that one query: `"basic"`, the default, is the flat chip row for a toolbar over a table; `"advanced"` is the condition builder, hung off a trigger or rendered in place with `advancedMode="inline"`. Both read and write the same tree, so a saved view built in one opens in the other. Other props worth knowing before you hand-roll them: `size` is two rungs, `"sm" | "default"`, resolved per style (there is no `lg`); `reorderable` turns on drag and Alt+Arrow row moves in the builder; `onBeforeQueryChange` is the ONE veto point for every write (return `false` to refuse, it cannot rewrite); `editors` registers custom value editors a field selects by `editor` name; `labels` / `operatorLabels` own every rendered string; `pathCollapse` + `maxPathSegments` shorten deep attribute paths; `renderChip` / `renderValue` / `renderEmpty` replace rendered parts. On a field, `loadOptions` supplies async options with paging and `resolveValues` renders a chip restored from a saved view whose option was never loaded. Pairs naturally with `data-grid`.
+
+## cascader
+
+**Required:** `items` (a tree of `{ value, label, children? }`), plus the panel parts inside `CascaderContent`.
+**Shape:**
+
+```tsx
+<Cascader items={items} value={value} onValueChange={setValue}>
+  <CascaderTrigger render={<Button variant="outline" />}>
+    <CascaderValue placeholder="Select an attribute" />
+  </CascaderTrigger>
+  <CascaderContent className="w-80">
+    <CascaderPanel>
+      <CascaderNav>
+        <CascaderBreadcrumb />
+        <CascaderInput />
+      </CascaderNav>
+      <CascaderEmpty />
+      <CascaderList maxHeight={288}>
+        <CascaderItems />
+      </CascaderList>
+      <CascaderStatus />
+    </CascaderPanel>
+  </CascaderContent>
+</Cascader>
+```
+
+**Gotcha:** pressing a branch NAVIGATES, it does not select - only leaves are selectable until you pass `selectable="any"` or a predicate, and once a branch is selectable its chevron becomes the only way to open it. `CascaderInput` must stay inside `CascaderContent` (Base UI refills the query from the selection when the input sits outside the popup). Always include `CascaderStatus`: it is the live region announcing level changes, which the visual breadcrumb does not provide to screen readers. Accepts a flat adjacency list via `getParent` as well as nested `children`. `searchScope="deep"` searches every level and annotates results with their path; `multiple` gives checkbox rows; `inline` + a bare `CascaderPanel` embeds it with no popover.
+
+The shape above is `mode="drill"`, the default. `mode="tree"` keeps the same parts (drop `CascaderBreadcrumb`, pass `showBack={false}`, drive expansion with `expanded`/`onExpandedChange`); `mode="columns"` REPLACES `CascaderList` + `CascaderItems` with a single `CascaderColumns`, and has no breadcrumb. Other props worth knowing before you hand-roll them: `cascade` (multi-select only, parent/child selection with indeterminate branches - pair it with `selectable="any"`, since a leaf-only tree can never cascade), `indicator={false}` to drop the single-select check and its gutter (visual only, no-op with `multiple`), `virtualize`/`virtualizeThreshold` plus `CascaderVirtualItems` for long levels, and `getChildren` for async levels with cursor paging, retry on failure and optional `prefetch`. `CascaderFooter` pins commands below the list (`actions` is the quick path) and `CascaderSubmenu` opens one as a side-anchored flyout with the full menu keyboard model. To head a run of rows use `CascaderGroup` wrapping a `CascaderLabel` - a bare label inside a listbox names nothing and is dropped from the accessibility tree - and `CascaderSeparator` for the rule between runs. Every rendered string comes from `labels`, and the panel is RTL-correct under a `DirectionProvider` or `dir="rtl"`.
 
 ## date-selector
 

.gitea/workflows/quality.yaml

@@ -38,14 +38,11 @@ jobs:
       api:    ${{ steps.detect.outputs.api }}
       docker: ${{ steps.detect.outputs.docker }}
     steps:
-      - if: ${{ inputs.is_pull_request }}
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
+          # Push may contain several commits; github.event.before is then
+          # more than one parent away. fetch-depth: 2 only has HEAD~1.
           fetch-depth: 0
-      - if: ${{ inputs.is_pull_request == false }}
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: 2
       - id: detect
         name: Detect changed paths per module
         env:
@@ -72,12 +69,16 @@ jobs:
             done
           }
 
+          has_commit() {
+            git cat-file -e "${1}^{commit}" 2>/dev/null
+          }
+
           if [ "$IS_PR" = "true" ]; then
             FILES="$(git diff --name-only "$BASE_SHA" "$HEAD_SHA")"
           else
             after="${HEAD_SHA:-$(git rev-parse HEAD)}"
             before="$BEFORE_SHA"
-            if [ -n "$before" ] && [ "$before" != "0000000000000000000000000000000000000000" ]; then
+            if [ -n "$before" ] && [ "$before" != "0000000000000000000000000000000000000000" ] && has_commit "$before"; then
               FILES="$(git diff --name-only "$before" "$after")"
             elif git rev-parse --verify HEAD~1 >/dev/null 2>&1; then
               FILES="$(git diff --name-only HEAD~1 HEAD)"

.opencode/skills/reui/SKILL.md

@@ -5,7 +5,7 @@ user-invocable: false
 allowed-tools: Bash(npx shadcn@latest *), Bash(pnpm dlx shadcn@latest *), Bash(bunx --bun shadcn@latest *)
 ---
 
-> **ReUI skill version `668fb463eb`.** If the ReUI MCP's `get_agent_skill` reports a newer `version`, re-run the ReUI installer (see `get_agent_skill` -> `install.recommended`) to update this skill. Cloud/tools-only agents have no local file and always read the latest - they can ignore this.
+> **ReUI skill version `3bdbad788a`.** If the ReUI MCP's `get_agent_skill` reports a newer `version`, re-run the ReUI installer (see `get_agent_skill` -> `install.recommended`) to update this skill. Cloud/tools-only agents have no local file and always read the latest - they can ignore this.
 
 # ReUI for Agents
 

.opencode/skills/reui/rules/components.md

@@ -1,6 +1,6 @@
 # ReUI components
 
-The 20 ReUI building blocks: `alert`, `autocomplete`, `badge`, `data-grid`, `date-selector`, `event-calendar`, `filters`, `frame`, `gantt`, `icon-stack`, `icon-tile`, `kanban`, `number-field`, `phone-input`, `rating`, `scrollspy`, `sortable`, `stepper`, `timeline`, `tree`. Examples and blocks are composed from these.
+The 21 ReUI building blocks: `alert`, `autocomplete`, `badge`, `cascader`, `data-grid`, `date-selector`, `event-calendar`, `filters`, `frame`, `gantt`, `icon-stack`, `icon-tile`, `kanban`, `number-field`, `phone-input`, `rating`, `scrollspy`, `sortable`, `stepper`, `timeline`, `tree`. Examples and blocks are composed from these.
 
 **Rule one: never guess a component's API. Read it first.** Call **`get_component(name)`** for its inline `api` (props + usage, no web fetch), and **share the result's `docsUrl`** (the component's API documentation page) with the user whenever you work with that component's API, so they have the full reference (the `/llms.txt` index is a further fallback). Then call **`get_examples(name)`** to install a worked example and copy real composition. The contracts below are first-try orientation (required props, composition shape, the one gotcha); the inline `api` is the full reference. No single block fits? Compose: search the components you need, read each `get_component`, install a `get_examples` example per component, and adapt.
 
@@ -106,22 +106,60 @@ Common mistakes:
 
 ## filters
 
-**Required:** `filters` (`Filter[]`), `fields` (`FilterFieldConfig[]`), `onChange`
+**Required:** `fields` (`FilterField[]`). The value is ONE `FilterQuery` tree - `query` + `onQueryChange`, or uncontrolled `defaultQuery`.
 **Shape:**
 
 ```tsx
-const [filters, setFilters] = useState<Filter[]>([
-  createFilter("priority", "is_any_of", ["low"]),
-])
-const fields: FilterFieldConfig[] = [
-  { key: "priority", label: "Priority", type: "multiselect",
-    options: [{ value: "low", label: "Low" }, { value: "high", label: "High" }] },
+const fields: FilterField[] = [
+  { id: "title", label: "Title", type: "text" },
+  {
+    id: "status",
+    label: "Status",
+    type: "select",
+    options: [
+      { value: "active", label: "Active" },
+      { value: "archived", label: "Archived" },
+    ],
+  },
 ]
+const [query, setQuery] = useState<FilterQuery>(() => createFilterQuery())
 
-<Filters filters={filters} fields={fields} onChange={setFilters} />
+<Filters fields={fields} query={query} onQueryChange={setQuery} />
 ```
 
-**Gotcha:** always build initial filters with `createFilter(field, operator, values)` - it generates the required `id`. Never hand-construct a `Filter` object. Pairs naturally with `data-grid`.
+**Gotcha:** the state is a TREE, not a list of chips. `FilterQuery` is a group of rules joined by `and`/`or` and a group may hold another group, so `(A and B) or C` is expressible; a rule is `{ id, type: "rule", path: ["status"], operator, value }` and `path` is the whole nested attribute path, root first. The pre-rewrite API is GONE: there is no `filters`/`onChange` prop, no `FilterFieldConfig` (fields are `FilterField`, nested through their own `fields`, keyed `id` not `key`), and no `createFilter()` - it minted ids inside a pure function and broke hydration, so ids now come from `createFilterIdFactory(seed)` seeded off `useId`, and `createFilterQuery()` / `createFilterRule()` take one. Read the query back with `flattenFilterConditions` (`{ path, field, operator, values, negated }` per rule, incomplete rules skipped) and walk the tree yourself when the parentheses carry meaning - the primitive compiles nothing, no SQL, no query string.
+
+`variant` picks the chrome over that one query: `"basic"`, the default, is the flat chip row for a toolbar over a table; `"advanced"` is the condition builder, hung off a trigger or rendered in place with `advancedMode="inline"`. Both read and write the same tree, so a saved view built in one opens in the other. Other props worth knowing before you hand-roll them: `size` is two rungs, `"sm" | "default"`, resolved per style (there is no `lg`); `reorderable` turns on drag and Alt+Arrow row moves in the builder; `onBeforeQueryChange` is the ONE veto point for every write (return `false` to refuse, it cannot rewrite); `editors` registers custom value editors a field selects by `editor` name; `labels` / `operatorLabels` own every rendered string; `pathCollapse` + `maxPathSegments` shorten deep attribute paths; `renderChip` / `renderValue` / `renderEmpty` replace rendered parts. On a field, `loadOptions` supplies async options with paging and `resolveValues` renders a chip restored from a saved view whose option was never loaded. Pairs naturally with `data-grid`.
+
+## cascader
+
+**Required:** `items` (a tree of `{ value, label, children? }`), plus the panel parts inside `CascaderContent`.
+**Shape:**
+
+```tsx
+<Cascader items={items} value={value} onValueChange={setValue}>
+  <CascaderTrigger render={<Button variant="outline" />}>
+    <CascaderValue placeholder="Select an attribute" />
+  </CascaderTrigger>
+  <CascaderContent className="w-80">
+    <CascaderPanel>
+      <CascaderNav>
+        <CascaderBreadcrumb />
+        <CascaderInput />
+      </CascaderNav>
+      <CascaderEmpty />
+      <CascaderList maxHeight={288}>
+        <CascaderItems />
+      </CascaderList>
+      <CascaderStatus />
+    </CascaderPanel>
+  </CascaderContent>
+</Cascader>
+```
+
+**Gotcha:** pressing a branch NAVIGATES, it does not select - only leaves are selectable until you pass `selectable="any"` or a predicate, and once a branch is selectable its chevron becomes the only way to open it. `CascaderInput` must stay inside `CascaderContent` (Base UI refills the query from the selection when the input sits outside the popup). Always include `CascaderStatus`: it is the live region announcing level changes, which the visual breadcrumb does not provide to screen readers. Accepts a flat adjacency list via `getParent` as well as nested `children`. `searchScope="deep"` searches every level and annotates results with their path; `multiple` gives checkbox rows; `inline` + a bare `CascaderPanel` embeds it with no popover.
+
+The shape above is `mode="drill"`, the default. `mode="tree"` keeps the same parts (drop `CascaderBreadcrumb`, pass `showBack={false}`, drive expansion with `expanded`/`onExpandedChange`); `mode="columns"` REPLACES `CascaderList` + `CascaderItems` with a single `CascaderColumns`, and has no breadcrumb. Other props worth knowing before you hand-roll them: `cascade` (multi-select only, parent/child selection with indeterminate branches - pair it with `selectable="any"`, since a leaf-only tree can never cascade), `indicator={false}` to drop the single-select check and its gutter (visual only, no-op with `multiple`), `virtualize`/`virtualizeThreshold` plus `CascaderVirtualItems` for long levels, and `getChildren` for async levels with cursor paging, retry on failure and optional `prefetch`. `CascaderFooter` pins commands below the list (`actions` is the quick path) and `CascaderSubmenu` opens one as a side-anchored flyout with the full menu keyboard model. To head a run of rows use `CascaderGroup` wrapping a `CascaderLabel` - a bare label inside a listbox names nothing and is dropped from the accessibility tree - and `CascaderSeparator` for the rule between runs. Every rendered string comes from `labels`, and the panel is RTL-correct under a `DirectionProvider` or `dir="rtl"`.
 
 ## date-selector
 

apps/api/package.json

@@ -5,7 +5,7 @@
   "type": "module",
   "scripts": {
     "dev": "tsx watch src/server.ts",
-    "build": "tsup src/server.ts --format esm --dts",
+    "build": "tsup --config tsup.config.ts",
     "start": "node dist/server.js",
     "test": "vitest run"
   },

apps/api/src/app.ts

@@ -35,8 +35,10 @@ import { auditRoutes } from "./routes/audit.js";
 import * as certificateService from "./services/certificate-service.js";
 import {
   createHealthCheckTask,
+  healthEngineFallbacksFromConfig,
   scheduleHealthCheckJob,
 } from "./services/health-check-scheduler.js";
+import { fireEnsureHealthWorker } from "./services/health/health-worker-deploy.js";
 import { AsyncTask, CronJob } from "toad-scheduler";
 
 export interface BuildAppOptions {
@@ -131,6 +133,14 @@ export async function buildApp(opts: BuildAppOptions = {}) {
     app.decorate("reloadHealthCheckJob", () => {
       scheduleHealthCheckJob(app, config, healthTask);
     });
+    if (config.cloudflareApiToken) {
+      fireEnsureHealthWorker(
+        app.db,
+        app.cf,
+        healthEngineFallbacksFromConfig(config),
+        app.log,
+      );
+    }
   }
 
   return app;

apps/api/src/lib/cf-client.ts

@@ -7,6 +7,8 @@ import type {
 } from "@cfdm/shared";
 import { createDnsAdapter } from "./cloudflare/dns-service.js";
 import { createHealthCheckAdapter, type CfHealthCheckPayload } from "./cloudflare/healthcheck-service.js";
+import { createKvAdapter } from "./cloudflare/kv-service.js";
+import { createWorkersAdapter } from "./cloudflare/workers-service.js";
 import { createZoneAdapter } from "./cloudflare/zone-service.js";
 
 export type { CfHealthCheckPayload };
@@ -15,11 +17,21 @@ export class CloudflareClient {
   private readonly zones;
   private readonly dns;
   private readonly healthchecks;
+  private readonly kv;
+  private readonly workers;
+  private readonly token;
 
   constructor(token: string) {
+    this.token = token.trim();
     this.zones = createZoneAdapter(token);
     this.dns = createDnsAdapter(token);
     this.healthchecks = createHealthCheckAdapter(token);
+    this.kv = createKvAdapter(token);
+    this.workers = createWorkersAdapter(token);
+  }
+
+  get isConfigured(): boolean {
+    return this.token.length > 0;
   }
 
   listZones(): Promise<CfZone[]> {
@@ -81,4 +93,45 @@ export class CloudflareClient {
   deleteHealthCheck(zoneId: string, id: string): Promise<void> {
     return this.healthchecks.deleteHealthCheck(zoneId, id);
   }
+
+  listAccounts() {
+    return this.workers.listAccounts();
+  }
+
+  listKvNamespaces(accountId: string) {
+    return this.kv.listNamespaces(accountId);
+  }
+
+  createKvNamespace(accountId: string, title: string) {
+    return this.kv.createNamespace(accountId, title);
+  }
+
+  kvGet(accountId: string, namespaceId: string, key: string) {
+    return this.kv.getValue(accountId, namespaceId, key);
+  }
+
+  kvPut(accountId: string, namespaceId: string, key: string, value: string) {
+    return this.kv.putValue(accountId, namespaceId, key, value);
+  }
+
+  putWorkerScript(opts: {
+    accountId: string;
+    scriptName: string;
+    source: string;
+    kvNamespaceId: string;
+  }) {
+    return this.workers.putScript(opts);
+  }
+
+  putWorkerSchedules(accountId: string, scriptName: string, crons: string[]) {
+    return this.workers.putSchedules(accountId, scriptName, crons);
+  }
+
+  enableWorkersDev(accountId: string, scriptName: string) {
+    return this.workers.enableWorkersDev(accountId, scriptName);
+  }
+
+  getWorkersSubdomain(accountId: string) {
+    return this.workers.getWorkersSubdomain(accountId);
+  }
 }

apps/api/src/lib/cloudflare/http.ts

@@ -17,6 +17,15 @@ export function mapCloudflareFailure(
 ): AppError {
   const lower = message.toLowerCase();
   if (status === 401 || status === 403 || lower.includes("authentication")) {
+    if (
+      operation.includes("workers") ||
+      operation.includes("kv_") ||
+      operation.includes("accounts")
+    ) {
+      return AppError.cloudflareAuthFailed(
+        "Токену нужны права Account: Workers Scripts Write и Workers KV Storage Write. Zone DNS недостаточно.",
+      );
+    }
     return AppError.cloudflareAuthFailed(
       "Cloudflare отклонил токен. Проверьте CLOUDFLARE_API_TOKEN.",
     );
@@ -67,6 +76,40 @@ export async function handleCfResponse<T>(
   return body.result;
 }
 
+/** KV PUT / schedules often return `{ success: true }` without `result`. */
+export async function handleCfSuccess(
+  response: Response,
+  operation: string,
+): Promise<void> {
+  if (response.status === 429) {
+    const wait = parseRetryAfter(response.headers) ?? 5000;
+    throw AppError.rateLimited(
+      `Cloudflare временно ограничил запросы. Повторите через ${Math.ceil(wait / 1000)} с.`,
+    );
+  }
+  const text = await response.text();
+  if (!text) {
+    if (!response.ok) {
+      throw mapCloudflareFailure(operation, response.status, String(response.status));
+    }
+    return;
+  }
+  let body: CfResponse<unknown>;
+  try {
+    body = JSON.parse(text) as CfResponse<unknown>;
+  } catch {
+    if (!response.ok) {
+      throw mapCloudflareFailure(operation, response.status, text.slice(0, 180));
+    }
+    return;
+  }
+  if (!body.success) {
+    const msg =
+      body.errors?.map((e) => e.message).join("; ") ?? "unknown cloudflare error";
+    throw mapCloudflareFailure(operation, response.status, msg);
+  }
+}
+
 export async function cfRequest<T>(
   token: string,
   path: string,

apps/api/src/lib/cloudflare/kv-service.ts

@@ -0,0 +1,100 @@
+import { CF_API_BASE, handleCfResponse, handleCfSuccess, mapCloudflareFailure } from "./http.js";
+
+export interface CfKvNamespace {
+  id: string;
+  title: string;
+}
+
+export function createKvAdapter(token: string) {
+  return {
+    async listNamespaces(accountId: string): Promise<CfKvNamespace[]> {
+      const all: CfKvNamespace[] = [];
+      let page = 1;
+      while (true) {
+        const url = new URL(
+          `${CF_API_BASE}/accounts/${accountId}/storage/kv/namespaces`,
+        );
+        url.searchParams.set("per_page", "100");
+        url.searchParams.set("page", String(page));
+        const response = await fetch(url.toString(), {
+          headers: { Authorization: `Bearer ${token}` },
+          signal: AbortSignal.timeout(30_000),
+        });
+        if (response.status >= 500 || response.status === 429) {
+          throw mapCloudflareFailure("kv_list", response.status, String(response.status));
+        }
+        const batch = await handleCfResponse<CfKvNamespace[]>(response, "kv_list");
+        all.push(...batch);
+        if (batch.length < 100) break;
+        page += 1;
+      }
+      return all;
+    },
+
+    async createNamespace(accountId: string, title: string): Promise<CfKvNamespace> {
+      const response = await fetch(
+        `${CF_API_BASE}/accounts/${accountId}/storage/kv/namespaces`,
+        {
+          method: "POST",
+          headers: {
+            Authorization: `Bearer ${token}`,
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify({ title }),
+          signal: AbortSignal.timeout(30_000),
+        },
+      );
+      if (response.status >= 500 || response.status === 429) {
+        throw mapCloudflareFailure("kv_create", response.status, String(response.status));
+      }
+      return handleCfResponse<CfKvNamespace>(response, "kv_create");
+    },
+
+    async getValue(
+      accountId: string,
+      namespaceId: string,
+      key: string,
+    ): Promise<string | null> {
+      const response = await fetch(
+        `${CF_API_BASE}/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/values/${encodeURIComponent(key)}`,
+        {
+          headers: { Authorization: `Bearer ${token}` },
+          signal: AbortSignal.timeout(30_000),
+        },
+      );
+      if (response.status === 404) return null;
+      if (response.status >= 500 || response.status === 429) {
+        throw mapCloudflareFailure("kv_get", response.status, String(response.status));
+      }
+      if (!response.ok) {
+        const text = await response.text().catch(() => "");
+        throw mapCloudflareFailure("kv_get", response.status, text.slice(0, 180));
+      }
+      return response.text();
+    },
+
+    async putValue(
+      accountId: string,
+      namespaceId: string,
+      key: string,
+      value: string,
+    ): Promise<void> {
+      const response = await fetch(
+        `${CF_API_BASE}/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/values/${encodeURIComponent(key)}`,
+        {
+          method: "PUT",
+          headers: {
+            Authorization: `Bearer ${token}`,
+            "Content-Type": "text/plain",
+          },
+          body: value,
+          signal: AbortSignal.timeout(30_000),
+        },
+      );
+      if (response.status >= 500 || response.status === 429) {
+        throw mapCloudflareFailure("kv_put", response.status, String(response.status));
+      }
+      await handleCfSuccess(response, "kv_put");
+    },
+  };
+}

apps/api/src/lib/cloudflare/workers-service.ts

@@ -0,0 +1,142 @@
+import {
+  CF_API_BASE,
+  handleCfResponse,
+  handleCfSuccess,
+  mapCloudflareFailure,
+} from "./http.js";
+
+export interface CfAccount {
+  id: string;
+  name?: string;
+}
+
+export interface CfWorkersSubdomain {
+  subdomain?: string;
+  enabled?: boolean;
+}
+
+export function createWorkersAdapter(token: string) {
+  return {
+    async listAccounts(): Promise<CfAccount[]> {
+      const response = await fetch(`${CF_API_BASE}/accounts?per_page=50`, {
+        headers: { Authorization: `Bearer ${token}` },
+        signal: AbortSignal.timeout(30_000),
+      });
+      if (response.status >= 500 || response.status === 429) {
+        throw mapCloudflareFailure("list_accounts", response.status, String(response.status));
+      }
+      return handleCfResponse<CfAccount[]>(response, "list_accounts");
+    },
+
+    async putScript(opts: {
+      accountId: string;
+      scriptName: string;
+      source: string;
+      kvNamespaceId: string;
+      filename?: string;
+    }): Promise<void> {
+      const filename = opts.filename ?? "index.mjs";
+      const metadata = {
+        main_module: filename,
+        compatibility_date: "2025-04-01",
+        bindings: [
+          {
+            type: "kv_namespace",
+            name: "HEALTH_KV",
+            namespace_id: opts.kvNamespaceId,
+          },
+        ],
+      };
+      const form = new FormData();
+      form.append(
+        "metadata",
+        new Blob([JSON.stringify(metadata)], { type: "application/json" }),
+      );
+      form.append(
+        filename,
+        new Blob([opts.source], { type: "application/javascript+module" }),
+        filename,
+      );
+      const response = await fetch(
+        `${CF_API_BASE}/accounts/${opts.accountId}/workers/scripts/${opts.scriptName}`,
+        {
+          method: "PUT",
+          headers: { Authorization: `Bearer ${token}` },
+          body: form,
+          signal: AbortSignal.timeout(60_000),
+        },
+      );
+      if (response.status >= 500 || response.status === 429) {
+        throw mapCloudflareFailure("workers_put_script", response.status, String(response.status));
+      }
+      await handleCfSuccess(response, "workers_put_script");
+    },
+
+    async putSchedules(
+      accountId: string,
+      scriptName: string,
+      crons: string[],
+    ): Promise<void> {
+      const response = await fetch(
+        `${CF_API_BASE}/accounts/${accountId}/workers/scripts/${scriptName}/schedules`,
+        {
+          method: "PUT",
+          headers: {
+            Authorization: `Bearer ${token}`,
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify(crons.map((cron) => ({ cron }))),
+          signal: AbortSignal.timeout(30_000),
+        },
+      );
+      if (response.status >= 500 || response.status === 429) {
+        throw mapCloudflareFailure("workers_put_schedules", response.status, String(response.status));
+      }
+      await handleCfSuccess(response, "workers_put_schedules");
+    },
+
+    async enableWorkersDev(
+      accountId: string,
+      scriptName: string,
+    ): Promise<void> {
+      const response = await fetch(
+        `${CF_API_BASE}/accounts/${accountId}/workers/scripts/${scriptName}/subdomain`,
+        {
+          method: "POST",
+          headers: {
+            Authorization: `Bearer ${token}`,
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify({ enabled: true }),
+          signal: AbortSignal.timeout(30_000),
+        },
+      );
+      if (response.status === 409) return;
+      if (response.status >= 500 || response.status === 429) {
+        throw mapCloudflareFailure("workers_subdomain", response.status, String(response.status));
+      }
+      if (!response.ok && response.status !== 200 && response.status !== 201) {
+        await handleCfSuccess(response, "workers_subdomain");
+      }
+    },
+
+    async getWorkersSubdomain(accountId: string): Promise<string | null> {
+      const response = await fetch(
+        `${CF_API_BASE}/accounts/${accountId}/workers/subdomain`,
+        {
+          headers: { Authorization: `Bearer ${token}` },
+          signal: AbortSignal.timeout(30_000),
+        },
+      );
+      if (response.status === 404) return null;
+      if (response.status >= 500 || response.status === 429) {
+        throw mapCloudflareFailure("workers_get_subdomain", response.status, String(response.status));
+      }
+      const result = await handleCfResponse<CfWorkersSubdomain>(
+        response,
+        "workers_get_subdomain",
+      );
+      return result.subdomain?.trim() || null;
+    },
+  };
+}

apps/api/src/lib/globalping-client.ts

@@ -0,0 +1,277 @@
+import type { HealthCheckTarget } from "@cfdm/shared";
+import {
+  clampGlobalpingLimit,
+  parseGlobalpingLocations,
+} from "@cfdm/shared";
+
+export const GLOBALPING_API_ROOT = "https://api.globalping.io";
+export const GLOBALPING_MIN_POLL_MS = 500;
+export const GLOBALPING_UA = "CFDM-health/1.0";
+
+export interface GlobalpingClientOptions {
+  token?: string | null;
+  locations?: string;
+  limit?: number;
+  pollIntervalMs?: number;
+  maxWaitMs?: number;
+  fetchImpl?: typeof fetch;
+}
+
+export interface GlobalpingProbeResult {
+  ok: boolean;
+  latencyMs: number;
+  error: string | null;
+  colo: string | null;
+}
+
+interface MeasurementCreateBody {
+  type: "ping" | "http";
+  target: string;
+  inProgressUpdates: false;
+  limit: number;
+  locations: Array<{ magic: string }>;
+  measurementOptions: Record<string, unknown>;
+}
+
+interface MeasurementProbe {
+  continent?: string;
+  country?: string;
+  city?: string;
+  network?: string;
+}
+
+interface MeasurementResultRow {
+  probe?: MeasurementProbe;
+  result?: {
+    status?: string;
+    statusCode?: number;
+    timings?: { total?: number };
+    stats?: { avg?: number; loss?: number };
+  };
+}
+
+interface MeasurementResponse {
+  id?: string;
+  status?: string;
+  results?: MeasurementResultRow[];
+}
+
+function sleep(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+function locationLabel(probe: MeasurementProbe | undefined): string | null {
+  if (!probe) return null;
+  const city = probe.city?.trim();
+  const country = probe.country?.trim();
+  if (city && country) return `${city}, ${country}`;
+  return city || country || null;
+}
+
+export function buildMeasurementBody(
+  target: HealthCheckTarget,
+  options: GlobalpingClientOptions,
+): MeasurementCreateBody {
+  const limit = clampGlobalpingLimit(options.limit, 3);
+  const locations = parseGlobalpingLocations(options.locations).map((magic) => ({
+    magic,
+  }));
+  const port = target.port ?? (target.type === "http" ? 80 : 80);
+  const ip = String(target.ip || "").trim();
+  const hostname = (target.hostname || ip).trim();
+
+  if (target.type === "http") {
+    const path = target.path?.trim() || "/";
+    const protocol = port === 443 ? "HTTPS" : "HTTP";
+    return {
+      type: "http",
+      target: ip,
+      inProgressUpdates: false,
+      limit,
+      locations,
+      measurementOptions: {
+        protocol,
+        port,
+        request: {
+          method: "GET",
+          host: hostname,
+          path: path.startsWith("/") ? path : `/${path}`,
+        },
+      },
+    };
+  }
+
+  return {
+    type: "ping",
+    target: ip,
+    inProgressUpdates: false,
+    limit,
+    locations,
+    measurementOptions: {
+      protocol: "TCP",
+      port,
+    },
+  };
+}
+
+function rowOk(target: HealthCheckTarget, row: MeasurementResultRow): boolean {
+  const result = row.result;
+  if (!result) return false;
+  const status = String(result.status ?? "").toLowerCase();
+  if (status && status !== "finished") return false;
+  if (target.type === "http") {
+    const code = result.statusCode;
+    if (code == null) return false;
+    if (target.expected_status != null) return code === target.expected_status;
+    return code >= 200 && code < 400;
+  }
+  const loss = result.stats?.loss;
+  if (loss != null && loss >= 100) return false;
+  return status === "finished" || status === "";
+}
+
+function rowLatency(row: MeasurementResultRow): number {
+  const total = row.result?.timings?.total;
+  if (typeof total === "number" && Number.isFinite(total)) return Math.round(total);
+  const avg = row.result?.stats?.avg;
+  if (typeof avg === "number" && Number.isFinite(avg)) return Math.round(avg);
+  return 0;
+}
+
+export function summarizeMeasurement(
+  target: HealthCheckTarget,
+  doc: MeasurementResponse,
+): GlobalpingProbeResult {
+  const rows = doc.results ?? [];
+  if (rows.length === 0) {
+    return {
+      ok: false,
+      latencyMs: 0,
+      error: "Globalping: пустой результат",
+      colo: null,
+    };
+  }
+  const oks = rows.map((row) => rowOk(target, row));
+  const okCount = oks.filter(Boolean).length;
+  const ok = okCount > rows.length / 2;
+  const latencies = rows.map(rowLatency);
+  const latencyMs = Math.round(
+    latencies.reduce((sum, n) => sum + n, 0) / latencies.length,
+  );
+  const colo =
+    locationLabel(rows.find((_, i) => oks[i])?.probe) ??
+    locationLabel(rows[0]?.probe);
+  if (ok) {
+    return { ok: true, latencyMs, error: null, colo };
+  }
+  const expected =
+    target.type === "http" && target.expected_status != null
+      ? `ожидали HTTP ${target.expected_status}`
+      : target.type === "http"
+        ? "ожидали HTTP 2xx/3xx"
+        : "TCP ping с packet loss < 100%";
+  return {
+    ok: false,
+    latencyMs,
+    error: `Globalping: ${okCount}/${rows.length} проб успешны (${expected})`,
+    colo,
+  };
+}
+
+async function parseJson(response: Response): Promise<MeasurementResponse> {
+  try {
+    return (await response.json()) as MeasurementResponse;
+  } catch {
+    return {};
+  }
+}
+
+export async function runGlobalpingMeasurement(
+  target: HealthCheckTarget,
+  options: GlobalpingClientOptions = {},
+): Promise<GlobalpingProbeResult> {
+  const fetchImpl = options.fetchImpl ?? fetch;
+  const pollMs =
+    options.pollIntervalMs === undefined
+      ? GLOBALPING_MIN_POLL_MS
+      : Math.max(0, options.pollIntervalMs);
+  const maxWaitMs = options.maxWaitMs ?? Math.max(target.timeout_ms ?? 3000, 3000) + 15_000;
+  const headers: Record<string, string> = {
+    Accept: "application/json",
+    "Content-Type": "application/json",
+    "User-Agent": GLOBALPING_UA,
+  };
+  const token = options.token?.trim();
+  if (token) headers.Authorization = `Bearer ${token}`;
+
+  const created = await fetchImpl(`${GLOBALPING_API_ROOT}/v1/measurements`, {
+    method: "POST",
+    headers,
+    body: JSON.stringify(buildMeasurementBody(target, options)),
+  });
+  if (created.status === 429) {
+    return {
+      ok: false,
+      latencyMs: 0,
+      error: "Globalping: 429 rate limit",
+      colo: null,
+    };
+  }
+  if (created.status !== 202 && created.status !== 200) {
+    const body = await parseJson(created);
+    return {
+      ok: false,
+      latencyMs: 0,
+      error: `Globalping: HTTP ${created.status}${body.status ? ` (${body.status})` : ""}`,
+      colo: null,
+    };
+  }
+  const createdBody = await parseJson(created);
+  const id = createdBody.id?.trim();
+  if (!id) {
+    return {
+      ok: false,
+      latencyMs: 0,
+      error: "Globalping: нет id измерения",
+      colo: null,
+    };
+  }
+
+  const started = Date.now();
+  while (Date.now() - started < maxWaitMs) {
+    await sleep(pollMs);
+    const polled = await fetchImpl(`${GLOBALPING_API_ROOT}/v1/measurements/${id}`, {
+      method: "GET",
+      headers: {
+        Accept: "application/json",
+        "User-Agent": GLOBALPING_UA,
+        ...(token ? { Authorization: `Bearer ${token}` } : {}),
+      },
+    });
+    if (polled.status === 429) {
+      return {
+        ok: false,
+        latencyMs: 0,
+        error: "Globalping: 429 rate limit",
+        colo: null,
+      };
+    }
+    if (!polled.ok) {
+      return {
+        ok: false,
+        latencyMs: 0,
+        error: `Globalping: HTTP ${polled.status} при опросе`,
+        colo: null,
+      };
+    }
+    const doc = await parseJson(polled);
+    if (String(doc.status ?? "").toLowerCase() === "in-progress") continue;
+    return summarizeMeasurement(target, doc);
+  }
+  return {
+    ok: false,
+    latencyMs: Date.now() - started,
+    error: "Globalping: timeout ожидания measurement",
+    colo: null,
+  };
+}

apps/api/src/routes/health-check.ts

@@ -5,8 +5,9 @@ import * as healthCheckService from "../services/health-check-service.js";
 import * as serviceConfigService from "../services/service-config-service.js";
 import {
   healthEngineFallbacksFromConfig,
-  resolveWorkerProbeConfig,
 } from "../services/health-check-scheduler.js";
+import { mailboxFromSettings } from "../services/health/health-worker-deploy.js";
+import { cronStaleAfterMs } from "../services/health/mailbox.js";
 
 export async function healthCheckRoutes(app: FastifyInstance) {
   app.get("/health-status", async (request) => {
@@ -20,9 +21,10 @@ export async function healthCheckRoutes(app: FastifyInstance) {
 
   app.post("/health-check/run", async (request) => {
     const config = request.server.config;
+    const fallbacks = healthEngineFallbacksFromConfig(config);
     const settings = getAppSettings(
       request.server.db,
-      healthEngineFallbacksFromConfig(config),
+      fallbacks,
     );
     const thresholds = {
       degradedFailures: settings.healthDegradedFailures,
@@ -33,7 +35,8 @@ export async function healthCheckRoutes(app: FastifyInstance) {
     const checked = await healthCheckService.runAllChecks(request.server.db, {
       thresholds,
       probeGapMs: config.healthProbeGapMs,
-      worker: resolveWorkerProbeConfig(request.server.db, config),
+      mailbox: mailboxFromSettings(request.server.db, request.server.cf, fallbacks),
+      staleAfterMs: cronStaleAfterMs(settings.healthCheckCron),
       onStatusChange: async (target, prev, next) => {
         try {
           const label =

apps/api/src/routes/settings.ts

@@ -10,6 +10,7 @@ import {
   assertValidHealthCron,
   healthEngineFallbacksFromConfig,
 } from "../services/health-check-scheduler.js";
+import { ensureHealthWorker } from "../services/health/health-worker-deploy.js";
 
 export async function settingsRoutes(app: FastifyInstance) {
   app.get("/settings", async (request) => {
@@ -40,11 +41,29 @@ export async function settingsRoutes(app: FastifyInstance) {
         "ошибок до down не меньше, чем до degraded",
       );
     }
-    const next = updateAppSettings(request.server.db, body, fallbacks);
+    updateAppSettings(request.server.db, body, fallbacks);
     if (body.healthCheckCron !== undefined) {
       request.server.reloadHealthCheckJob?.();
+      const after = getAppSettings(request.server.db, fallbacks);
+      if (after.healthWorkerKvNamespaceId) {
+        try {
+          await ensureHealthWorker(
+            request.server.db,
+            request.server.cf,
+            fallbacks,
+          );
+        } catch {
+          // error stored in settings
+        }
+      }
     }
-    return next;
+    return getAppSettings(request.server.db, fallbacks);
+  });
+
+  app.post("/settings/health/worker/ensure", async (request) => {
+    const fallbacks = healthEngineFallbacksFromConfig(request.server.config);
+    await ensureHealthWorker(request.server.db, request.server.cf, fallbacks);
+    return getAppSettings(request.server.db, fallbacks);
   });
 
   app.post("/settings/vps-tracker/test", async (request) => {

apps/api/src/services/health-check-scheduler.ts

@@ -3,6 +3,7 @@ import { AsyncTask, CronJob } from "toad-scheduler";
 import {
   getAppSettings,
   getAppSettingsSecrets,
+  updateAppSettings,
   type HealthEngineFallbacks,
 } from "@cfdm/db";
 import { repos } from "@cfdm/db";
@@ -10,6 +11,10 @@ import type { AppConfig } from "../config.js";
 import { AppError } from "../errors.js";
 import * as healthCheckService from "./health-check-service.js";
 import * as serviceConfigService from "./service-config-service.js";
+import {
+  mailboxFromSettings,
+} from "./health/health-worker-deploy.js";
+import { cronStaleAfterMs } from "./health/mailbox.js";
 
 declare module "fastify" {
   interface FastifyInstance {
@@ -33,18 +38,6 @@ export function healthEngineFallbacksFromConfig(
   };
 }
 
-export function resolveWorkerProbeConfig(
-  db: import("@cfdm/db").Db,
-  config: AppConfig,
-): { url: string; token: string } | null {
-  const settings = getAppSettings(db, healthEngineFallbacksFromConfig(config));
-  const secrets = getAppSettingsSecrets(db);
-  const url = settings.healthWorkerUrl.trim();
-  const token = (secrets.healthWorkerToken || config.healthWorkerToken).trim();
-  if (!url || !token) return null;
-  return { url, token };
-}
-
 export function assertValidHealthCron(expr: string): void {
   const cronExpression = expr.trim();
   const parts = cronExpression.split(/\s+/).filter(Boolean);
@@ -78,10 +71,18 @@ export function createHealthCheckTask(
         latencyWarnMs: settings.healthLatencyWarnMs,
         successRecoveries: settings.healthSuccessRecoveries,
       };
+      const mailbox = mailboxFromSettings(app.db, app.cf, fallbacks);
+      const secrets = getAppSettingsSecrets(app.db);
       const n = await healthCheckService.runAllChecks(app.db, {
         thresholds,
         probeGapMs: config.healthProbeGapMs,
-        worker: resolveWorkerProbeConfig(app.db, config),
+        mailbox,
+        staleAfterMs: cronStaleAfterMs(settings.healthCheckCron),
+        globalping: {
+          token: secrets.globalpingToken,
+          locations: secrets.globalpingLocations,
+          limit: secrets.globalpingLimit,
+        },
         onStatusChange: async (target, prev, next) => {
           try {
             const label =
@@ -114,6 +115,13 @@ export function createHealthCheckTask(
           }
         },
       });
+      if (mailbox) {
+        updateAppSettings(
+          app.db,
+          { healthWorkerLastIngestAt: new Date().toISOString() },
+          fallbacks,
+        );
+      }
       const monitors = await healthCheckService.runDomainMonitors(
         app.db,
         thresholds,

apps/api/src/services/health-check-service.ts

@@ -3,14 +3,28 @@ import { resolve4, resolve6 } from "node:dns/promises";
 import { Agent, buildConnector, fetch as undiciFetch } from "undici";
 import type { Db } from "@cfdm/db";
 import { repos } from "@cfdm/db";
-import type { HealthCheckTarget, IpHealthState } from "@cfdm/shared";
+import type { HealthCheckTarget, IpHealthState, HealthCheckProvider } from "@cfdm/shared";
+import {
+  aggregateHealthOk,
+  parseHealthAggregate,
+  targetProviders,
+} from "@cfdm/shared";
 import { AppError } from "../errors.js";
 import { nextHealthState } from "./health/state-machine.js";
 import { LocalHealthCheckProvider } from "./health/local.js";
+import { workerNotConfiguredResult } from "./health/worker.js";
 import {
-  CloudflareWorkerHealthCheckProvider,
-  workerNotConfiguredResult,
-} from "./health/worker.js";
+  globalpingNotConfiguredResult,
+  probeWithGlobalping,
+} from "./health/globalping.js";
+import {
+  buildTargetsDoc,
+  indexResults,
+  isResultsStale,
+  originProbeKey,
+  type HealthMailbox,
+} from "./health/mailbox.js";
+import type { GlobalpingClientOptions } from "../lib/globalping-client.js";
 
 export interface HealthCheckThresholds {
   degradedFailures: number;
@@ -267,8 +281,11 @@ export interface RunAllChecksOptions {
   thresholds: HealthCheckThresholds;
   /** Pause between unique physical probes (default 2000). Same IP is only probed once. */
   probeGapMs?: number;
-  /** Cloudflare Worker URL+token. Missing → cloudflare targets fail, never Local fallback. */
-  worker?: { url: string; token: string } | null;
+  /** KV mailbox with Worker results. Missing → cloudflare targets fail, never Local fallback. */
+  mailbox?: HealthMailbox | null;
+  /** Results older than this are stale (default 10 min). */
+  staleAfterMs?: number;
+  globalping?: GlobalpingClientOptions | null;
   onStatusChange?: (
     target: HealthCheckTarget,
     prevState: IpHealthState | null,
@@ -281,38 +298,115 @@ function sleep(ms: number): Promise<void> {
 }
 
 /**
- * One network hit per key. Group+binding on the same IP share a single TCP/HTTP probe
- * so anti-bot / rate-limit on the origin is not tripped by back-to-back checks.
+ * One network hit per origin+provider. Group+binding on the same IP share a probe.
  */
-export function physicalProbeKey(target: HealthCheckTarget): string {
-  const kind = target.provider === "cloudflare" ? "cloudflare" : "local";
-  const port = target.port ?? (target.type === "http" ? 80 : 80);
-  const ip = String(target.ip || "").trim().toLowerCase();
-  if (target.type === "http") {
-    const path = (target.path?.trim() || "/") || "/";
-    const expected = target.expected_status ?? "";
-    return `${kind}|http|${ip}|${port}|${path}|${expected}`;
-  }
-  if (target.type === "tcp") return `${kind}|tcp|${ip}|${port}`;
-  if (target.type === "ping") {
-    return `${kind}|ping|${String(target.hostname || target.ip || "").trim().toLowerCase()}`;
-  }
-  if (target.type === "dns") {
-    return `${kind}|dns|${String(target.hostname || target.ip || "").trim().toLowerCase()}`;
-  }
-  return `${kind}|${target.type}|${ip}|${port}`;
+export function physicalProbeKey(
+  target: HealthCheckTarget,
+  provider: HealthCheckProvider = target.provider,
+): string {
+  return `${provider}|${originProbeKey(target)}`;
 }
 
-async function executeProbe(
+function logSourceResult(
+  db: Db,
   target: HealthCheckTarget,
-  local: LocalHealthCheckProvider,
-  worker: CloudflareWorkerHealthCheckProvider | null,
-): Promise<ProbeResult> {
-  if (target.provider === "cloudflare") {
-    if (!worker) return workerNotConfiguredResult();
-    return worker.probe(target);
+  provider: HealthCheckProvider,
+  result: ProbeResult,
+): void {
+  repos.insertHealthProbeLog(db, {
+    scope: target.scope,
+    refId: target.ref_id,
+    ip: target.ip,
+    provider,
+    status: result.ok ? "up" : "down",
+    ok: result.ok,
+    latencyMs: result.latencyMs,
+    colo: result.colo ?? null,
+    error: result.error,
+  });
+}
+
+function applyAggregatedStatus(
+  db: Db,
+  target: HealthCheckTarget,
+  sources: Array<{ provider: HealthCheckProvider; result: ProbeResult }>,
+  options: RunAllChecksOptions,
+): void {
+  const policy = parseHealthAggregate(target.aggregate);
+  const oks = sources.map((s) => s.result.ok);
+  const aggregatedOk = aggregateHealthOk(oks, policy);
+  const latencies = sources.map((s) => s.result.latencyMs);
+  const latencyMs = latencies.length
+    ? Math.round(latencies.reduce((sum, n) => sum + n, 0) / latencies.length)
+    : 0;
+  const colo =
+    sources.find((s) => s.result.colo)?.result.colo ??
+    sources[0]?.result.colo ??
+    null;
+  const error = aggregatedOk
+    ? null
+    : sources
+        .map((s) => s.result.error)
+        .filter((msg): msg is string => Boolean(msg))
+        .join("; ") || "health aggregate down";
+  const statusProvider =
+    sources.length > 1 ? "aggregate" : (sources[0]?.provider ?? target.provider);
+
+  const prev = repos.getIpHealthStatusRow(
+    db,
+    target.scope,
+    target.ref_id,
+    target.ip,
+  );
+  const { state, failures, successes, node } = deriveState(
+    aggregatedOk,
+    latencyMs,
+    prev
+      ? {
+          consecutive_failures: prev.consecutive_failures,
+          consecutive_successes: prev.consecutive_successes,
+          status: prev.status,
+        }
+      : null,
+    options.thresholds,
+  );
+  const prevState: IpHealthState | null = prev
+    ? (prev.status as IpHealthState)
+    : null;
+  repos.upsertIpHealthStatus(
+    db,
+    target.scope,
+    target.ref_id,
+    target.ip,
+    state,
+    latencyMs,
+    failures,
+    error,
+    successes,
+    { colo, provider: statusProvider },
+  );
+  const matchedNode = repos.findNodeByIp(db, target.ip);
+  if (matchedNode && matchedNode.enabled) {
+    repos.updateNode(db, matchedNode.id, {
+      health_status: node,
+      consecutive_failures: failures,
+      consecutive_successes: successes,
+      last_check_at: new Date().toISOString().replace("T", " ").slice(0, 19),
+      last_failure_reason: error,
+    });
   }
-  return local.probe(target);
+  if (prevState !== state) {
+    options.onStatusChange?.(target, prevState, state);
+  }
+}
+
+function staleWorkerResult(colo: string | null): ProbeResult {
+  return {
+    ok: false,
+    latencyMs: 0,
+    error: "Cloudflare Worker: результаты устарели или KV пуст",
+    colo,
+  };
 }
 
 export async function runAllChecks(
@@ -322,93 +416,106 @@ export async function runAllChecks(
   const targets = repos.listHealthCheckTargets(db);
   const gapMs = Math.max(0, options.probeGapMs ?? 2000);
   const local = new LocalHealthCheckProvider();
-  const worker =
-    options.worker?.url && options.worker.token
-      ? new CloudflareWorkerHealthCheckProvider(options.worker)
-      : null;
+  const staleAfterMs = options.staleAfterMs ?? 10 * 60_000;
 
-  const byPhysical = new Map<string, HealthCheckTarget[]>();
+  const byOrigin = new Map<string, HealthCheckTarget[]>();
   for (const target of targets) {
-    const key = physicalProbeKey(target);
-    const list = byPhysical.get(key);
+    const key = originProbeKey(target);
+    const list = byOrigin.get(key);
     if (list) list.push(target);
-    else byPhysical.set(key, [target]);
+    else byOrigin.set(key, [target]);
   }
 
-  let probeIndex = 0;
-  for (const group of byPhysical.values()) {
-    if (probeIndex > 0 && gapMs > 0) {
-      await sleep(gapMs);
+  const needsCloudflare = targets.some((t) =>
+    targetProviders(t).includes("cloudflare"),
+  );
+  let mailboxResults = new Map<string, { ok: boolean; latencyMs: number; error: string | null }>();
+  let mailboxColo: string | null = null;
+  let mailboxStale = true;
+  const mailbox = options.mailbox ?? null;
+  if (needsCloudflare) {
+    const resultsDoc = mailbox ? await mailbox.getResults() : null;
+    mailboxResults = indexResults(resultsDoc);
+    mailboxStale = !mailbox || isResultsStale(resultsDoc, staleAfterMs);
+    mailboxColo = resultsDoc?.colo ?? null;
+    if (mailbox) {
+      try {
+        const next = buildTargetsDoc(targets);
+        const current = await mailbox.getTargets();
+        if (current?.fingerprint !== next.fingerprint) {
+          await mailbox.putTargets(next);
+        }
+      } catch {
+        // ingest still proceeds
+      }
     }
-    probeIndex += 1;
+  }
 
-    // Prefer binding hostname for SNI when several scopes share one IP.
+  const probeCache = new Map<string, ProbeResult>();
+  let probeIndex = 0;
+
+  async function resolveProvider(
+    provider: HealthCheckProvider,
+    representative: HealthCheckTarget,
+    originKey: string,
+  ): Promise<ProbeResult> {
+    const cacheKey = `${provider}|${originKey}`;
+    const cached = probeCache.get(cacheKey);
+    if (cached) return cached;
+
+    let result: ProbeResult;
+    if (provider === "local") {
+      if (probeIndex > 0 && gapMs > 0) await sleep(gapMs);
+      probeIndex += 1;
+      result = await local.probe(representative);
+    } else if (provider === "cloudflare") {
+      const item = mailboxResults.get(originKey);
+      if (!mailbox) result = workerNotConfiguredResult();
+      else if (mailboxStale || !item) result = staleWorkerResult(mailboxColo);
+      else {
+        result = {
+          ok: item.ok,
+          latencyMs: item.latencyMs,
+          error: item.error,
+          colo: mailboxColo,
+        };
+      }
+    } else {
+      if (!options.globalping?.token?.trim()) {
+        result = globalpingNotConfiguredResult();
+      } else {
+        if (probeIndex > 0 && gapMs > 0) await sleep(gapMs);
+        probeIndex += 1;
+        result = await probeWithGlobalping(representative, options.globalping);
+      }
+    }
+    probeCache.set(cacheKey, result);
+    return result;
+  }
+
+  for (const [originKey, group] of byOrigin) {
     const representative =
       group.find((t) => t.scope === "binding") ?? group[0]!;
-    const result = await executeProbe(representative, local, worker);
-
+    const needed = new Set<HealthCheckProvider>();
     for (const target of group) {
-      const prev = repos.getIpHealthStatusRow(
-        db,
-        target.scope,
-        target.ref_id,
-        target.ip,
-      );
-      const { state, failures, successes, node } = deriveState(
-        result.ok,
-        result.latencyMs,
-        prev
-          ? {
-              consecutive_failures: prev.consecutive_failures,
-              consecutive_successes: prev.consecutive_successes,
-              status: prev.status,
-            }
-          : null,
-        options.thresholds,
-      );
-      const prevState: IpHealthState | null = prev
-        ? (prev.status as IpHealthState)
-        : null;
-      const provider = target.provider === "cloudflare" ? "cloudflare" : "local";
-      repos.upsertIpHealthStatus(
-        db,
-        target.scope,
-        target.ref_id,
-        target.ip,
-        state,
-        result.latencyMs,
-        failures,
-        result.error,
-        successes,
-        { colo: result.colo ?? null, provider },
-      );
-      repos.insertHealthProbeLog(db, {
-        scope: target.scope,
-        refId: target.ref_id,
-        ip: target.ip,
+      for (const provider of targetProviders(target)) needed.add(provider);
+    }
+    for (const provider of needed) {
+      await resolveProvider(provider, representative, originKey);
+    }
+    for (const target of group) {
+      const providers = targetProviders(target);
+      const sources = providers.map((provider) => ({
         provider,
-        status: state,
-        ok: result.ok,
-        latencyMs: result.latencyMs,
-        colo: result.colo ?? null,
-        error: result.error,
-      });
-      const matchedNode = repos.findNodeByIp(db, target.ip);
-      if (matchedNode && matchedNode.enabled) {
-        repos.updateNode(db, matchedNode.id, {
-          health_status: node,
-          consecutive_failures: failures,
-          consecutive_successes: successes,
-          last_check_at: new Date().toISOString().replace("T", " ").slice(0, 19),
-          last_failure_reason: result.error,
-        });
-      }
-      if (prevState !== state) {
-        options.onStatusChange?.(target, prevState, state);
+        result: probeCache.get(`${provider}|${originKey}`)!,
+      }));
+      for (const source of sources) {
+        logSourceResult(db, target, source.provider, source.result);
       }
+      applyAggregatedStatus(db, target, sources, options);
     }
   }
-  // Orphan rows (old IPs / hostname keys) still feed MAX latency on group badge.
+
   repos.pruneStaleIpHealthStatus(db, targets);
   return targets.length;
 }
@@ -432,6 +539,8 @@ export async function runDomainMonitors(
       timeout_ms: monitor.timeout_ms,
       verify_tls: false,
       provider: "local",
+      providers: ["local"],
+      aggregate: "majority",
     };
     let result: ProbeResult;
     if (monitor.type === "http") {

apps/api/src/services/health/globalping.ts

@@ -0,0 +1,40 @@
+import type { HealthCheckTarget } from "@cfdm/shared";
+import {
+  runGlobalpingMeasurement,
+  type GlobalpingClientOptions,
+} from "../../lib/globalping-client.js";
+import type { ProbeResult } from "../health-check-service.js";
+
+export function globalpingNotConfiguredResult(): ProbeResult {
+  return {
+    ok: false,
+    latencyMs: 0,
+    error: "Globalping: токен не задан",
+    colo: null,
+  };
+}
+
+export async function probeWithGlobalping(
+  target: HealthCheckTarget,
+  options: GlobalpingClientOptions,
+): Promise<ProbeResult> {
+  if (!options.token?.trim()) {
+    return globalpingNotConfiguredResult();
+  }
+  try {
+    const result = await runGlobalpingMeasurement(target, options);
+    return {
+      ok: result.ok,
+      latencyMs: result.latencyMs,
+      error: result.error,
+      colo: result.colo,
+    };
+  } catch (err) {
+    return {
+      ok: false,
+      latencyMs: 0,
+      error: err instanceof Error ? err.message : "Globalping: ошибка запроса",
+      colo: null,
+    };
+  }
+}

apps/api/src/services/health/health-probe-script.ts

@@ -0,0 +1,21 @@
+import { existsSync, readFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+
+export function loadHealthProbeWorkerSource(): string {
+  const dir = dirname(fileURLToPath(import.meta.url));
+  const candidates = [
+    join(dir, "health-probe-worker.mjs"),
+    join(process.cwd(), "dist/health-probe-worker.mjs"),
+    join(process.cwd(), "health-probe-worker.mjs"),
+    join(dir, "../../../../../workers/health-probe/src/index.mjs"),
+    join(process.cwd(), "../../workers/health-probe/src/index.mjs"),
+    join(process.cwd(), "workers/health-probe/src/index.mjs"),
+  ];
+  for (const path of candidates) {
+    if (existsSync(path)) {
+      return readFileSync(path, "utf8");
+    }
+  }
+  throw new Error("не найден исходник Worker health-probe");
+}

apps/api/src/services/health/health-worker-deploy.ts

@@ -0,0 +1,185 @@
+import { getAppSettings, repos, updateAppSettings, type HealthEngineFallbacks } from "@cfdm/db";
+import type { Db } from "@cfdm/db";
+import { HEALTH_PROBE_KV_TITLE, HEALTH_PROBE_SCRIPT_NAME, targetHasProvider } from "@cfdm/shared";
+import type { CloudflareClient } from "../../lib/cf-client.js";
+import { AppError } from "../../errors.js";
+import { loadHealthProbeWorkerSource } from "./health-probe-script.js";
+import {
+  buildTargetsDoc,
+  createCloudflareKvMailbox,
+  toCloudflareCron,
+  type HealthMailbox,
+} from "./mailbox.js";
+
+export const DEFAULT_HEALTH_FALLBACKS: HealthEngineFallbacks = {
+  healthCheckCron: "0 */2 * * * *",
+  healthDegradedFailures: 1,
+  healthDownFailures: 2,
+  healthLatencyWarnMs: 1000,
+  healthSuccessRecoveries: 2,
+  healthWorkerUrl: "",
+  healthWorkerTokenSet: false,
+};
+
+export async function resolveAccountId(
+  cf: CloudflareClient,
+  db: Db,
+  cached?: string | null,
+): Promise<string> {
+  const trimmed = cached?.trim();
+  if (trimmed) return trimmed;
+  const domains = repos.listDomains(db);
+  for (const domain of domains) {
+    if (!domain.cf_zone_id) continue;
+    try {
+      const zone = await cf.getZone(domain.cf_zone_id);
+      const id = zone.account?.id?.trim();
+      if (id) return id;
+    } catch {
+      // try next zone / accounts list
+    }
+  }
+  const accounts = await cf.listAccounts();
+  const id = accounts[0]?.id?.trim();
+  if (!id) {
+    throw AppError.cloudflare(
+      "Не удалось определить Cloudflare account_id. Добавьте зону или расширьте права токена (Account Settings Read).",
+    );
+  }
+  return id;
+}
+
+export async function ensureKvNamespace(
+  cf: CloudflareClient,
+  accountId: string,
+  existingId?: string | null,
+): Promise<string> {
+  if (existingId?.trim()) return existingId.trim();
+  const listed = await cf.listKvNamespaces(accountId);
+  const found = listed.find((ns) => ns.title === HEALTH_PROBE_KV_TITLE);
+  if (found?.id) return found.id;
+  const created = await cf.createKvNamespace(accountId, HEALTH_PROBE_KV_TITLE);
+  if (!created.id) {
+    throw AppError.cloudflare("Cloudflare не вернул id KV namespace");
+  }
+  return created.id;
+}
+
+export async function ensureHealthWorker(
+  db: Db,
+  cf: CloudflareClient,
+  fallbacks: HealthEngineFallbacks,
+): Promise<{ url: string; kvNamespaceId: string; accountId: string }> {
+  const settings = getAppSettings(db, fallbacks);
+  try {
+    const accountId = await resolveAccountId(cf, db, settings.healthWorkerAccountId);
+    const kvNamespaceId = await ensureKvNamespace(
+      cf,
+      accountId,
+      settings.healthWorkerKvNamespaceId,
+    );
+    const source = loadHealthProbeWorkerSource();
+    await cf.putWorkerScript({
+      accountId,
+      scriptName: HEALTH_PROBE_SCRIPT_NAME,
+      source,
+      kvNamespaceId,
+    });
+    await cf.putWorkerSchedules(accountId, HEALTH_PROBE_SCRIPT_NAME, [
+      toCloudflareCron(settings.healthCheckCron),
+    ]);
+    try {
+      await cf.enableWorkersDev(accountId, HEALTH_PROBE_SCRIPT_NAME);
+    } catch {
+      // workers.dev may already be on
+    }
+    const subdomain = await cf.getWorkersSubdomain(accountId);
+    const url = subdomain
+      ? `https://${HEALTH_PROBE_SCRIPT_NAME}.${subdomain}.workers.dev`
+      : settings.healthWorkerUrl || `https://${HEALTH_PROBE_SCRIPT_NAME}.workers.dev`;
+
+    updateAppSettings(
+      db,
+      {
+        healthWorkerAccountId: accountId,
+        healthWorkerKvNamespaceId: kvNamespaceId,
+        healthWorkerUrl: url,
+        healthWorkerError: null,
+        healthWorkerDeployedAt: new Date().toISOString(),
+      },
+      fallbacks,
+    );
+
+    await syncCloudflareTargetsToKv(db, cf, fallbacks);
+    return { url, kvNamespaceId, accountId };
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    updateAppSettings(db, { healthWorkerError: message }, fallbacks);
+    throw err;
+  }
+}
+
+export async function maybeEnsureHealthWorker(
+  db: Db,
+  cf: CloudflareClient,
+  fallbacks: HealthEngineFallbacks,
+): Promise<void> {
+  const hasCloudflare = repos
+    .listHealthCheckTargets(db)
+    .some((target) => targetHasProvider(target, "cloudflare"));
+  if (!hasCloudflare) return;
+  const settings = getAppSettings(db, fallbacks);
+  if (settings.healthWorkerKvNamespaceId.trim() && !settings.healthWorkerError) {
+    await syncCloudflareTargetsToKv(db, cf, fallbacks);
+    return;
+  }
+  await ensureHealthWorker(db, cf, fallbacks);
+}
+
+export function mailboxFromSettings(
+  db: Db,
+  cf: CloudflareClient,
+  fallbacks: HealthEngineFallbacks,
+): HealthMailbox | null {
+  const settings = getAppSettings(db, fallbacks);
+  const accountId = settings.healthWorkerAccountId.trim();
+  const ns = settings.healthWorkerKvNamespaceId.trim();
+  if (!accountId || !ns) return null;
+  return createCloudflareKvMailbox(cf, accountId, ns);
+}
+
+export async function syncCloudflareTargetsToKv(
+  db: Db,
+  cf: CloudflareClient,
+  fallbacks: HealthEngineFallbacks,
+  mailbox?: HealthMailbox | null,
+): Promise<void> {
+  const box = mailbox ?? mailboxFromSettings(db, cf, fallbacks);
+  if (!box) return;
+  const next = buildTargetsDoc(repos.listHealthCheckTargets(db));
+  const current = await box.getTargets();
+  if (current?.fingerprint === next.fingerprint) return;
+  await box.putTargets(next);
+}
+
+export function fireEnsureHealthWorker(
+  db: Db,
+  cf: CloudflareClient,
+  fallbacks: HealthEngineFallbacks,
+  log?: { warn: (obj: unknown, msg: string) => void },
+): void {
+  if (process.env.VITEST) return;
+  if (!cf.isConfigured) return;
+  const hasCloudflare = repos
+    .listHealthCheckTargets(db)
+    .some((target) => targetHasProvider(target, "cloudflare"));
+  if (!hasCloudflare) {
+    void syncCloudflareTargetsToKv(db, cf, fallbacks).catch((err) => {
+      log?.warn({ err }, "health worker KV sync failed");
+    });
+    return;
+  }
+  void maybeEnsureHealthWorker(db, cf, fallbacks).catch((err) => {
+    log?.warn({ err }, "health worker ensure failed");
+  });
+}

apps/api/src/services/health/mailbox.ts

@@ -0,0 +1,145 @@
+import type {
+  HealthCheckTarget,
+  HealthProbeResultItem,
+  HealthProbeResultsDoc,
+  HealthProbeTargetItem,
+  HealthProbeTargetsDoc,
+} from "@cfdm/shared";
+import { HEALTH_KV_RESULTS_KEY, HEALTH_KV_TARGETS_KEY, targetHasProvider } from "@cfdm/shared";
+import type { CloudflareClient } from "../../lib/cf-client.js";
+
+export interface HealthMailbox {
+  getTargets(): Promise<HealthProbeTargetsDoc | null>;
+  putTargets(doc: HealthProbeTargetsDoc): Promise<void>;
+  getResults(): Promise<HealthProbeResultsDoc | null>;
+}
+
+export function createCloudflareKvMailbox(
+  cf: CloudflareClient,
+  accountId: string,
+  namespaceId: string,
+): HealthMailbox {
+  return {
+    async getTargets() {
+      return readJson<HealthProbeTargetsDoc>(cf, accountId, namespaceId, HEALTH_KV_TARGETS_KEY);
+    },
+    async putTargets(doc) {
+      await cf.kvPut(accountId, namespaceId, HEALTH_KV_TARGETS_KEY, JSON.stringify(doc));
+    },
+    async getResults() {
+      return readJson<HealthProbeResultsDoc>(cf, accountId, namespaceId, HEALTH_KV_RESULTS_KEY);
+    },
+  };
+}
+
+async function readJson<T>(
+  cf: CloudflareClient,
+  accountId: string,
+  namespaceId: string,
+  key: string,
+): Promise<T | null> {
+  const raw = await cf.kvGet(accountId, namespaceId, key);
+  if (!raw) return null;
+  try {
+    return JSON.parse(raw) as T;
+  } catch {
+    return null;
+  }
+}
+
+export function originProbeKey(target: HealthCheckTarget): string {
+  const port = target.port ?? (target.type === "http" ? 80 : 80);
+  const ip = String(target.ip || "").trim().toLowerCase();
+  if (target.type === "http") {
+    const path = (target.path?.trim() || "/") || "/";
+    const expected = target.expected_status ?? "";
+    return `http|${ip}|${port}|${path}|${expected}`;
+  }
+  if (target.type === "tcp") return `tcp|${ip}|${port}`;
+  if (target.type === "ping") {
+    return `ping|${String(target.hostname || target.ip || "").trim().toLowerCase()}`;
+  }
+  if (target.type === "dns") {
+    return `dns|${String(target.hostname || target.ip || "").trim().toLowerCase()}`;
+  }
+  return `${target.type}|${ip}|${port}`;
+}
+
+export function cloudflareMailboxTargets(
+  targets: HealthCheckTarget[],
+): HealthProbeTargetItem[] {
+  const unique = new Map<string, HealthProbeTargetItem>();
+  for (const target of targets) {
+    if (!targetHasProvider(target, "cloudflare")) continue;
+    if (target.type !== "tcp" && target.type !== "http") continue;
+    const key = originProbeKey(target);
+    if (unique.has(key)) continue;
+    unique.set(key, {
+      key,
+      ip: target.ip,
+      hostname: target.hostname || target.ip,
+      type: target.type,
+      port: target.port ?? (target.type === "http" ? 80 : 80),
+      path: target.path ?? "/",
+      expectedStatus: target.expected_status,
+      timeoutMs: target.timeout_ms ?? 3000,
+      verifyTls: Boolean(target.verify_tls),
+    });
+  }
+  return [...unique.values()].sort((a, b) => a.key.localeCompare(b.key));
+}
+
+export function fingerprintTargets(items: HealthProbeTargetItem[]): string {
+  return items
+    .map(
+      (item) =>
+        `${item.key}|${item.hostname}|${item.timeoutMs ?? ""}|${item.verifyTls ? "1" : "0"}`,
+    )
+    .join(";");
+}
+
+export function buildTargetsDoc(targets: HealthCheckTarget[]): HealthProbeTargetsDoc {
+  const items = cloudflareMailboxTargets(targets);
+  return {
+    fingerprint: fingerprintTargets(items),
+    updatedAt: new Date().toISOString(),
+    items,
+  };
+}
+
+export function indexResults(
+  doc: HealthProbeResultsDoc | null,
+): Map<string, HealthProbeResultItem> {
+  const map = new Map<string, HealthProbeResultItem>();
+  if (!doc?.items) return map;
+  for (const item of doc.items) {
+    map.set(item.key, item);
+  }
+  return map;
+}
+
+export function isResultsStale(doc: HealthProbeResultsDoc | null, staleAfterMs: number): boolean {
+  if (!doc?.probedAt) return true;
+  const ts = Date.parse(doc.probedAt);
+  if (!Number.isFinite(ts)) return true;
+  return Date.now() - ts > staleAfterMs;
+}
+
+/** Drop seconds from toad 6-field cron for Cloudflare Workers (5-field). */
+export function toCloudflareCron(expr: string): string {
+  const parts = expr.trim().split(/\s+/).filter(Boolean);
+  if (parts.length === 6) return parts.slice(1).join(" ");
+  if (parts.length === 5) return parts.join(" ");
+  throw new Error("некорректное cron-выражение");
+}
+
+export function cronStaleAfterMs(expr: string): number {
+  const cf = toCloudflareCron(expr);
+  const minute = cf.split(/\s+/)[0] ?? "*";
+  if (minute.startsWith("*/")) {
+    const n = Number(minute.slice(2));
+    if (Number.isFinite(n) && n > 0) return Math.max(n * 2, 5) * 60_000;
+  }
+  if (minute === "*") return 10 * 60_000;
+  return 10 * 60_000;
+}

apps/api/src/services/health/worker.ts

@@ -1,93 +1,13 @@
-import type { HealthCheckTarget } from "@cfdm/shared";
-import type { ProbeResult } from "../health-check-service.js";
-import type { HealthCheckProvider } from "./provider.js";
-
-export interface WorkerProbeConfig {
-  url: string;
-  token: string;
-}
-
-const WORKER_NOT_CONFIGURED = "Cloudflare Worker не настроен (URL и токен)";
-
-export class CloudflareWorkerHealthCheckProvider implements HealthCheckProvider {
-  readonly kind = "cloudflare" as const;
-
-  constructor(private readonly config: WorkerProbeConfig) {}
-
-  async probe(target: HealthCheckTarget): Promise<ProbeResult> {
-    const base = this.config.url.replace(/\/$/, "");
-    if (!base || !this.config.token) {
-      return {
-        ok: false,
-        latencyMs: 0,
-        error: WORKER_NOT_CONFIGURED,
-        colo: null,
-      };
-    }
-    const timeoutMs = Math.max(100, target.timeout_ms ?? 3000);
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), timeoutMs + 2500);
-    try {
-      const res = await fetch(`${base}/probe`, {
-        method: "POST",
-        headers: {
-          Authorization: `Bearer ${this.config.token}`,
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-          type: target.type === "http" ? "http" : "tcp",
-          ip: target.ip,
-          hostname: target.hostname,
-          port: target.port ?? (target.type === "http" ? 80 : 80),
-          path: target.path ?? "/",
-          expected_status: target.expected_status,
-          timeout_ms: timeoutMs,
-          verify_tls: Boolean(target.verify_tls),
-          method: "GET",
-        }),
-        signal: controller.signal,
-      });
-      if (!res.ok) {
-        const text = await res.text().catch(() => "");
-        return {
-          ok: false,
-          latencyMs: 0,
-          error: `Worker HTTP ${res.status}${text ? `: ${text.slice(0, 180)}` : ""}`,
-          colo: null,
-        };
-      }
-      const body = (await res.json()) as {
-        ok?: boolean;
-        latencyMs?: number;
-        error?: string | null;
-        colo?: string | null;
-      };
-      const ok = Boolean(body.ok);
-      return {
-        ok,
-        latencyMs: typeof body.latencyMs === "number" ? body.latencyMs : 0,
-        error: ok ? null : (body.error ?? "probe failed"),
-        colo: body.colo ?? null,
-      };
-    } catch (err) {
-      const message =
-        err instanceof Error
-          ? err.name === "AbortError"
-            ? "Worker timeout"
-            : err.message
-          : "Worker probe failed";
-      return { ok: false, latencyMs: 0, error: message, colo: null };
-    } finally {
-      clearTimeout(timer);
-    }
-  }
-}
-
-export function workerNotConfiguredResult(): ProbeResult {
+export function workerNotConfiguredResult(): {
+  ok: false;
+  latencyMs: number;
+  error: string;
+  colo: null;
+} {
   return {
     ok: false,
     latencyMs: 0,
-    error: WORKER_NOT_CONFIGURED,
+    error: "Cloudflare Worker не настроен (нет KV mailbox)",
     colo: null,
   };
 }

apps/api/src/services/service-config-service.ts

@@ -2,6 +2,8 @@ import type { Db } from "@cfdm/db";
 import { repos } from "@cfdm/db";
 import type {
   DnsRecord,
+  HealthCheckAggregate,
+  HealthCheckProvider,
   HealthCheckScope,
   HealthCheckType,
   IpHealthState,
@@ -24,6 +26,7 @@ import { isValidIpv4 } from "../lib/validators.js";
 import * as dnsService from "./dns-service.js";
 import * as domainService from "./domain-service.js";
 import { syncServiceToVpsTracker } from "./vps-tracker-sync.js";
+import { fireEnsureHealthWorker, DEFAULT_HEALTH_FALLBACKS } from "./health/health-worker-deploy.js";
 import {
   selectActiveIpsByMode,
   withBindingLock,
@@ -50,7 +53,9 @@ export interface ServiceDomainInput {
   health_check_interval_sec?: number;
   health_check_timeout_ms?: number;
   health_check_verify_tls?: boolean;
-  health_check_provider?: "local" | "cloudflare";
+  health_check_provider?: HealthCheckProvider;
+  health_check_providers?: HealthCheckProvider[];
+  health_check_aggregate?: HealthCheckAggregate;
 }
 
 export interface ToggleRequest {
@@ -71,7 +76,9 @@ export interface ServiceGroupBody {
   health_check_interval_sec?: number;
   health_check_timeout_ms?: number;
   health_check_verify_tls?: boolean;
-  health_check_provider?: "local" | "cloudflare";
+  health_check_provider?: HealthCheckProvider;
+  health_check_providers?: HealthCheckProvider[];
+  health_check_aggregate?: HealthCheckAggregate;
 }
 
 export interface UpdateServiceGroupBody {
@@ -88,7 +95,9 @@ export interface UpdateServiceGroupBody {
   health_check_interval_sec?: number;
   health_check_timeout_ms?: number;
   health_check_verify_tls?: boolean;
-  health_check_provider?: "local" | "cloudflare";
+  health_check_provider?: HealthCheckProvider;
+  health_check_providers?: HealthCheckProvider[];
+  health_check_aggregate?: HealthCheckAggregate;
 }
 
 export interface UpdateServiceConfigRequest {
@@ -295,6 +304,10 @@ async function buildView(db: Db, serviceId: number): Promise<ServiceView> {
       health_check_timeout_ms: binding.health_check_timeout_ms,
       health_check_verify_tls: binding.health_check_verify_tls,
       health_check_provider: binding.health_check_provider ?? "local",
+      health_check_providers: binding.health_check_providers ?? [
+        binding.health_check_provider ?? "local",
+      ],
+      health_check_aggregate: binding.health_check_aggregate ?? "majority",
       sync_status: aggregateSyncStatus(statuses),
     };
   });
@@ -1163,7 +1176,9 @@ export async function updateConfig(
         input.health_check_interval_sec !== undefined ||
         input.health_check_timeout_ms !== undefined ||
         input.health_check_verify_tls !== undefined ||
-        input.health_check_provider !== undefined
+        input.health_check_provider !== undefined ||
+        input.health_check_providers !== undefined ||
+        input.health_check_aggregate !== undefined
       ) {
         repos.updateBindingLbConfig(db, binding.id, {
           lb_mode: input.lb_mode,
@@ -1176,6 +1191,8 @@ export async function updateConfig(
           health_check_timeout_ms: input.health_check_timeout_ms,
           health_check_verify_tls: input.health_check_verify_tls,
           health_check_provider: input.health_check_provider,
+          health_check_providers: input.health_check_providers,
+          health_check_aggregate: input.health_check_aggregate,
         });
       }
 
@@ -1250,6 +1267,8 @@ export async function updateConfig(
 
   void syncServiceToVpsTracker(db, id, removedBindingIds);
 
+  fireEnsureHealthWorker(db, cf, DEFAULT_HEALTH_FALLBACKS);
+
   const [view] = attachServiceHealth(db, [await buildView(db, id)]);
   return view!;
 }
@@ -1261,7 +1280,7 @@ export async function createGroup(
 ): Promise<ServiceGroup> {
   const groupType = body.type?.trim() || "custom";
   const domain = await normalizeGroupDomain(db, cf, body.domain);
-  return repos.createServiceGroup(
+  const group = repos.createServiceGroup(
     db,
     body.name,
     groupType,
@@ -1278,8 +1297,12 @@ export async function createGroup(
       health_check_timeout_ms: body.health_check_timeout_ms,
       health_check_verify_tls: body.health_check_verify_tls,
       health_check_provider: body.health_check_provider,
+      health_check_providers: body.health_check_providers,
+      health_check_aggregate: body.health_check_aggregate,
     },
   );
+  fireEnsureHealthWorker(db, cf, DEFAULT_HEALTH_FALLBACKS);
+  return group;
 }
 
 export async function updateGroup(
@@ -1315,6 +1338,8 @@ export async function updateGroup(
       health_check_timeout_ms: body.health_check_timeout_ms,
       health_check_verify_tls: body.health_check_verify_tls,
       health_check_provider: body.health_check_provider,
+      health_check_providers: body.health_check_providers,
+      health_check_aggregate: body.health_check_aggregate,
     },
   );
   if (!domain && group.enabled) {
@@ -1322,6 +1347,7 @@ export async function updateGroup(
     group = repos.getServiceGroup(db, id);
   }
   await syncEnabledServicesInGroup(db, cf, id);
+  fireEnsureHealthWorker(db, cf, DEFAULT_HEALTH_FALLBACKS);
   return group;
 }
 

apps/api/test/health-globalping.test.ts

@@ -0,0 +1,273 @@
+import { describe, expect, it } from "vitest";
+import { buildApp } from "../src/app.js";
+import { loadConfig } from "../src/config.js";
+import { repos, type Db } from "@cfdm/db";
+import * as healthCheckService from "../src/services/health-check-service.js";
+import {
+  buildMeasurementBody,
+  summarizeMeasurement,
+} from "../src/lib/globalping-client.js";
+import { aggregateHealthOk } from "@cfdm/shared";
+import type { HealthCheckTarget } from "@cfdm/shared";
+
+const thresholds = {
+  degradedFailures: 1,
+  downFailures: 2,
+  latencyWarnMs: 1000,
+  successRecoveries: 2,
+};
+
+function tcpTarget(overrides?: Partial<HealthCheckTarget>): HealthCheckTarget {
+  return {
+    scope: "binding",
+    ref_id: 1,
+    ip: "203.0.113.10",
+    hostname: "panel.example.com",
+    type: "tcp",
+    port: 443,
+    path: null,
+    expected_status: null,
+    timeout_ms: 400,
+    verify_tls: false,
+    provider: "globalping",
+    providers: ["globalping"],
+    aggregate: "majority",
+    ...overrides,
+  };
+}
+
+async function seedBinding(
+  db: Db,
+  opts: {
+    ip: string;
+    providers: Array<"local" | "cloudflare" | "globalping">;
+    aggregate?: "any" | "all" | "majority";
+    port?: number;
+  },
+) {
+  const domain = repos.createDomain(db, null, "example.com", "zone-1");
+  const service = repos.createService(db, "Panel", "panel");
+  repos.setServiceEnabled(db, service.id, true);
+  repos.replaceServiceIps(db, service.id, [opts.ip]);
+  const binding = repos.insertBinding(db, domain.id, service.id, "panel", null);
+  repos.replaceBindingIpsWithMeta(db, binding.id, [
+    { ip: opts.ip, weight: 1, priority: 1 },
+  ]);
+  repos.updateBindingLbConfig(db, binding.id, {
+    health_check_enabled: true,
+    health_check_type: "tcp",
+    health_check_port: opts.port ?? 1,
+    health_check_timeout_ms: 400,
+    health_check_providers: opts.providers,
+    health_check_aggregate: opts.aggregate ?? "majority",
+  });
+  return { service, binding, domain };
+}
+
+function mockFetch(handler: (url: string, init?: RequestInit) => Response): typeof fetch {
+  return (async (input: RequestInfo | URL, init?: RequestInit) => {
+    const url = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
+    return handler(url, init);
+  }) as typeof fetch;
+}
+
+describe("aggregateHealthOk", () => {
+  it("any / all / majority", () => {
+    expect(aggregateHealthOk([true, false], "any")).toBe(false);
+    expect(aggregateHealthOk([true, false], "all")).toBe(true);
+    expect(aggregateHealthOk([true, false], "majority")).toBe(true);
+    expect(aggregateHealthOk([false, false], "majority")).toBe(false);
+    expect(aggregateHealthOk([true, false, false], "majority")).toBe(false);
+    expect(aggregateHealthOk([true, true, false], "majority")).toBe(true);
+    expect(aggregateHealthOk([true], "majority")).toBe(true);
+  });
+});
+
+describe("globalping mapping", () => {
+  it("maps CFDM TCP to ping+TCP and HTTP to http+host", () => {
+    const tcp = buildMeasurementBody(tcpTarget(), { limit: 3, locations: "World" });
+    expect(tcp.type).toBe("ping");
+    expect(tcp.measurementOptions.protocol).toBe("TCP");
+    expect(tcp.measurementOptions.port).toBe(443);
+    expect(tcp.inProgressUpdates).toBe(false);
+
+    const http = buildMeasurementBody(
+      tcpTarget({ type: "http", port: 443, path: "/health", expected_status: 200 }),
+      { limit: 2, locations: "EU,US" },
+    );
+    expect(http.type).toBe("http");
+    expect(http.locations).toEqual([{ magic: "EU" }, { magic: "US" }]);
+    expect(http.measurementOptions.request).toMatchObject({
+      host: "panel.example.com",
+      path: "/health",
+      method: "GET",
+    });
+  });
+
+  it("summarizes HTTP majority and TCP packet loss", () => {
+    const httpOk = summarizeMeasurement(
+      tcpTarget({ type: "http", expected_status: 200 }),
+      {
+        status: "finished",
+        results: [
+          { probe: { city: "Frankfurt", country: "DE" }, result: { status: "finished", statusCode: 200, timings: { total: 40 } } },
+          { probe: { city: "London", country: "GB" }, result: { status: "finished", statusCode: 200, timings: { total: 50 } } },
+          { probe: { city: "Paris", country: "FR" }, result: { status: "finished", statusCode: 500, timings: { total: 20 } } },
+        ],
+      },
+    );
+    expect(httpOk.ok).toBe(true);
+    expect(httpOk.colo).toBe("Frankfurt, DE");
+
+    const tcpFail = summarizeMeasurement(tcpTarget(), {
+      status: "finished",
+      results: [
+        { result: { status: "finished", stats: { avg: 12, loss: 100 } } },
+        { result: { status: "finished", stats: { avg: 11, loss: 100 } } },
+      ],
+    });
+    expect(tcpFail.ok).toBe(false);
+  });
+});
+
+describe("globalping engine", () => {
+  it("POST 202 + GET finished writes colo from probe city", async () => {
+    const app = await buildApp({
+      config: { ...loadConfig(), staticDir: null },
+      memory: true,
+    });
+    const { binding } = await seedBinding(app.db, {
+      ip: "203.0.113.40",
+      providers: ["globalping"],
+      port: 443,
+    });
+    const fetchImpl = mockFetch((url) => {
+      if (url.endsWith("/v1/measurements")) {
+        return new Response(JSON.stringify({ id: "meas-1" }), { status: 202 });
+      }
+      return new Response(
+        JSON.stringify({
+          id: "meas-1",
+          status: "finished",
+          results: [
+            {
+              probe: { city: "Amsterdam", country: "NL" },
+              result: { status: "finished", stats: { avg: 18, loss: 0 } },
+            },
+            {
+              probe: { city: "Frankfurt", country: "DE" },
+              result: { status: "finished", stats: { avg: 22, loss: 0 } },
+            },
+          ],
+        }),
+        { status: 200 },
+      );
+    });
+    await healthCheckService.runAllChecks(app.db, {
+      thresholds,
+      probeGapMs: 0,
+      globalping: {
+        token: "gp_test",
+        locations: "World",
+        limit: 2,
+        pollIntervalMs: 0,
+        fetchImpl,
+      },
+    });
+    const row = repos.getIpHealthStatusRow(
+      app.db,
+      "binding",
+      binding.id,
+      "203.0.113.40",
+    );
+    expect(row?.status).toBe("up");
+    expect(row?.provider).toBe("globalping");
+    expect(row?.colo).toMatch(/Amsterdam/);
+    await app.close();
+  });
+
+  it("429 fails the source and does not fall back to local", async () => {
+    const app = await buildApp({
+      config: { ...loadConfig(), staticDir: null },
+      memory: true,
+    });
+    const { binding } = await seedBinding(app.db, {
+      ip: "127.0.0.1",
+      providers: ["globalping"],
+      port: 1,
+    });
+    const fetchImpl = mockFetch(() => new Response("rate limited", { status: 429 }));
+    await healthCheckService.runAllChecks(app.db, {
+      thresholds,
+      probeGapMs: 0,
+      globalping: {
+        token: "gp_test",
+        locations: "World",
+        limit: 1,
+        pollIntervalMs: 0,
+        fetchImpl,
+      },
+    });
+    const row = repos.getIpHealthStatusRow(
+      app.db,
+      "binding",
+      binding.id,
+      "127.0.0.1",
+    );
+    expect(row?.last_error).toMatch(/429/i);
+    expect(row?.provider).toBe("globalping");
+    await app.close();
+  });
+
+  it("local+globalping all keeps IP up if Globalping is ok", async () => {
+    const app = await buildApp({
+      config: { ...loadConfig(), staticDir: null },
+      memory: true,
+    });
+    const { binding, service } = await seedBinding(app.db, {
+      ip: "127.0.0.1",
+      providers: ["local", "globalping"],
+      aggregate: "all",
+      port: 1,
+    });
+    const fetchImpl = mockFetch((url) => {
+      if (url.endsWith("/v1/measurements")) {
+        return new Response(JSON.stringify({ id: "meas-2" }), { status: 202 });
+      }
+      return new Response(
+        JSON.stringify({
+          status: "finished",
+          results: [
+            { probe: { city: "Vienna", country: "AT" }, result: { status: "finished", stats: { avg: 9, loss: 0 } } },
+          ],
+        }),
+        { status: 200 },
+      );
+    });
+    await healthCheckService.runAllChecks(app.db, {
+      thresholds,
+      probeGapMs: 0,
+      globalping: {
+        token: "gp_test",
+        locations: "World",
+        limit: 1,
+        pollIntervalMs: 0,
+        fetchImpl,
+      },
+    });
+    const row = repos.getIpHealthStatusRow(
+      app.db,
+      "binding",
+      binding.id,
+      "127.0.0.1",
+    );
+    expect(row?.status).toBe("up");
+    expect(row?.provider).toBe("aggregate");
+    const logs = repos.listHealthProbeLogForService(app.db, service.id);
+    expect(logs.map((row) => row.provider).sort()).toEqual([
+      "globalping",
+      "local",
+    ]);
+    await app.close();
+  });
+});

apps/api/test/health-worker-deploy.test.ts

@@ -0,0 +1,160 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { buildApp } from "../src/app.js";
+import { loadConfig } from "../src/config.js";
+import { toCloudflareCron } from "../src/services/health/mailbox.js";
+import { HEALTH_PROBE_SCRIPT_NAME } from "@cfdm/shared";
+
+async function authHeaders(app: Awaited<ReturnType<typeof buildApp>>) {
+  const res = await app.inject({
+    method: "POST",
+    url: "/api/v1/auth/login",
+    payload: { username: "admin", password: "admin" },
+  });
+  expect(res.statusCode).toBe(200);
+  const { token } = res.json() as { token: string };
+  return { authorization: `Bearer ${token}` };
+}
+
+function jsonOk(result: unknown, status = 200): Response {
+  return new Response(JSON.stringify({ success: true, result }), {
+    status,
+    headers: { "content-type": "application/json" },
+  });
+}
+
+describe("health worker deploy", () => {
+  afterEach(() => {
+    vi.unstubAllGlobals();
+  });
+
+  it("maps 6-field toad cron to 5-field Cloudflare cron", () => {
+    expect(toCloudflareCron("0 */2 * * * *")).toBe("*/2 * * * *");
+    expect(toCloudflareCron("*/5 * * * *")).toBe("*/5 * * * *");
+  });
+
+  it("POST ensure creates KV+script; 403 is not local fallback", async () => {
+    const calls: string[] = [];
+    vi.stubGlobal(
+      "fetch",
+      async (input: RequestInfo | URL, init?: RequestInit) => {
+        const url =
+          typeof input === "string" || input instanceof URL
+            ? String(input)
+            : input.url;
+        const method = (
+          init?.method ??
+          (typeof Request !== "undefined" && input instanceof Request
+            ? input.method
+            : "GET")
+        ).toUpperCase();
+        calls.push(`${method} ${url}`);
+        if (
+          (url.includes("/accounts?") || /\/accounts$/.test(url.split("?")[0] ?? "")) &&
+          !url.includes("/storage/") &&
+          !url.includes("/workers/")
+        ) {
+          return jsonOk([{ id: "acc-1", name: "Test" }]);
+        }
+        if (url.includes("/storage/kv/namespaces") && method === "GET" && !url.includes("/values/")) {
+          return jsonOk([]);
+        }
+        if (url.includes("/storage/kv/namespaces") && method === "POST") {
+          return jsonOk({ id: "kv-1", title: "cfdm-health-probe" });
+        }
+        if (
+          url.includes(`/workers/scripts/${HEALTH_PROBE_SCRIPT_NAME}`) &&
+          method === "PUT" &&
+          !url.includes("/schedules")
+        ) {
+          return jsonOk({ id: "script-1" });
+        }
+        if (url.includes("/schedules") && method === "PUT") {
+          return jsonOk([{ cron: "*/2 * * * *" }]);
+        }
+        if (url.includes("/subdomain") && method === "POST") {
+          return jsonOk({ enabled: true });
+        }
+        if (url.includes("/workers/subdomain") && method === "GET") {
+          return jsonOk({ subdomain: "example" });
+        }
+        if (url.includes("/values/") && method === "GET") {
+          return new Response("null", { status: 404 });
+        }
+        if (url.includes("/values/") && method === "PUT") {
+          return jsonOk(null);
+        }
+        return jsonOk({});
+      },
+    );
+
+    const app = await buildApp({
+      config: { ...loadConfig(), staticDir: null, cloudflareApiToken: "cf-token" },
+      memory: true,
+    });
+    const headers = await authHeaders(app);
+    const res = await app.inject({
+      method: "POST",
+      url: "/api/v1/settings/health/worker/ensure",
+      headers,
+    });
+    expect(res.statusCode).toBe(200);
+    const body = res.json() as {
+      healthWorkerStatus: string;
+      healthWorkerUrl: string;
+      healthWorkerKvNamespaceId: string;
+      healthWorkerError: string | null;
+    };
+    expect(body.healthWorkerStatus).toBe("ready");
+    expect(body.healthWorkerKvNamespaceId).toBe("kv-1");
+    expect(body.healthWorkerUrl).toContain("cfdm-health-probe.example.workers.dev");
+    expect(body.healthWorkerError).toBeNull();
+    expect(calls.some((c) => c.includes("/workers/scripts/"))).toBe(true);
+    await app.close();
+  }, 20_000);
+
+  it("POST ensure 403 stores error, does not probe as local", async () => {
+    vi.stubGlobal(
+      "fetch",
+      async (input: RequestInfo | URL) => {
+        const url = String(input);
+        if (url.includes("/storage/kv/namespaces")) {
+          return new Response(
+            JSON.stringify({
+              success: false,
+              errors: [{ code: 10000, message: "Authentication error" }],
+            }),
+            { status: 403, headers: { "content-type": "application/json" } },
+          );
+        }
+        if (url.includes("/accounts")) {
+          return jsonOk([{ id: "acc-1" }]);
+        }
+        return jsonOk({});
+      },
+    );
+
+    const app = await buildApp({
+      config: { ...loadConfig(), staticDir: null, cloudflareApiToken: "zone-only" },
+      memory: true,
+    });
+    const headers = await authHeaders(app);
+    const res = await app.inject({
+      method: "POST",
+      url: "/api/v1/settings/health/worker/ensure",
+      headers,
+    });
+    expect(res.statusCode).toBe(401);
+    const again = await app.inject({
+      method: "GET",
+      url: "/api/v1/settings",
+      headers,
+    });
+    const body = again.json() as {
+      healthWorkerStatus: string;
+      healthWorkerError: string | null;
+    };
+    expect(body.healthWorkerStatus).toBe("error");
+    expect(body.healthWorkerError).toMatch(/Workers Scripts Write|токен/i);
+    await app.close();
+  }, 20_000);
+});

apps/api/test/health-worker.test.ts

@@ -1,9 +1,11 @@
-import { createServer, type Server as HttpServer } from "node:http";
 import { describe, expect, it } from "vitest";
 import { buildApp } from "../src/app.js";
 import { loadConfig } from "../src/config.js";
 import { repos, type Db } from "@cfdm/db";
 import * as healthCheckService from "../src/services/health-check-service.js";
+import type { HealthMailbox } from "../src/services/health/mailbox.js";
+import { originProbeKey } from "../src/services/health/mailbox.js";
+import type { HealthCheckTarget } from "@cfdm/shared";
 
 async function authHeaders(app: Awaited<ReturnType<typeof buildApp>>) {
   const res = await app.inject({
@@ -16,37 +18,6 @@ async function authHeaders(app: Awaited<ReturnType<typeof buildApp>>) {
   return { authorization: `Bearer ${token}` };
 }
 
-function startWorkerMock(handler: (req: {
-  url?: string;
-  headers: Record<string, string | string[] | undefined>;
-  body: string;
-}) => { status: number; json: unknown } | "hang"): Promise<{
-  server: HttpServer;
-  url: string;
-}> {
-  return new Promise((resolve) => {
-    const server = createServer((req, res) => {
-      const chunks: Buffer[] = [];
-      req.on("data", (chunk) => chunks.push(chunk as Buffer));
-      req.on("end", () => {
-        const result = handler({
-          url: req.url,
-          headers: req.headers,
-          body: Buffer.concat(chunks).toString("utf8"),
-        });
-        if (result === "hang") return;
-        res.writeHead(result.status, { "content-type": "application/json" });
-        res.end(JSON.stringify(result.json));
-      });
-    });
-    server.listen(0, "127.0.0.1", () => {
-      const address = server.address();
-      const port = typeof address === "object" && address ? address.port : 0;
-      resolve({ server, url: `http://127.0.0.1:${port}` });
-    });
-  });
-}
-
 async function seedBinding(
   db: Db,
   opts: { provider: "local" | "cloudflare"; ip: string },
@@ -76,7 +47,51 @@ const thresholds = {
   successRecoveries: 2,
 };
 
-describe("health-check XOR worker", () => {
+function memoryMailbox(opts?: {
+  resultsOk?: boolean;
+  colo?: string;
+  probedAt?: string;
+}): HealthMailbox {
+  let targets: unknown = null;
+  return {
+    async getTargets() {
+      return targets as never;
+    },
+    async putTargets(doc) {
+      targets = doc;
+    },
+    async getResults() {
+      if (!opts) return null;
+      const dummy: HealthCheckTarget = {
+        scope: "binding",
+        ref_id: 1,
+        ip: "203.0.113.10",
+        hostname: "panel.example.com",
+        type: "tcp",
+        port: 1,
+        path: null,
+        expected_status: null,
+        timeout_ms: 400,
+        verify_tls: false,
+        provider: "cloudflare",
+      };
+      return {
+        probedAt: opts.probedAt ?? new Date().toISOString(),
+        colo: opts.colo ?? "AMS",
+        items: [
+          {
+            key: originProbeKey(dummy),
+            ok: opts.resultsOk !== false,
+            latencyMs: 42,
+            error: opts.resultsOk === false ? "down" : null,
+          },
+        ],
+      };
+    },
+  };
+}
+
+describe("health-check XOR worker mailbox", () => {
   it("lists only local providers when no cloudflare bindings", async () => {
     const app = await buildApp({
       config: { ...loadConfig(), staticDir: null },
@@ -93,7 +108,7 @@ describe("health-check XOR worker", () => {
     await app.close();
   });
 
-  it("cloudflare without worker URL does not fall back to local", async () => {
+  it("cloudflare without mailbox does not fall back to local", async () => {
     const app = await buildApp({
       config: { ...loadConfig(), staticDir: null },
       memory: true,
@@ -105,7 +120,7 @@ describe("health-check XOR worker", () => {
     await healthCheckService.runAllChecks(app.db, {
       thresholds,
       probeGapMs: 0,
-      worker: null,
+      mailbox: null,
     });
     const row = repos.getIpHealthStatusRow(
       app.db,
@@ -118,17 +133,7 @@ describe("health-check XOR worker", () => {
     await app.close();
   });
 
-  it("worker mock 200 writes colo and last_checked_at", async () => {
-    const mock = await startWorkerMock((req) => {
-      const auth = String(req.headers.authorization ?? "");
-      if (auth !== "Bearer secret") {
-        return { status: 401, json: { ok: false, error: "unauthorized" } };
-      }
-      return {
-        status: 200,
-        json: { ok: true, latencyMs: 42, error: null, colo: "AMS" },
-      };
-    });
+  it("KV results write colo and last_checked_at without HTTP /probe", async () => {
     const app = await buildApp({
       config: { ...loadConfig(), staticDir: null },
       memory: true,
@@ -138,10 +143,34 @@ describe("health-check XOR worker", () => {
       provider: "cloudflare",
       ip: "203.0.113.10",
     });
+    const targets = repos.listHealthCheckTargets(app.db);
+    const cfTarget = targets.find((t) => t.ip === "203.0.113.10")!;
+    const mailbox: HealthMailbox = {
+      async getTargets() {
+        return null;
+      },
+      async putTargets() {
+        /* fingerprint sync */
+      },
+      async getResults() {
+        return {
+          probedAt: new Date().toISOString(),
+          colo: "AMS",
+          items: [
+            {
+              key: originProbeKey(cfTarget),
+              ok: true,
+              latencyMs: 42,
+              error: null,
+            },
+          ],
+        };
+      },
+    };
     await healthCheckService.runAllChecks(app.db, {
       thresholds,
       probeGapMs: 0,
-      worker: { url: mock.url, token: "secret" },
+      mailbox,
     });
     const row = repos.getIpHealthStatusRow(
       app.db,
@@ -170,7 +199,6 @@ describe("health-check XOR worker", () => {
     };
     const ipRow = body.ip_health.find((item) => item.ip === "203.0.113.10");
     expect(ipRow?.colo).toBe("AMS");
-    expect(ipRow?.last_checked_at).toBeTruthy();
     expect(ipRow?.provider).toBe("cloudflare");
 
     const logRes = await app.inject({
@@ -182,12 +210,10 @@ describe("health-check XOR worker", () => {
     const logBody = logRes.json() as { items: Array<{ colo: string | null }> };
     expect(logBody.items[0]?.colo).toBe("AMS");
 
-    await new Promise<void>((resolve) => mock.server.close(() => resolve()));
     await app.close();
   });
 
-  it("worker timeout is recorded, not local probe", async () => {
-    const mock = await startWorkerMock(() => "hang");
+  it("stale KV results are recorded, not local probe", async () => {
     const app = await buildApp({
       config: { ...loadConfig(), staticDir: null },
       memory: true,
@@ -199,7 +225,12 @@ describe("health-check XOR worker", () => {
     await healthCheckService.runAllChecks(app.db, {
       thresholds,
       probeGapMs: 0,
-      worker: { url: mock.url, token: "secret" },
+      mailbox: memoryMailbox({
+        resultsOk: true,
+        colo: "SIN",
+        probedAt: new Date(Date.now() - 60 * 60_000).toISOString(),
+      }),
+      staleAfterMs: 60_000,
     });
     const row = repos.getIpHealthStatusRow(
       app.db,
@@ -207,9 +238,8 @@ describe("health-check XOR worker", () => {
       binding.id,
       "203.0.113.20",
     );
-    expect(row?.last_error).toMatch(/timeout|Worker/i);
+    expect(row?.last_error).toMatch(/устарели|KV/i);
     expect(row?.provider).toBe("cloudflare");
-    await new Promise<void>((resolve) => mock.server.close(() => resolve()));
     await app.close();
-  }, 15_000);
+  });
 });

apps/api/test/settings-health.test.ts

@@ -40,12 +40,14 @@ describe("settings health engine", () => {
       healthDownFailures: number;
       healthLatencyWarnMs: number;
       healthSuccessRecoveries: number;
+      healthWorkerStatus?: string;
     };
     expect(body.healthCheckCron).toBe("*/30 * * * * *");
     expect(body.healthDegradedFailures).toBe(3);
     expect(body.healthDownFailures).toBe(4);
     expect(body.healthLatencyWarnMs).toBe(1500);
     expect(body.healthSuccessRecoveries).toBe(5);
+    expect(body.healthWorkerStatus).toBe("missing");
     await app.close();
   });
 
@@ -162,4 +164,51 @@ describe("settings health engine", () => {
     expect(body.healthWorkerToken).toBeUndefined();
     await app.close();
   });
+
+  it("GET exposes Globalping flags without the token; PATCH persists locations/limit", async () => {
+    const app = await buildApp({
+      config: { ...loadConfig(), staticDir: null },
+      memory: true,
+    });
+    const headers = await authHeaders(app);
+    const initial = await app.inject({
+      method: "GET",
+      url: "/api/v1/settings",
+      headers,
+    });
+    expect(initial.statusCode).toBe(200);
+    const before = initial.json() as {
+      globalpingTokenSet?: boolean;
+      globalpingLocations?: string;
+      globalpingLimit?: number;
+      globalpingToken?: string;
+    };
+    expect(before.globalpingTokenSet).toBe(false);
+    expect(before.globalpingLocations).toBe("World");
+    expect(before.globalpingLimit).toBe(3);
+    expect(before.globalpingToken).toBeUndefined();
+
+    const patched = await app.inject({
+      method: "PATCH",
+      url: "/api/v1/settings",
+      headers,
+      payload: {
+        globalpingToken: "gp_secret",
+        globalpingLocations: "EU,US",
+        globalpingLimit: 5,
+      },
+    });
+    expect(patched.statusCode).toBe(200);
+    const body = patched.json() as {
+      globalpingTokenSet: boolean;
+      globalpingLocations: string;
+      globalpingLimit: number;
+      globalpingToken?: string;
+    };
+    expect(body.globalpingTokenSet).toBe(true);
+    expect(body.globalpingLocations).toBe("EU,US");
+    expect(body.globalpingLimit).toBe(5);
+    expect(body.globalpingToken).toBeUndefined();
+    await app.close();
+  });
 });

apps/api/tsup.config.ts

@@ -0,0 +1,17 @@
+import { copyFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { defineConfig } from "tsup";
+
+export default defineConfig({
+  entry: ["src/server.ts"],
+  format: ["esm"],
+  dts: true,
+  async onSuccess() {
+    const root = join(dirname(fileURLToPath(import.meta.url)), "../..");
+    copyFileSync(
+      join(root, "workers/health-probe/src/index.mjs"),
+      join(dirname(fileURLToPath(import.meta.url)), "dist/health-probe-worker.mjs"),
+    );
+  },
+});

apps/api/vitest.config.ts

@@ -4,6 +4,7 @@ export default defineConfig({
   test: {
     environment: "node",
     include: ["test/**/*.test.ts"],
+    testTimeout: 20_000,
     typecheck: {
       tsconfig: "./tsconfig.test.json",
     },

apps/web/src/components/health-check-config-fields.tsx

@@ -17,16 +17,22 @@ import {
   SelectValue,
 } from '@cfdm/ui/components/select'
 import { Switch } from '@cfdm/ui/components/switch'
+import { FieldGroup } from '@cfdm/ui/components/field'
 import { Button } from '@cfdm/ui/components/button'
 import { ButtonGroup } from '@cfdm/ui/components/button-group'
-import { FieldGroup } from '@cfdm/ui/components/field'
-import { Link } from '@tanstack/react-router'
-import { Alert, AlertDescription, AlertTitle } from '@/components/reui/alert'
+import { CableIcon, GlobeIcon } from 'lucide-react'
 import { cn } from '@cfdm/ui/lib/utils'
+import {
+  HealthAggregateTiles,
+  HealthSourceTiles,
+  type HealthAggregate,
+  type HealthProvider,
+} from '@/components/reui-kit/health-source-tiles'
+import { uniqueHealthProviders } from '@cfdm/shared'
 
 export type LbMode = 'round_robin' | 'failover' | 'weighted'
 export type HealthCheckType = 'tcp' | 'http'
-export type HealthProvider = 'local' | 'cloudflare'
+export type { HealthProvider, HealthAggregate }
 
 export interface HealthCheckConfig {
   enabled: boolean
@@ -38,6 +44,8 @@ export interface HealthCheckConfig {
   timeout_ms: number
   verify_tls: boolean
   provider: HealthProvider
+  providers: HealthProvider[]
+  aggregate: HealthAggregate
   method?: string | null
   retries?: number
   consecutive_fails?: number
@@ -54,62 +62,6 @@ const defaultLbModeOptions = [
   { value: 'weighted', label: 'Weighted (веса)' },
 ]
 
-const healthCheckTypes = [
-  { value: 'tcp', label: 'TCP connect' },
-  { value: 'http', label: 'HTTP' },
-] as const
-
-const cloudflareTypes = [
-  { value: 'tcp', label: 'TCP' },
-  { value: 'http', label: 'HTTP' },
-] as const
-
-export function HealthProviderToggle({
-  value,
-  onChange,
-  id,
-}: {
-  value: HealthProvider
-  onChange: (next: HealthProvider) => void
-  id?: string
-}) {
-  const provider = value || 'local'
-  return (
-    <ButtonGroup className="w-full" id={id}>
-      <Button
-        type="button"
-        size="sm"
-        className="flex-1"
-        variant={provider === 'local' ? 'secondary' : 'outline'}
-        aria-pressed={provider === 'local'}
-        onClick={() => onChange('local')}
-      >
-        Local
-      </Button>
-      <Button
-        type="button"
-        size="sm"
-        className="flex-1"
-        variant={provider === 'cloudflare' ? 'secondary' : 'outline'}
-        aria-pressed={provider === 'cloudflare'}
-        onClick={() => onChange('cloudflare')}
-      >
-        Cloudflare
-      </Button>
-    </ButtonGroup>
-  )
-}
-
-interface HealthCheckConfigFieldsProps {
-  value: LbAndHealthConfig
-  onChange: (next: LbAndHealthConfig) => void
-  lbModeLabel?: string
-  lbModeOptions?: { value: string; label: string }[]
-  idPrefix?: string
-  showLbMode?: boolean
-  className?: string
-}
-
 function CompactNumberField({
   id,
   value,
@@ -151,11 +103,24 @@ export function HealthCheckConfigFields({
   idPrefix = 'health',
   showLbMode = true,
   className,
-}: HealthCheckConfigFieldsProps) {
+}: {
+  value: LbAndHealthConfig
+  onChange: (next: LbAndHealthConfig) => void
+  lbModeLabel?: string
+  lbModeOptions?: { value: string; label: string }[]
+  idPrefix?: string
+  showLbMode?: boolean
+  className?: string
+}) {
   function patch(next: Partial<LbAndHealthConfig>) {
     onChange({ ...value, ...next })
   }
 
+  const providers =
+    value.providers?.length > 0
+      ? uniqueHealthProviders(value.providers)
+      : uniqueHealthProviders([value.provider ?? 'local'])
+  const aggregate = value.aggregate ?? 'majority'
   const isHttp = value.type === 'http'
   const rowClass = 'gap-3 px-0 py-3'
 
@@ -190,47 +155,40 @@ export function HealthCheckConfigFields({
 
       <SettingRow
         title="Провайдер health-check"
-        description="Откуда идёт проба: API CFDM или Cloudflare Worker (edge)"
+        description="Кто пробирует цель. Можно выбрать несколько источников."
         labelFor={`${idPrefix}-provider`}
         compact
+        stacked
         className={rowClass}
+        contentClassName="min-w-0"
       >
-        <HealthProviderToggle
-          id={`${idPrefix}-provider`}
-          value={value.provider ?? 'local'}
-          onChange={(provider) =>
+        <HealthSourceTiles
+          value={providers}
+          onChange={(next) =>
             patch({
-              provider,
-              enabled: provider === 'cloudflare' ? true : value.enabled,
+              providers: next,
+              provider: next[0] ?? 'local',
+              enabled: next.includes('cloudflare') ? true : value.enabled,
             })
           }
         />
       </SettingRow>
-      {value.provider === 'cloudflare' ? (
-        <Alert>
-          <AlertTitle>Cloudflare Worker</AlertTitle>
-          <AlertDescription>
-            Проба с edge Cloudflare, не продукт Health Checks API (на Free его нет).
-            Регионы WNAM/WEU недоступны — в результате будет colo ближайшего POP
-            (например AMS). URL и токен Worker — в{' '}
-            <Link to="/settings/health" className="text-foreground underline">
-              Настройках → Health-check
-            </Link>
-            . Если Worker не задан, цель не пробируется как Local.
-          </AlertDescription>
-        </Alert>
-      ) : (
-        <Alert>
-          <AlertTitle>Local health-check</AlertTitle>
-          <AlertDescription>
-            Проба TCP/HTTP с сервера API. Cron и пороги Slow/Down — в{' '}
-            <Link to="/settings/health" className="text-foreground underline">
-              Настройках → Health-check
-            </Link>
-            . Интервал в карточке не используется.
-          </AlertDescription>
-        </Alert>
-      )}
+
+      {providers.length > 1 ? (
+        <SettingRow
+          title="Агрегация"
+          description="Как свести результаты источников в один статус IP для failover"
+          compact
+          stacked
+          className={rowClass}
+          contentClassName="min-w-0"
+        >
+          <HealthAggregateTiles
+            value={aggregate}
+            onChange={(next) => patch({ aggregate: next })}
+          />
+        </SettingRow>
+      ) : null}
 
       <SettingRow
         title="Health-check"
@@ -259,25 +217,30 @@ export function HealthCheckConfigFields({
         <div className="flex flex-col gap-3 pt-1 pb-1">
           <div className="grid grid-cols-2 gap-3">
             <FormFieldSimple label="Тип" htmlFor={`${idPrefix}-type`}>
-              <Select
-                modal={false}
-                value={value.type}
-                onValueChange={(v) => patch({ type: (v ?? 'tcp') as HealthCheckType })}
-              >
-                <SelectTrigger id={`${idPrefix}-type`} className="w-full">
-                  <SelectValue placeholder="Тип" />
-                </SelectTrigger>
-                <SelectContent>
-                  {(value.provider === 'cloudflare'
-                    ? cloudflareTypes
-                    : healthCheckTypes
-                  ).map((item) => (
-                    <SelectItem key={item.value} value={item.value}>
-                      {item.label}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
+              <ButtonGroup id={`${idPrefix}-type`} className="w-full min-w-0">
+                <Button
+                  type="button"
+                  size="sm"
+                  variant={value.type === 'tcp' ? 'secondary' : 'outline'}
+                  className="flex-1"
+                  aria-pressed={value.type === 'tcp'}
+                  onClick={() => patch({ type: 'tcp' })}
+                >
+                  <CableIcon data-icon="inline-start" />
+                  TCP
+                </Button>
+                <Button
+                  type="button"
+                  size="sm"
+                  variant={value.type === 'http' ? 'secondary' : 'outline'}
+                  className="flex-1"
+                  aria-pressed={value.type === 'http'}
+                  onClick={() => patch({ type: 'http' })}
+                >
+                  <GlobeIcon data-icon="inline-start" />
+                  HTTP
+                </Button>
+              </ButtonGroup>
             </FormFieldSimple>
 
             <FormFieldSimple label="Порт" htmlFor={`${idPrefix}-port`}>

apps/web/src/components/reui-kit/health-source-tiles.tsx

@@ -0,0 +1,248 @@
+import type { KeyboardEvent, ReactNode } from 'react'
+import { ServerIcon, LayersIcon, ShieldAlertIcon, ScaleIcon } from 'lucide-react'
+
+import { Frame, FramePanel } from '@/components/reui/frame'
+import { IconTile } from '@/components/reui/icon-tile'
+import { Badge } from '@/components/reui/badge'
+import {
+  Item,
+  ItemActions,
+  ItemContent,
+  ItemDescription,
+  ItemMedia,
+  ItemTitle,
+} from '@cfdm/ui/components/item'
+import { cn } from '@cfdm/ui/lib/utils'
+import type { HealthCheckAggregate, HealthCheckProvider } from '@cfdm/shared'
+
+export type HealthProvider = HealthCheckProvider
+export type HealthAggregate = HealthCheckAggregate
+
+const DEFAULT_ICON_CLASS = 'text-muted-foreground [&_svg]:text-current'
+
+/** Official Cloudflare mark (Simple Icons). */
+function CloudflareMark() {
+  return (
+    <svg viewBox="0 0 24 24" aria-hidden="true">
+      <path
+        fill="currentColor"
+        d="M16.5088 16.8447c.1475-.5068.0908-.9707-.1553-1.3154-.2246-.3164-.6045-.499-1.0615-.5205l-8.6592-.1123a.1559.1559 0 0 1-.1333-.0713c-.0283-.042-.0351-.0986-.021-.1553.0278-.084.1123-.1484.2036-.1562l8.7359-.1123c1.0351-.0489 2.1601-.8868 2.5537-1.9136l.499-1.3013c.0215-.0561.0293-.1128.0147-.168-.5625-2.5463-2.835-4.4453-5.5499-4.4453-2.5039 0-4.6284 1.6177-5.3876 3.8614-.4927-.3658-1.1187-.5625-1.794-.499-1.2026.119-2.1665 1.083-2.2861 2.2856-.0283.31-.0069.6128.0635.894C1.5683 13.171 0 14.7754 0 16.752c0 .1748.0142.3515.0352.5273.0141.083.0844.1475.1689.1475h15.9814c.0909 0 .1758-.0645.2032-.1553l.12-.4268zm2.7568-5.5634c-.0771 0-.1611 0-.2383.0112-.0566 0-.1054.0415-.127.0976l-.3378 1.1744c-.1475.5068-.0918.9707.1543 1.3164.2256.3164.6055.498 1.0625.5195l1.8437.1133c.0557 0 .1055.0263.1329.0703.0283.043.0351.1074.0214.1562-.0283.084-.1132.1485-.204.1553l-1.921.1123c-1.041.0488-2.1582.8867-2.5527 1.914l-.1406.3585c-.0283.0713.0215.1416.0986.1416h6.5977c.0771 0 .1474-.0489.169-.126.1122-.4082.1757-.837.1757-1.2803 0-2.6025-2.125-4.727-4.7344-4.727"
+      />
+    </svg>
+  )
+}
+
+/** Official Globalping mark (globalping.io favicon). */
+function GlobalpingMark() {
+  return (
+    <svg viewBox="0 0 26 26" fill="none" aria-hidden="true">
+      <path
+        fill="currentColor"
+        d="M10.354 6.081a2.636 2.636 0 0 1 4.32.257 31.5 31.5 0 0 1 8.55-1.349A12.97 12.97 0 0 0 3.247 4.42a33.6 33.6 0 0 1 7.107 1.661m13.647.003-.764.02a30.6 30.6 0 0 0-8.235 1.3q.005.08 0 .16c0 .6-.222 1.178-.624 1.624a42 42 0 0 1 2.382 3.695q.478.835.884 1.645h.134c.348-.003.689.102.975.302q3.286-2.798 5.83-7.517l.052-.094m-11.16 2.616a2.65 2.65 0 0 1-2.997-.644c-3.276 1.658-6.702 4.284-9.022 8.45 1.579.6 3.232.982 4.914 1.135a1.566 1.566 0 0 1 2.811.026h.14a16 16 0 0 0 6.935-2.188 1.5 1.5 0 0 1-.097-.52 1.53 1.53 0 0 1 .475-1.105 39 39 0 0 0-3.16-5.154Z"
+      />
+      <path
+        fill="currentColor"
+        d="M18.866 24.463c.28-2.216-.22-4.582-1.06-6.825h-.019a1.66 1.66 0 0 1-.812-.211 17 17 0 0 1-7.622 2.467h-.14a1.563 1.563 0 0 1-2.902-.026 19 19 0 0 1-4.94-1.086 13 13 0 0 0 17.479 5.801zm6.324-15.97a26.5 26.5 0 0 1-5.82 7.218 1.4 1.4 0 0 1 .049.374 1.55 1.55 0 0 1-.56 1.18c.907 2.417 1.3 4.644 1.174 6.659a12.98 12.98 0 0 0 5.158-15.431Zm-15.258-.28a2.35 2.35 0 0 1-.045-1.108 33 33 0 0 0-7.46-1.658 12.97 12.97 0 0 0-1.829 11.45c2.106-3.682 5.268-6.627 9.334-8.684"
+      />
+    </svg>
+  )
+}
+
+const PROVIDER_ITEMS: Array<{
+  id: HealthProvider
+  title: string
+  description: string
+  icon: ReactNode
+  iconClassName: string
+}> = [
+  {
+    id: 'local',
+    title: 'Local',
+    description: 'TCP/HTTP с сервера API',
+    icon: <ServerIcon />,
+    iconClassName: 'text-info [&_svg]:text-current',
+  },
+  {
+    id: 'cloudflare',
+    title: 'Cloudflare',
+    description: 'Worker на edge, KV mailbox',
+    icon: <CloudflareMark />,
+    iconClassName: 'text-warning [&_svg]:text-current',
+  },
+  {
+    id: 'globalping',
+    title: 'Globalping',
+    description: 'Пробы из сети globalping.io',
+    icon: <GlobalpingMark />,
+    iconClassName: 'text-success [&_svg]:text-current',
+  },
+]
+
+const AGGREGATE_ITEMS: Array<{
+  id: HealthAggregate
+  title: string
+  description: string
+  icon: ReactNode
+}> = [
+  {
+    id: 'any',
+    title: 'Any',
+    description: 'Down, если хотя бы один источник Down',
+    icon: <ShieldAlertIcon />,
+  },
+  {
+    id: 'all',
+    title: 'All',
+    description: 'Down, только если все выбранные Down',
+    icon: <LayersIcon />,
+  },
+  {
+    id: 'majority',
+    title: 'Majority',
+    description: 'Down по большинству (2 → оба, 3 → ≥2)',
+    icon: <ScaleIcon />,
+  },
+]
+
+function handleTileKeyDown(onActivate: () => void, event: KeyboardEvent<HTMLDivElement>) {
+  if (event.key === 'Enter' || event.key === ' ') {
+    event.preventDefault()
+    onActivate()
+  }
+}
+
+function ChoicePanel({
+  selected,
+  title,
+  description,
+  icon,
+  iconClassName,
+  role,
+  onActivate,
+}: {
+  selected: boolean
+  title: string
+  description: string
+  icon: ReactNode
+  iconClassName?: string
+  role: 'checkbox' | 'radio'
+  onActivate: () => void
+}) {
+  return (
+    <FramePanel
+      fit
+      role={role}
+      aria-checked={selected}
+      aria-pressed={selected}
+      tabIndex={0}
+      className={cn(
+        'min-w-0 cursor-pointer transition-colors',
+        'hover:bg-muted/40 focus-visible:ring-ring focus-visible:ring-2 focus-visible:outline-none',
+        selected && 'bg-muted/40',
+      )}
+      onClick={onActivate}
+      onKeyDown={(event) => handleTileKeyDown(onActivate, event)}
+    >
+      <Item size="sm" className="w-full min-w-0 border-0 p-0">
+        <ItemMedia>
+          <IconTile
+            variant="elevated"
+            aria-hidden="true"
+            className={cn('size-10.5', iconClassName ?? DEFAULT_ICON_CLASS)}
+          >
+            {icon}
+          </IconTile>
+        </ItemMedia>
+        <ItemContent className="min-w-0 gap-0.5">
+          <ItemTitle className="w-full min-w-0">{title}</ItemTitle>
+          <ItemDescription>{description}</ItemDescription>
+        </ItemContent>
+        {selected ? (
+          <ItemActions className="shrink-0">
+            <Badge variant="outline" size="sm">
+              Выбрано
+            </Badge>
+          </ItemActions>
+        ) : null}
+      </Item>
+    </FramePanel>
+  )
+}
+
+function ChoiceFrame({ children }: { children: ReactNode }) {
+  return (
+    <Frame stacked spacing="sm" className="w-full min-w-0">
+      {children}
+    </Frame>
+  )
+}
+
+/**
+ * Мультивыбор источников проб (Local / Cloudflare / Globalping).
+ * Preview: https://reui.io/preview/base/list-9 · https://reui.io/preview/base/stats-12
+ * Docs: https://reui.io/docs/components/base/frame · https://reui.io/docs/components/base/icon-tile
+ */
+export function HealthSourceTiles({
+  value,
+  onChange,
+}: {
+  value: HealthProvider[]
+  onChange: (next: HealthProvider[]) => void
+}) {
+  const selected = value.length > 0 ? value : (['local'] as HealthProvider[])
+
+  function toggle(id: HealthProvider) {
+    if (selected.includes(id)) {
+      if (selected.length === 1) return
+      onChange(selected.filter((item) => item !== id))
+      return
+    }
+    onChange([...selected, id])
+  }
+
+  return (
+    <ChoiceFrame>
+      {PROVIDER_ITEMS.map((item) => (
+        <ChoicePanel
+          key={item.id}
+          selected={selected.includes(item.id)}
+          title={item.title}
+          description={item.description}
+          icon={item.icon}
+          iconClassName={item.iconClassName}
+          role="checkbox"
+          onActivate={() => toggle(item.id)}
+        />
+      ))}
+    </ChoiceFrame>
+  )
+}
+
+/**
+ * Правило агрегации (ровно одно): any / all / majority.
+ * Preview: https://reui.io/preview/base/list-9 · https://reui.io/preview/base/settings-5
+ */
+export function HealthAggregateTiles({
+  value,
+  onChange,
+}: {
+  value: HealthAggregate
+  onChange: (next: HealthAggregate) => void
+}) {
+  const selected = value || 'majority'
+  return (
+    <ChoiceFrame>
+      {AGGREGATE_ITEMS.map((item) => (
+        <ChoicePanel
+          key={item.id}
+          selected={selected === item.id}
+          title={item.title}
+          description={item.description}
+          icon={item.icon}
+          role="radio"
+          onActivate={() => onChange(item.id)}
+        />
+      ))}
+    </ChoiceFrame>
+  )
+}

apps/web/src/components/reui-kit/index.ts

@@ -18,3 +18,9 @@ export { OpsDashboard } from './ops-dashboard'
 export { KanbanBoard, KanbanBoardSkeleton, type KanbanBoardProps, type KanbanColumnConfig } from './kanban-board'
 export { DetailPanel, type DetailMetricCard } from './detail-panel'
 export { SettingsShell, type SettingsTabConfig } from './settings-shell'
+export {
+  HealthSourceTiles,
+  HealthAggregateTiles,
+  type HealthProvider,
+  type HealthAggregate,
+} from './health-source-tiles'

apps/web/src/components/service-edit-sheet.tsx

@@ -8,6 +8,8 @@ import {
   type LbAndHealthConfig,
   type LbMode,
   type HealthCheckType,
+  type HealthProvider,
+  type HealthAggregate,
 } from '@/components/health-check-config-fields'
 import type {
   CreateServiceWithConfigInput,
@@ -53,7 +55,9 @@ interface BindingHealthConfig {
   interval_sec: number
   timeout_ms: number
   verify_tls: boolean
-  provider: 'local' | 'cloudflare'
+  provider: HealthProvider
+  providers: HealthProvider[]
+  aggregate: HealthAggregate
 }
 
 export interface ServiceBindingDraft {
@@ -77,6 +81,8 @@ const defaultHealth: BindingHealthConfig = {
   timeout_ms: 3000,
   verify_tls: false,
   provider: 'local',
+  providers: ['local'],
+  aggregate: 'majority',
 }
 
 interface ServiceEditSheetProps {
@@ -110,7 +116,12 @@ function toBindingDrafts(service: ServiceView): ServiceBindingDraft[] {
       interval_sec: binding.health_check_interval_sec,
       timeout_ms: binding.health_check_timeout_ms,
       verify_tls: binding.health_check_verify_tls ?? false,
-      provider: binding.health_check_provider === 'cloudflare' ? 'cloudflare' : 'local',
+      provider: binding.health_check_provider ?? 'local',
+      providers:
+        binding.health_check_providers?.length > 0
+          ? binding.health_check_providers
+          : [binding.health_check_provider ?? 'local'],
+      aggregate: binding.health_check_aggregate ?? 'majority',
     },
     target_ip_weights: binding.target_ip_weights ?? {},
     target_ip_priorities: binding.target_ip_priorities ?? {},
@@ -139,6 +150,8 @@ function buildDomainsPayload(bindings: ServiceBindingDraft[]) {
             health_check_timeout_ms: binding.health.timeout_ms,
             health_check_verify_tls: binding.health.verify_tls,
             health_check_provider: binding.health.provider,
+            health_check_providers: binding.health.providers,
+            health_check_aggregate: binding.health.aggregate,
           }
         : {
             fqdn: binding.fqdn.trim(),
@@ -155,6 +168,8 @@ function buildDomainsPayload(bindings: ServiceBindingDraft[]) {
             health_check_timeout_ms: binding.health.timeout_ms,
             health_check_verify_tls: binding.health.verify_tls,
             health_check_provider: binding.health.provider,
+            health_check_providers: binding.health.providers,
+            health_check_aggregate: binding.health.aggregate,
           },
     )
 }
@@ -334,6 +349,8 @@ export function ServiceEditSheet({
       timeout_ms: next.timeout_ms,
       verify_tls: next.verify_tls,
       provider: next.provider,
+      providers: next.providers,
+      aggregate: next.aggregate,
     }
   }
 

apps/web/src/components/setting-row.tsx

@@ -73,7 +73,7 @@ export function SettingRow({
         >
           <div
             className={cn(
-              'flex w-full justify-start',
+              'flex w-full min-w-0 justify-start',
               stacked ? 'justify-start' : '@md/field-group:justify-end',
             )}
           >

apps/web/src/lib/schemas.ts

@@ -36,7 +36,9 @@ export const serviceGroupSchema = z.object({
   health_check_interval_sec: z.number().default(30),
   health_check_timeout_ms: z.number().default(3000),
   health_check_verify_tls: z.coerce.boolean().default(false),
-  health_check_provider: z.enum(['local', 'cloudflare']).catch('local'),
+  health_check_provider: z.enum(['local', 'cloudflare', 'globalping']).catch('local'),
+  health_check_providers: z.array(z.enum(['local', 'cloudflare', 'globalping'])).min(1).catch(['local']),
+  health_check_aggregate: z.enum(['any', 'all', 'majority']).catch('majority'),
   created_at: z.string(),
   updated_at: z.string(),
 })
@@ -77,7 +79,9 @@ export const serviceDomainBindingSchema = z
     health_check_interval_sec: z.number().default(30),
     health_check_timeout_ms: z.number().default(3000),
     health_check_verify_tls: z.coerce.boolean().default(false),
-    health_check_provider: z.enum(['local', 'cloudflare']).catch('local'),
+    health_check_provider: z.enum(['local', 'cloudflare', 'globalping']).catch('local'),
+    health_check_providers: z.array(z.enum(['local', 'cloudflare', 'globalping'])).min(1).catch(['local']),
+    health_check_aggregate: z.enum(['any', 'all', 'majority']).catch('majority'),
     sync_status: z.string().nullable().default(null),
   })
   .transform((binding) => ({
@@ -102,7 +106,7 @@ export const serviceIpHealthSchema = z.object({
   latency_ms: z.number().nullable(),
   last_checked_at: z.string().nullable().optional(),
   last_error: z.string().nullable().optional(),
-  provider: z.enum(['local', 'cloudflare']).optional(),
+  provider: z.enum(['local', 'cloudflare', 'globalping', 'aggregate']).optional(),
   colo: z.string().nullable().optional(),
 })
 
@@ -111,7 +115,7 @@ export const healthProbeLogSchema = z.object({
   scope: z.string(),
   ref_id: z.number(),
   ip: z.string(),
-  provider: z.enum(['local', 'cloudflare']),
+  provider: z.enum(['local', 'cloudflare', 'globalping']),
   status: z.enum(['up', 'down', 'degraded', 'unknown']),
   ok: z.coerce.boolean(),
   latency_ms: z.number().nullable(),
@@ -188,7 +192,9 @@ export const serviceBindingSchema = z
     health_check_interval_sec: z.number().default(30),
     health_check_timeout_ms: z.number().default(3000),
     health_check_verify_tls: z.coerce.boolean().default(false),
-    health_check_provider: z.enum(['local', 'cloudflare']).catch('local'),
+    health_check_provider: z.enum(['local', 'cloudflare', 'globalping']).catch('local'),
+    health_check_providers: z.array(z.enum(['local', 'cloudflare', 'globalping'])).min(1).catch(['local']),
+    health_check_aggregate: z.enum(['any', 'all', 'majority']).catch('majority'),
     sync_status: z.string().nullable().default(null),
     created_at: z.string(),
     updated_at: z.string(),
@@ -273,7 +279,9 @@ const healthCheckConfigFields = {
   health_check_interval_sec: z.number().int().min(5).max(3600).optional(),
   health_check_timeout_ms: z.number().int().min(100).max(30000).optional(),
   health_check_verify_tls: z.boolean().optional(),
-  health_check_provider: z.enum(['local', 'cloudflare']).optional(),
+  health_check_provider: z.enum(['local', 'cloudflare', 'globalping']).optional(),
+  health_check_providers: z.array(z.enum(['local', 'cloudflare', 'globalping'])).min(1).optional(),
+  health_check_aggregate: z.enum(['any', 'all', 'majority']).optional(),
 }
 
 const serviceDomainInputSchema = z

apps/web/src/routes/_auth/settings/health.tsx

@@ -5,7 +5,7 @@ import { useForm, Controller } from 'react-hook-form'
 import { zodResolver } from '@hookform/resolvers/zod'
 import { z } from 'zod'
 import { toast } from 'sonner'
-import { HeartPulseIcon } from 'lucide-react'
+import { HeartPulseIcon, GlobeIcon } from 'lucide-react'
 
 import { api } from '@/lib/api-client'
 import { SettingRow } from '@/components/setting-row'
@@ -28,6 +28,8 @@ import {
 import { FieldGroup } from '@cfdm/ui/components/field'
 import { Input } from '@cfdm/ui/components/input'
 import { Alert, AlertDescription, AlertTitle } from '@/components/reui/alert'
+import { Badge } from '@/components/reui/badge'
+import { Button } from '@cfdm/ui/components/button'
 
 const formSchema = z.object({
   healthCheckCron: z.string().trim().min(1, 'Укажите cron').max(64),
@@ -35,8 +37,6 @@ const formSchema = z.object({
   healthDownFailures: z.number().int().min(1).max(50),
   healthLatencyWarnMs: z.number().int().min(50).max(60_000),
   healthSuccessRecoveries: z.number().int().min(1).max(20),
-  healthWorkerUrl: z.string().trim().url('Некорректный URL').or(z.literal('')),
-  healthWorkerToken: z.string().optional(),
 }).superRefine((data, ctx) => {
   if (data.healthDownFailures < data.healthDegradedFailures) {
     ctx.addIssue({
@@ -47,11 +47,27 @@ const formSchema = z.object({
   }
 })
 
+const globalpingSchema = z.object({
+  globalpingToken: z.string().optional(),
+  globalpingLocations: z.string().trim().min(1).max(200),
+  globalpingLimit: z.number().int().min(1).max(10),
+})
+
 type FormValues = z.infer<typeof formSchema>
+type GlobalpingValues = z.infer<typeof globalpingSchema>
+type HealthWorkerStatus = 'missing' | 'ready' | 'error'
 
 type SettingsResponse = FormValues & {
   id: string
-  healthWorkerTokenSet?: boolean
+  healthWorkerUrl?: string
+  healthWorkerStatus?: HealthWorkerStatus
+  healthWorkerError?: string | null
+  healthWorkerDeployedAt?: string | null
+  healthWorkerLastIngestAt?: string | null
+  healthWorkerKvNamespaceId?: string
+  globalpingTokenSet?: boolean
+  globalpingLocations?: string
+  globalpingLimit?: number
 }
 
 export const Route = createFileRoute('/_auth/settings/health')({
@@ -94,6 +110,28 @@ function CompactNumberInput({
   )
 }
 
+function statusBadge(status: HealthWorkerStatus | undefined) {
+  if (status === 'ready') {
+    return (
+      <Badge variant="success-light" size="sm">
+        Готов
+      </Badge>
+    )
+  }
+  if (status === 'error') {
+    return (
+      <Badge variant="destructive-light" size="sm">
+        Ошибка
+      </Badge>
+    )
+  }
+  return (
+    <Badge variant="outline" size="sm">
+      Не создан
+    </Badge>
+  )
+}
+
 function HealthSettingsPage() {
   const queryClient = useQueryClient()
   const { data, isLoading } = useQuery({
@@ -109,8 +147,15 @@ function HealthSettingsPage() {
       healthDownFailures: 2,
       healthLatencyWarnMs: 1000,
       healthSuccessRecoveries: 2,
-      healthWorkerUrl: '',
-      healthWorkerToken: '',
+    },
+  })
+
+  const gpForm = useForm<GlobalpingValues>({
+    resolver: zodResolver(globalpingSchema),
+    defaultValues: {
+      globalpingToken: '',
+      globalpingLocations: 'World',
+      globalpingLimit: 3,
     },
   })
 
@@ -122,26 +167,23 @@ function HealthSettingsPage() {
       healthDownFailures: data.healthDownFailures,
       healthLatencyWarnMs: data.healthLatencyWarnMs,
       healthSuccessRecoveries: data.healthSuccessRecoveries,
-      healthWorkerUrl: data.healthWorkerUrl ?? '',
-      healthWorkerToken: '',
     })
-  }, [data, form])
+    gpForm.reset({
+      globalpingToken: '',
+      globalpingLocations: data.globalpingLocations || 'World',
+      globalpingLimit: data.globalpingLimit ?? 3,
+    })
+  }, [data, form, gpForm])
 
   const saveMut = useMutation({
-    mutationFn: (values: FormValues) => {
-      const payload: Record<string, unknown> = {
+    mutationFn: (values: FormValues) =>
+      api.patch<SettingsResponse>('/api/v1/settings', {
         healthCheckCron: values.healthCheckCron,
         healthDegradedFailures: values.healthDegradedFailures,
         healthDownFailures: values.healthDownFailures,
         healthLatencyWarnMs: values.healthLatencyWarnMs,
         healthSuccessRecoveries: values.healthSuccessRecoveries,
-        healthWorkerUrl: values.healthWorkerUrl,
-      }
-      if (values.healthWorkerToken?.trim()) {
-        payload.healthWorkerToken = values.healthWorkerToken.trim()
-      }
-      return api.patch<SettingsResponse>('/api/v1/settings', payload)
-    },
+      }),
     onSuccess: () => {
       void queryClient.invalidateQueries({ queryKey: ['app-settings'] })
       toast.success('Настройки health-check сохранены')
@@ -150,7 +192,40 @@ function HealthSettingsPage() {
       toast.error(e instanceof Error ? e.message : 'Не удалось сохранить'),
   })
 
+  const saveGpMut = useMutation({
+    mutationFn: (values: GlobalpingValues) =>
+      api.patch<SettingsResponse>('/api/v1/settings', {
+        globalpingLocations: values.globalpingLocations,
+        globalpingLimit: values.globalpingLimit,
+        ...(values.globalpingToken?.trim()
+          ? { globalpingToken: values.globalpingToken.trim() }
+          : {}),
+      }),
+    onSuccess: () => {
+      void queryClient.invalidateQueries({ queryKey: ['app-settings'] })
+      toast.success('Настройки Globalping сохранены')
+      gpForm.reset({
+        ...gpForm.getValues(),
+        globalpingToken: '',
+      })
+    },
+    onError: (e: unknown) =>
+      toast.error(e instanceof Error ? e.message : 'Не удалось сохранить'),
+  })
+
+  const ensureMut = useMutation({
+    mutationFn: () =>
+      api.post<SettingsResponse>('/api/v1/settings/health/worker/ensure'),
+    onSuccess: () => {
+      void queryClient.invalidateQueries({ queryKey: ['app-settings'] })
+      toast.success('Worker создан или обновлён')
+    },
+    onError: (e: unknown) =>
+      toast.error(e instanceof Error ? e.message : 'Не удалось создать Worker'),
+  })
+
   return (
+    <div className="flex w-full flex-col gap-4">
     <form
       className="flex w-full flex-col gap-4"
       onSubmit={(event) =>
@@ -164,15 +239,15 @@ function HealthSettingsPage() {
             Local health-check
           </FrameTitle>
           <FrameDescription>
-            Расписание и пороги движка — общие для Local и Cloudflare Worker.
-            Тип/порт/path задаются в карточке сервиса.
+            Расписание и пороги движка — общие для Local, Cloudflare Worker и Globalping.
+            Тип/порт/path и правило агрегации задаются в карточке сервиса.
           </FrameDescription>
         </FrameHeader>
         <FramePanel className="p-0">
           <FieldGroup className="gap-0">
             <SettingRow
               title="Cron"
-              description="Расписание проб (6 полей: сек мин час день месяц день-недели). Env: HEALTH_CHECK_CRON."
+              description="Расписание проб CFDM (6 полей). Worker на edge получает 5-польное cron без секунд. Env: HEALTH_CHECK_CRON."
               labelFor="health-cron"
               stacked
             >
@@ -267,6 +342,7 @@ function HealthSettingsPage() {
               description="Подряд успешных проб, чтобы выйти из Checking в Healthy. Env: HEALTH_SUCCESS_RECOVERIES."
               labelFor="health-recoveries"
               compact
+              last
             >
               <Controller
                 control={form.control}
@@ -283,55 +359,7 @@ function HealthSettingsPage() {
                 )}
               />
             </SettingRow>
-
-            <SettingRow
-              title="URL Worker"
-              description="https://cfdm-health-probe.<account>.workers.dev. Env: HEALTH_WORKER_URL."
-              labelFor="health-worker-url"
-              compact
-            >
-              <Input
-                id="health-worker-url"
-                type="url"
-                placeholder="https://cfdm-health-probe.workers.dev"
-                disabled={isLoading || saveMut.isPending}
-                {...form.register('healthWorkerUrl')}
-              />
-            </SettingRow>
-            {form.formState.errors.healthWorkerUrl ? (
-              <p className="text-destructive px-5 pb-2 text-sm">
-                {form.formState.errors.healthWorkerUrl.message}
-              </p>
-            ) : null}
-
-            <SettingRow
-              title="Токен Worker"
-              description={
-                data?.healthWorkerTokenSet
-                  ? 'Токен задан. Оставьте пустым, чтобы не менять.'
-                  : 'Authorization Bearer. Env: HEALTH_WORKER_TOKEN.'
-              }
-              labelFor="health-worker-token"
-              compact
-              last
-            >
-              <Input
-                id="health-worker-token"
-                type="password"
-                autoComplete="new-password"
-                placeholder={data?.healthWorkerTokenSet ? '••••••••' : 'секрет'}
-                disabled={isLoading || saveMut.isPending}
-                {...form.register('healthWorkerToken')}
-              />
-            </SettingRow>
           </FieldGroup>
-          <Alert>
-            <AlertTitle>Cloudflare Worker, не Health Checks API</AlertTitle>
-            <AlertDescription>
-              На Free-плане продукта Health Checks нет. CFDM вызывает Worker с edge;
-              cron остаётся здесь. Лимит Free Workers ≈ 100k запросов/сутки (cron × число IP).
-            </AlertDescription>
-          </Alert>
           <FrameFooter className="flex flex-row justify-end">
             <LoadingButton
               type="submit"
@@ -343,6 +371,218 @@ function HealthSettingsPage() {
           </FrameFooter>
         </FramePanel>
       </Frame>
+
+      <Frame dense spacing="sm" className="w-full">
+        <FrameHeader>
+          <FrameTitle className="flex items-center gap-2">
+            Cloudflare Worker
+            {statusBadge(data?.healthWorkerStatus)}
+          </FrameTitle>
+          <FrameDescription>
+            Worker сам опрашивает IP/порты с edge. CFDM создаёт скрипт через API
+            и забирает результаты из KV. Preview:{' '}
+            <a
+              href="https://reui.io/preview/base/settings-16"
+              className="underline"
+              target="_blank"
+              rel="noreferrer"
+            >
+              settings-16
+            </a>
+            .
+          </FrameDescription>
+        </FrameHeader>
+        <FramePanel className="flex flex-col gap-3 p-4">
+          <Alert variant={data?.healthWorkerStatus === 'error' ? 'destructive' : 'info'}>
+            <AlertTitle>Не Health Checks API</AlertTitle>
+            <AlertDescription>
+              На Free-плане продукта Health Checks нет. Нужен Account-токен с
+              Workers Scripts Write и Workers KV Storage Write — Zone DNS
+              недостаточно. Лимиты Free: 5 cron на аккаунт, KV 1000 writes/сутки
+              (интервал ≥ 2 мин), до 48 целей за тик.
+            </AlertDescription>
+          </Alert>
+          {data?.healthWorkerError ? (
+            <Alert variant="destructive">
+              <AlertTitle>Ошибка деплоя</AlertTitle>
+              <AlertDescription>{data.healthWorkerError}</AlertDescription>
+            </Alert>
+          ) : null}
+          <FieldGroup className="gap-0">
+            <SettingRow title="Скрипт" compact>
+              <span className="font-mono text-sm">cfdm-health-probe</span>
+            </SettingRow>
+            <SettingRow
+              title="KV namespace"
+              description="id mailbox targets/results"
+              compact
+            >
+              <span className="font-mono text-sm break-all">
+                {data?.healthWorkerKvNamespaceId || '—'}
+              </span>
+            </SettingRow>
+            <SettingRow
+              title="URL"
+              description="workers.dev после автодеплоя"
+              compact
+            >
+              <span className="font-mono text-sm break-all">
+                {data?.healthWorkerUrl || '—'}
+              </span>
+            </SettingRow>
+            <SettingRow
+              title="Последний деплой"
+              compact
+            >
+              <span className="text-sm text-muted-foreground">
+                {data?.healthWorkerDeployedAt || '—'}
+              </span>
+            </SettingRow>
+            <SettingRow
+              title="Последний ingest"
+              description="colo пишется в журнал проб"
+              compact
+              last
+            >
+              <span className="text-sm text-muted-foreground">
+                {data?.healthWorkerLastIngestAt || '—'}
+              </span>
+            </SettingRow>
+          </FieldGroup>
+          <div className="flex justify-end">
+            <Button
+              type="button"
+              variant="outline"
+              disabled={ensureMut.isPending}
+              onClick={() => ensureMut.mutate()}
+            >
+              {ensureMut.isPending ? 'Создаём…' : 'Создать / обновить Worker'}
+            </Button>
+          </div>
+        </FramePanel>
+      </Frame>
     </form>
+
+      <form
+        className="flex w-full flex-col gap-4"
+        onSubmit={(event) =>
+          void gpForm.handleSubmit((values) => saveGpMut.mutate(values))(event)
+        }
+      >
+        <Frame dense spacing="sm" className="w-full">
+          <FrameHeader>
+            <FrameTitle className="flex items-center gap-2">
+              <GlobeIcon className="size-4" aria-hidden />
+              Globalping
+              <Badge
+                variant={data?.globalpingTokenSet ? 'success-light' : 'outline'}
+                size="sm"
+              >
+                {data?.globalpingTokenSet ? 'Токен задан' : 'Нет токена'}
+              </Badge>
+            </FrameTitle>
+            <FrameDescription>
+              Пробы из сети globalping.io. Poll ≥ 500 мс.{' '}
+              <a
+                href="https://reui.io/preview/base/settings-16"
+                className="underline"
+                target="_blank"
+                rel="noreferrer"
+              >
+                settings-16
+              </a>
+              .
+            </FrameDescription>
+          </FrameHeader>
+          <FramePanel className="p-0">
+            <div className="flex flex-col gap-3 p-4">
+              <Alert>
+                <AlertTitle>Лимиты и credits</AlertTitle>
+                <AlertDescription>
+                  Без токена — 250 tests/hour, с токеном — 500 +{' '}
+                  <a
+                    href="https://globalping.io/credits"
+                    className="underline"
+                    target="_blank"
+                    rel="noreferrer"
+                  >
+                    credits
+                  </a>
+                  . Токен: dash.globalping.io/tokens. Один measurement на
+                  уникальный IP/порт за тик cron. При десятках IP следите за
+                  hourly credits.
+                </AlertDescription>
+              </Alert>
+            </div>
+            <FieldGroup className="gap-0">
+              <SettingRow
+                title="Токен"
+                description={
+                  data?.globalpingTokenSet
+                    ? 'Оставьте пустым, чтобы не менять сохранённый токен.'
+                    : 'Authorization: Bearer. Без токена источник Globalping = fail.'
+                }
+                labelFor="gp-token"
+                stacked
+              >
+                <Input
+                  id="gp-token"
+                  type="password"
+                  autoComplete="off"
+                  placeholder={data?.globalpingTokenSet ? '••••••••' : 'gp_…'}
+                  disabled={isLoading || saveGpMut.isPending}
+                  {...gpForm.register('globalpingToken')}
+                />
+              </SettingRow>
+              <SettingRow
+                title="Локации"
+                description="Magic CSV, например World или EU,US. Default World."
+                labelFor="gp-locations"
+                stacked
+              >
+                <Input
+                  id="gp-locations"
+                  spellCheck={false}
+                  autoComplete="off"
+                  disabled={isLoading || saveGpMut.isPending}
+                  {...gpForm.register('globalpingLocations')}
+                />
+              </SettingRow>
+              <SettingRow
+                title="Проб в measurement"
+                description="limit 1–10. Default 3."
+                labelFor="gp-limit"
+                compact
+                last
+              >
+                <Controller
+                  control={gpForm.control}
+                  name="globalpingLimit"
+                  render={({ field }) => (
+                    <CompactNumberInput
+                      id="gp-limit"
+                      value={field.value}
+                      min={1}
+                      max={10}
+                      disabled={isLoading || saveGpMut.isPending}
+                      onValueChange={field.onChange}
+                    />
+                  )}
+                />
+              </SettingRow>
+            </FieldGroup>
+            <FrameFooter className="flex flex-row justify-end">
+              <LoadingButton
+                type="submit"
+                isLoading={saveGpMut.isPending}
+                disabled={isLoading || !gpForm.formState.isDirty}
+              >
+                Сохранить
+              </LoadingButton>
+            </FrameFooter>
+          </FramePanel>
+        </Frame>
+      </form>
+    </div>
   )
 }

deploy/docker/cfdm/Dockerfile

@@ -21,6 +21,7 @@ COPY apps/api apps/api
 COPY packages/ui packages/ui
 COPY packages/shared packages/shared
 COPY packages/db packages/db
+COPY workers/health-probe workers/health-probe
 RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \
     pnpm turbo build --filter=web --filter=@cfdm/api \
     && pnpm --filter @cfdm/api deploy --prod /out \

docs/Home.md

@@ -14,7 +14,7 @@ Manage Cloudflare zones, DNS records, domain groups, and TLS certificate expiry
 
 | Variable | Description |
 |----------|-------------|
-| `CLOUDFLARE_API_TOKEN` | API token with Zone.DNS permissions |
+| `CLOUDFLARE_API_TOKEN` | API token: Zone.DNS **и** для Worker — Account Workers Scripts Write + Workers KV Storage Write |
 | `DATABASE_URL` | SQLite path (`sqlite:/data/app.db`) |
 | `JWT_SECRET` | JWT signing secret |
 | `ADMIN_USERNAME` | Admin username |
@@ -25,8 +25,6 @@ Manage Cloudflare zones, DNS records, domain groups, and TLS certificate expiry
 | `HEALTH_DOWN_FAILURES` | Ошибок подряд до `down` (default `2`). То же в UI. |
 | `HEALTH_SUCCESS_RECOVERIES` | Успехов подряд для recovery `CHECKING → HEALTHY` (default `2`). То же в UI. |
 | `HEALTH_LATENCY_WARN_MS` | Латентность-порог для `degraded` (default `1000`). То же в UI. |
-| `HEALTH_WORKER_URL` | URL Worker health-probe (fallback). Переопределяется в **Настройки → Health-check**. |
-| `HEALTH_WORKER_TOKEN` | Bearer-токен Worker (fallback). В GET `/settings` не отдаётся целиком. |
 
 ## Load balancing & health checks
 
@@ -51,29 +49,47 @@ health-check работают на двух уровнях:
 после `HEALTH_SUCCESS_RECOVERIES` (default 2). Пороги и cron движка задаются в
 **Настройки → Health-check** (env — fallback, пока значения не сохранены в UI).
 
-### Local XOR Cloudflare Worker
+### Источники проб: Local, Cloudflare Worker, Globalping
 
-Провайдер задаётся на привязке (`service_bindings.health_check_provider`): **local**
-или **cloudflare**. Одновременно оба не работают.
+На привязке/группе задаётся **мультивыбор** источников (`health_check_providers` JSON)
+и **правило агрегации** (`health_check_aggregate`: `any` | `all` | `majority`).
+Failover читает одну строку `ip_health_status` (агрегат). Журнал `health_probe_log` —
+строка на каждый источник.
 
-| | Local | Cloudflare Worker |
-|---|---|---|
-| Кто пробирует | процесс API CFDM | Worker на edge Cloudflare |
-| Планировщик | глобальный cron CFDM | тот же cron вызывает Worker |
-| Пороги Slow/Down | Настройки → Health-check | те же |
-| Результат | SQLite `ip_health_status` | та же SQLite + `colo` |
-| Регионы Health Checks | нет | нет (на Free продукта нет) |
+| | Local | Cloudflare Worker | Globalping |
+|---|---|---|---|
+| Кто пробирует | процесс API CFDM | Worker на edge (Cron Trigger) | [globalping.io](https://globalping.io) |
+| Планировщик | глобальный cron CFDM | cron Worker + ingest KV | тот же cron CFDM (POST/GET measurements) |
+| Пороги Slow/Down | Настройки → Health-check | те же | те же (по агрегату) |
+| Результат | SQLite `ip_health_status` | та же SQLite + `colo` из KV | та же SQLite, colo = city/country пробы |
+| Fallback | — | нет (не Local) | нет (нет токена / 429 / timeout = fail) |
+
+**Агрегация (на сервисе/группе):**
+
+- `any` — Down, если хотя бы один выбранный источник Down
+- `all` — Down, только если все выбранные Down
+- `majority` — Down по большинству (2 источника → оба; 3 → ≥2)
 
 **Cloudflare в CFDM — это Worker**, не [Health Checks API](https://developers.cloudflare.com/api/resources/healthchecks).
-Продукт Health Checks на Free-плане недоступен и **не используется**. Worker
-stateless: конфиг и журнал (`health_probe_log`) живут в SQLite CFDM.
+Продукт Health Checks на Free-плане недоступен и **не используется**.
 
-Деплой Worker: [`workers/health-probe/README.md`](../workers/health-probe/README.md)
-(`wrangler deploy`). URL и токен — **Настройки → Health-check**. Если Worker не
-задан, cloudflare-цели **не** пробируются как Local.
+Worker **сам** опрашивает IP/порты/протоколы (TCP/HTTP, паттерн [UptimeFlare](https://github.com/lyc8503/UptimeFlare): `sockets.opened`, p-limit 5).
+CFDM создаёт скрипт через Workers Scripts API, кладёт список целей в KV и читает результаты.
+Публичный URL API не нужен. Если Worker/KV не готовы, cloudflare-цели **не** пробируются как Local.
 
-Reconcile DNS запускается cron-задачей `health-check`. Free Workers ≈ 100k
-запросов/сутки; cron раз в 2 мин × число IP должен влезать.
+Кнопка **Создать / обновить Worker** — **Настройки → Health-check**. Токен:
+Account `Workers Scripts Write` + `Workers KV Storage Write`. Zone DNS недостаточно.
+
+Free: 5 Cron Triggers на аккаунт; KV 1000 writes/сутки (интервал ≥ 2 мин);
+≤ 48 целей за тик. Исходник: [`workers/health-probe/`](../workers/health-probe/).
+
+**Globalping:** `POST /v1/measurements` → poll `GET` каждые ≥ 500 мс.
+CFDM TCP → `type: ping` + `protocol: TCP`; HTTP → `type: http`, `target` = IP, `request.host` = hostname.
+Токен: [dash.globalping.io/tokens](https://dash.globalping.io/tokens). Без токена 250 tests/hour, с токеном 500 + [credits](https://globalping.io/credits).
+Локации (magic CSV, default `World`) и `limit` (1–10, default 3) — **Настройки → Health-check**.
+Один measurement на уникальный origin (IP/порт/path) за тик.
+
+Reconcile DNS запускается cron-задачей `health-check` после ingest KV и агрегации.
 
 ## Docker
 

packages/db/dist/index.d.ts

@@ -1,7 +1,7 @@
 import * as drizzle_orm_sqlite_core from 'drizzle-orm/sqlite-core';
 import Database from 'better-sqlite3';
 import { drizzle } from 'drizzle-orm/better-sqlite3';
-import { AuditSourceApp, AuditSeverity, AuditTargetType, AuditLogEntry, LbMode, HealthCheckType, HealthCheckProvider, IpHealthState, HealthCheckScope, ServiceBinding, Domain, Group, OriginHealthCheck, ServiceNode, Service, ServiceGroup, Subdomain, DnsRecord, ServiceBindingView, Certificate, GroupWithStats, IpHealthStatus, SyncJob, DomainListItem, HealthCheckTarget } from '@cfdm/shared';
+import { AuditSourceApp, AuditSeverity, AuditTargetType, AuditLogEntry, HealthWorkerStatus, LbMode, HealthCheckType, HealthCheckProvider, HealthCheckAggregate, IpHealthState, HealthStatusProvider, HealthCheckScope, ServiceBinding, Domain, Group, OriginHealthCheck, ServiceNode, Service, ServiceGroup, Subdomain, DnsRecord, ServiceBindingView, Certificate, GroupWithStats, IpHealthStatus, SyncJob, DomainListItem, HealthCheckTarget } from '@cfdm/shared';
 
 declare const groups: drizzle_orm_sqlite_core.SQLiteTableWithColumns<{
     name: "groups";
@@ -599,6 +599,44 @@ declare const serviceGroups: drizzle_orm_sqlite_core.SQLiteTableWithColumns<{
         }, {}, {
             length: number | undefined;
         }>;
+        health_check_providers: drizzle_orm_sqlite_core.SQLiteColumn<{
+            name: "health_check_providers";
+            tableName: "service_groups";
+            dataType: "string";
+            columnType: "SQLiteText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            length: number | undefined;
+        }>;
+        health_check_aggregate: drizzle_orm_sqlite_core.SQLiteColumn<{
+            name: "health_check_aggregate";
+            tableName: "service_groups";
+            dataType: "string";
+            columnType: "SQLiteText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            length: number | undefined;
+        }>;
         created_at: drizzle_orm_sqlite_core.SQLiteColumn<{
             name: "created_at";
             tableName: "service_groups";
@@ -1537,6 +1575,44 @@ declare const serviceBindings: drizzle_orm_sqlite_core.SQLiteTableWithColumns<{
         }, {}, {
             length: number | undefined;
         }>;
+        health_check_providers: drizzle_orm_sqlite_core.SQLiteColumn<{
+            name: "health_check_providers";
+            tableName: "service_bindings";
+            dataType: "string";
+            columnType: "SQLiteText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            length: number | undefined;
+        }>;
+        health_check_aggregate: drizzle_orm_sqlite_core.SQLiteColumn<{
+            name: "health_check_aggregate";
+            tableName: "service_bindings";
+            dataType: "string";
+            columnType: "SQLiteText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            length: number | undefined;
+        }>;
         routing_strategy: drizzle_orm_sqlite_core.SQLiteColumn<{
             name: "routing_strategy";
             tableName: "service_bindings";
@@ -3365,6 +3441,156 @@ declare const appSettings: drizzle_orm_sqlite_core.SQLiteTableWithColumns<{
         }, {}, {
             length: number | undefined;
         }>;
+        health_worker_account_id: drizzle_orm_sqlite_core.SQLiteColumn<{
+            name: "health_worker_account_id";
+            tableName: "app_settings";
+            dataType: "string";
+            columnType: "SQLiteText";
+            data: string;
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            length: number | undefined;
+        }>;
+        health_worker_kv_namespace_id: drizzle_orm_sqlite_core.SQLiteColumn<{
+            name: "health_worker_kv_namespace_id";
+            tableName: "app_settings";
+            dataType: "string";
+            columnType: "SQLiteText";
+            data: string;
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            length: number | undefined;
+        }>;
+        health_worker_error: drizzle_orm_sqlite_core.SQLiteColumn<{
+            name: "health_worker_error";
+            tableName: "app_settings";
+            dataType: "string";
+            columnType: "SQLiteText";
+            data: string;
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            length: number | undefined;
+        }>;
+        health_worker_deployed_at: drizzle_orm_sqlite_core.SQLiteColumn<{
+            name: "health_worker_deployed_at";
+            tableName: "app_settings";
+            dataType: "string";
+            columnType: "SQLiteText";
+            data: string;
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            length: number | undefined;
+        }>;
+        health_worker_last_ingest_at: drizzle_orm_sqlite_core.SQLiteColumn<{
+            name: "health_worker_last_ingest_at";
+            tableName: "app_settings";
+            dataType: "string";
+            columnType: "SQLiteText";
+            data: string;
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            length: number | undefined;
+        }>;
+        globalping_token: drizzle_orm_sqlite_core.SQLiteColumn<{
+            name: "globalping_token";
+            tableName: "app_settings";
+            dataType: "string";
+            columnType: "SQLiteText";
+            data: string;
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            length: number | undefined;
+        }>;
+        globalping_locations: drizzle_orm_sqlite_core.SQLiteColumn<{
+            name: "globalping_locations";
+            tableName: "app_settings";
+            dataType: "string";
+            columnType: "SQLiteText";
+            data: string;
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            length: number | undefined;
+        }>;
+        globalping_limit: drizzle_orm_sqlite_core.SQLiteColumn<{
+            name: "globalping_limit";
+            tableName: "app_settings";
+            dataType: "number";
+            columnType: "SQLiteInteger";
+            data: number;
+            driverParam: number;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
         created_at: drizzle_orm_sqlite_core.SQLiteColumn<{
             name: "created_at";
             tableName: "app_settings";
@@ -5056,6 +5282,44 @@ declare const schema: {
             }, {}, {
                 length: number | undefined;
             }>;
+            health_check_providers: drizzle_orm_sqlite_core.SQLiteColumn<{
+                name: "health_check_providers";
+                tableName: "service_groups";
+                dataType: "string";
+                columnType: "SQLiteText";
+                data: string;
+                driverParam: string;
+                notNull: true;
+                hasDefault: true;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: [string, ...string[]];
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {
+                length: number | undefined;
+            }>;
+            health_check_aggregate: drizzle_orm_sqlite_core.SQLiteColumn<{
+                name: "health_check_aggregate";
+                tableName: "service_groups";
+                dataType: "string";
+                columnType: "SQLiteText";
+                data: string;
+                driverParam: string;
+                notNull: true;
+                hasDefault: true;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: [string, ...string[]];
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {
+                length: number | undefined;
+            }>;
             created_at: drizzle_orm_sqlite_core.SQLiteColumn<{
                 name: "created_at";
                 tableName: "service_groups";
@@ -5994,6 +6258,44 @@ declare const schema: {
             }, {}, {
                 length: number | undefined;
             }>;
+            health_check_providers: drizzle_orm_sqlite_core.SQLiteColumn<{
+                name: "health_check_providers";
+                tableName: "service_bindings";
+                dataType: "string";
+                columnType: "SQLiteText";
+                data: string;
+                driverParam: string;
+                notNull: true;
+                hasDefault: true;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: [string, ...string[]];
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {
+                length: number | undefined;
+            }>;
+            health_check_aggregate: drizzle_orm_sqlite_core.SQLiteColumn<{
+                name: "health_check_aggregate";
+                tableName: "service_bindings";
+                dataType: "string";
+                columnType: "SQLiteText";
+                data: string;
+                driverParam: string;
+                notNull: true;
+                hasDefault: true;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: [string, ...string[]];
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {
+                length: number | undefined;
+            }>;
             routing_strategy: drizzle_orm_sqlite_core.SQLiteColumn<{
                 name: "routing_strategy";
                 tableName: "service_bindings";
@@ -7822,6 +8124,156 @@ declare const schema: {
             }, {}, {
                 length: number | undefined;
             }>;
+            health_worker_account_id: drizzle_orm_sqlite_core.SQLiteColumn<{
+                name: "health_worker_account_id";
+                tableName: "app_settings";
+                dataType: "string";
+                columnType: "SQLiteText";
+                data: string;
+                driverParam: string;
+                notNull: false;
+                hasDefault: false;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: [string, ...string[]];
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {
+                length: number | undefined;
+            }>;
+            health_worker_kv_namespace_id: drizzle_orm_sqlite_core.SQLiteColumn<{
+                name: "health_worker_kv_namespace_id";
+                tableName: "app_settings";
+                dataType: "string";
+                columnType: "SQLiteText";
+                data: string;
+                driverParam: string;
+                notNull: false;
+                hasDefault: false;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: [string, ...string[]];
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {
+                length: number | undefined;
+            }>;
+            health_worker_error: drizzle_orm_sqlite_core.SQLiteColumn<{
+                name: "health_worker_error";
+                tableName: "app_settings";
+                dataType: "string";
+                columnType: "SQLiteText";
+                data: string;
+                driverParam: string;
+                notNull: false;
+                hasDefault: false;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: [string, ...string[]];
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {
+                length: number | undefined;
+            }>;
+            health_worker_deployed_at: drizzle_orm_sqlite_core.SQLiteColumn<{
+                name: "health_worker_deployed_at";
+                tableName: "app_settings";
+                dataType: "string";
+                columnType: "SQLiteText";
+                data: string;
+                driverParam: string;
+                notNull: false;
+                hasDefault: false;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: [string, ...string[]];
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {
+                length: number | undefined;
+            }>;
+            health_worker_last_ingest_at: drizzle_orm_sqlite_core.SQLiteColumn<{
+                name: "health_worker_last_ingest_at";
+                tableName: "app_settings";
+                dataType: "string";
+                columnType: "SQLiteText";
+                data: string;
+                driverParam: string;
+                notNull: false;
+                hasDefault: false;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: [string, ...string[]];
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {
+                length: number | undefined;
+            }>;
+            globalping_token: drizzle_orm_sqlite_core.SQLiteColumn<{
+                name: "globalping_token";
+                tableName: "app_settings";
+                dataType: "string";
+                columnType: "SQLiteText";
+                data: string;
+                driverParam: string;
+                notNull: false;
+                hasDefault: false;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: [string, ...string[]];
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {
+                length: number | undefined;
+            }>;
+            globalping_locations: drizzle_orm_sqlite_core.SQLiteColumn<{
+                name: "globalping_locations";
+                tableName: "app_settings";
+                dataType: "string";
+                columnType: "SQLiteText";
+                data: string;
+                driverParam: string;
+                notNull: false;
+                hasDefault: false;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: [string, ...string[]];
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {
+                length: number | undefined;
+            }>;
+            globalping_limit: drizzle_orm_sqlite_core.SQLiteColumn<{
+                name: "globalping_limit";
+                tableName: "app_settings";
+                dataType: "number";
+                columnType: "SQLiteInteger";
+                data: number;
+                driverParam: number;
+                notNull: false;
+                hasDefault: false;
+                isPrimaryKey: false;
+                isAutoincrement: false;
+                hasRuntimeDefault: false;
+                enumValues: undefined;
+                baseColumn: never;
+                identity: undefined;
+                generated: undefined;
+            }, {}, {}>;
             created_at: drizzle_orm_sqlite_core.SQLiteColumn<{
                 name: "created_at";
                 tableName: "app_settings";
@@ -8980,6 +9432,15 @@ type AppSettingsDto = {
     showQuickActions: boolean;
     healthWorkerUrl: string;
     healthWorkerTokenSet: boolean;
+    healthWorkerStatus: HealthWorkerStatus;
+    healthWorkerAccountId: string;
+    healthWorkerKvNamespaceId: string;
+    healthWorkerError: string | null;
+    healthWorkerDeployedAt: string | null;
+    healthWorkerLastIngestAt: string | null;
+    globalpingTokenSet: boolean;
+    globalpingLocations: string;
+    globalpingLimit: number;
 } & HealthEngineSettings;
 type AppSettingsPatch = {
     vpsTrackerUrl?: string;
@@ -8993,6 +9454,14 @@ type AppSettingsPatch = {
     healthSuccessRecoveries?: number;
     healthWorkerUrl?: string;
     healthWorkerToken?: string;
+    healthWorkerAccountId?: string | null;
+    healthWorkerKvNamespaceId?: string | null;
+    healthWorkerError?: string | null;
+    healthWorkerDeployedAt?: string | null;
+    healthWorkerLastIngestAt?: string | null;
+    globalpingToken?: string;
+    globalpingLocations?: string;
+    globalpingLimit?: number;
 };
 type HealthEngineFallbacks = HealthEngineSettings & {
     healthWorkerUrl: string;
@@ -9005,6 +9474,9 @@ declare function getAppSettingsSecrets(db: Db): {
     vpsTrackerSyncEnabled: boolean;
     healthWorkerUrl: string;
     healthWorkerToken: string;
+    globalpingToken: string;
+    globalpingLocations: string;
+    globalpingLimit: number;
 };
 declare function updateAppSettings(db: Db, patch: AppSettingsPatch, fallbacks?: HealthEngineFallbacks): AppSettingsDto;
 declare function touchVpsTrackerSync(db: Db): void;
@@ -9093,6 +9565,8 @@ interface ServiceGroupLbPatch {
     health_check_timeout_ms?: number;
     health_check_verify_tls?: boolean;
     health_check_provider?: HealthCheckProvider;
+    health_check_providers?: HealthCheckProvider[];
+    health_check_aggregate?: HealthCheckAggregate;
 }
 declare function createServiceGroup(db: Db, name: string, groupType: string, icon: string | null, domain: string | null, lbPatch?: ServiceGroupLbPatch): ServiceGroup;
 declare function updateServiceGroup(db: Db, id: number, name: string, groupType: string, icon: string | null, domain: string | null, lbPatch?: ServiceGroupLbPatch): ServiceGroup;
@@ -9201,6 +9675,8 @@ interface BindingLbPatch {
     health_check_timeout_ms?: number;
     health_check_verify_tls?: boolean;
     health_check_provider?: HealthCheckProvider;
+    health_check_providers?: HealthCheckProvider[];
+    health_check_aggregate?: HealthCheckAggregate;
 }
 declare function updateBindingLbConfig(db: Db, bindingId: number, patch: BindingLbPatch): void;
 declare function setBindingCnameTarget(db: Db, bindingId: number, target: string | null): void;
@@ -9252,7 +9728,7 @@ type ServiceIpHealthRow = {
     latency_ms: number | null;
     last_checked_at: string | null;
     last_error: string | null;
-    provider: HealthCheckProvider;
+    provider: HealthStatusProvider;
     colo: string | null;
 };
 /** Per-IP binding-scope health, worst status if the same IP is on several bindings. */
@@ -9261,7 +9737,7 @@ declare function mergeHealthAggregates(parts: Array<HealthAggregate | undefined
 declare function getIpHealthStatusRow(db: Db, scope: HealthCheckScope, refId: number, ip: string): IpHealthStatus | null;
 declare function upsertIpHealthStatus(db: Db, scope: HealthCheckScope, refId: number, ip: string, status: string, latencyMs: number | null, consecutiveFailures: number, lastError: string | null, consecutiveSuccesses?: number, extras?: {
     colo?: string | null;
-    provider?: HealthCheckProvider;
+    provider?: HealthStatusProvider;
 }): void;
 declare function deleteIpHealthStatusForRef(db: Db, scope: HealthCheckScope, refId: number): void;
 declare function deleteIpHealthStatusForIp(db: Db, scope: HealthCheckScope, refId: number, ip: string): void;

packages/db/dist/index.js

@@ -53,6 +53,8 @@ var serviceGroups = sqliteTable("service_groups", {
   health_check_timeout_ms: integer("health_check_timeout_ms").notNull().default(3e3),
   health_check_verify_tls: integer("health_check_verify_tls", { mode: "boolean" }).notNull().default(false),
   health_check_provider: text("health_check_provider").notNull().default("local"),
+  health_check_providers: text("health_check_providers").notNull().default('["local"]'),
+  health_check_aggregate: text("health_check_aggregate").notNull().default("majority"),
   created_at: text("created_at").notNull().default(sql`datetime('now')`),
   updated_at: text("updated_at").notNull().default(sql`datetime('now')`)
 });
@@ -119,6 +121,8 @@ var serviceBindings = sqliteTable(
       mode: "boolean"
     }).notNull().default(false),
     health_check_provider: text("health_check_provider").notNull().default("local"),
+    health_check_providers: text("health_check_providers").notNull().default('["local"]'),
+    health_check_aggregate: text("health_check_aggregate").notNull().default("majority"),
     routing_strategy: text("routing_strategy").notNull().default("round_robin"),
     operation_version: integer("operation_version").notNull().default(0),
     created_at: text("created_at").notNull().default(sql`datetime('now')`),
@@ -281,6 +285,14 @@ var appSettings = sqliteTable("app_settings", {
   health_success_recoveries: integer("health_success_recoveries"),
   health_worker_url: text("health_worker_url"),
   health_worker_token: text("health_worker_token"),
+  health_worker_account_id: text("health_worker_account_id"),
+  health_worker_kv_namespace_id: text("health_worker_kv_namespace_id"),
+  health_worker_error: text("health_worker_error"),
+  health_worker_deployed_at: text("health_worker_deployed_at"),
+  health_worker_last_ingest_at: text("health_worker_last_ingest_at"),
+  globalping_token: text("globalping_token"),
+  globalping_locations: text("globalping_locations"),
+  globalping_limit: integer("globalping_limit"),
   created_at: text("created_at").notNull().default(sql`datetime('now')`),
   updated_at: text("updated_at").notNull().default(sql`datetime('now')`)
 });
@@ -522,6 +534,13 @@ var SETTINGS_ID = "settings-main";
 function coalesceInt(value, fallback) {
   return value == null || Number.isNaN(value) || value < 1 ? fallback : value;
 }
+function workerStatus(row, envUrl) {
+  if (row.health_worker_error?.trim()) return "error";
+  const url = row.health_worker_url?.trim() || envUrl;
+  const kv = row.health_worker_kv_namespace_id?.trim();
+  if (kv && url) return "ready";
+  return "missing";
+}
 function toDto(row, fallbacks) {
   const env = fallbacks ?? {
     healthCheckCron: "0 */2 * * * *",
@@ -559,7 +578,16 @@ function toDto(row, fallbacks) {
       env.healthSuccessRecoveries
     ),
     healthWorkerUrl: row.health_worker_url?.trim() || env.healthWorkerUrl,
-    healthWorkerTokenSet: Boolean(row.health_worker_token?.trim()) || env.healthWorkerTokenSet
+    healthWorkerTokenSet: Boolean(row.health_worker_token?.trim()) || env.healthWorkerTokenSet,
+    healthWorkerAccountId: row.health_worker_account_id?.trim() ?? "",
+    healthWorkerKvNamespaceId: row.health_worker_kv_namespace_id?.trim() ?? "",
+    healthWorkerError: row.health_worker_error?.trim() || null,
+    healthWorkerDeployedAt: row.health_worker_deployed_at ?? null,
+    healthWorkerLastIngestAt: row.health_worker_last_ingest_at ?? null,
+    healthWorkerStatus: workerStatus(row, env.healthWorkerUrl),
+    globalpingTokenSet: Boolean(row.globalping_token?.trim()),
+    globalpingLocations: row.globalping_locations?.trim() || "World",
+    globalpingLimit: row.globalping_limit == null || Number.isNaN(row.globalping_limit) || row.globalping_limit < 1 ? 3 : Math.min(10, row.globalping_limit)
   };
 }
 function getAppSettings(db, fallbacks) {
@@ -575,12 +603,16 @@ function getAppSettings(db, fallbacks) {
 }
 function getAppSettingsSecrets(db) {
   const row = db.select().from(appSettings).where(eq2(appSettings.id, SETTINGS_ID)).get();
+  const limit = row?.globalping_limit;
   return {
     vpsTrackerUrl: row?.vps_tracker_url?.trim() ?? "",
     vpsTrackerIntegrationToken: row?.vps_tracker_integration_token?.trim() ?? "",
     vpsTrackerSyncEnabled: Boolean(row?.vps_tracker_sync_enabled),
     healthWorkerUrl: row?.health_worker_url?.trim() ?? "",
-    healthWorkerToken: row?.health_worker_token?.trim() ?? ""
+    healthWorkerToken: row?.health_worker_token?.trim() ?? "",
+    globalpingToken: row?.globalping_token?.trim() ?? "",
+    globalpingLocations: row?.globalping_locations?.trim() || "World",
+    globalpingLimit: limit == null || Number.isNaN(limit) || limit < 1 ? 3 : Math.min(10, limit)
   };
 }
 function updateAppSettings(db, patch, fallbacks) {
@@ -590,7 +622,6 @@ function updateAppSettings(db, patch, fallbacks) {
   }
   const current = db.select().from(appSettings).where(eq2(appSettings.id, SETTINGS_ID)).get();
   db.update(appSettings).set({
-    // app_switcher_json: deprecated — source of truth is auth-portal
     vps_tracker_url: patch.vpsTrackerUrl !== void 0 ? patch.vpsTrackerUrl : current.vps_tracker_url,
     vps_tracker_integration_token: patch.vpsTrackerIntegrationToken !== void 0 && patch.vpsTrackerIntegrationToken.trim() !== "" ? patch.vpsTrackerIntegrationToken : current.vps_tracker_integration_token,
     vps_tracker_sync_enabled: patch.vpsTrackerSyncEnabled !== void 0 ? patch.vpsTrackerSyncEnabled : current.vps_tracker_sync_enabled,
@@ -602,6 +633,14 @@ function updateAppSettings(db, patch, fallbacks) {
     health_success_recoveries: patch.healthSuccessRecoveries !== void 0 ? patch.healthSuccessRecoveries : current.health_success_recoveries,
     health_worker_url: patch.healthWorkerUrl !== void 0 ? patch.healthWorkerUrl.trim() || null : current.health_worker_url,
     health_worker_token: patch.healthWorkerToken !== void 0 && patch.healthWorkerToken.trim() !== "" ? patch.healthWorkerToken : current.health_worker_token,
+    health_worker_account_id: patch.healthWorkerAccountId !== void 0 ? patch.healthWorkerAccountId?.trim() || null : current.health_worker_account_id,
+    health_worker_kv_namespace_id: patch.healthWorkerKvNamespaceId !== void 0 ? patch.healthWorkerKvNamespaceId?.trim() || null : current.health_worker_kv_namespace_id,
+    health_worker_error: patch.healthWorkerError !== void 0 ? patch.healthWorkerError?.trim() || null : current.health_worker_error,
+    health_worker_deployed_at: patch.healthWorkerDeployedAt !== void 0 ? patch.healthWorkerDeployedAt : current.health_worker_deployed_at,
+    health_worker_last_ingest_at: patch.healthWorkerLastIngestAt !== void 0 ? patch.healthWorkerLastIngestAt : current.health_worker_last_ingest_at,
+    globalping_token: patch.globalpingToken !== void 0 && patch.globalpingToken.trim() !== "" ? patch.globalpingToken : current.globalping_token,
+    globalping_locations: patch.globalpingLocations !== void 0 ? patch.globalpingLocations.trim() || "World" : current.globalping_locations,
+    globalping_limit: patch.globalpingLimit !== void 0 ? Math.min(10, Math.max(1, patch.globalpingLimit)) : current.globalping_limit,
     updated_at: (/* @__PURE__ */ new Date()).toISOString()
   }).where(eq2(appSettings.id, SETTINGS_ID)).run();
   return getAppSettings(db, fallbacks);
@@ -749,7 +788,15 @@ __export(repos_exports, {
   upsertIpHealthStatus: () => upsertIpHealthStatus,
   upsertSubdomain: () => upsertSubdomain
 });
-import { dnsRecordNamesMatch, isIpLiteral } from "@cfdm/shared";
+import {
+  derivePrimaryProvider,
+  dnsRecordNamesMatch,
+  isIpLiteral,
+  parseHealthAggregate,
+  parseHealthProviders,
+  serializeHealthProviders,
+  normalizeStatusProvider
+} from "@cfdm/shared";
 import { and as and2, asc, count, eq as eq3, isNull, like, notInArray, or as or2, sql as sql2 } from "drizzle-orm";
 function listGroups(db) {
   return db.select().from(groups).orderBy(asc(groups.name)).all();
@@ -1136,8 +1183,58 @@ function deleteService(db, id) {
   const result = db.delete(services).where(eq3(services.id, id)).run();
   if (result.changes === 0) throw new NotFoundError(`service ${id}`);
 }
-function normalizeHealthProvider(value) {
-  return value === "cloudflare" ? "cloudflare" : "local";
+function healthProviderColumns(patch) {
+  const out = {};
+  if (patch.health_check_providers !== void 0) {
+    const list = parseHealthProviders(patch.health_check_providers);
+    out.health_check_providers = serializeHealthProviders(list);
+    out.health_check_provider = derivePrimaryProvider(list);
+  } else if (patch.health_check_provider !== void 0) {
+    const list = parseHealthProviders(null, patch.health_check_provider);
+    out.health_check_providers = serializeHealthProviders(list);
+    out.health_check_provider = derivePrimaryProvider(list);
+  }
+  if (patch.health_check_aggregate !== void 0) {
+    out.health_check_aggregate = parseHealthAggregate(
+      patch.health_check_aggregate
+    );
+  }
+  return out;
+}
+function mapHealthFields(row) {
+  const providers = parseHealthProviders(
+    row.health_check_providers,
+    row.health_check_provider
+  );
+  return {
+    health_check_providers: providers,
+    health_check_provider: derivePrimaryProvider(providers),
+    health_check_aggregate: parseHealthAggregate(row.health_check_aggregate)
+  };
+}
+function mapServiceBinding(row) {
+  return {
+    id: row.id,
+    domain_id: row.domain_id,
+    service_id: row.service_id,
+    hostname: row.hostname,
+    cname_target: row.cname_target,
+    dns_record_id: row.dns_record_id,
+    lb_mode: row.lb_mode,
+    health_check_enabled: row.health_check_enabled,
+    health_check_type: row.health_check_type,
+    health_check_port: row.health_check_port,
+    health_check_path: row.health_check_path,
+    health_check_expected_status: row.health_check_expected_status,
+    health_check_interval_sec: row.health_check_interval_sec,
+    health_check_timeout_ms: row.health_check_timeout_ms,
+    health_check_verify_tls: row.health_check_verify_tls,
+    ...mapHealthFields(row),
+    routing_strategy: row.routing_strategy,
+    operation_version: row.operation_version,
+    created_at: row.created_at,
+    updated_at: row.updated_at
+  };
 }
 function mapServiceGroup(row) {
   return {
@@ -1156,7 +1253,7 @@ function mapServiceGroup(row) {
     health_check_interval_sec: row.health_check_interval_sec,
     health_check_timeout_ms: row.health_check_timeout_ms,
     health_check_verify_tls: row.health_check_verify_tls,
-    health_check_provider: normalizeHealthProvider(row.health_check_provider),
+    ...mapHealthFields(row),
     created_at: row.created_at,
     updated_at: row.updated_at
   };
@@ -1184,7 +1281,11 @@ function createServiceGroup(db, name, groupType, icon, domain, lbPatch) {
     health_check_interval_sec: lbPatch?.health_check_interval_sec ?? 30,
     health_check_timeout_ms: lbPatch?.health_check_timeout_ms ?? 3e3,
     health_check_verify_tls: lbPatch?.health_check_verify_tls ?? false,
-    health_check_provider: lbPatch?.health_check_provider ?? "local"
+    ...healthProviderColumns({
+      health_check_provider: lbPatch?.health_check_provider ?? "local",
+      health_check_providers: lbPatch?.health_check_providers,
+      health_check_aggregate: lbPatch?.health_check_aggregate ?? "majority"
+    })
   }).returning({ id: serviceGroups.id }).get().id;
   return getServiceGroup(db, id);
 }
@@ -1214,8 +1315,7 @@ function updateServiceGroup(db, id, name, groupType, icon, domain, lbPatch) {
       update.health_check_timeout_ms = lbPatch.health_check_timeout_ms;
     if (lbPatch.health_check_verify_tls !== void 0)
       update.health_check_verify_tls = lbPatch.health_check_verify_tls;
-    if (lbPatch.health_check_provider !== void 0)
-      update.health_check_provider = lbPatch.health_check_provider;
+    Object.assign(update, healthProviderColumns(lbPatch));
   }
   const result = db.update(serviceGroups).set(update).where(eq3(serviceGroups.id, id)).run();
   if (result.changes === 0) throw new NotFoundError(`service group ${id}`);
@@ -1525,8 +1625,7 @@ function updateBindingLbConfig(db, bindingId, patch) {
     update.health_check_timeout_ms = patch.health_check_timeout_ms;
   if (patch.health_check_verify_tls !== void 0)
     update.health_check_verify_tls = patch.health_check_verify_tls;
-  if (patch.health_check_provider !== void 0)
-    update.health_check_provider = patch.health_check_provider;
+  Object.assign(update, healthProviderColumns(patch));
   db.update(serviceBindings).set(update).where(eq3(serviceBindings.id, bindingId)).run();
 }
 function setBindingCnameTarget(db, bindingId, target) {
@@ -1585,7 +1684,8 @@ function dnsRecordMatchesHostname(recordName, hostname, zoneName) {
 var SERVICE_BINDING_SELECT_COLUMNS = `sb.id, sb.domain_id, sb.service_id, sb.hostname, sb.dns_record_id,
   sb.lb_mode, sb.health_check_enabled, sb.health_check_type, sb.health_check_port,
   sb.health_check_path, sb.health_check_expected_status, sb.health_check_interval_sec,
-  sb.health_check_timeout_ms, sb.health_check_verify_tls, sb.health_check_provider, sb.cname_target,
+  sb.health_check_timeout_ms, sb.health_check_verify_tls, sb.health_check_provider,
+  sb.health_check_providers, sb.health_check_aggregate, sb.cname_target,
   d.zone_name, d.group_id, g.name AS group_name,
   s.name AS service_name, s.slug AS service_slug,
   dr.content AS target_ip, dr.sync_status,
@@ -1633,6 +1733,7 @@ function enrichServiceBindingView(db, row) {
   return {
     ...row,
     cname_target: row.cname_target ?? null,
+    ...mapHealthFields(row),
     target_ips,
     target_ip: target_ips[0] ?? null,
     target_ip_weights,
@@ -1673,7 +1774,7 @@ function listBindingsByService(db, serviceId) {
 function getBinding(db, id) {
   const row = db.select().from(serviceBindings).where(eq3(serviceBindings.id, id)).get();
   if (!row) throw new NotFoundError(`service binding ${id}`);
-  return row;
+  return mapServiceBinding(row);
 }
 function getBindingView(db, id) {
   const rows = db.all(sql2`
@@ -1696,7 +1797,8 @@ function findBinding(db, serviceId, domainId, hostname) {
       eq3(serviceBindings.hostname, hostname)
     )
   ).get();
-  return row ?? null;
+  if (!row) return null;
+  return mapServiceBinding(row);
 }
 function insertBinding(db, domainId, serviceId, hostname, dnsRecordId) {
   const id = db.insert(serviceBindings).values({
@@ -1722,7 +1824,7 @@ function setBindingDnsRecordId(db, bindingId, dnsRecordId) {
   }).where(eq3(serviceBindings.id, bindingId)).run();
 }
 function bindingsToRemove(db, serviceId, keepIds) {
-  const all = db.select().from(serviceBindings).where(eq3(serviceBindings.service_id, serviceId)).all();
+  const all = db.select().from(serviceBindings).where(eq3(serviceBindings.service_id, serviceId)).all().map(mapServiceBinding);
   return all.filter((b) => !keepIds.includes(b.id));
 }
 function deleteBindingsExcept(db, serviceId, keepIds) {
@@ -1953,7 +2055,7 @@ function listIpHealthByServiceIds(db, serviceIds) {
       latency_ms: parsed.health_latency_ms,
       last_checked_at: row.last_checked_at,
       last_error: row.last_error,
-      provider: normalizeHealthProvider(row.provider),
+      provider: normalizeStatusProvider(row.provider),
       colo: row.colo
     });
     result.set(row.service_id, list);
@@ -2079,6 +2181,8 @@ function listHealthCheckTargets(db) {
       sb.health_check_expected_status AS expected_status,
       sb.health_check_timeout_ms AS timeout_ms,
       sb.health_check_verify_tls AS verify_tls,
+      sb.health_check_providers AS providers_json,
+      COALESCE(sb.health_check_aggregate, 'majority') AS aggregate,
       COALESCE(sb.health_check_provider, 'local') AS provider
     FROM service_binding_ips sbi
     JOIN service_bindings sb ON sb.id = sbi.binding_id
@@ -2094,6 +2198,8 @@ function listHealthCheckTargets(db) {
       sg.health_check_expected_status AS expected_status,
       sg.health_check_timeout_ms AS timeout_ms,
       sg.health_check_verify_tls AS verify_tls,
+      sg.health_check_providers AS providers_json,
+      COALESCE(sg.health_check_aggregate, 'majority') AS aggregate,
       COALESCE(sg.health_check_provider, 'local') AS provider
     FROM service_binding_ips sbi
     JOIN service_bindings sb ON sb.id = sbi.binding_id
@@ -2115,6 +2221,8 @@ function listHealthCheckTargets(db) {
       sg.health_check_expected_status AS expected_status,
       sg.health_check_timeout_ms AS timeout_ms,
       sg.health_check_verify_tls AS verify_tls,
+      sg.health_check_providers AS providers_json,
+      COALESCE(sg.health_check_aggregate, 'majority') AS aggregate,
       COALESCE(sg.health_check_provider, 'local') AS provider
     FROM service_binding_ips sbi
     JOIN service_bindings sb ON sb.id = sbi.binding_id
@@ -2136,6 +2244,8 @@ function listHealthCheckTargets(db) {
       sb.health_check_expected_status AS expected_status,
       sb.health_check_timeout_ms AS timeout_ms,
       sb.health_check_verify_tls AS verify_tls,
+      sb.health_check_providers AS providers_json,
+      COALESCE(sb.health_check_aggregate, 'majority') AS aggregate,
       COALESCE(sb.health_check_provider, 'local') AS provider
     FROM service_bindings sb
     JOIN domains d ON d.id = sb.domain_id
@@ -2154,6 +2264,8 @@ function listHealthCheckTargets(db) {
       sg.health_check_expected_status AS expected_status,
       sg.health_check_timeout_ms AS timeout_ms,
       sg.health_check_verify_tls AS verify_tls,
+      sg.health_check_providers AS providers_json,
+      COALESCE(sg.health_check_aggregate, 'majority') AS aggregate,
       COALESCE(sg.health_check_provider, 'local') AS provider
     FROM service_bindings sb
     JOIN domains d ON d.id = sb.domain_id
@@ -2173,11 +2285,25 @@ function listHealthCheckTargets(db) {
     ...groupInheritedBindingTargets,
     ...cnameBindingTargets,
     ...groupInheritedCnameBindingTargets
-  ].map((t) => ({
-    ...t,
-    verify_tls: Boolean(t.verify_tls),
-    provider: normalizeHealthProvider(t.provider)
-  }));
+  ].map((t) => {
+    const row = t;
+    const providers = parseHealthProviders(row.providers_json, row.provider);
+    return {
+      scope: row.scope,
+      ref_id: row.ref_id,
+      ip: row.ip,
+      hostname: row.hostname,
+      type: row.type,
+      port: row.port,
+      path: row.path,
+      expected_status: row.expected_status,
+      timeout_ms: row.timeout_ms,
+      verify_tls: Boolean(row.verify_tls),
+      providers,
+      aggregate: parseHealthAggregate(row.aggregate),
+      provider: derivePrimaryProvider(providers)
+    };
+  });
 }
 function listDomainTags(db, domainId) {
   return db.select({ tag: domainTags.tag }).from(domainTags).where(eq3(domainTags.domain_id, domainId)).all().map((r) => r.tag);
@@ -2307,7 +2433,7 @@ function listHealthProbeLogForService(db, serviceId, limit = 50) {
   `);
   return rows.map((row) => ({
     ...row,
-    provider: normalizeHealthProvider(row.provider),
+    provider: parseHealthProviders(null, row.provider)[0] ?? "local",
     ok: Boolean(row.ok)
   }));
 }

packages/db/migrations/022_health_worker_kv.sql

@@ -0,0 +1,5 @@
+ALTER TABLE app_settings ADD COLUMN health_worker_account_id TEXT;
+ALTER TABLE app_settings ADD COLUMN health_worker_kv_namespace_id TEXT;
+ALTER TABLE app_settings ADD COLUMN health_worker_error TEXT;
+ALTER TABLE app_settings ADD COLUMN health_worker_deployed_at TEXT;
+ALTER TABLE app_settings ADD COLUMN health_worker_last_ingest_at TEXT;

packages/db/migrations/023_health_providers.sql

@@ -0,0 +1,21 @@
+ALTER TABLE service_bindings ADD COLUMN health_check_providers TEXT;
+ALTER TABLE service_bindings ADD COLUMN health_check_aggregate TEXT NOT NULL DEFAULT 'majority';
+UPDATE service_bindings
+SET health_check_providers = CASE
+  WHEN health_check_provider = 'cloudflare' THEN '["cloudflare"]'
+  ELSE '["local"]'
+END
+WHERE health_check_providers IS NULL;
+
+ALTER TABLE service_groups ADD COLUMN health_check_providers TEXT;
+ALTER TABLE service_groups ADD COLUMN health_check_aggregate TEXT NOT NULL DEFAULT 'majority';
+UPDATE service_groups
+SET health_check_providers = CASE
+  WHEN health_check_provider = 'cloudflare' THEN '["cloudflare"]'
+  ELSE '["local"]'
+END
+WHERE health_check_providers IS NULL;
+
+ALTER TABLE app_settings ADD COLUMN globalping_token TEXT;
+ALTER TABLE app_settings ADD COLUMN globalping_locations TEXT;
+ALTER TABLE app_settings ADD COLUMN globalping_limit INTEGER;

packages/db/src/repos.ts

@@ -5,10 +5,12 @@ import type {
   DomainListItem,
   Group,
   GroupWithStats,
+  HealthCheckAggregate,
   HealthCheckProvider,
   HealthCheckScope,
   HealthCheckTarget,
   HealthCheckType,
+  HealthStatusProvider,
   IpHealthState,
   IpHealthStatus,
   LbMode,
@@ -21,7 +23,15 @@ import type {
   Subdomain,
   SyncJob,
 } from "@cfdm/shared";
-import { dnsRecordNamesMatch, isIpLiteral } from "@cfdm/shared";
+import {
+  derivePrimaryProvider,
+  dnsRecordNamesMatch,
+  isIpLiteral,
+  parseHealthAggregate,
+  parseHealthProviders,
+  serializeHealthProviders,
+  normalizeStatusProvider,
+} from "@cfdm/shared";
 import { and, asc, count, eq, isNull, like, notInArray, or, sql } from "drizzle-orm";
 import type { Db } from "./client.js";
 import { ConflictError, NotFoundError } from "./errors.js";
@@ -770,8 +780,82 @@ export function deleteService(db: Db, id: number): void {
 
 // --- Service Groups ---
 
-function normalizeHealthProvider(value: unknown): HealthCheckProvider {
-  return value === "cloudflare" ? "cloudflare" : "local";
+function healthProviderColumns(patch: {
+  health_check_provider?: HealthCheckProvider;
+  health_check_providers?: HealthCheckProvider[];
+  health_check_aggregate?: HealthCheckAggregate;
+}): {
+  health_check_provider?: string;
+  health_check_providers?: string;
+  health_check_aggregate?: string;
+} {
+  const out: {
+    health_check_provider?: string;
+    health_check_providers?: string;
+    health_check_aggregate?: string;
+  } = {};
+  if (patch.health_check_providers !== undefined) {
+    const list = parseHealthProviders(patch.health_check_providers);
+    out.health_check_providers = serializeHealthProviders(list);
+    out.health_check_provider = derivePrimaryProvider(list);
+  } else if (patch.health_check_provider !== undefined) {
+    const list = parseHealthProviders(null, patch.health_check_provider);
+    out.health_check_providers = serializeHealthProviders(list);
+    out.health_check_provider = derivePrimaryProvider(list);
+  }
+  if (patch.health_check_aggregate !== undefined) {
+    out.health_check_aggregate = parseHealthAggregate(
+      patch.health_check_aggregate,
+    );
+  }
+  return out;
+}
+
+function mapHealthFields(row: {
+  health_check_provider?: unknown;
+  health_check_providers?: unknown;
+  health_check_aggregate?: unknown;
+}): {
+  health_check_provider: HealthCheckProvider;
+  health_check_providers: HealthCheckProvider[];
+  health_check_aggregate: HealthCheckAggregate;
+} {
+  const providers = parseHealthProviders(
+    row.health_check_providers,
+    row.health_check_provider,
+  );
+  return {
+    health_check_providers: providers,
+    health_check_provider: derivePrimaryProvider(providers),
+    health_check_aggregate: parseHealthAggregate(row.health_check_aggregate),
+  };
+}
+
+function mapServiceBinding(
+  row: typeof serviceBindings.$inferSelect,
+): ServiceBinding {
+  return {
+    id: row.id,
+    domain_id: row.domain_id,
+    service_id: row.service_id,
+    hostname: row.hostname,
+    cname_target: row.cname_target,
+    dns_record_id: row.dns_record_id,
+    lb_mode: row.lb_mode as LbMode,
+    health_check_enabled: row.health_check_enabled,
+    health_check_type: row.health_check_type as HealthCheckType,
+    health_check_port: row.health_check_port,
+    health_check_path: row.health_check_path,
+    health_check_expected_status: row.health_check_expected_status,
+    health_check_interval_sec: row.health_check_interval_sec,
+    health_check_timeout_ms: row.health_check_timeout_ms,
+    health_check_verify_tls: row.health_check_verify_tls,
+    ...mapHealthFields(row),
+    routing_strategy: row.routing_strategy as LbMode,
+    operation_version: row.operation_version,
+    created_at: row.created_at,
+    updated_at: row.updated_at,
+  };
 }
 
 function mapServiceGroup(row: typeof serviceGroups.$inferSelect): ServiceGroup {
@@ -791,7 +875,7 @@ function mapServiceGroup(row: typeof serviceGroups.$inferSelect): ServiceGroup {
     health_check_interval_sec: row.health_check_interval_sec,
     health_check_timeout_ms: row.health_check_timeout_ms,
     health_check_verify_tls: row.health_check_verify_tls,
-    health_check_provider: normalizeHealthProvider(row.health_check_provider),
+    ...mapHealthFields(row),
     created_at: row.created_at,
     updated_at: row.updated_at,
   };
@@ -827,6 +911,8 @@ export interface ServiceGroupLbPatch {
   health_check_timeout_ms?: number;
   health_check_verify_tls?: boolean;
   health_check_provider?: HealthCheckProvider;
+  health_check_providers?: HealthCheckProvider[];
+  health_check_aggregate?: HealthCheckAggregate;
 }
 
 export function createServiceGroup(
@@ -853,7 +939,11 @@ export function createServiceGroup(
       health_check_interval_sec: lbPatch?.health_check_interval_sec ?? 30,
       health_check_timeout_ms: lbPatch?.health_check_timeout_ms ?? 3000,
       health_check_verify_tls: lbPatch?.health_check_verify_tls ?? false,
-      health_check_provider: lbPatch?.health_check_provider ?? "local",
+      ...healthProviderColumns({
+        health_check_provider: lbPatch?.health_check_provider ?? "local",
+        health_check_providers: lbPatch?.health_check_providers,
+        health_check_aggregate: lbPatch?.health_check_aggregate ?? "majority",
+      }),
     })
     .returning({ id: serviceGroups.id })
     .get()!.id;
@@ -894,8 +984,7 @@ export function updateServiceGroup(
       update.health_check_timeout_ms = lbPatch.health_check_timeout_ms;
     if (lbPatch.health_check_verify_tls !== undefined)
       update.health_check_verify_tls = lbPatch.health_check_verify_tls;
-    if (lbPatch.health_check_provider !== undefined)
-      update.health_check_provider = lbPatch.health_check_provider;
+    Object.assign(update, healthProviderColumns(lbPatch));
   }
   const result = db
     .update(serviceGroups)
@@ -1439,6 +1528,8 @@ export interface BindingLbPatch {
   health_check_timeout_ms?: number;
   health_check_verify_tls?: boolean;
   health_check_provider?: HealthCheckProvider;
+  health_check_providers?: HealthCheckProvider[];
+  health_check_aggregate?: HealthCheckAggregate;
 }
 
 export function updateBindingLbConfig(
@@ -1469,8 +1560,7 @@ export function updateBindingLbConfig(
     update.health_check_timeout_ms = patch.health_check_timeout_ms;
   if (patch.health_check_verify_tls !== undefined)
     update.health_check_verify_tls = patch.health_check_verify_tls;
-  if (patch.health_check_provider !== undefined)
-    update.health_check_provider = patch.health_check_provider;
+  Object.assign(update, healthProviderColumns(patch));
   db.update(serviceBindings)
     .set(update)
     .where(eq(serviceBindings.id, bindingId))
@@ -1578,7 +1668,8 @@ function dnsRecordMatchesHostname(
 const SERVICE_BINDING_SELECT_COLUMNS = `sb.id, sb.domain_id, sb.service_id, sb.hostname, sb.dns_record_id,
   sb.lb_mode, sb.health_check_enabled, sb.health_check_type, sb.health_check_port,
   sb.health_check_path, sb.health_check_expected_status, sb.health_check_interval_sec,
-  sb.health_check_timeout_ms, sb.health_check_verify_tls, sb.health_check_provider, sb.cname_target,
+  sb.health_check_timeout_ms, sb.health_check_verify_tls, sb.health_check_provider,
+  sb.health_check_providers, sb.health_check_aggregate, sb.cname_target,
   d.zone_name, d.group_id, g.name AS group_name,
   s.name AS service_name, s.slug AS service_slug,
   dr.content AS target_ip, dr.sync_status,
@@ -1642,6 +1733,7 @@ function enrichServiceBindingView(
   return {
     ...row,
     cname_target: row.cname_target ?? null,
+    ...mapHealthFields(row),
     target_ips,
     target_ip: target_ips[0] ?? null,
     target_ip_weights,
@@ -1694,7 +1786,7 @@ export function getBinding(db: Db, id: number): ServiceBinding {
     .where(eq(serviceBindings.id, id))
     .get();
   if (!row) throw new NotFoundError(`service binding ${id}`);
-  return row as ServiceBinding;
+  return mapServiceBinding(row);
 }
 
 export function getBindingView(db: Db, id: number): ServiceBindingView {
@@ -1728,7 +1820,8 @@ export function findBinding(
       ),
     )
     .get();
-  return (row as ServiceBinding) ?? null;
+  if (!row) return null;
+  return mapServiceBinding(row);
 }
 
 export function insertBinding(
@@ -1792,7 +1885,8 @@ export function bindingsToRemove(
     .select()
     .from(serviceBindings)
     .where(eq(serviceBindings.service_id, serviceId))
-    .all() as ServiceBinding[];
+    .all()
+    .map(mapServiceBinding);
   return all.filter((b) => !keepIds.includes(b.id));
 }
 
@@ -2124,7 +2218,7 @@ export type ServiceIpHealthRow = {
   latency_ms: number | null;
   last_checked_at: string | null;
   last_error: string | null;
-  provider: HealthCheckProvider;
+  provider: HealthStatusProvider;
   colo: string | null;
 };
 
@@ -2175,7 +2269,7 @@ export function listIpHealthByServiceIds(
       latency_ms: parsed.health_latency_ms,
       last_checked_at: row.last_checked_at,
       last_error: row.last_error,
-      provider: normalizeHealthProvider(row.provider),
+      provider: normalizeStatusProvider(row.provider),
       colo: row.colo,
     });
     result.set(row.service_id, list);
@@ -2243,7 +2337,7 @@ export function upsertIpHealthStatus(
   consecutiveFailures: number,
   lastError: string | null,
   consecutiveSuccesses = 0,
-  extras?: { colo?: string | null; provider?: HealthCheckProvider },
+  extras?: { colo?: string | null; provider?: HealthStatusProvider },
 ): void {
   const colo = extras?.colo ?? null;
   const provider = extras?.provider ?? "local";
@@ -2359,6 +2453,8 @@ export function listHealthCheckTargets(db: Db): HealthCheckTarget[] {
       sb.health_check_expected_status AS expected_status,
       sb.health_check_timeout_ms AS timeout_ms,
       sb.health_check_verify_tls AS verify_tls,
+      sb.health_check_providers AS providers_json,
+      COALESCE(sb.health_check_aggregate, 'majority') AS aggregate,
       COALESCE(sb.health_check_provider, 'local') AS provider
     FROM service_binding_ips sbi
     JOIN service_bindings sb ON sb.id = sbi.binding_id
@@ -2378,6 +2474,8 @@ export function listHealthCheckTargets(db: Db): HealthCheckTarget[] {
       sg.health_check_expected_status AS expected_status,
       sg.health_check_timeout_ms AS timeout_ms,
       sg.health_check_verify_tls AS verify_tls,
+      sg.health_check_providers AS providers_json,
+      COALESCE(sg.health_check_aggregate, 'majority') AS aggregate,
       COALESCE(sg.health_check_provider, 'local') AS provider
     FROM service_binding_ips sbi
     JOIN service_bindings sb ON sb.id = sbi.binding_id
@@ -2404,6 +2502,8 @@ export function listHealthCheckTargets(db: Db): HealthCheckTarget[] {
       sg.health_check_expected_status AS expected_status,
       sg.health_check_timeout_ms AS timeout_ms,
       sg.health_check_verify_tls AS verify_tls,
+      sg.health_check_providers AS providers_json,
+      COALESCE(sg.health_check_aggregate, 'majority') AS aggregate,
       COALESCE(sg.health_check_provider, 'local') AS provider
     FROM service_binding_ips sbi
     JOIN service_bindings sb ON sb.id = sbi.binding_id
@@ -2427,6 +2527,8 @@ export function listHealthCheckTargets(db: Db): HealthCheckTarget[] {
       sb.health_check_expected_status AS expected_status,
       sb.health_check_timeout_ms AS timeout_ms,
       sb.health_check_verify_tls AS verify_tls,
+      sb.health_check_providers AS providers_json,
+      COALESCE(sb.health_check_aggregate, 'majority') AS aggregate,
       COALESCE(sb.health_check_provider, 'local') AS provider
     FROM service_bindings sb
     JOIN domains d ON d.id = sb.domain_id
@@ -2448,6 +2550,8 @@ export function listHealthCheckTargets(db: Db): HealthCheckTarget[] {
       sg.health_check_expected_status AS expected_status,
       sg.health_check_timeout_ms AS timeout_ms,
       sg.health_check_verify_tls AS verify_tls,
+      sg.health_check_providers AS providers_json,
+      COALESCE(sg.health_check_aggregate, 'majority') AS aggregate,
       COALESCE(sg.health_check_provider, 'local') AS provider
     FROM service_bindings sb
     JOIN domains d ON d.id = sb.domain_id
@@ -2468,11 +2572,28 @@ export function listHealthCheckTargets(db: Db): HealthCheckTarget[] {
     ...groupInheritedBindingTargets,
     ...cnameBindingTargets,
     ...groupInheritedCnameBindingTargets,
-  ].map((t) => ({
-    ...t,
-    verify_tls: Boolean(t.verify_tls),
-    provider: normalizeHealthProvider(t.provider),
-  }));
+  ].map((t) => {
+    const row = t as HealthCheckTarget & {
+      providers_json?: string | null;
+      aggregate?: string | null;
+    };
+    const providers = parseHealthProviders(row.providers_json, row.provider);
+    return {
+      scope: row.scope,
+      ref_id: row.ref_id,
+      ip: row.ip,
+      hostname: row.hostname,
+      type: row.type,
+      port: row.port,
+      path: row.path,
+      expected_status: row.expected_status,
+      timeout_ms: row.timeout_ms,
+      verify_tls: Boolean(row.verify_tls),
+      providers,
+      aggregate: parseHealthAggregate(row.aggregate),
+      provider: derivePrimaryProvider(providers),
+    };
+  });
 }
 
 // --- Domain tags ---
@@ -2759,7 +2880,7 @@ export function listHealthProbeLogForService(
   `);
   return rows.map((row) => ({
     ...row,
-    provider: normalizeHealthProvider(row.provider),
+    provider: parseHealthProviders(null, row.provider)[0] ?? "local",
     ok: Boolean(row.ok),
   }));
 }

packages/db/src/schema.ts

@@ -65,6 +65,8 @@ export const serviceGroups = sqliteTable("service_groups", {
     .notNull()
     .default(false),
   health_check_provider: text("health_check_provider").notNull().default("local"),
+  health_check_providers: text("health_check_providers").notNull().default('["local"]'),
+  health_check_aggregate: text("health_check_aggregate").notNull().default("majority"),
   created_at: text("created_at")
     .notNull()
     .default(sql`datetime('now')`),
@@ -169,6 +171,12 @@ export const serviceBindings = sqliteTable(
     health_check_provider: text("health_check_provider")
       .notNull()
       .default("local"),
+    health_check_providers: text("health_check_providers")
+      .notNull()
+      .default('["local"]'),
+    health_check_aggregate: text("health_check_aggregate")
+      .notNull()
+      .default("majority"),
     routing_strategy: text("routing_strategy").notNull().default("round_robin"),
     operation_version: integer("operation_version").notNull().default(0),
     created_at: text("created_at")
@@ -393,6 +401,14 @@ export const appSettings = sqliteTable("app_settings", {
   health_success_recoveries: integer("health_success_recoveries"),
   health_worker_url: text("health_worker_url"),
   health_worker_token: text("health_worker_token"),
+  health_worker_account_id: text("health_worker_account_id"),
+  health_worker_kv_namespace_id: text("health_worker_kv_namespace_id"),
+  health_worker_error: text("health_worker_error"),
+  health_worker_deployed_at: text("health_worker_deployed_at"),
+  health_worker_last_ingest_at: text("health_worker_last_ingest_at"),
+  globalping_token: text("globalping_token"),
+  globalping_locations: text("globalping_locations"),
+  globalping_limit: integer("globalping_limit"),
   created_at: text("created_at")
     .notNull()
     .default(sql`datetime('now')`),

packages/db/src/settings-repo.ts

@@ -1,4 +1,5 @@
 import { eq } from "drizzle-orm";
+import type { HealthWorkerStatus } from "@cfdm/shared";
 import type { Db } from "./client.js";
 import { appSettings } from "./schema.js";
 
@@ -21,6 +22,15 @@ export type AppSettingsDto = {
   showQuickActions: boolean;
   healthWorkerUrl: string;
   healthWorkerTokenSet: boolean;
+  healthWorkerStatus: HealthWorkerStatus;
+  healthWorkerAccountId: string;
+  healthWorkerKvNamespaceId: string;
+  healthWorkerError: string | null;
+  healthWorkerDeployedAt: string | null;
+  healthWorkerLastIngestAt: string | null;
+  globalpingTokenSet: boolean;
+  globalpingLocations: string;
+  globalpingLimit: number;
 } & HealthEngineSettings;
 
 export type AppSettingsPatch = {
@@ -35,6 +45,14 @@ export type AppSettingsPatch = {
   healthSuccessRecoveries?: number;
   healthWorkerUrl?: string;
   healthWorkerToken?: string;
+  healthWorkerAccountId?: string | null;
+  healthWorkerKvNamespaceId?: string | null;
+  healthWorkerError?: string | null;
+  healthWorkerDeployedAt?: string | null;
+  healthWorkerLastIngestAt?: string | null;
+  globalpingToken?: string;
+  globalpingLocations?: string;
+  globalpingLimit?: number;
 };
 
 export type HealthEngineFallbacks = HealthEngineSettings & {
@@ -46,6 +64,17 @@ function coalesceInt(value: number | null | undefined, fallback: number): number
   return value == null || Number.isNaN(value) || value < 1 ? fallback : value;
 }
 
+function workerStatus(
+  row: typeof appSettings.$inferSelect,
+  envUrl: string,
+): HealthWorkerStatus {
+  if (row.health_worker_error?.trim()) return "error";
+  const url = row.health_worker_url?.trim() || envUrl;
+  const kv = row.health_worker_kv_namespace_id?.trim();
+  if (kv && url) return "ready";
+  return "missing";
+}
+
 function toDto(
   row: typeof appSettings.$inferSelect,
   fallbacks?: HealthEngineFallbacks,
@@ -89,6 +118,20 @@ function toDto(
     healthWorkerUrl: row.health_worker_url?.trim() || env.healthWorkerUrl,
     healthWorkerTokenSet:
       Boolean(row.health_worker_token?.trim()) || env.healthWorkerTokenSet,
+    healthWorkerAccountId: row.health_worker_account_id?.trim() ?? "",
+    healthWorkerKvNamespaceId: row.health_worker_kv_namespace_id?.trim() ?? "",
+    healthWorkerError: row.health_worker_error?.trim() || null,
+    healthWorkerDeployedAt: row.health_worker_deployed_at ?? null,
+    healthWorkerLastIngestAt: row.health_worker_last_ingest_at ?? null,
+    healthWorkerStatus: workerStatus(row, env.healthWorkerUrl),
+    globalpingTokenSet: Boolean(row.globalping_token?.trim()),
+    globalpingLocations: row.globalping_locations?.trim() || "World",
+    globalpingLimit:
+      row.globalping_limit == null ||
+      Number.isNaN(row.globalping_limit) ||
+      row.globalping_limit < 1
+        ? 3
+        : Math.min(10, row.globalping_limit),
   };
 }
 
@@ -117,12 +160,16 @@ export function getAppSettingsSecrets(db: Db): {
   vpsTrackerSyncEnabled: boolean;
   healthWorkerUrl: string;
   healthWorkerToken: string;
+  globalpingToken: string;
+  globalpingLocations: string;
+  globalpingLimit: number;
 } {
   const row = db
     .select()
     .from(appSettings)
     .where(eq(appSettings.id, SETTINGS_ID))
     .get();
+  const limit = row?.globalping_limit;
   return {
     vpsTrackerUrl: row?.vps_tracker_url?.trim() ?? "",
     vpsTrackerIntegrationToken:
@@ -130,6 +177,12 @@ export function getAppSettingsSecrets(db: Db): {
     vpsTrackerSyncEnabled: Boolean(row?.vps_tracker_sync_enabled),
     healthWorkerUrl: row?.health_worker_url?.trim() ?? "",
     healthWorkerToken: row?.health_worker_token?.trim() ?? "",
+    globalpingToken: row?.globalping_token?.trim() ?? "",
+    globalpingLocations: row?.globalping_locations?.trim() || "World",
+    globalpingLimit:
+      limit == null || Number.isNaN(limit) || limit < 1
+        ? 3
+        : Math.min(10, limit),
   };
 }
 
@@ -154,7 +207,6 @@ export function updateAppSettings(
 
   db.update(appSettings)
     .set({
-      // app_switcher_json: deprecated — source of truth is auth-portal
       vps_tracker_url:
         patch.vpsTrackerUrl !== undefined
           ? patch.vpsTrackerUrl
@@ -201,6 +253,39 @@ export function updateAppSettings(
         patch.healthWorkerToken.trim() !== ""
           ? patch.healthWorkerToken
           : current.health_worker_token,
+      health_worker_account_id:
+        patch.healthWorkerAccountId !== undefined
+          ? patch.healthWorkerAccountId?.trim() || null
+          : current.health_worker_account_id,
+      health_worker_kv_namespace_id:
+        patch.healthWorkerKvNamespaceId !== undefined
+          ? patch.healthWorkerKvNamespaceId?.trim() || null
+          : current.health_worker_kv_namespace_id,
+      health_worker_error:
+        patch.healthWorkerError !== undefined
+          ? patch.healthWorkerError?.trim() || null
+          : current.health_worker_error,
+      health_worker_deployed_at:
+        patch.healthWorkerDeployedAt !== undefined
+          ? patch.healthWorkerDeployedAt
+          : current.health_worker_deployed_at,
+      health_worker_last_ingest_at:
+        patch.healthWorkerLastIngestAt !== undefined
+          ? patch.healthWorkerLastIngestAt
+          : current.health_worker_last_ingest_at,
+      globalping_token:
+        patch.globalpingToken !== undefined &&
+        patch.globalpingToken.trim() !== ""
+          ? patch.globalpingToken
+          : current.globalping_token,
+      globalping_locations:
+        patch.globalpingLocations !== undefined
+          ? patch.globalpingLocations.trim() || "World"
+          : current.globalping_locations,
+      globalping_limit:
+        patch.globalpingLimit !== undefined
+          ? Math.min(10, Math.max(1, patch.globalpingLimit))
+          : current.globalping_limit,
       updated_at: new Date().toISOString(),
     })
     .where(eq(appSettings.id, SETTINGS_ID))

packages/shared/dist/index.d.ts

@@ -15,6 +15,36 @@ declare const CERT_MONITOR_REQUIRED = "required";
 declare const CERT_MONITOR_SKIPPED = "skipped";
 declare const CERT_MONITORING_VALUES: readonly ["auto", "required", "skipped"];
 
+declare const HEALTH_CHECK_PROVIDERS: readonly ["local", "cloudflare", "globalping"];
+type HealthCheckProvider = (typeof HEALTH_CHECK_PROVIDERS)[number];
+declare const HEALTH_STATUS_PROVIDERS: readonly ["local", "cloudflare", "globalping", "aggregate"];
+type HealthStatusProvider = (typeof HEALTH_STATUS_PROVIDERS)[number];
+declare const HEALTH_CHECK_AGGREGATES: readonly ["any", "all", "majority"];
+type HealthCheckAggregate = (typeof HEALTH_CHECK_AGGREGATES)[number];
+declare function normalizeProbeProvider(value: unknown): HealthCheckProvider;
+declare function normalizeStatusProvider(value: unknown): HealthStatusProvider;
+declare function uniqueHealthProviders(values: readonly unknown[]): HealthCheckProvider[];
+declare function parseHealthProviders(json: unknown, fallback?: unknown): HealthCheckProvider[];
+declare function serializeHealthProviders(providers: readonly HealthCheckProvider[]): string;
+declare function parseHealthAggregate(value: unknown): HealthCheckAggregate;
+declare function derivePrimaryProvider(providers: readonly HealthCheckProvider[]): HealthCheckProvider;
+declare function targetProviders(target: {
+    providers?: readonly HealthCheckProvider[] | null;
+    provider?: HealthCheckProvider | null;
+}): HealthCheckProvider[];
+declare function targetHasProvider(target: {
+    providers?: readonly HealthCheckProvider[] | null;
+    provider?: HealthCheckProvider | null;
+}, provider: HealthCheckProvider): boolean;
+/**
+ * any — Down if at least one source is Down (ok only if all ok).
+ * all — Down only if every source is Down (ok if any ok).
+ * majority — Down if a strict majority of sources are Down (2 → both, 3 → ≥2).
+ */
+declare function aggregateHealthOk(oks: readonly boolean[], policy: HealthCheckAggregate): boolean;
+declare function clampGlobalpingLimit(value: unknown, fallback?: number): number;
+declare function parseGlobalpingLocations(value: unknown): string[];
+
 interface ServiceGroup$1 {
     id: number;
     name: string;
@@ -32,6 +62,8 @@ interface ServiceGroup$1 {
     health_check_timeout_ms: number;
     health_check_verify_tls: boolean;
     health_check_provider: HealthCheckProvider;
+    health_check_providers: HealthCheckProvider[];
+    health_check_aggregate: HealthCheckAggregate;
     created_at: string;
     updated_at: string;
 }
@@ -62,6 +94,8 @@ interface ServiceBinding {
     health_check_timeout_ms: number;
     health_check_verify_tls: boolean;
     health_check_provider: HealthCheckProvider;
+    health_check_providers: HealthCheckProvider[];
+    health_check_aggregate: HealthCheckAggregate;
     routing_strategy: LbMode;
     operation_version: number;
     created_at: string;
@@ -93,6 +127,8 @@ interface ServiceBindingView {
     health_check_timeout_ms: number;
     health_check_verify_tls: boolean;
     health_check_provider: HealthCheckProvider;
+    health_check_providers: HealthCheckProvider[];
+    health_check_aggregate: HealthCheckAggregate;
     sync_status: string | null;
     created_at: string;
     updated_at: string;
@@ -118,6 +154,8 @@ interface ServiceDomainBindingView {
     health_check_timeout_ms: number;
     health_check_verify_tls: boolean;
     health_check_provider: HealthCheckProvider;
+    health_check_providers: HealthCheckProvider[];
+    health_check_aggregate: HealthCheckAggregate;
     sync_status: string | null;
 }
 interface ServiceView$1 {
@@ -151,6 +189,10 @@ interface CfZone {
     id: string;
     name: string;
     status: string;
+    account?: {
+        id: string;
+        name?: string;
+    };
 }
 interface CfDnsRecord {
     id?: string;
@@ -185,7 +227,6 @@ type LbMode = "round_robin" | "failover" | "weighted";
 type HealthCheckType = "tcp" | "http" | "ping" | "dns";
 type IpHealthState = "up" | "down" | "degraded" | "unknown";
 type NodeHealthState = "unknown" | "checking" | "healthy" | "degraded" | "unhealthy" | "disabled";
-type HealthCheckProvider = "local" | "cloudflare";
 type HealthCheckScope = "binding" | "group";
 interface IpHealthStatus {
     scope: HealthCheckScope;
@@ -198,7 +239,7 @@ interface IpHealthStatus {
     last_checked_at: string | null;
     last_error: string | null;
     colo?: string | null;
-    provider?: HealthCheckProvider;
+    provider?: HealthStatusProvider;
 }
 interface ServiceIpHealth$1 {
     ip: string;
@@ -206,7 +247,7 @@ interface ServiceIpHealth$1 {
     latency_ms: number | null;
     last_checked_at?: string | null;
     last_error?: string | null;
-    provider?: HealthCheckProvider;
+    provider?: HealthStatusProvider;
     colo?: string | null;
 }
 interface ServiceNode {
@@ -286,6 +327,8 @@ interface HealthCheckTarget {
     timeout_ms: number;
     verify_tls: boolean;
     provider: HealthCheckProvider;
+    providers?: HealthCheckProvider[];
+    aggregate?: HealthCheckAggregate;
 }
 
 declare class ValidationError extends Error {
@@ -366,7 +409,24 @@ declare const nodeHealthStateSchema: z.ZodEnum<{
 declare const healthCheckProviderSchema: z.ZodEnum<{
     local: "local";
     cloudflare: "cloudflare";
+    globalping: "globalping";
 }>;
+declare const healthStatusProviderSchema: z.ZodEnum<{
+    local: "local";
+    cloudflare: "cloudflare";
+    globalping: "globalping";
+    aggregate: "aggregate";
+}>;
+declare const healthCheckAggregateSchema: z.ZodEnum<{
+    any: "any";
+    all: "all";
+    majority: "majority";
+}>;
+declare const healthCheckProvidersSchema: z.ZodPipe<z.ZodArray<z.ZodEnum<{
+    local: "local";
+    cloudflare: "cloudflare";
+    globalping: "globalping";
+}>>, z.ZodTransform<("local" | "cloudflare" | "globalping")[] | readonly ["local"], ("local" | "cloudflare" | "globalping")[]>>;
 declare const healthCheckScopeSchema: z.ZodEnum<{
     binding: "binding";
     group: "group";
@@ -393,6 +453,8 @@ declare const ipHealthStatusSchema: z.ZodObject<{
     provider: z.ZodOptional<z.ZodEnum<{
         local: "local";
         cloudflare: "cloudflare";
+        globalping: "globalping";
+        aggregate: "aggregate";
     }>>;
 }, z.core.$strip>;
 declare const serviceIpHealthSchema: z.ZodObject<{
@@ -409,6 +471,8 @@ declare const serviceIpHealthSchema: z.ZodObject<{
     provider: z.ZodOptional<z.ZodEnum<{
         local: "local";
         cloudflare: "cloudflare";
+        globalping: "globalping";
+        aggregate: "aggregate";
     }>>;
     colo: z.ZodOptional<z.ZodNullable<z.ZodString>>;
 }, z.core.$strip>;
@@ -421,6 +485,7 @@ declare const healthProbeLogSchema: z.ZodObject<{
     provider: z.ZodEnum<{
         local: "local";
         cloudflare: "cloudflare";
+        globalping: "globalping";
     }>;
     status: z.ZodEnum<{
         unknown: "unknown";
@@ -451,21 +516,21 @@ declare const groupWithStatsSchema: z.ZodObject<{
     domain_count: z.ZodNumber;
 }, z.core.$strip>;
 declare const serviceGroupTypeSchema: z.ZodEnum<{
+    custom: "custom";
     vpn: "vpn";
     network: "network";
     internet: "internet";
     bgp: "bgp";
-    custom: "custom";
 }>;
 declare const serviceGroupSchema: z.ZodObject<{
     id: z.ZodNumber;
     name: z.ZodString;
     type: z.ZodCatch<z.ZodEnum<{
+        custom: "custom";
         vpn: "vpn";
         network: "network";
         internet: "internet";
         bgp: "bgp";
-        custom: "custom";
     }>>;
     icon: z.ZodDefault<z.ZodNullable<z.ZodString>>;
     domain: z.ZodDefault<z.ZodNullable<z.ZodString>>;
@@ -491,6 +556,17 @@ declare const serviceGroupSchema: z.ZodObject<{
     health_check_provider: z.ZodCatch<z.ZodEnum<{
         local: "local";
         cloudflare: "cloudflare";
+        globalping: "globalping";
+    }>>;
+    health_check_providers: z.ZodCatch<z.ZodPipe<z.ZodArray<z.ZodEnum<{
+        local: "local";
+        cloudflare: "cloudflare";
+        globalping: "globalping";
+    }>>, z.ZodTransform<("local" | "cloudflare" | "globalping")[] | readonly ["local"], ("local" | "cloudflare" | "globalping")[]>>>;
+    health_check_aggregate: z.ZodCatch<z.ZodEnum<{
+        any: "any";
+        all: "all";
+        majority: "majority";
     }>>;
     created_at: z.ZodString;
     updated_at: z.ZodString;
@@ -544,6 +620,17 @@ declare const serviceDomainBindingSchema: z.ZodPipe<z.ZodObject<{
     health_check_provider: z.ZodCatch<z.ZodEnum<{
         local: "local";
         cloudflare: "cloudflare";
+        globalping: "globalping";
+    }>>;
+    health_check_providers: z.ZodCatch<z.ZodPipe<z.ZodArray<z.ZodEnum<{
+        local: "local";
+        cloudflare: "cloudflare";
+        globalping: "globalping";
+    }>>, z.ZodTransform<("local" | "cloudflare" | "globalping")[] | readonly ["local"], ("local" | "cloudflare" | "globalping")[]>>>;
+    health_check_aggregate: z.ZodCatch<z.ZodEnum<{
+        any: "any";
+        all: "all";
+        majority: "majority";
     }>>;
     sync_status: z.ZodDefault<z.ZodNullable<z.ZodString>>;
 }, z.core.$strip>, z.ZodTransform<{
@@ -566,7 +653,9 @@ declare const serviceDomainBindingSchema: z.ZodPipe<z.ZodObject<{
     health_check_interval_sec: number;
     health_check_timeout_ms: number;
     health_check_verify_tls: boolean;
-    health_check_provider: "local" | "cloudflare";
+    health_check_provider: "local" | "cloudflare" | "globalping";
+    health_check_providers: ("local" | "cloudflare" | "globalping")[] | readonly ["local"];
+    health_check_aggregate: "any" | "all" | "majority";
     sync_status: string | null;
     target_ip?: string | null | undefined;
 }, {
@@ -585,7 +674,9 @@ declare const serviceDomainBindingSchema: z.ZodPipe<z.ZodObject<{
     health_check_interval_sec: number;
     health_check_timeout_ms: number;
     health_check_verify_tls: boolean;
-    health_check_provider: "local" | "cloudflare";
+    health_check_provider: "local" | "cloudflare" | "globalping";
+    health_check_providers: ("local" | "cloudflare" | "globalping")[] | readonly ["local"];
+    health_check_aggregate: "any" | "all" | "majority";
     sync_status: string | null;
     target_ips?: string[] | undefined;
     target_ip?: string | null | undefined;
@@ -642,6 +733,17 @@ declare const serviceViewSchema: z.ZodObject<{
         health_check_provider: z.ZodCatch<z.ZodEnum<{
             local: "local";
             cloudflare: "cloudflare";
+            globalping: "globalping";
+        }>>;
+        health_check_providers: z.ZodCatch<z.ZodPipe<z.ZodArray<z.ZodEnum<{
+            local: "local";
+            cloudflare: "cloudflare";
+            globalping: "globalping";
+        }>>, z.ZodTransform<("local" | "cloudflare" | "globalping")[] | readonly ["local"], ("local" | "cloudflare" | "globalping")[]>>>;
+        health_check_aggregate: z.ZodCatch<z.ZodEnum<{
+            any: "any";
+            all: "all";
+            majority: "majority";
         }>>;
         sync_status: z.ZodDefault<z.ZodNullable<z.ZodString>>;
     }, z.core.$strip>, z.ZodTransform<{
@@ -664,7 +766,9 @@ declare const serviceViewSchema: z.ZodObject<{
         health_check_interval_sec: number;
         health_check_timeout_ms: number;
         health_check_verify_tls: boolean;
-        health_check_provider: "local" | "cloudflare";
+        health_check_provider: "local" | "cloudflare" | "globalping";
+        health_check_providers: ("local" | "cloudflare" | "globalping")[] | readonly ["local"];
+        health_check_aggregate: "any" | "all" | "majority";
         sync_status: string | null;
         target_ip?: string | null | undefined;
     }, {
@@ -683,7 +787,9 @@ declare const serviceViewSchema: z.ZodObject<{
         health_check_interval_sec: number;
         health_check_timeout_ms: number;
         health_check_verify_tls: boolean;
-        health_check_provider: "local" | "cloudflare";
+        health_check_provider: "local" | "cloudflare" | "globalping";
+        health_check_providers: ("local" | "cloudflare" | "globalping")[] | readonly ["local"];
+        health_check_aggregate: "any" | "all" | "majority";
         sync_status: string | null;
         target_ips?: string[] | undefined;
         target_ip?: string | null | undefined;
@@ -712,6 +818,8 @@ declare const serviceViewSchema: z.ZodObject<{
         provider: z.ZodOptional<z.ZodEnum<{
             local: "local";
             cloudflare: "cloudflare";
+            globalping: "globalping";
+            aggregate: "aggregate";
         }>>;
         colo: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     }, z.core.$strip>>>;
@@ -721,11 +829,11 @@ declare const serviceGroupViewSchema: z.ZodObject<{
     id: z.ZodNumber;
     name: z.ZodString;
     type: z.ZodCatch<z.ZodEnum<{
+        custom: "custom";
         vpn: "vpn";
         network: "network";
         internet: "internet";
         bgp: "bgp";
-        custom: "custom";
     }>>;
     icon: z.ZodDefault<z.ZodNullable<z.ZodString>>;
     domain: z.ZodDefault<z.ZodNullable<z.ZodString>>;
@@ -751,6 +859,17 @@ declare const serviceGroupViewSchema: z.ZodObject<{
     health_check_provider: z.ZodCatch<z.ZodEnum<{
         local: "local";
         cloudflare: "cloudflare";
+        globalping: "globalping";
+    }>>;
+    health_check_providers: z.ZodCatch<z.ZodPipe<z.ZodArray<z.ZodEnum<{
+        local: "local";
+        cloudflare: "cloudflare";
+        globalping: "globalping";
+    }>>, z.ZodTransform<("local" | "cloudflare" | "globalping")[] | readonly ["local"], ("local" | "cloudflare" | "globalping")[]>>>;
+    health_check_aggregate: z.ZodCatch<z.ZodEnum<{
+        any: "any";
+        all: "all";
+        majority: "majority";
     }>>;
     created_at: z.ZodString;
     updated_at: z.ZodString;
@@ -803,6 +922,17 @@ declare const serviceGroupViewSchema: z.ZodObject<{
             health_check_provider: z.ZodCatch<z.ZodEnum<{
                 local: "local";
                 cloudflare: "cloudflare";
+                globalping: "globalping";
+            }>>;
+            health_check_providers: z.ZodCatch<z.ZodPipe<z.ZodArray<z.ZodEnum<{
+                local: "local";
+                cloudflare: "cloudflare";
+                globalping: "globalping";
+            }>>, z.ZodTransform<("local" | "cloudflare" | "globalping")[] | readonly ["local"], ("local" | "cloudflare" | "globalping")[]>>>;
+            health_check_aggregate: z.ZodCatch<z.ZodEnum<{
+                any: "any";
+                all: "all";
+                majority: "majority";
             }>>;
             sync_status: z.ZodDefault<z.ZodNullable<z.ZodString>>;
         }, z.core.$strip>, z.ZodTransform<{
@@ -825,7 +955,9 @@ declare const serviceGroupViewSchema: z.ZodObject<{
             health_check_interval_sec: number;
             health_check_timeout_ms: number;
             health_check_verify_tls: boolean;
-            health_check_provider: "local" | "cloudflare";
+            health_check_provider: "local" | "cloudflare" | "globalping";
+            health_check_providers: ("local" | "cloudflare" | "globalping")[] | readonly ["local"];
+            health_check_aggregate: "any" | "all" | "majority";
             sync_status: string | null;
             target_ip?: string | null | undefined;
         }, {
@@ -844,7 +976,9 @@ declare const serviceGroupViewSchema: z.ZodObject<{
             health_check_interval_sec: number;
             health_check_timeout_ms: number;
             health_check_verify_tls: boolean;
-            health_check_provider: "local" | "cloudflare";
+            health_check_provider: "local" | "cloudflare" | "globalping";
+            health_check_providers: ("local" | "cloudflare" | "globalping")[] | readonly ["local"];
+            health_check_aggregate: "any" | "all" | "majority";
             sync_status: string | null;
             target_ips?: string[] | undefined;
             target_ip?: string | null | undefined;
@@ -873,6 +1007,8 @@ declare const serviceGroupViewSchema: z.ZodObject<{
             provider: z.ZodOptional<z.ZodEnum<{
                 local: "local";
                 cloudflare: "cloudflare";
+                globalping: "globalping";
+                aggregate: "aggregate";
             }>>;
             colo: z.ZodOptional<z.ZodNullable<z.ZodString>>;
         }, z.core.$strip>>>;
@@ -891,11 +1027,11 @@ declare const serviceGroupsResponseSchema: z.ZodObject<{
         id: z.ZodNumber;
         name: z.ZodString;
         type: z.ZodCatch<z.ZodEnum<{
+            custom: "custom";
             vpn: "vpn";
             network: "network";
             internet: "internet";
             bgp: "bgp";
-            custom: "custom";
         }>>;
         icon: z.ZodDefault<z.ZodNullable<z.ZodString>>;
         domain: z.ZodDefault<z.ZodNullable<z.ZodString>>;
@@ -921,6 +1057,17 @@ declare const serviceGroupsResponseSchema: z.ZodObject<{
         health_check_provider: z.ZodCatch<z.ZodEnum<{
             local: "local";
             cloudflare: "cloudflare";
+            globalping: "globalping";
+        }>>;
+        health_check_providers: z.ZodCatch<z.ZodPipe<z.ZodArray<z.ZodEnum<{
+            local: "local";
+            cloudflare: "cloudflare";
+            globalping: "globalping";
+        }>>, z.ZodTransform<("local" | "cloudflare" | "globalping")[] | readonly ["local"], ("local" | "cloudflare" | "globalping")[]>>>;
+        health_check_aggregate: z.ZodCatch<z.ZodEnum<{
+            any: "any";
+            all: "all";
+            majority: "majority";
         }>>;
         created_at: z.ZodString;
         updated_at: z.ZodString;
@@ -973,6 +1120,17 @@ declare const serviceGroupsResponseSchema: z.ZodObject<{
                 health_check_provider: z.ZodCatch<z.ZodEnum<{
                     local: "local";
                     cloudflare: "cloudflare";
+                    globalping: "globalping";
+                }>>;
+                health_check_providers: z.ZodCatch<z.ZodPipe<z.ZodArray<z.ZodEnum<{
+                    local: "local";
+                    cloudflare: "cloudflare";
+                    globalping: "globalping";
+                }>>, z.ZodTransform<("local" | "cloudflare" | "globalping")[] | readonly ["local"], ("local" | "cloudflare" | "globalping")[]>>>;
+                health_check_aggregate: z.ZodCatch<z.ZodEnum<{
+                    any: "any";
+                    all: "all";
+                    majority: "majority";
                 }>>;
                 sync_status: z.ZodDefault<z.ZodNullable<z.ZodString>>;
             }, z.core.$strip>, z.ZodTransform<{
@@ -995,7 +1153,9 @@ declare const serviceGroupsResponseSchema: z.ZodObject<{
                 health_check_interval_sec: number;
                 health_check_timeout_ms: number;
                 health_check_verify_tls: boolean;
-                health_check_provider: "local" | "cloudflare";
+                health_check_provider: "local" | "cloudflare" | "globalping";
+                health_check_providers: ("local" | "cloudflare" | "globalping")[] | readonly ["local"];
+                health_check_aggregate: "any" | "all" | "majority";
                 sync_status: string | null;
                 target_ip?: string | null | undefined;
             }, {
@@ -1014,7 +1174,9 @@ declare const serviceGroupsResponseSchema: z.ZodObject<{
                 health_check_interval_sec: number;
                 health_check_timeout_ms: number;
                 health_check_verify_tls: boolean;
-                health_check_provider: "local" | "cloudflare";
+                health_check_provider: "local" | "cloudflare" | "globalping";
+                health_check_providers: ("local" | "cloudflare" | "globalping")[] | readonly ["local"];
+                health_check_aggregate: "any" | "all" | "majority";
                 sync_status: string | null;
                 target_ips?: string[] | undefined;
                 target_ip?: string | null | undefined;
@@ -1043,6 +1205,8 @@ declare const serviceGroupsResponseSchema: z.ZodObject<{
                 provider: z.ZodOptional<z.ZodEnum<{
                     local: "local";
                     cloudflare: "cloudflare";
+                    globalping: "globalping";
+                    aggregate: "aggregate";
                 }>>;
                 colo: z.ZodOptional<z.ZodNullable<z.ZodString>>;
             }, z.core.$strip>>>;
@@ -1105,6 +1269,17 @@ declare const serviceGroupsResponseSchema: z.ZodObject<{
             health_check_provider: z.ZodCatch<z.ZodEnum<{
                 local: "local";
                 cloudflare: "cloudflare";
+                globalping: "globalping";
+            }>>;
+            health_check_providers: z.ZodCatch<z.ZodPipe<z.ZodArray<z.ZodEnum<{
+                local: "local";
+                cloudflare: "cloudflare";
+                globalping: "globalping";
+            }>>, z.ZodTransform<("local" | "cloudflare" | "globalping")[] | readonly ["local"], ("local" | "cloudflare" | "globalping")[]>>>;
+            health_check_aggregate: z.ZodCatch<z.ZodEnum<{
+                any: "any";
+                all: "all";
+                majority: "majority";
             }>>;
             sync_status: z.ZodDefault<z.ZodNullable<z.ZodString>>;
         }, z.core.$strip>, z.ZodTransform<{
@@ -1127,7 +1302,9 @@ declare const serviceGroupsResponseSchema: z.ZodObject<{
             health_check_interval_sec: number;
             health_check_timeout_ms: number;
             health_check_verify_tls: boolean;
-            health_check_provider: "local" | "cloudflare";
+            health_check_provider: "local" | "cloudflare" | "globalping";
+            health_check_providers: ("local" | "cloudflare" | "globalping")[] | readonly ["local"];
+            health_check_aggregate: "any" | "all" | "majority";
             sync_status: string | null;
             target_ip?: string | null | undefined;
         }, {
@@ -1146,7 +1323,9 @@ declare const serviceGroupsResponseSchema: z.ZodObject<{
             health_check_interval_sec: number;
             health_check_timeout_ms: number;
             health_check_verify_tls: boolean;
-            health_check_provider: "local" | "cloudflare";
+            health_check_provider: "local" | "cloudflare" | "globalping";
+            health_check_providers: ("local" | "cloudflare" | "globalping")[] | readonly ["local"];
+            health_check_aggregate: "any" | "all" | "majority";
             sync_status: string | null;
             target_ips?: string[] | undefined;
             target_ip?: string | null | undefined;
@@ -1175,6 +1354,8 @@ declare const serviceGroupsResponseSchema: z.ZodObject<{
             provider: z.ZodOptional<z.ZodEnum<{
                 local: "local";
                 cloudflare: "cloudflare";
+                globalping: "globalping";
+                aggregate: "aggregate";
             }>>;
             colo: z.ZodOptional<z.ZodNullable<z.ZodString>>;
         }, z.core.$strip>>>;
@@ -1383,6 +1564,17 @@ declare const healthCheckConfigSchema: z.ZodObject<{
     health_check_provider: z.ZodOptional<z.ZodEnum<{
         local: "local";
         cloudflare: "cloudflare";
+        globalping: "globalping";
+    }>>;
+    health_check_providers: z.ZodOptional<z.ZodPipe<z.ZodArray<z.ZodEnum<{
+        local: "local";
+        cloudflare: "cloudflare";
+        globalping: "globalping";
+    }>>, z.ZodTransform<("local" | "cloudflare" | "globalping")[] | readonly ["local"], ("local" | "cloudflare" | "globalping")[]>>>;
+    health_check_aggregate: z.ZodOptional<z.ZodEnum<{
+        any: "any";
+        all: "all";
+        majority: "majority";
     }>>;
 }, z.core.$strip>;
 type HealthCheckConfig = z.infer<typeof healthCheckConfigSchema>;
@@ -1414,6 +1606,17 @@ declare const createServiceWithConfigSchema: z.ZodObject<{
         health_check_provider: z.ZodOptional<z.ZodEnum<{
             local: "local";
             cloudflare: "cloudflare";
+            globalping: "globalping";
+        }>>;
+        health_check_providers: z.ZodOptional<z.ZodPipe<z.ZodArray<z.ZodEnum<{
+            local: "local";
+            cloudflare: "cloudflare";
+            globalping: "globalping";
+        }>>, z.ZodTransform<("local" | "cloudflare" | "globalping")[] | readonly ["local"], ("local" | "cloudflare" | "globalping")[]>>>;
+        health_check_aggregate: z.ZodOptional<z.ZodEnum<{
+            any: "any";
+            all: "all";
+            majority: "majority";
         }>>;
         fqdn: z.ZodString;
         target_ips: z.ZodOptional<z.ZodArray<z.ZodString>>;
@@ -1606,6 +1809,17 @@ declare const updateServiceConfigSchema: z.ZodObject<{
         health_check_provider: z.ZodOptional<z.ZodEnum<{
             local: "local";
             cloudflare: "cloudflare";
+            globalping: "globalping";
+        }>>;
+        health_check_providers: z.ZodOptional<z.ZodPipe<z.ZodArray<z.ZodEnum<{
+            local: "local";
+            cloudflare: "cloudflare";
+            globalping: "globalping";
+        }>>, z.ZodTransform<("local" | "cloudflare" | "globalping")[] | readonly ["local"], ("local" | "cloudflare" | "globalping")[]>>>;
+        health_check_aggregate: z.ZodOptional<z.ZodEnum<{
+            any: "any";
+            all: "all";
+            majority: "majority";
         }>>;
         fqdn: z.ZodString;
         target_ips: z.ZodOptional<z.ZodArray<z.ZodString>>;
@@ -1637,14 +1851,25 @@ declare const createServiceGroupSchema: z.ZodObject<{
     health_check_provider: z.ZodOptional<z.ZodEnum<{
         local: "local";
         cloudflare: "cloudflare";
+        globalping: "globalping";
+    }>>;
+    health_check_providers: z.ZodOptional<z.ZodPipe<z.ZodArray<z.ZodEnum<{
+        local: "local";
+        cloudflare: "cloudflare";
+        globalping: "globalping";
+    }>>, z.ZodTransform<("local" | "cloudflare" | "globalping")[] | readonly ["local"], ("local" | "cloudflare" | "globalping")[]>>>;
+    health_check_aggregate: z.ZodOptional<z.ZodEnum<{
+        any: "any";
+        all: "all";
+        majority: "majority";
     }>>;
     name: z.ZodString;
     type: z.ZodDefault<z.ZodEnum<{
+        custom: "custom";
         vpn: "vpn";
         network: "network";
         internet: "internet";
         bgp: "bgp";
-        custom: "custom";
     }>>;
     icon: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     domain: z.ZodOptional<z.ZodNullable<z.ZodString>>;
@@ -1671,14 +1896,25 @@ declare const updateServiceGroupSchema: z.ZodObject<{
     health_check_provider: z.ZodOptional<z.ZodEnum<{
         local: "local";
         cloudflare: "cloudflare";
+        globalping: "globalping";
+    }>>;
+    health_check_providers: z.ZodOptional<z.ZodPipe<z.ZodArray<z.ZodEnum<{
+        local: "local";
+        cloudflare: "cloudflare";
+        globalping: "globalping";
+    }>>, z.ZodTransform<("local" | "cloudflare" | "globalping")[] | readonly ["local"], ("local" | "cloudflare" | "globalping")[]>>>;
+    health_check_aggregate: z.ZodOptional<z.ZodEnum<{
+        any: "any";
+        all: "all";
+        majority: "majority";
     }>>;
     name: z.ZodOptional<z.ZodString>;
     type: z.ZodOptional<z.ZodEnum<{
+        custom: "custom";
         vpn: "vpn";
         network: "network";
         internet: "internet";
         bgp: "bgp";
-        custom: "custom";
     }>>;
     icon: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     domain: z.ZodOptional<z.ZodNullable<z.ZodString>>;
@@ -1772,6 +2008,7 @@ declare const originHealthCheckSchema: z.ZodObject<{
     provider: z.ZodEnum<{
         local: "local";
         cloudflare: "cloudflare";
+        globalping: "globalping";
     }>;
     cf_healthcheck_id: z.ZodNullable<z.ZodString>;
     cf_zone_id: z.ZodNullable<z.ZodString>;
@@ -1793,6 +2030,7 @@ declare const createOriginHealthCheckSchema: z.ZodObject<{
     provider: z.ZodEnum<{
         local: "local";
         cloudflare: "cloudflare";
+        globalping: "globalping";
     }>;
     name: z.ZodString;
     cf_zone_id: z.ZodOptional<z.ZodNullable<z.ZodString>>;
@@ -1920,6 +2158,9 @@ declare const appSettingsPatchSchema: z.ZodObject<{
     healthSuccessRecoveries: z.ZodOptional<z.ZodNumber>;
     healthWorkerUrl: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodLiteral<"">]>>;
     healthWorkerToken: z.ZodOptional<z.ZodString>;
+    globalpingToken: z.ZodOptional<z.ZodString>;
+    globalpingLocations: z.ZodOptional<z.ZodString>;
+    globalpingLimit: z.ZodOptional<z.ZodNumber>;
 }, z.core.$strip>;
 type AppSettingsPatch = z.infer<typeof appSettingsPatchSchema>;
 declare const vpsTrackerEventSchema: z.ZodObject<{
@@ -1936,6 +2177,43 @@ declare const vpsTrackerEventSchema: z.ZodObject<{
 }, z.core.$strip>;
 type VpsTrackerEvent = z.infer<typeof vpsTrackerEventSchema>;
 
+declare const HEALTH_PROBE_SCRIPT_NAME = "cfdm-health-probe";
+declare const HEALTH_PROBE_KV_TITLE = "cfdm-health-probe";
+declare const HEALTH_KV_TARGETS_KEY = "targets";
+declare const HEALTH_KV_RESULTS_KEY = "results";
+declare const HEALTH_KV_CURSOR_KEY = "cursor";
+declare const HEALTH_PROBE_BATCH = 48;
+declare const HEALTH_PROBE_CONCURRENCY = 5;
+type HealthWorkerStatus = "missing" | "ready" | "error";
+interface HealthProbeTargetItem {
+    key: string;
+    ip: string;
+    hostname: string;
+    type: "tcp" | "http";
+    port: number;
+    path?: string;
+    expectedStatus?: number | null;
+    timeoutMs?: number;
+    verifyTls?: boolean;
+}
+interface HealthProbeTargetsDoc {
+    fingerprint: string;
+    updatedAt: string;
+    items: HealthProbeTargetItem[];
+}
+interface HealthProbeResultItem {
+    key: string;
+    ok: boolean;
+    latencyMs: number;
+    error: string | null;
+}
+interface HealthProbeResultsDoc {
+    probedAt: string;
+    colo: string | null;
+    fingerprint?: string;
+    items: HealthProbeResultItem[];
+}
+
 declare const AUDIT_SEVERITIES: readonly ["info", "warning", "critical"];
 type AuditSeverity = (typeof AUDIT_SEVERITIES)[number];
 declare const auditSeveritySchema: z.ZodEnum<{
@@ -2044,4 +2322,4 @@ declare const ingestAuditEventSchema: z.ZodObject<{
 }, z.core.$strip>;
 type IngestAuditEvent = z.infer<typeof ingestAuditEventSchema>;
 
-export { AUDIT_SEVERITIES, AUDIT_SOURCE_APPS, AUDIT_TARGET_TYPES, type AppSettingsPatch, type AppSwitcherConfig, type AppSwitcherEntry, type AuditListQuery, type AuditLogEntry, type AuditSeverity, type AuditSourceApp, type AuditTargetType, type BulkUpdateDomainsInput, CERT_ERROR, CERT_EXPIRED, CERT_MONITORING_VALUES, CERT_MONITOR_AUTO, CERT_MONITOR_REQUIRED, CERT_MONITOR_SKIPPED, CERT_OK, CERT_UNKNOWN, CERT_WARNING, type CertMonitoring, type Certificate, type CfDnsRecord, type CfHealthCheck, type CfZone, type CfdmBindingSyncItem, type ChangeDomainInput, type ChangeIpInput, type CreateDnsRecordInput, type CreateDnsRecordPayload, type CreateDomainInput, type CreateDomainMonitorInput, type CreateGroupInput, type CreateOriginHealthCheckInput, type CreateServiceBindingInput, type CreateServiceGroupInput, type CreateServiceInput, type CreateServiceNodeInput, type CreateServiceWithConfigInput, type CreateSubdomainInput, type DnsRecord, type Domain, type DomainEnvironment, type DomainListItem, type DomainMonitor, type DomainMonitorResult, type DomainMonitorType, type Group, type GroupWithStats, type HealthCheckConfig, type HealthCheckProvider, type HealthCheckScope, type HealthCheckTarget, type HealthCheckType, type HealthProbeLog, type HealthStatusQuery, type IngestAuditEvent, type IpHealthState, type IpHealthStatus, type JwtClaims, type LbMode, type LoginInput, type LoginRequest, type LoginResponse, type NodeHealthState, type NotificationLog, type OriginHealthCheck, type OriginHealthCheckRecord, type ParsedFqdn, type PatchDnsRecordPayload, type ReorderServicesInput, SYNC_CONFLICT, SYNC_ERROR, SYNC_PENDING_DELETE, SYNC_PENDING_PUSH, SYNC_SYNCED, type Service, type ServiceBinding, type ServiceBindingView, type ServiceDomainBinding, type ServiceDomainBindingView, type ServiceGroup, type ServiceGroupView, type ServiceGroupsResponse, type ServiceIpHealth, type ServiceNode, type ServiceNodeRecord, type ServiceOverview, type ServiceView, type Subdomain, type SubdomainRecord, type SyncJob, type ToggleEnabledInput, type ToggleServiceIpInput, type UpdateDomainInput, type UpdateServiceConfigInput, type UpdateServiceGroupInput, type UpdateServiceNodeInput, type UpdateSubdomainInput, ValidationError, type VpsTrackerEvent, appSettingsPatchSchema, appSwitcherConfigSchema, appSwitcherEntrySchema, appSwitcherIconSchema, auditListQuerySchema, auditLogEntrySchema, auditSeveritySchema, auditSourceAppSchema, auditTargetTypeSchema, bindingToFqdn, bulkUpdateDomainsSchema, certMonitoringSchema, certStatusFromExpiry, certificateSchema, cfdmBindingSyncItemSchema, cfdmSyncBindingsBodySchema, changeDomainSchema, changeIpSchema, createDnsRecordSchema, createDomainMonitorSchema, createDomainSchema, createGroupSchema, createOriginHealthCheckSchema, createServiceBindingSchema, createServiceGroupSchema, createServiceNodeSchema, createServiceSchema, createServiceWithConfigSchema, createSubdomainSchema, dnsNameToSubdomainLabel, dnsRecordNamesMatch, dnsRecordSchema, domainEnvironmentSchema, domainListItemSchema, domainMonitorResultSchema, domainMonitorSchema, domainMonitorTypeSchema, domainSchema, fqdnToDisplay, groupSchema, groupWithStatsSchema, healthCheckConfigSchema, healthCheckProviderSchema, healthCheckScopeSchema, healthCheckTypeSchema, healthProbeLogSchema, healthStatusQuerySchema, ingestAuditEventSchema, ipHealthStateSchema, ipHealthStatusSchema, isIpLiteral, isValidIpv4, lbModeSchema, loginSchema, nodeHealthStateSchema, normalizeDnsRecordName, notificationLogSchema, originHealthCheckSchema, parseFqdn, reorderServicesSchema, serviceBindingSchema, serviceDomainBindingSchema, serviceGroupSchema, serviceGroupTypeSchema, serviceGroupViewSchema, serviceGroupsResponseSchema, serviceIpHealthSchema, serviceNodeSchema, serviceSchema, serviceViewSchema, shouldMonitorService, subdomainLabelToFqdn, subdomainSchema, toggleEnabledSchema, toggleServiceIpSchema, updateDomainGroupSchema, updateDomainSchema, updateServiceConfigSchema, updateServiceGroupSchema, updateServiceNodeSchema, updateSubdomainSchema, validateDnsRecord, vpsTrackerEventSchema };
+export { AUDIT_SEVERITIES, AUDIT_SOURCE_APPS, AUDIT_TARGET_TYPES, type AppSettingsPatch, type AppSwitcherConfig, type AppSwitcherEntry, type AuditListQuery, type AuditLogEntry, type AuditSeverity, type AuditSourceApp, type AuditTargetType, type BulkUpdateDomainsInput, CERT_ERROR, CERT_EXPIRED, CERT_MONITORING_VALUES, CERT_MONITOR_AUTO, CERT_MONITOR_REQUIRED, CERT_MONITOR_SKIPPED, CERT_OK, CERT_UNKNOWN, CERT_WARNING, type CertMonitoring, type Certificate, type CfDnsRecord, type CfHealthCheck, type CfZone, type CfdmBindingSyncItem, type ChangeDomainInput, type ChangeIpInput, type CreateDnsRecordInput, type CreateDnsRecordPayload, type CreateDomainInput, type CreateDomainMonitorInput, type CreateGroupInput, type CreateOriginHealthCheckInput, type CreateServiceBindingInput, type CreateServiceGroupInput, type CreateServiceInput, type CreateServiceNodeInput, type CreateServiceWithConfigInput, type CreateSubdomainInput, type DnsRecord, type Domain, type DomainEnvironment, type DomainListItem, type DomainMonitor, type DomainMonitorResult, type DomainMonitorType, type Group, type GroupWithStats, HEALTH_CHECK_AGGREGATES, HEALTH_CHECK_PROVIDERS, HEALTH_KV_CURSOR_KEY, HEALTH_KV_RESULTS_KEY, HEALTH_KV_TARGETS_KEY, HEALTH_PROBE_BATCH, HEALTH_PROBE_CONCURRENCY, HEALTH_PROBE_KV_TITLE, HEALTH_PROBE_SCRIPT_NAME, HEALTH_STATUS_PROVIDERS, type HealthCheckAggregate, type HealthCheckConfig, type HealthCheckProvider, type HealthCheckScope, type HealthCheckTarget, type HealthCheckType, type HealthProbeLog, type HealthProbeResultItem, type HealthProbeResultsDoc, type HealthProbeTargetItem, type HealthProbeTargetsDoc, type HealthStatusProvider, type HealthStatusQuery, type HealthWorkerStatus, type IngestAuditEvent, type IpHealthState, type IpHealthStatus, type JwtClaims, type LbMode, type LoginInput, type LoginRequest, type LoginResponse, type NodeHealthState, type NotificationLog, type OriginHealthCheck, type OriginHealthCheckRecord, type ParsedFqdn, type PatchDnsRecordPayload, type ReorderServicesInput, SYNC_CONFLICT, SYNC_ERROR, SYNC_PENDING_DELETE, SYNC_PENDING_PUSH, SYNC_SYNCED, type Service, type ServiceBinding, type ServiceBindingView, type ServiceDomainBinding, type ServiceDomainBindingView, type ServiceGroup, type ServiceGroupView, type ServiceGroupsResponse, type ServiceIpHealth, type ServiceNode, type ServiceNodeRecord, type ServiceOverview, type ServiceView, type Subdomain, type SubdomainRecord, type SyncJob, type ToggleEnabledInput, type ToggleServiceIpInput, type UpdateDomainInput, type UpdateServiceConfigInput, type UpdateServiceGroupInput, type UpdateServiceNodeInput, type UpdateSubdomainInput, ValidationError, type VpsTrackerEvent, aggregateHealthOk, appSettingsPatchSchema, appSwitcherConfigSchema, appSwitcherEntrySchema, appSwitcherIconSchema, auditListQuerySchema, auditLogEntrySchema, auditSeveritySchema, auditSourceAppSchema, auditTargetTypeSchema, bindingToFqdn, bulkUpdateDomainsSchema, certMonitoringSchema, certStatusFromExpiry, certificateSchema, cfdmBindingSyncItemSchema, cfdmSyncBindingsBodySchema, changeDomainSchema, changeIpSchema, clampGlobalpingLimit, createDnsRecordSchema, createDomainMonitorSchema, createDomainSchema, createGroupSchema, createOriginHealthCheckSchema, createServiceBindingSchema, createServiceGroupSchema, createServiceNodeSchema, createServiceSchema, createServiceWithConfigSchema, createSubdomainSchema, derivePrimaryProvider, dnsNameToSubdomainLabel, dnsRecordNamesMatch, dnsRecordSchema, domainEnvironmentSchema, domainListItemSchema, domainMonitorResultSchema, domainMonitorSchema, domainMonitorTypeSchema, domainSchema, fqdnToDisplay, groupSchema, groupWithStatsSchema, healthCheckAggregateSchema, healthCheckConfigSchema, healthCheckProviderSchema, healthCheckProvidersSchema, healthCheckScopeSchema, healthCheckTypeSchema, healthProbeLogSchema, healthStatusProviderSchema, healthStatusQuerySchema, ingestAuditEventSchema, ipHealthStateSchema, ipHealthStatusSchema, isIpLiteral, isValidIpv4, lbModeSchema, loginSchema, nodeHealthStateSchema, normalizeDnsRecordName, normalizeProbeProvider, normalizeStatusProvider, notificationLogSchema, originHealthCheckSchema, parseFqdn, parseGlobalpingLocations, parseHealthAggregate, parseHealthProviders, reorderServicesSchema, serializeHealthProviders, serviceBindingSchema, serviceDomainBindingSchema, serviceGroupSchema, serviceGroupTypeSchema, serviceGroupViewSchema, serviceGroupsResponseSchema, serviceIpHealthSchema, serviceNodeSchema, serviceSchema, serviceViewSchema, shouldMonitorService, subdomainLabelToFqdn, subdomainSchema, targetHasProvider, targetProviders, toggleEnabledSchema, toggleServiceIpSchema, uniqueHealthProviders, updateDomainGroupSchema, updateDomainSchema, updateServiceConfigSchema, updateServiceGroupSchema, updateServiceNodeSchema, updateSubdomainSchema, validateDnsRecord, vpsTrackerEventSchema };

packages/shared/dist/index.js

@@ -165,6 +165,100 @@ function bindingToFqdn(binding) {
 
 // src/schemas.ts
 import { z } from "zod";
+
+// src/health-providers.ts
+var HEALTH_CHECK_PROVIDERS = [
+  "local",
+  "cloudflare",
+  "globalping"
+];
+var HEALTH_STATUS_PROVIDERS = [
+  ...HEALTH_CHECK_PROVIDERS,
+  "aggregate"
+];
+var HEALTH_CHECK_AGGREGATES = ["any", "all", "majority"];
+var PROVIDER_SET = new Set(HEALTH_CHECK_PROVIDERS);
+var STATUS_SET = new Set(HEALTH_STATUS_PROVIDERS);
+var AGGREGATE_SET = new Set(HEALTH_CHECK_AGGREGATES);
+function normalizeProbeProvider(value) {
+  return value === "cloudflare" || value === "globalping" || value === "local" ? value : "local";
+}
+function normalizeStatusProvider(value) {
+  if (typeof value === "string" && STATUS_SET.has(value)) {
+    return value;
+  }
+  return "local";
+}
+function uniqueHealthProviders(values) {
+  const out = [];
+  for (const value of values) {
+    if (!PROVIDER_SET.has(String(value))) continue;
+    const next = value;
+    if (!out.includes(next)) out.push(next);
+  }
+  return out;
+}
+function parseHealthProviders(json, fallback) {
+  if (Array.isArray(json)) {
+    const parsed = uniqueHealthProviders(json);
+    if (parsed.length > 0) return parsed;
+  }
+  if (typeof json === "string" && json.trim()) {
+    const trimmed = json.trim();
+    if (trimmed.startsWith("[")) {
+      try {
+        const parsed = uniqueHealthProviders(JSON.parse(trimmed));
+        if (parsed.length > 0) return parsed;
+      } catch {
+      }
+    }
+    const one = uniqueHealthProviders(trimmed.split(","));
+    if (one.length > 0) return one;
+  }
+  return [normalizeProbeProvider(fallback)];
+}
+function serializeHealthProviders(providers) {
+  const unique = uniqueHealthProviders(providers);
+  return JSON.stringify(unique.length > 0 ? unique : ["local"]);
+}
+function parseHealthAggregate(value) {
+  if (typeof value === "string" && AGGREGATE_SET.has(value)) {
+    return value;
+  }
+  return "majority";
+}
+function derivePrimaryProvider(providers) {
+  return uniqueHealthProviders(providers)[0] ?? "local";
+}
+function targetProviders(target) {
+  if (target.providers && target.providers.length > 0) {
+    return uniqueHealthProviders(target.providers);
+  }
+  return [normalizeProbeProvider(target.provider)];
+}
+function targetHasProvider(target, provider) {
+  return targetProviders(target).includes(provider);
+}
+function aggregateHealthOk(oks, policy) {
+  const n = oks.length;
+  if (n === 0) return false;
+  const down = oks.filter((ok) => !ok).length;
+  if (policy === "any") return down === 0;
+  if (policy === "all") return down < n;
+  return down < Math.floor(n / 2) + 1;
+}
+function clampGlobalpingLimit(value, fallback = 3) {
+  const n = typeof value === "number" ? value : Number(value);
+  if (!Number.isFinite(n)) return fallback;
+  return Math.min(10, Math.max(1, Math.trunc(n)));
+}
+function parseGlobalpingLocations(value) {
+  const raw = typeof value === "string" ? value : "";
+  const parts = raw.split(",").map((part) => part.trim()).filter(Boolean);
+  return parts.length > 0 ? parts : ["World"];
+}
+
+// src/schemas.ts
 var certMonitoringSchema = z.enum(["auto", "required", "skipped"]);
 var lbModeSchema = z.enum(["round_robin", "failover", "weighted"]);
 var healthCheckTypeSchema = z.enum(["tcp", "http", "ping", "dns"]);
@@ -179,7 +273,13 @@ var nodeHealthStateSchema = z.enum([
   "unhealthy",
   "disabled"
 ]);
-var healthCheckProviderSchema = z.enum(["local", "cloudflare"]);
+var healthCheckProviderSchema = z.enum(HEALTH_CHECK_PROVIDERS);
+var healthStatusProviderSchema = z.enum(HEALTH_STATUS_PROVIDERS);
+var healthCheckAggregateSchema = z.enum(HEALTH_CHECK_AGGREGATES);
+var healthCheckProvidersSchema = z.array(healthCheckProviderSchema).min(1).transform((arr) => {
+  const unique = uniqueHealthProviders(arr);
+  return unique.length > 0 ? unique : ["local"];
+});
 var healthCheckScopeSchema = z.enum(["binding", "group"]);
 var ipHealthStatusSchema = z.object({
   scope: healthCheckScopeSchema,
@@ -192,7 +292,7 @@ var ipHealthStatusSchema = z.object({
   last_checked_at: z.string().nullable(),
   last_error: z.string().nullable(),
   colo: z.string().nullable().optional(),
-  provider: healthCheckProviderSchema.optional()
+  provider: healthStatusProviderSchema.optional()
 });
 var serviceIpHealthSchema = z.object({
   ip: z.string(),
@@ -200,7 +300,7 @@ var serviceIpHealthSchema = z.object({
   latency_ms: z.number().nullable(),
   last_checked_at: z.string().nullable().optional(),
   last_error: z.string().nullable().optional(),
-  provider: healthCheckProviderSchema.optional(),
+  provider: healthStatusProviderSchema.optional(),
   colo: z.string().nullable().optional()
 });
 var healthProbeLogSchema = z.object({
@@ -250,6 +350,8 @@ var serviceGroupSchema = z.object({
   health_check_timeout_ms: z.number().default(3e3),
   health_check_verify_tls: z.coerce.boolean().default(false),
   health_check_provider: healthCheckProviderSchema.catch("local"),
+  health_check_providers: healthCheckProvidersSchema.catch(["local"]),
+  health_check_aggregate: healthCheckAggregateSchema.catch("majority"),
   created_at: z.string(),
   updated_at: z.string()
 });
@@ -288,6 +390,8 @@ var serviceDomainBindingSchema = z.object({
   health_check_timeout_ms: z.number().default(3e3),
   health_check_verify_tls: z.coerce.boolean().default(false),
   health_check_provider: healthCheckProviderSchema.catch("local"),
+  health_check_providers: healthCheckProvidersSchema.catch(["local"]),
+  health_check_aggregate: healthCheckAggregateSchema.catch("majority"),
   sync_status: z.string().nullable().default(null)
 }).transform((binding) => ({
   ...binding,
@@ -414,7 +518,9 @@ var healthCheckConfigFields = {
   health_check_interval_sec: z.number().int().min(5).max(3600).optional(),
   health_check_timeout_ms: z.number().int().min(100).max(3e4).optional(),
   health_check_verify_tls: z.boolean().optional(),
-  health_check_provider: healthCheckProviderSchema.optional()
+  health_check_provider: healthCheckProviderSchema.optional(),
+  health_check_providers: healthCheckProvidersSchema.optional(),
+  health_check_aggregate: healthCheckAggregateSchema.optional()
 };
 var healthCheckConfigSchema = z.object(healthCheckConfigFields);
 var serviceDomainInputSchema = z.object({
@@ -727,7 +833,10 @@ var appSettingsPatchSchema = z3.object({
   healthLatencyWarnMs: z3.number().int().min(50).max(6e4).optional(),
   healthSuccessRecoveries: z3.number().int().min(1).max(20).optional(),
   healthWorkerUrl: z3.string().url().or(z3.literal("")).optional(),
-  healthWorkerToken: z3.string().optional()
+  healthWorkerToken: z3.string().optional(),
+  globalpingToken: z3.string().optional(),
+  globalpingLocations: z3.string().trim().max(200).optional(),
+  globalpingLimit: z3.number().int().min(1).max(10).optional()
 }).superRefine((data, ctx) => {
   if (data.healthDegradedFailures != null && data.healthDownFailures != null && data.healthDownFailures < data.healthDegradedFailures) {
     ctx.addIssue({
@@ -749,6 +858,15 @@ var vpsTrackerEventSchema = z3.object({
   timestamp: z3.string().datetime().optional()
 });
 
+// src/health-probe-mailbox.ts
+var HEALTH_PROBE_SCRIPT_NAME = "cfdm-health-probe";
+var HEALTH_PROBE_KV_TITLE = "cfdm-health-probe";
+var HEALTH_KV_TARGETS_KEY = "targets";
+var HEALTH_KV_RESULTS_KEY = "results";
+var HEALTH_KV_CURSOR_KEY = "cursor";
+var HEALTH_PROBE_BATCH = 48;
+var HEALTH_PROBE_CONCURRENCY = 5;
+
 // src/audit.ts
 import { z as z4 } from "zod";
 var AUDIT_SEVERITIES = ["info", "warning", "critical"];
@@ -820,12 +938,23 @@ export {
   CERT_OK,
   CERT_UNKNOWN,
   CERT_WARNING,
+  HEALTH_CHECK_AGGREGATES,
+  HEALTH_CHECK_PROVIDERS,
+  HEALTH_KV_CURSOR_KEY,
+  HEALTH_KV_RESULTS_KEY,
+  HEALTH_KV_TARGETS_KEY,
+  HEALTH_PROBE_BATCH,
+  HEALTH_PROBE_CONCURRENCY,
+  HEALTH_PROBE_KV_TITLE,
+  HEALTH_PROBE_SCRIPT_NAME,
+  HEALTH_STATUS_PROVIDERS,
   SYNC_CONFLICT,
   SYNC_ERROR,
   SYNC_PENDING_DELETE,
   SYNC_PENDING_PUSH,
   SYNC_SYNCED,
   ValidationError,
+  aggregateHealthOk,
   appSettingsPatchSchema,
   appSwitcherConfigSchema,
   appSwitcherEntrySchema,
@@ -844,6 +973,7 @@ export {
   cfdmSyncBindingsBodySchema,
   changeDomainSchema,
   changeIpSchema,
+  clampGlobalpingLimit,
   createDnsRecordSchema,
   createDomainMonitorSchema,
   createDomainSchema,
@@ -855,6 +985,7 @@ export {
   createServiceSchema,
   createServiceWithConfigSchema,
   createSubdomainSchema,
+  derivePrimaryProvider,
   dnsNameToSubdomainLabel,
   dnsRecordNamesMatch,
   dnsRecordSchema,
@@ -867,11 +998,14 @@ export {
   fqdnToDisplay,
   groupSchema,
   groupWithStatsSchema,
+  healthCheckAggregateSchema,
   healthCheckConfigSchema,
   healthCheckProviderSchema,
+  healthCheckProvidersSchema,
   healthCheckScopeSchema,
   healthCheckTypeSchema,
   healthProbeLogSchema,
+  healthStatusProviderSchema,
   healthStatusQuerySchema,
   ingestAuditEventSchema,
   ipHealthStateSchema,
@@ -882,10 +1016,16 @@ export {
   loginSchema,
   nodeHealthStateSchema,
   normalizeDnsRecordName,
+  normalizeProbeProvider,
+  normalizeStatusProvider,
   notificationLogSchema,
   originHealthCheckSchema,
   parseFqdn,
+  parseGlobalpingLocations,
+  parseHealthAggregate,
+  parseHealthProviders,
   reorderServicesSchema,
+  serializeHealthProviders,
   serviceBindingSchema,
   serviceDomainBindingSchema,
   serviceGroupSchema,
@@ -899,8 +1039,11 @@ export {
   shouldMonitorService,
   subdomainLabelToFqdn,
   subdomainSchema,
+  targetHasProvider,
+  targetProviders,
   toggleEnabledSchema,
   toggleServiceIpSchema,
+  uniqueHealthProviders,
   updateDomainGroupSchema,
   updateDomainSchema,
   updateServiceConfigSchema,

packages/shared/src/health-probe-mailbox.ts

@@ -0,0 +1,41 @@
+export const HEALTH_PROBE_SCRIPT_NAME = "cfdm-health-probe";
+export const HEALTH_PROBE_KV_TITLE = "cfdm-health-probe";
+export const HEALTH_KV_TARGETS_KEY = "targets";
+export const HEALTH_KV_RESULTS_KEY = "results";
+export const HEALTH_KV_CURSOR_KEY = "cursor";
+export const HEALTH_PROBE_BATCH = 48;
+export const HEALTH_PROBE_CONCURRENCY = 5;
+
+export type HealthWorkerStatus = "missing" | "ready" | "error";
+
+export interface HealthProbeTargetItem {
+  key: string;
+  ip: string;
+  hostname: string;
+  type: "tcp" | "http";
+  port: number;
+  path?: string;
+  expectedStatus?: number | null;
+  timeoutMs?: number;
+  verifyTls?: boolean;
+}
+
+export interface HealthProbeTargetsDoc {
+  fingerprint: string;
+  updatedAt: string;
+  items: HealthProbeTargetItem[];
+}
+
+export interface HealthProbeResultItem {
+  key: string;
+  ok: boolean;
+  latencyMs: number;
+  error: string | null;
+}
+
+export interface HealthProbeResultsDoc {
+  probedAt: string;
+  colo: string | null;
+  fingerprint?: string;
+  items: HealthProbeResultItem[];
+}

packages/shared/src/health-providers.ts

@@ -0,0 +1,143 @@
+export const HEALTH_CHECK_PROVIDERS = [
+  "local",
+  "cloudflare",
+  "globalping",
+] as const;
+
+export type HealthCheckProvider = (typeof HEALTH_CHECK_PROVIDERS)[number];
+
+export const HEALTH_STATUS_PROVIDERS = [
+  ...HEALTH_CHECK_PROVIDERS,
+  "aggregate",
+] as const;
+
+export type HealthStatusProvider = (typeof HEALTH_STATUS_PROVIDERS)[number];
+
+export const HEALTH_CHECK_AGGREGATES = ["any", "all", "majority"] as const;
+
+export type HealthCheckAggregate = (typeof HEALTH_CHECK_AGGREGATES)[number];
+
+const PROVIDER_SET = new Set<string>(HEALTH_CHECK_PROVIDERS);
+const STATUS_SET = new Set<string>(HEALTH_STATUS_PROVIDERS);
+const AGGREGATE_SET = new Set<string>(HEALTH_CHECK_AGGREGATES);
+
+export function normalizeProbeProvider(value: unknown): HealthCheckProvider {
+  return value === "cloudflare" || value === "globalping" || value === "local"
+    ? value
+    : "local";
+}
+
+export function normalizeStatusProvider(value: unknown): HealthStatusProvider {
+  if (typeof value === "string" && STATUS_SET.has(value)) {
+    return value as HealthStatusProvider;
+  }
+  return "local";
+}
+
+export function uniqueHealthProviders(
+  values: readonly unknown[],
+): HealthCheckProvider[] {
+  const out: HealthCheckProvider[] = [];
+  for (const value of values) {
+    if (!PROVIDER_SET.has(String(value))) continue;
+    const next = value as HealthCheckProvider;
+    if (!out.includes(next)) out.push(next);
+  }
+  return out;
+}
+
+export function parseHealthProviders(
+  json: unknown,
+  fallback?: unknown,
+): HealthCheckProvider[] {
+  if (Array.isArray(json)) {
+    const parsed = uniqueHealthProviders(json);
+    if (parsed.length > 0) return parsed;
+  }
+  if (typeof json === "string" && json.trim()) {
+    const trimmed = json.trim();
+    if (trimmed.startsWith("[")) {
+      try {
+        const parsed = uniqueHealthProviders(JSON.parse(trimmed) as unknown[]);
+        if (parsed.length > 0) return parsed;
+      } catch {
+        // fall through to single-provider
+      }
+    }
+    const one = uniqueHealthProviders(trimmed.split(","));
+    if (one.length > 0) return one;
+  }
+  return [normalizeProbeProvider(fallback)];
+}
+
+export function serializeHealthProviders(
+  providers: readonly HealthCheckProvider[],
+): string {
+  const unique = uniqueHealthProviders(providers);
+  return JSON.stringify(unique.length > 0 ? unique : ["local"]);
+}
+
+export function parseHealthAggregate(value: unknown): HealthCheckAggregate {
+  if (typeof value === "string" && AGGREGATE_SET.has(value)) {
+    return value as HealthCheckAggregate;
+  }
+  return "majority";
+}
+
+export function derivePrimaryProvider(
+  providers: readonly HealthCheckProvider[],
+): HealthCheckProvider {
+  return uniqueHealthProviders(providers)[0] ?? "local";
+}
+
+export function targetProviders(target: {
+  providers?: readonly HealthCheckProvider[] | null;
+  provider?: HealthCheckProvider | null;
+}): HealthCheckProvider[] {
+  if (target.providers && target.providers.length > 0) {
+    return uniqueHealthProviders(target.providers);
+  }
+  return [normalizeProbeProvider(target.provider)];
+}
+
+export function targetHasProvider(
+  target: {
+    providers?: readonly HealthCheckProvider[] | null;
+    provider?: HealthCheckProvider | null;
+  },
+  provider: HealthCheckProvider,
+): boolean {
+  return targetProviders(target).includes(provider);
+}
+
+/**
+ * any — Down if at least one source is Down (ok only if all ok).
+ * all — Down only if every source is Down (ok if any ok).
+ * majority — Down if a strict majority of sources are Down (2 → both, 3 → ≥2).
+ */
+export function aggregateHealthOk(
+  oks: readonly boolean[],
+  policy: HealthCheckAggregate,
+): boolean {
+  const n = oks.length;
+  if (n === 0) return false;
+  const down = oks.filter((ok) => !ok).length;
+  if (policy === "any") return down === 0;
+  if (policy === "all") return down < n;
+  return down < Math.floor(n / 2) + 1;
+}
+
+export function clampGlobalpingLimit(value: unknown, fallback = 3): number {
+  const n = typeof value === "number" ? value : Number(value);
+  if (!Number.isFinite(n)) return fallback;
+  return Math.min(10, Math.max(1, Math.trunc(n)));
+}
+
+export function parseGlobalpingLocations(value: unknown): string[] {
+  const raw = typeof value === "string" ? value : "";
+  const parts = raw
+    .split(",")
+    .map((part) => part.trim())
+    .filter(Boolean);
+  return parts.length > 0 ? parts : ["World"];
+}

packages/shared/src/index.ts

@@ -5,6 +5,8 @@ export * from "./parse-fqdn.js";
 export * from "./schemas.js";
 export * from "./app-switcher.js";
 export * from "./integration-vps-tracker.js";
+export * from "./health-probe-mailbox.js";
+export * from "./health-providers.js";
 export * from "./audit.js";
 export type {
   CfZone,
@@ -22,7 +24,6 @@ export type {
   HealthCheckType,
   IpHealthState,
   NodeHealthState,
-  HealthCheckProvider,
   HealthCheckScope,
   IpHealthStatus,
   HealthCheckTarget,

packages/shared/src/integration-vps-tracker.ts

@@ -37,6 +37,9 @@ export const appSettingsPatchSchema = z.object({
   healthSuccessRecoveries: z.number().int().min(1).max(20).optional(),
   healthWorkerUrl: z.string().url().or(z.literal("")).optional(),
   healthWorkerToken: z.string().optional(),
+  globalpingToken: z.string().optional(),
+  globalpingLocations: z.string().trim().max(200).optional(),
+  globalpingLimit: z.number().int().min(1).max(10).optional(),
 }).superRefine((data, ctx) => {
   if (
     data.healthDegradedFailures != null &&

packages/shared/src/schemas.ts

@@ -1,4 +1,10 @@
 import { z } from 'zod'
+import {
+  HEALTH_CHECK_AGGREGATES,
+  HEALTH_CHECK_PROVIDERS,
+  HEALTH_STATUS_PROVIDERS,
+  uniqueHealthProviders,
+} from './health-providers.js'
 
 export const certMonitoringSchema = z.enum(['auto', 'required', 'skipped'])
 
@@ -29,8 +35,19 @@ export const nodeHealthStateSchema = z.enum([
 ])
 export type NodeHealthState = z.infer<typeof nodeHealthStateSchema>
 
-export const healthCheckProviderSchema = z.enum(['local', 'cloudflare'])
-export type HealthCheckProvider = z.infer<typeof healthCheckProviderSchema>
+export const healthCheckProviderSchema = z.enum(HEALTH_CHECK_PROVIDERS)
+
+export const healthStatusProviderSchema = z.enum(HEALTH_STATUS_PROVIDERS)
+
+export const healthCheckAggregateSchema = z.enum(HEALTH_CHECK_AGGREGATES)
+
+export const healthCheckProvidersSchema = z
+  .array(healthCheckProviderSchema)
+  .min(1)
+  .transform((arr) => {
+    const unique = uniqueHealthProviders(arr)
+    return unique.length > 0 ? unique : (['local'] as const)
+  })
 
 export const healthCheckScopeSchema = z.enum(['binding', 'group'])
 export type HealthCheckScope = z.infer<typeof healthCheckScopeSchema>
@@ -46,7 +63,7 @@ export const ipHealthStatusSchema = z.object({
   last_checked_at: z.string().nullable(),
   last_error: z.string().nullable(),
   colo: z.string().nullable().optional(),
-  provider: healthCheckProviderSchema.optional(),
+  provider: healthStatusProviderSchema.optional(),
 })
 
 export type IpHealthStatus = z.infer<typeof ipHealthStatusSchema>
@@ -57,7 +74,7 @@ export const serviceIpHealthSchema = z.object({
   latency_ms: z.number().nullable(),
   last_checked_at: z.string().nullable().optional(),
   last_error: z.string().nullable().optional(),
-  provider: healthCheckProviderSchema.optional(),
+  provider: healthStatusProviderSchema.optional(),
   colo: z.string().nullable().optional(),
 })
 
@@ -116,6 +133,8 @@ export const serviceGroupSchema = z.object({
   health_check_timeout_ms: z.number().default(3000),
   health_check_verify_tls: z.coerce.boolean().default(false),
   health_check_provider: healthCheckProviderSchema.catch('local'),
+  health_check_providers: healthCheckProvidersSchema.catch(['local']),
+  health_check_aggregate: healthCheckAggregateSchema.catch('majority'),
   created_at: z.string(),
   updated_at: z.string(),
 })
@@ -157,6 +176,8 @@ export const serviceDomainBindingSchema = z
     health_check_timeout_ms: z.number().default(3000),
     health_check_verify_tls: z.coerce.boolean().default(false),
     health_check_provider: healthCheckProviderSchema.catch('local'),
+    health_check_providers: healthCheckProvidersSchema.catch(['local']),
+    health_check_aggregate: healthCheckAggregateSchema.catch('majority'),
     sync_status: z.string().nullable().default(null),
   })
   .transform((binding) => ({
@@ -329,6 +350,8 @@ const healthCheckConfigFields = {
   health_check_timeout_ms: z.number().int().min(100).max(30000).optional(),
   health_check_verify_tls: z.boolean().optional(),
   health_check_provider: healthCheckProviderSchema.optional(),
+  health_check_providers: healthCheckProvidersSchema.optional(),
+  health_check_aggregate: healthCheckAggregateSchema.optional(),
 }
 
 export const healthCheckConfigSchema = z.object(healthCheckConfigFields)

packages/shared/src/types.ts

@@ -1,3 +1,15 @@
+import type {
+  HealthCheckProvider,
+  HealthCheckAggregate,
+  HealthStatusProvider,
+} from "./health-providers.js";
+
+export type {
+  HealthCheckProvider,
+  HealthCheckAggregate,
+  HealthStatusProvider,
+} from "./health-providers.js";
+
 export interface Group {
   id: number;
   name: string;
@@ -23,6 +35,8 @@ export interface ServiceGroup {
   health_check_timeout_ms: number;
   health_check_verify_tls: boolean;
   health_check_provider: HealthCheckProvider;
+  health_check_providers: HealthCheckProvider[];
+  health_check_aggregate: HealthCheckAggregate;
   created_at: string;
   updated_at: string;
 }
@@ -123,6 +137,8 @@ export interface ServiceBinding {
   health_check_timeout_ms: number;
   health_check_verify_tls: boolean;
   health_check_provider: HealthCheckProvider;
+  health_check_providers: HealthCheckProvider[];
+  health_check_aggregate: HealthCheckAggregate;
   routing_strategy: LbMode;
   operation_version: number;
   created_at: string;
@@ -155,6 +171,8 @@ export interface ServiceBindingView {
   health_check_timeout_ms: number;
   health_check_verify_tls: boolean;
   health_check_provider: HealthCheckProvider;
+  health_check_providers: HealthCheckProvider[];
+  health_check_aggregate: HealthCheckAggregate;
   sync_status: string | null;
   created_at: string;
   updated_at: string;
@@ -181,6 +199,8 @@ export interface ServiceDomainBindingView {
   health_check_timeout_ms: number;
   health_check_verify_tls: boolean;
   health_check_provider: HealthCheckProvider;
+  health_check_providers: HealthCheckProvider[];
+  health_check_aggregate: HealthCheckAggregate;
   sync_status: string | null;
 }
 
@@ -229,6 +249,7 @@ export interface CfZone {
   id: string;
   name: string;
   status: string;
+  account?: { id: string; name?: string };
 }
 
 export interface CfDnsRecord {
@@ -283,8 +304,6 @@ export type NodeHealthState =
   | "unhealthy"
   | "disabled";
 
-export type HealthCheckProvider = "local" | "cloudflare";
-
 export type HealthCheckScope = "binding" | "group";
 
 export interface IpHealthStatus {
@@ -298,7 +317,7 @@ export interface IpHealthStatus {
   last_checked_at: string | null;
   last_error: string | null;
   colo?: string | null;
-  provider?: HealthCheckProvider;
+  provider?: HealthStatusProvider;
 }
 
 export interface ServiceIpHealth {
@@ -307,7 +326,7 @@ export interface ServiceIpHealth {
   latency_ms: number | null;
   last_checked_at?: string | null;
   last_error?: string | null;
-  provider?: HealthCheckProvider;
+  provider?: HealthStatusProvider;
   colo?: string | null;
 }
 
@@ -393,4 +412,6 @@ export interface HealthCheckTarget {
   timeout_ms: number;
   verify_tls: boolean;
   provider: HealthCheckProvider;
+  providers?: HealthCheckProvider[];
+  aggregate?: HealthCheckAggregate;
 }

packages/ui/src/components/toggle-group.tsx

@@ -0,0 +1,89 @@
+"use client"
+
+import * as React from "react"
+import { Toggle as TogglePrimitive } from "@base-ui/react/toggle"
+import { ToggleGroup as ToggleGroupPrimitive } from "@base-ui/react/toggle-group"
+import { type VariantProps } from "class-variance-authority"
+
+import { cn } from "@cfdm/ui/lib/utils"
+import { toggleVariants } from "@cfdm/ui/components/toggle"
+
+const ToggleGroupContext = React.createContext<
+  VariantProps<typeof toggleVariants> & {
+    spacing?: number
+    orientation?: "horizontal" | "vertical"
+  }
+>({
+  size: "default",
+  variant: "default",
+  spacing: 2,
+  orientation: "horizontal",
+})
+
+function ToggleGroup({
+  className,
+  variant,
+  size,
+  spacing = 2,
+  orientation = "horizontal",
+  children,
+  ...props
+}: ToggleGroupPrimitive.Props &
+  VariantProps<typeof toggleVariants> & {
+    spacing?: number
+    orientation?: "horizontal" | "vertical"
+  }) {
+  return (
+    <ToggleGroupPrimitive
+      data-slot="toggle-group"
+      data-variant={variant}
+      data-size={size}
+      data-spacing={spacing}
+      data-orientation={orientation}
+      style={{ "--gap": spacing } as React.CSSProperties}
+      className={cn(
+        "group/toggle-group flex w-fit flex-row items-center gap-[--spacing(var(--gap))] rounded-lg data-[size=sm]:rounded-[min(var(--radius-md),10px)] data-vertical:flex-col data-vertical:items-stretch",
+        className
+      )}
+      {...props}
+    >
+      <ToggleGroupContext.Provider
+        value={{ variant, size, spacing, orientation }}
+      >
+        {children}
+      </ToggleGroupContext.Provider>
+    </ToggleGroupPrimitive>
+  )
+}
+
+function ToggleGroupItem({
+  className,
+  children,
+  variant = "default",
+  size = "default",
+  ...props
+}: TogglePrimitive.Props & VariantProps<typeof toggleVariants>) {
+  const context = React.useContext(ToggleGroupContext)
+
+  return (
+    <TogglePrimitive
+      data-slot="toggle-group-item"
+      data-variant={context.variant || variant}
+      data-size={context.size || size}
+      data-spacing={context.spacing}
+      className={cn(
+        "shrink-0 group-data-[spacing=0]/toggle-group:rounded-none group-data-[spacing=0]/toggle-group:px-2 focus:z-10 focus-visible:z-10 group-data-[spacing=0]/toggle-group:has-data-[icon=inline-end]:pr-1.5 group-data-[spacing=0]/toggle-group:has-data-[icon=inline-start]:pl-1.5 group-data-horizontal/toggle-group:data-[spacing=0]:first:rounded-l-lg group-data-vertical/toggle-group:data-[spacing=0]:first:rounded-t-lg group-data-horizontal/toggle-group:data-[spacing=0]:last:rounded-r-lg group-data-vertical/toggle-group:data-[spacing=0]:last:rounded-b-lg group-data-horizontal/toggle-group:data-[spacing=0]:data-[variant=outline]:border-l-0 group-data-vertical/toggle-group:data-[spacing=0]:data-[variant=outline]:border-t-0 group-data-horizontal/toggle-group:data-[spacing=0]:data-[variant=outline]:first:border-l group-data-vertical/toggle-group:data-[spacing=0]:data-[variant=outline]:first:border-t",
+        toggleVariants({
+          variant: context.variant || variant,
+          size: context.size || size,
+        }),
+        className
+      )}
+      {...props}
+    >
+      {children}
+    </TogglePrimitive>
+  )
+}
+
+export { ToggleGroup, ToggleGroupItem }

packages/ui/src/components/toggle.tsx

@@ -0,0 +1,43 @@
+import { Toggle as TogglePrimitive } from "@base-ui/react/toggle"
+import { cva, type VariantProps } from "class-variance-authority"
+
+import { cn } from "@cfdm/ui/lib/utils"
+
+const toggleVariants = cva(
+  "group/toggle inline-flex items-center justify-center gap-1 rounded-lg text-sm font-medium whitespace-nowrap transition-all outline-none hover:bg-muted hover:text-foreground focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 aria-pressed:bg-muted data-[state=on]:bg-muted dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+  {
+    variants: {
+      variant: {
+        default: "bg-transparent",
+        outline: "border border-input bg-transparent hover:bg-muted",
+      },
+      size: {
+        default:
+          "h-8 min-w-8 px-2.5 has-data-[icon=inline-end]:pr-2 has-data-[icon=inline-start]:pl-2",
+        sm: "h-7 min-w-7 rounded-[min(var(--radius-md),12px)] px-2.5 text-[0.8rem] has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 [&_svg:not([class*='size-'])]:size-3.5",
+        lg: "h-9 min-w-9 px-2.5 has-data-[icon=inline-end]:pr-2 has-data-[icon=inline-start]:pl-2",
+      },
+    },
+    defaultVariants: {
+      variant: "default",
+      size: "default",
+    },
+  }
+)
+
+function Toggle({
+  className,
+  variant = "default",
+  size = "default",
+  ...props
+}: TogglePrimitive.Props & VariantProps<typeof toggleVariants>) {
+  return (
+    <TogglePrimitive
+      data-slot="toggle"
+      className={cn(toggleVariants({ variant, size, className }))}
+      {...props}
+    />
+  )
+}
+
+export { Toggle, toggleVariants }

workers/health-probe/README.md

@@ -1,37 +1,17 @@
 # CFDM health-probe Worker
 
-Stateless edge probe for CFDM. **Not** Cloudflare Health Checks API (unavailable on Free).
-Cron stays in CFDM — this Worker has no Cron Trigger.
+Edge probe for CFDM. **Not** Cloudflare Health Checks API (unavailable on Free).
 
-## Deploy
+Production: CFDM creates this Worker via the Cloudflare API (KV mailbox + Cron Trigger).
+You do not need `wrangler deploy`. Token needs **Account**: Workers Scripts Write and Workers KV Storage Write.
+
+Local debug:
 
 ```powershell
 cd workers/health-probe
-npx wrangler login
-npx wrangler secret put PROBE_TOKEN
-npx wrangler deploy
+npx wrangler dev
 ```
 
-Paste the Worker URL (`https://cfdm-health-probe.<account>.workers.dev`) and the same token into **Настройки → Health-check**.
+Worker reads KV `targets`, probes TCP (`cloudflare:sockets` + `opened`) or HTTP (`fetch` to IP + `Host`), writes KV `results`. Batch ≤ 48, concurrency 5.
 
-Free Workers ≈ 100k requests/day. CFDM cron every 2 minutes × number of IPs must fit.
-
-## API
-
-`POST /probe` + `Authorization: Bearer <PROBE_TOKEN>`
-
-```json
-{
-  "type": "tcp",
-  "ip": "1.2.3.4",
-  "hostname": "app.example.com",
-  "port": 443,
-  "path": "/",
-  "expected_status": 200,
-  "timeout_ms": 3000,
-  "verify_tls": true,
-  "method": "GET"
-}
-```
-
-Response: `{ "ok": true, "latencyMs": 42, "error": null, "colo": "AMS" }`.
+`GET /` — liveness.

workers/health-probe/src/index.mjs

@@ -0,0 +1,228 @@
+/**
+ * CFDM health-probe Worker. Cron Trigger reads KV `targets`, probes TCP/HTTP
+ * from the edge (UptimeFlare-style), writes KV `results`. CFDM is SoT in SQLite.
+ */
+
+const TARGETS_KEY = "targets";
+const RESULTS_KEY = "results";
+const CURSOR_KEY = "cursor";
+const BATCH = 48;
+const CONCURRENCY = 5;
+const COOLDOWN_MS = 3 * 60 * 1000;
+const UA = "CFDM-health-probe/1.0";
+
+export default {
+  async fetch() {
+    return new Response(JSON.stringify({ ok: true, service: "cfdm-health-probe" }), {
+      headers: { "content-type": "application/json" },
+    });
+  },
+
+  async scheduled(_event, env) {
+    await probeBatch(env);
+  },
+};
+
+async function probeBatch(env) {
+  const raw = await env.HEALTH_KV.get(TARGETS_KEY);
+  if (!raw) return;
+  let doc;
+  try {
+    doc = JSON.parse(raw);
+  } catch {
+    return;
+  }
+  const items = Array.isArray(doc.items) ? doc.items : [];
+  if (items.length === 0) return;
+
+  let offset = 0;
+  const cursorRaw = await env.HEALTH_KV.get(CURSOR_KEY);
+  if (cursorRaw) {
+    try {
+      const cursor = JSON.parse(cursorRaw);
+      if (Number.isFinite(cursor.offset) && cursor.offset >= 0) {
+        offset = cursor.offset % items.length;
+      }
+    } catch {
+      offset = 0;
+    }
+  }
+
+  const slice = items.slice(offset, offset + BATCH);
+  const nextOffset = offset + slice.length >= items.length ? 0 : offset + slice.length;
+
+  const colo = await readColo();
+  const probed = await mapPool(slice, CONCURRENCY, async (target) => {
+    const type = target.type === "http" ? "http" : "tcp";
+    const port = Number(target.port) || (type === "http" ? 80 : 80);
+    const timeoutMs = Math.min(Math.max(Number(target.timeoutMs) || 3000, 100), 25_000);
+    const hostname = String(target.hostname ?? "").trim() || target.ip;
+    try {
+      const result =
+        type === "http"
+          ? await httpProbe({
+              ip: target.ip,
+              hostname,
+              port,
+              path: target.path || "/",
+              expectedStatus: target.expectedStatus ?? 200,
+              timeoutMs,
+              verifyTls: Boolean(target.verifyTls),
+            })
+          : await tcpProbe(target.ip, port, timeoutMs);
+      return { key: target.key, ...result };
+    } catch (err) {
+      return {
+        key: target.key,
+        ok: false,
+        latencyMs: 0,
+        error: err instanceof Error ? err.message : "probe failed",
+      };
+    }
+  });
+
+  const fingerprint = resultFingerprint(probed);
+  const previousRaw = await env.HEALTH_KV.get(RESULTS_KEY);
+  let skipWrite = false;
+  if (previousRaw) {
+    try {
+      const prev = JSON.parse(previousRaw);
+      const age = Date.now() - Date.parse(prev.probedAt);
+      if (prev.fingerprint === fingerprint && Number.isFinite(age) && age < COOLDOWN_MS) {
+        skipWrite = true;
+      }
+    } catch {
+      skipWrite = false;
+    }
+  }
+
+  if (!skipWrite) {
+    const results = {
+      probedAt: new Date().toISOString(),
+      colo,
+      fingerprint,
+      items: probed,
+    };
+    await env.HEALTH_KV.put(RESULTS_KEY, JSON.stringify(results));
+  }
+  if (items.length > BATCH || offset !== 0) {
+    await env.HEALTH_KV.put(CURSOR_KEY, JSON.stringify({ offset: nextOffset }));
+  }
+}
+
+function resultFingerprint(items) {
+  return items
+    .map((item) => `${item.key}:${item.ok ? "1" : "0"}:${item.error ?? ""}`)
+    .sort()
+    .join("|");
+}
+
+async function mapPool(items, concurrency, fn) {
+  if (items.length === 0) return [];
+  const results = new Array(items.length);
+  let next = 0;
+  async function worker() {
+    while (next < items.length) {
+      const idx = next;
+      next += 1;
+      results[idx] = await fn(items[idx]);
+    }
+  }
+  const n = Math.min(concurrency, items.length);
+  await Promise.all(Array.from({ length: n }, () => worker()));
+  return results;
+}
+
+async function readColo() {
+  try {
+    const res = await fetch("https://www.cloudflare.com/cdn-cgi/trace", {
+      cf: { cacheTtlByStatus: { "100-599": -1 } },
+    });
+    const text = await res.text();
+    const line = text.split("\n").find((row) => row.startsWith("colo="));
+    return line ? line.slice(5).trim() || null : null;
+  } catch {
+    return null;
+  }
+}
+
+function withTimeout(promise, timeoutMs, label) {
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => reject(new Error(`${label} timeout`)), timeoutMs);
+    promise.then(
+      (value) => {
+        clearTimeout(timer);
+        resolve(value);
+      },
+      (err) => {
+        clearTimeout(timer);
+        reject(err);
+      },
+    );
+  });
+}
+
+async function tcpProbe(ip, port, timeoutMs) {
+  const started = Date.now();
+  const { connect } = await import("cloudflare:sockets");
+  const socket = connect({ hostname: ip, port });
+  try {
+    await withTimeout(socket.opened, timeoutMs, "tcp");
+    return { ok: true, latencyMs: Date.now() - started, error: null };
+  } catch (err) {
+    const message = err instanceof Error ? err.message : "tcp failed";
+    return { ok: false, latencyMs: Date.now() - started, error: message };
+  } finally {
+    try {
+      socket.close();
+    } catch {
+      // ignore
+    }
+  }
+}
+
+async function httpProbe(opts) {
+  const started = Date.now();
+  const useTls = opts.verifyTls || opts.port === 443;
+  const host = opts.ip.includes(":") ? `[${opts.ip}]` : opts.ip;
+  const path = opts.path.startsWith("/") ? opts.path : `/${opts.path}`;
+  const url = `${useTls ? "https" : "http"}://${host}:${opts.port}${path}`;
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), opts.timeoutMs);
+  try {
+    const res = await fetch(url, {
+      method: "GET",
+      headers: {
+        Host: opts.hostname,
+        "User-Agent": UA,
+      },
+      signal: controller.signal,
+      redirect: "manual",
+      cf: { cacheTtlByStatus: { "100-599": -1 } },
+    });
+    try {
+      await res.body?.cancel();
+    } catch {
+      // ignore
+    }
+    const latencyMs = Date.now() - started;
+    if (res.status !== opts.expectedStatus) {
+      return {
+        ok: false,
+        latencyMs,
+        error: `HTTP ${res.status} (ожидали ${opts.expectedStatus})`,
+      };
+    }
+    return { ok: true, latencyMs, error: null };
+  } catch (err) {
+    const message =
+      err instanceof Error
+        ? err.name === "AbortError"
+          ? "http timeout"
+          : err.message
+        : "http failed";
+    return { ok: false, latencyMs: Date.now() - started, error: message };
+  } finally {
+    clearTimeout(timer);
+  }
+}

workers/health-probe/src/index.ts

@@ -1,181 +0,0 @@
-/**
- * Stateless CFDM health probe. Cron lives in CFDM API — this Worker only
- * answers POST /probe. Deploy: wrangler deploy; paste URL + token into
- * Настройки → Health-check.
- */
-
-export interface Env {
-  PROBE_TOKEN: string;
-}
-
-type ProbeType = "tcp" | "http";
-
-interface ProbeRequest {
-  type?: ProbeType;
-  ip?: string;
-  hostname?: string;
-  port?: number;
-  path?: string;
-  expected_status?: number | null;
-  timeout_ms?: number;
-  verify_tls?: boolean;
-  method?: string;
-}
-
-interface ProbeResponse {
-  ok: boolean;
-  latencyMs: number;
-  error: string | null;
-  colo: string | null;
-}
-
-export default {
-  async fetch(request: Request, env: Env): Promise<Response> {
-    const colo =
-      (request as Request & { cf?: { colo?: string } }).cf?.colo ?? null;
-    if (request.method !== "POST") {
-      return json({ ok: false, latencyMs: 0, error: "method not allowed", colo }, 405);
-    }
-    const pathname = new URL(request.url).pathname.replace(/\/$/, "") || "/";
-    if (pathname !== "/probe") {
-      return json({ ok: false, latencyMs: 0, error: "not found", colo }, 404);
-    }
-    const token = bearer(request);
-    if (!env.PROBE_TOKEN || token !== env.PROBE_TOKEN) {
-      return json({ ok: false, latencyMs: 0, error: "unauthorized", colo }, 401);
-    }
-
-    let body: ProbeRequest;
-    try {
-      body = (await request.json()) as ProbeRequest;
-    } catch {
-      return json({ ok: false, latencyMs: 0, error: "invalid json", colo }, 400);
-    }
-
-    const ip = String(body.ip ?? "").trim();
-    if (!ip) {
-      return json({ ok: false, latencyMs: 0, error: "ip required", colo }, 400);
-    }
-    const type: ProbeType = body.type === "http" ? "http" : "tcp";
-    const port = Number(body.port) || (type === "http" ? 80 : 80);
-    const timeoutMs = Math.min(Math.max(Number(body.timeout_ms) || 3000, 100), 25_000);
-    const hostname = String(body.hostname ?? "").trim() || ip;
-
-    try {
-      const result =
-        type === "http"
-          ? await httpProbe({
-              ip,
-              hostname,
-              port,
-              path: body.path || "/",
-              expectedStatus: body.expected_status ?? 200,
-              timeoutMs,
-              verifyTls: Boolean(body.verify_tls),
-              method: (body.method || "GET").toUpperCase(),
-            })
-          : await tcpProbe(ip, port, timeoutMs);
-      return json({ ...result, colo });
-    } catch (err) {
-      const message = err instanceof Error ? err.message : "probe failed";
-      return json({ ok: false, latencyMs: 0, error: message, colo });
-    }
-  },
-};
-
-function bearer(request: Request): string {
-  const header = request.headers.get("Authorization") ?? "";
-  return header.startsWith("Bearer ") ? header.slice(7) : "";
-}
-
-function json(body: ProbeResponse, status = 200): Response {
-  return new Response(JSON.stringify(body), {
-    status,
-    headers: { "content-type": "application/json" },
-  });
-}
-
-function withTimeout<T>(promise: Promise<T>, timeoutMs: number, label: string): Promise<T> {
-  return new Promise((resolve, reject) => {
-    const timer = setTimeout(() => reject(new Error(`${label} timeout`)), timeoutMs);
-    promise.then(
-      (value) => {
-        clearTimeout(timer);
-        resolve(value);
-      },
-      (err) => {
-        clearTimeout(timer);
-        reject(err);
-      },
-    );
-  });
-}
-
-async function tcpProbe(
-  ip: string,
-  port: number,
-  timeoutMs: number,
-): Promise<Omit<ProbeResponse, "colo">> {
-  const started = Date.now();
-  const { connect } = await import("cloudflare:sockets");
-  const socket = connect({ hostname: ip, port });
-  try {
-    await withTimeout(socket.opened, timeoutMs, "tcp");
-    return { ok: true, latencyMs: Date.now() - started, error: null };
-  } catch (err) {
-    const message = err instanceof Error ? err.message : "tcp failed";
-    return { ok: false, latencyMs: Date.now() - started, error: message };
-  } finally {
-    try {
-      socket.close();
-    } catch {
-      // ignore
-    }
-  }
-}
-
-async function httpProbe(opts: {
-  ip: string;
-  hostname: string;
-  port: number;
-  path: string;
-  expectedStatus: number;
-  timeoutMs: number;
-  verifyTls: boolean;
-  method: string;
-}): Promise<Omit<ProbeResponse, "colo">> {
-  const started = Date.now();
-  const useTls = opts.verifyTls || opts.port === 443;
-  const host = opts.ip.includes(":") ? `[${opts.ip}]` : opts.ip;
-  const path = opts.path.startsWith("/") ? opts.path : `/${opts.path}`;
-  const url = `${useTls ? "https" : "http"}://${host}:${opts.port}${path}`;
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), opts.timeoutMs);
-  try {
-    const res = await fetch(url, {
-      method: opts.method === "HEAD" ? "HEAD" : "GET",
-      headers: { Host: opts.hostname },
-      signal: controller.signal,
-      redirect: "manual",
-    });
-    const latencyMs = Date.now() - started;
-    if (res.status !== opts.expectedStatus) {
-      return {
-        ok: false,
-        latencyMs,
-        error: `HTTP ${res.status} (ожидали ${opts.expectedStatus})`,
-      };
-    }
-    return { ok: true, latencyMs, error: null };
-  } catch (err) {
-    const message =
-      err instanceof Error
-        ? err.name === "AbortError"
-          ? "http timeout"
-          : err.message
-        : "http failed";
-    return { ok: false, latencyMs: Date.now() - started, error: message };
-  } finally {
-    clearTimeout(timer);
-  }
-}

workers/health-probe/wrangler.toml

@@ -1,6 +1,10 @@
 name = "cfdm-health-probe"
-main = "src/index.ts"
+main = "src/index.mjs"
 compatibility_date = "2025-04-01"
 
-# Set the shared secret: wrangler secret put PROBE_TOKEN
-# Then paste the Worker URL + token into CFDM → Настройки → Health-check.
+# Production Worker is created by CFDM (Workers Scripts API + KV + Cron Trigger).
+# This file is for local `wrangler dev` only.
+
+[[kv_namespaces]]
+binding = "HEALTH_KV"
+id = "00000000-0000-0000-0000-000000000000"