diff --git a/CLAUDE.md b/CLAUDE.md index bc6ab7f..e5561cd 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -10,7 +10,7 @@ Authoritative design: [serverless_cloud_blueprint.md](serverless_cloud_blueprint **v1.1.x — SDK foundation + services — is complete.** The SDK shape (handle pattern, `::` namespaces, `Services`/`SdkCallCx`; see [docs/sdk-shape.md](docs/sdk-shape.md), stdlib at [docs/stdlib-reference.md](docs/stdlib-reference.md)) fixed in v1.1.0, then KV, docs, modules, HTTP, cron, files, pub/sub, email, users, and durable queues + `invoke()` filled it in through **v1.1.9** — blueprint §12 has the table. Earlier groundwork: blueprint Phase 3 (admin auth, multi-app scoping, Phase 3.5 capability gating — `manager-core::authz::{can, require, Capability}`, migration `0006_users_authz.sql`). -**Current focus: v1.2 _Hierarchies_ — groups + the declarative project tool** ([docs/design/groups-and-project-tool.md](docs/design/groups-and-project-tool.md)). That doc's §11 uses its own **Phase 1–6 numbering, distinct from the blueprint product-phase numbering above — do not conflate them** (its "Phase 3" = group-inherited config, not admin auth). Implemented on `feat/groups-*` branches: §11 Phase 1 (declarative `pic plan`/`apply`/`prune` + env overlays), Phase 2 (single-parent groups tree + hierarchy-aware RBAC), Phase 3 (group-inherited, env-scoped `vars` + secrets resolved **live** via a recursive CTE — no materialized cache), Phase 4-lite (group-owned **endpoint** scripts: `scripts` polymorphic owner in `0050_group_scripts.sql`, `get_by_name_inherited`/`is_invocable_by_app` chain resolution, inherited `invoke()` + declarative route/trigger binding — all **live**, no body materialization), Phase 5 (the **declarative project tool maps onto the group tree**: the reconcile engine generalized to `ApplyOwner{App|Group}`, a `[group]` manifest kind, and a single atomic **tree apply** — `pic plan/apply --dir` reconciles a whole directory tree of `picloud.toml` nodes in one Postgres transaction, groups-before-apps so an app route can bind a group script created in the same tx; the bound token folds in each group's `structure_version`. Multi-repo single-owner/attach-point and per-env approval gating are deferred; groups pre-exist), Phase 4b (group **modules** + the **lexical (sealed-by-default) import resolver**, §5.5: owner-polymorphic `ModuleScript`, origin-rooted `ModuleSource::resolve` walking the importing node's chain, `ExecRequest.script_owner` threaded from every dispatch + `invoke()` site, `_source`-driven lexical chaining in `PicloudModuleResolver` with the compiled-module cache re-keyed by `ScriptId`, group modules/imports allowed, single-node dangling-import `plan` check — an inherited group script's imports **seal to the group**, a leaf can't shadow them), §5.5 **extension points** (opt-in polymorphism — **§5.5 now complete**: marker table `0051_extension_points.sql` (owner-polymorphic, CASCADE — structurally a `secrets` name; default body = a co-located `kind=module` script), `ModuleSource::resolve_policy` with **nearest-declaration-kind-wins** — a concrete module resolves lexically, an EP marker resolves **dynamically against the inheriting app** (its override else the default body up-chain), `NoProvider` is a hard error; declarative-only authoring via the `[app]`/`[group]` manifest key `extension_points = [...]`, reconcile mirrors `secrets`, single-node no-provider `plan` check, read-only `pic extension-points ls` + `pull` round-trip — the app can **override** a group default, the deliberate inverse of the Phase 4b sealed import), §11.6 **group-level collections — KV + DOCS + FILES slices** (full cross-app shared read/write: a group declares a collection shared via the `[group]` manifest `collections = [...]` → owner-polymorphic marker `0052_group_collections.sql` with a `kind` discriminator + a per-kind group-keyed store: `0053_group_kv_entries.sql` (`kind='kv'`), `0054_group_docs.sql` (`kind='docs'`, the queryable-JSON store), and `0055_group_files.sql` (`kind='files'`, blob metadata in Postgres + bytes on disk under `/files/groups//...`, a `groups/` infix disjoint from the per-app `files//` subtree so the existing recursive orphan sweeper covers both with zero change) — no `app_id`, a shared row belongs to the group; CASCADE on group delete, an app delete leaves the data. Scripts use the **explicit** `kv::shared_collection("name")` / `docs::shared_collection("name")` / `files::shared_collection("name")` handles (`shared` alone is a Rhai reserved word); `GroupKv`/`GroupDocs`/`GroupFilesServiceImpl` resolve the owning group from `cx.app_id`'s ancestor chain **filtered by kind** (nearest-wins) — **that walk is the isolation boundary**, a foreign app gets `CollectionNotShared`; a `kv`, a `docs`, and a `files` collection of the same name are distinct stores. The docs slice reuses the `docs_filter` DSL — `build_find_query` generalized on its owner column (`docs`/`app_id` vs `group_docs`/`group_id`, both literals); the files slice likewise generalized the atomic-write + checksum-on-read path helpers on an owner-relative dir (one source for the security-sensitive disk mechanics). **Reads open** to any subtree script (anonymous incl. — the declaration is the grant), **writes require an authenticated editor+** on the owning group (`GroupKvRead/Write`, `GroupDocsRead/Write`, `GroupFilesRead/Write`, `script_gate_require_principal` fails closed on anon). Declarative authoring is the **string-or-table** form `collections = ["catalog", { name = "articles", kind = "docs" }, { name = "assets", kind = "files" }]` (bare string = kv); reconcile keys markers by `(name, kind)`; read-only `pic collections ls --group` shows a kind column. Deferred: shared-collection triggers (the "group trigger has no app to watch" problem), topics/queue shared collections (same trigger-centric gap), per-group quotas, an operator admin API for shared blobs (scripts use the SDK; `pic collections ls` shows the marker)), and **§4.5 group TRIGGER templates** (live, event kinds — a `[group]` declares a `[[triggers.kv|docs|files|pubsub]]` template binding a group-owned handler; `triggers` gained a polymorphic owner `0056_group_triggers.sql` mirroring `0050`; the dispatcher's `list_matching_kv/docs/files` + the pubsub publish fan-out prepend `CHAIN_LEVELS_CTE` + `JOIN chain c ON (t.app_id = c.app_owner OR t.group_id = c.group_owner)` so a descendant app's event matches its own triggers **plus** ancestor-group templates in one query, the handler running under the firing `app_id` — **the chain walk is the isolation boundary**, a sibling-subtree app never matches; stateful kinds cron/queue/email rejected on a group (need materialization), per-app opt-out deferred; read-only `pic triggers ls --group`), and **§4.5 group ROUTE templates** (live, inherited — a `[group]` declares a `[[routes]]` template binding a group-owned endpoint; `routes` gained a polymorphic owner `0057_group_routes.sql` mirroring `0056`. Unlike triggers (per-event SQL), routes serve from the in-memory `RouteTable`, so the HTTP hot path can't resolve inheritance per request — instead the table **rebuild** expands templates into each descendant app's slice via `RouteRepository::list_effective` (all-apps generalization of `CHAIN_LEVELS_CTE`: every app × its ancestor chain ⋈ routes), and `compile_effective_routes` applies **nearest-owner-wins shadowing** (an app's own identical binding shadows the inherited template; non-identical bindings coexist under the matcher's existing precedence — a route picks one winner, unlike a fanning trigger). Because the table is a cache, inheritance is rebuilt **full-live** through the single `rebuild_route_table` chokepoint on every edge that changes it: route CRUD, apply, **and tree mutations** — app create/delete (`apps_api`) + group reparent (`groups_api`) — so a new app under a group serves its templates instantly. Host-claim validation is skipped for a group template (descendants serve it on their own host claim; templates use `host_kind = any`). **The chain expansion is the isolation boundary** — a sibling-subtree app never inherits (pinned by `tests/group_route_templates.rs` + the `group_routes` journey); read-only `pic routes ls --group`. Deferred: multi-node snapshot propagation), and **§11 tail per-app opt-out (template suppression)** (a descendant declines an inherited group template: an `[app]` declares `[suppress]` with `triggers = [...]` (handler script names) + `routes = [...]` (paths) — **coarse by reference**, not a full definition, since template row-ids churn on re-apply but a reference is stable (re-apply NoOp, may decline several templates bound to the same script/path). App-only marker `0058_template_suppressions.sql` (`app_id NOT NULL` CASCADE, a `target_kind` discriminator), reconciled with the extension-point marker pattern (prunable → re-inherits). Consumed at the two resolution points: the trigger dispatch queries gain a correlated `NOT EXISTS` anti-join (gated to `t.group_id IS NOT NULL`), and `compile_effective_routes` drops an inherited (`depth > 0`) route at a suppressed path (loaded via `RouteRepository::list_route_suppressions`). **Inheritance-only** — the `group_id IS NOT NULL` / `depth > 0` gates mean an app can only decline what it inherits, never its own or a sibling's (pinned by `tests/template_suppression.rs` + the `suppress` journey); a dangling suppress is an apply-time warning; read-only `pic suppress ls --app`. **Trust-model consequence:** group templates are advisory-by-default (run *unless* a descendant declines) — a footgun for compliance hooks (audit/security triggers a tenant can opt out of)), and **§11 tail `sealed` (mandatory) group templates** (closes that footgun: a `[group]` marks a route/event-trigger template `sealed = true` and the two suppression filters skip it, so a descendant's `[suppress]` is ignored — it fires/serves on every descendant. Column `sealed BOOLEAN` on `triggers` + `routes` (`0059_sealed_templates.sql`); the trigger anti-join gains `AND t.sealed = FALSE` (a sealed row is never excluded → fires through), and `compile_effective_routes` gates its suppression `continue` on `!er.route.sealed`. `sealed` lives on the shared `Route` DTO + manager-core `Trigger` (both pure data) so the apply diff sees the current value — part of the route Update comparison + the trigger identity, so toggling it re-applies. Authored per-template (`sealed = true` on a `[[routes]]`/`[[triggers.kv|docs|files|pubsub]]`), **group-only** — `validate_bundle_for` rejects it on an app owner (an app resource is never inherited). Sealing only *strengthens* the guarantee (a sealed template can't be declined; it never grants new reach — the chain walk is still the isolation boundary). The dangling-suppress warning also flags a suppression matching only sealed templates ("… is sealed — the suppression has no effect"), and `pic triggers/routes ls --group` show a `sealed` column; pinned by `tests/sealed_templates.rs` + the `sealed` journey. Deferred: multi-node snapshot propagation), and **§11 tail M1 group-level suppression** (`template_suppressions` gained a polymorphic owner `0060_group_suppressions.sql` — a `[group]` declares `[suppress]` to decline a template it inherits from a higher ancestor for its **whole subtree**. Both filters generalized to the chain: the trigger anti-join joins the `chain` CTE (`ts.app_id = sc.app_owner OR ts.group_id = sc.group_owner`), and `list_route_suppressions` expands group suppressions across descendants via the all-apps `app_chain` CTE (`compile_effective_routes` unchanged). Still inheritance-only + `sealed` overrides; owner-polymorphic `suppression_repo::list_for_owner`/`insert`/`delete`; read-only `pic suppress ls --group`; the ineffective-suppress warning walks `GROUP_CHAIN_LEVELS_CTE` for a group node. Pinned by `tests/group_suppression.rs` + the `suppress` journey). Next: multi-node cluster mode, or extend templates to the stateful kinds, or multi-repo ownership. +**Current focus: v1.2 _Hierarchies_ — groups + the declarative project tool** ([docs/design/groups-and-project-tool.md](docs/design/groups-and-project-tool.md)). That doc's §11 uses its own **Phase 1–6 numbering, distinct from the blueprint product-phase numbering above — do not conflate them** (its "Phase 3" = group-inherited config, not admin auth). Implemented on `feat/groups-*` branches: §11 Phase 1 (declarative `pic plan`/`apply`/`prune` + env overlays), Phase 2 (single-parent groups tree + hierarchy-aware RBAC), Phase 3 (group-inherited, env-scoped `vars` + secrets resolved **live** via a recursive CTE — no materialized cache), Phase 4-lite (group-owned **endpoint** scripts: `scripts` polymorphic owner in `0050_group_scripts.sql`, `get_by_name_inherited`/`is_invocable_by_app` chain resolution, inherited `invoke()` + declarative route/trigger binding — all **live**, no body materialization), Phase 5 (the **declarative project tool maps onto the group tree**: the reconcile engine generalized to `ApplyOwner{App|Group}`, a `[group]` manifest kind, and a single atomic **tree apply** — `pic plan/apply --dir` reconciles a whole directory tree of `picloud.toml` nodes in one Postgres transaction, groups-before-apps so an app route can bind a group script created in the same tx; the bound token folds in each group's `structure_version`. Multi-repo single-owner/attach-point and per-env approval gating are deferred; groups pre-exist), Phase 4b (group **modules** + the **lexical (sealed-by-default) import resolver**, §5.5: owner-polymorphic `ModuleScript`, origin-rooted `ModuleSource::resolve` walking the importing node's chain, `ExecRequest.script_owner` threaded from every dispatch + `invoke()` site, `_source`-driven lexical chaining in `PicloudModuleResolver` with the compiled-module cache re-keyed by `ScriptId`, group modules/imports allowed, single-node dangling-import `plan` check — an inherited group script's imports **seal to the group**, a leaf can't shadow them), §5.5 **extension points** (opt-in polymorphism — **§5.5 now complete**: marker table `0051_extension_points.sql` (owner-polymorphic, CASCADE — structurally a `secrets` name; default body = a co-located `kind=module` script), `ModuleSource::resolve_policy` with **nearest-declaration-kind-wins** — a concrete module resolves lexically, an EP marker resolves **dynamically against the inheriting app** (its override else the default body up-chain), `NoProvider` is a hard error; declarative-only authoring via the `[app]`/`[group]` manifest key `extension_points = [...]`, reconcile mirrors `secrets`, single-node no-provider `plan` check, read-only `pic extension-points ls` + `pull` round-trip — the app can **override** a group default, the deliberate inverse of the Phase 4b sealed import), §11.6 **group-level collections — KV + DOCS + FILES slices** (full cross-app shared read/write: a group declares a collection shared via the `[group]` manifest `collections = [...]` → owner-polymorphic marker `0052_group_collections.sql` with a `kind` discriminator + a per-kind group-keyed store: `0053_group_kv_entries.sql` (`kind='kv'`), `0054_group_docs.sql` (`kind='docs'`, the queryable-JSON store), and `0055_group_files.sql` (`kind='files'`, blob metadata in Postgres + bytes on disk under `/files/groups//...`, a `groups/` infix disjoint from the per-app `files//` subtree so the existing recursive orphan sweeper covers both with zero change) — no `app_id`, a shared row belongs to the group; CASCADE on group delete, an app delete leaves the data. Scripts use the **explicit** `kv::shared_collection("name")` / `docs::shared_collection("name")` / `files::shared_collection("name")` handles (`shared` alone is a Rhai reserved word); `GroupKv`/`GroupDocs`/`GroupFilesServiceImpl` resolve the owning group from `cx.app_id`'s ancestor chain **filtered by kind** (nearest-wins) — **that walk is the isolation boundary**, a foreign app gets `CollectionNotShared`; a `kv`, a `docs`, and a `files` collection of the same name are distinct stores. The docs slice reuses the `docs_filter` DSL — `build_find_query` generalized on its owner column (`docs`/`app_id` vs `group_docs`/`group_id`, both literals); the files slice likewise generalized the atomic-write + checksum-on-read path helpers on an owner-relative dir (one source for the security-sensitive disk mechanics). **Reads open** to any subtree script (anonymous incl. — the declaration is the grant), **writes require an authenticated editor+** on the owning group (`GroupKvRead/Write`, `GroupDocsRead/Write`, `GroupFilesRead/Write`, `script_gate_require_principal` fails closed on anon). Declarative authoring is the **string-or-table** form `collections = ["catalog", { name = "articles", kind = "docs" }, { name = "assets", kind = "files" }]` (bare string = kv); reconcile keys markers by `(name, kind)`; read-only `pic collections ls --group` shows a kind column. Deferred: topics/queue shared collections (same trigger-centric gap), an operator admin API for shared blobs (scripts use the SDK; `pic collections ls` shows the marker)), and **§4.5 group TRIGGER templates** (live, event kinds — a `[group]` declares a `[[triggers.kv|docs|files|pubsub]]` template binding a group-owned handler; `triggers` gained a polymorphic owner `0056_group_triggers.sql` mirroring `0050`; the dispatcher's `list_matching_kv/docs/files` + the pubsub publish fan-out prepend `CHAIN_LEVELS_CTE` + `JOIN chain c ON (t.app_id = c.app_owner OR t.group_id = c.group_owner)` so a descendant app's event matches its own triggers **plus** ancestor-group templates in one query, the handler running under the firing `app_id` — **the chain walk is the isolation boundary**, a sibling-subtree app never matches; stateful kinds cron/queue/email rejected on a group (need materialization), per-app opt-out deferred; read-only `pic triggers ls --group`), and **§4.5 group ROUTE templates** (live, inherited — a `[group]` declares a `[[routes]]` template binding a group-owned endpoint; `routes` gained a polymorphic owner `0057_group_routes.sql` mirroring `0056`. Unlike triggers (per-event SQL), routes serve from the in-memory `RouteTable`, so the HTTP hot path can't resolve inheritance per request — instead the table **rebuild** expands templates into each descendant app's slice via `RouteRepository::list_effective` (all-apps generalization of `CHAIN_LEVELS_CTE`: every app × its ancestor chain ⋈ routes), and `compile_effective_routes` applies **nearest-owner-wins shadowing** (an app's own identical binding shadows the inherited template; non-identical bindings coexist under the matcher's existing precedence — a route picks one winner, unlike a fanning trigger). Because the table is a cache, inheritance is rebuilt **full-live** through the single `rebuild_route_table` chokepoint on every edge that changes it: route CRUD, apply, **and tree mutations** — app create/delete (`apps_api`) + group reparent (`groups_api`) — so a new app under a group serves its templates instantly. Host-claim validation is skipped for a group template (descendants serve it on their own host claim; templates use `host_kind = any`). **The chain expansion is the isolation boundary** — a sibling-subtree app never inherits (pinned by `tests/group_route_templates.rs` + the `group_routes` journey); read-only `pic routes ls --group`. Deferred: multi-node snapshot propagation), and **§11 tail per-app opt-out (template suppression)** (a descendant declines an inherited group template: an `[app]` declares `[suppress]` with `triggers = [...]` (handler script names) + `routes = [...]` (paths) — **coarse by reference**, not a full definition, since template row-ids churn on re-apply but a reference is stable (re-apply NoOp, may decline several templates bound to the same script/path). App-only marker `0058_template_suppressions.sql` (`app_id NOT NULL` CASCADE, a `target_kind` discriminator), reconciled with the extension-point marker pattern (prunable → re-inherits). Consumed at the two resolution points: the trigger dispatch queries gain a correlated `NOT EXISTS` anti-join (gated to `t.group_id IS NOT NULL`), and `compile_effective_routes` drops an inherited (`depth > 0`) route at a suppressed path (loaded via `RouteRepository::list_route_suppressions`). **Inheritance-only** — the `group_id IS NOT NULL` / `depth > 0` gates mean an app can only decline what it inherits, never its own or a sibling's (pinned by `tests/template_suppression.rs` + the `suppress` journey); a dangling suppress is an apply-time warning; read-only `pic suppress ls --app`. **Trust-model consequence:** group templates are advisory-by-default (run *unless* a descendant declines) — a footgun for compliance hooks (audit/security triggers a tenant can opt out of)), and **§11 tail `sealed` (mandatory) group templates** (closes that footgun: a `[group]` marks a route/event-trigger template `sealed = true` and the two suppression filters skip it, so a descendant's `[suppress]` is ignored — it fires/serves on every descendant. Column `sealed BOOLEAN` on `triggers` + `routes` (`0059_sealed_templates.sql`); the trigger anti-join gains `AND t.sealed = FALSE` (a sealed row is never excluded → fires through), and `compile_effective_routes` gates its suppression `continue` on `!er.route.sealed`. `sealed` lives on the shared `Route` DTO + manager-core `Trigger` (both pure data) so the apply diff sees the current value — part of the route Update comparison + the trigger identity, so toggling it re-applies. Authored per-template (`sealed = true` on a `[[routes]]`/`[[triggers.kv|docs|files|pubsub]]`), **group-only** — `validate_bundle_for` rejects it on an app owner (an app resource is never inherited). Sealing only *strengthens* the guarantee (a sealed template can't be declined; it never grants new reach — the chain walk is still the isolation boundary). The dangling-suppress warning also flags a suppression matching only sealed templates ("… is sealed — the suppression has no effect"), and `pic triggers/routes ls --group` show a `sealed` column; pinned by `tests/sealed_templates.rs` + the `sealed` journey. Deferred: multi-node snapshot propagation), and **§11 tail M1 group-level suppression** (`template_suppressions` gained a polymorphic owner `0060_group_suppressions.sql` — a `[group]` declares `[suppress]` to decline a template it inherits from a higher ancestor for its **whole subtree**. Both filters generalized to the chain: the trigger anti-join joins the `chain` CTE (`ts.app_id = sc.app_owner OR ts.group_id = sc.group_owner`), and `list_route_suppressions` expands group suppressions across descendants via the all-apps `app_chain` CTE (`compile_effective_routes` unchanged). Still inheritance-only + `sealed` overrides; owner-polymorphic `suppression_repo::list_for_owner`/`insert`/`delete`; read-only `pic suppress ls --group`; the ineffective-suppress warning walks `GROUP_CHAIN_LEVELS_CTE` for a group node. Pinned by `tests/group_suppression.rs` + the `suppress` journey), and **§11.6 M2 shared-collection triggers** (a write to a group SHARED collection now fires a trigger — closes the "group trigger has no app to watch" gap. A group-owned trigger marked `shared = true` (`shared BOOLEAN` on `triggers`, `0061_shared_triggers.sql`) watches the group's shared collection; the per-app `list_matching_kv/docs/files` add `AND t.shared = FALSE`, new `list_matching_shared_{kv,docs,files}(owning_group,…)` select `shared = TRUE` triggers on the owning group — the `shared` flag is the namespace boundary. `ServiceEventEmitter` gained `emit_shared(cx, owning_group, event)`; `GroupKv/Docs/FilesServiceImpl` (via a `with_events` builder) emit on write, and the outbox emitter stamps the WRITER app_id so the handler runs under the writer. `shared` is authored on a group `[[triggers.kv|docs|files]]`, is part of the diff identity, and `validate_bundle_for` rejects it on an app owner / a non-collection kind / an undeclared collection. Read-only `shared` column in `pic triggers ls --group`; pinned by `tests/shared_triggers.rs` + the `shared_triggers` journey. Deferred: shared pubsub triggers). Next: multi-node cluster mode, or extend templates to the stateful kinds, or multi-repo ownership. **Data-model invariant:** app-owned data-plane tables (KV, docs, files, …) start with `app_id UUID NOT NULL REFERENCES apps(id) ON DELETE CASCADE`; the group-inheritable tables — _config_ (`vars`, `secrets`) and now group-owned _code_ (`scripts`, `0050`) — instead carry a **polymorphic owner**: nullable `group_id` and `app_id` with an exactly-one CHECK and per-owner partial-unique indexes (config is `ON DELETE CASCADE`, scripts `RESTRICT` — code is not data). Inheritance resolves **live** down `apps.group_id → groups.parent_id` via `CHAIN_LEVELS_CTE` (no materialized view); nearest-owner-wins with an app's own row shadowing the inherited one (CoW). Every Rhai SDK call resolves its app from `cx.app_id`, never a script-passed arg, and a group script always runs under the *inheriting* app's `cx.app_id` (the cross-app isolation boundary). diff --git a/crates/manager-core/src/apply_service.rs b/crates/manager-core/src/apply_service.rs index d1f6607..6df57c8 100644 --- a/crates/manager-core/src/apply_service.rs +++ b/crates/manager-core/src/apply_service.rs @@ -575,6 +575,8 @@ pub struct TriggerTemplateInfo { pub enabled: bool, /// §11 tail: `true` for a sealed (non-suppressible) template. pub sealed: bool, + /// §11.6: `true` for a shared-collection template. + pub shared: bool, } /// One row of the read-only §11 tail route-template report (`pic routes ls @@ -2173,6 +2175,7 @@ impl ApplyService { script: name_by_id.get(&t.script_id).cloned().unwrap_or_default(), enabled: t.enabled, sealed: t.sealed, + shared: t.shared, } }) .collect()) diff --git a/crates/manager-core/tests/shared_triggers.rs b/crates/manager-core/tests/shared_triggers.rs new file mode 100644 index 0000000..daacbc9 --- /dev/null +++ b/crates/manager-core/tests/shared_triggers.rs @@ -0,0 +1,192 @@ +//! §11.6 integration test: SHARED-collection triggers. +//! A group-owned `shared = true` trigger watches the group's shared collection. +//! A write to that shared collection (by any subtree app) matches the shared +//! trigger via the OWNING-group match query; a per-app collection of the same +//! name does NOT match it, and the shared trigger does NOT match a per-app +//! write (the `shared` flag is the namespace boundary). +//! +//! Deterministic: drives `list_matching_shared_kv` + `list_matching_kv` +//! directly (no async dispatcher). Skips when `DATABASE_URL` is unset. + +#![allow(clippy::needless_pass_by_value, clippy::too_many_lines)] + +use picloud_manager_core::trigger_repo::{PostgresTriggerRepo, TriggerRepo}; +use picloud_shared::{AppId, GroupId, KvEventOp}; +use sqlx::postgres::PgPoolOptions; +use sqlx::PgPool; +use uuid::Uuid; + +async fn pool_or_skip() -> Option { + let Ok(url) = std::env::var("DATABASE_URL") else { + eprintln!("shared_triggers: DATABASE_URL unset — skipping"); + return None; + }; + let pool = PgPoolOptions::new() + .max_connections(2) + .connect(&url) + .await + .expect("connect"); + sqlx::migrate!("./migrations") + .run(&pool) + .await + .expect("migrate"); + Some(pool) +} + +/// Insert a kv trigger (owner + `shared` flag) + its details; returns id. +async fn kv_trigger( + pool: &PgPool, + app_id: Option, + group_id: Option, + script: Uuid, + admin: Uuid, + shared: bool, + glob: &str, +) -> Uuid { + let row: (Uuid,) = sqlx::query_as( + "INSERT INTO triggers \ + (app_id, group_id, script_id, kind, enabled, dispatch_mode, \ + retry_max_attempts, retry_backoff, retry_base_ms, \ + registered_by_principal, name, shared) \ + VALUES ($1, $2, $3, 'kv', TRUE, 'async', 3, 'exponential', 1000, $4, $5, $6) RETURNING id", + ) + .bind(app_id) + .bind(group_id) + .bind(script) + .bind(admin) + .bind(Uuid::new_v4().simple().to_string()) + .bind(shared) + .fetch_one(pool) + .await + .expect("trigger"); + sqlx::query( + "INSERT INTO kv_trigger_details (trigger_id, collection_glob, ops) \ + VALUES ($1, $2, ARRAY['insert'])", + ) + .bind(row.0) + .bind(glob) + .execute(pool) + .await + .expect("details"); + row.0 +} + +#[tokio::test(flavor = "multi_thread", worker_threads = 2)] +async fn shared_trigger_matches_only_shared_writes() { + let Some(pool) = pool_or_skip().await else { + return; + }; + let sfx = Uuid::new_v4().simple().to_string(); + let admin = { + let r: (Uuid,) = sqlx::query_as( + "INSERT INTO admin_users (username, password_hash) VALUES ($1, 'x') RETURNING id", + ) + .bind(format!("sh-{sfx}")) + .fetch_one(&pool) + .await + .unwrap(); + r.0 + }; + // Group G with a handler + a SHARED kv trigger on collection "catalog". + let g: (Uuid,) = sqlx::query_as("INSERT INTO groups (slug, name) VALUES ($1, $1) RETURNING id") + .bind(format!("sh-g-{sfx}")) + .fetch_one(&pool) + .await + .unwrap(); + let handler: (Uuid,) = sqlx::query_as( + "INSERT INTO scripts (name, source, group_id) VALUES ($1, 'x', $2) RETURNING id", + ) + .bind(format!("on-cat-{sfx}")) + .bind(g.0) + .fetch_one(&pool) + .await + .unwrap(); + let shared_trig = kv_trigger(&pool, None, Some(g.0), handler.0, admin, true, "catalog").await; + + // App A under G with its OWN (non-shared) kv trigger on "catalog". + let a: (Uuid,) = + sqlx::query_as("INSERT INTO apps (slug, name, group_id) VALUES ($1, $1, $2) RETURNING id") + .bind(format!("sh-a-{sfx}")) + .bind(g.0) + .fetch_one(&pool) + .await + .unwrap(); + let app_script: (Uuid,) = sqlx::query_as( + "INSERT INTO scripts (name, source, app_id) VALUES ($1, 'x', $2) RETURNING id", + ) + .bind(format!("app-cat-{sfx}")) + .bind(a.0) + .fetch_one(&pool) + .await + .unwrap(); + let app_trig = kv_trigger( + &pool, + Some(a.0), + None, + app_script.0, + admin, + false, + "catalog", + ) + .await; + + let trig = PostgresTriggerRepo::new(pool.clone()); + + // A SHARED write to G's "catalog" → matches the shared trigger, NOT the + // app's per-app trigger. + let shared_matches = trig + .list_matching_shared_kv(GroupId::from(g.0), "catalog", KvEventOp::Insert) + .await + .expect("shared match"); + assert!( + shared_matches + .iter() + .any(|m| m.trigger_id == shared_trig.into()), + "a shared write must match the group's shared trigger" + ); + assert!( + !shared_matches + .iter() + .any(|m| m.trigger_id == app_trig.into()), + "a shared write must NOT match a per-app trigger of the same name" + ); + + // A PER-APP write to app A's "catalog" → matches the app's trigger, NOT the + // shared trigger (the per-app query excludes `shared = TRUE`). + let app_matches = trig + .list_matching_kv(AppId::from(a.0), "catalog", KvEventOp::Insert) + .await + .expect("app match"); + assert!( + app_matches.iter().any(|m| m.trigger_id == app_trig.into()), + "a per-app write must match the app's own trigger" + ); + assert!( + !app_matches + .iter() + .any(|m| m.trigger_id == shared_trig.into()), + "a per-app write must NOT match the group's shared trigger" + ); + + // Cleanup. + let _ = sqlx::query("DELETE FROM triggers WHERE id = ANY($1)") + .bind(vec![shared_trig, app_trig]) + .execute(&pool) + .await; + let _ = sqlx::query("DELETE FROM apps WHERE id = $1") + .bind(a.0) + .execute(&pool) + .await; + let _ = sqlx::query("DELETE FROM scripts WHERE id = ANY($1)") + .bind(vec![handler.0, app_script.0]) + .execute(&pool) + .await; + let _ = sqlx::query("DELETE FROM groups WHERE id = $1") + .bind(g.0) + .execute(&pool) + .await; + let _ = sqlx::query("DELETE FROM admin_users WHERE id = $1") + .bind(admin) + .execute(&pool) + .await; +} diff --git a/crates/picloud-cli/src/client.rs b/crates/picloud-cli/src/client.rs index 19e9b93..1ff8819 100644 --- a/crates/picloud-cli/src/client.rs +++ b/crates/picloud-cli/src/client.rs @@ -1421,6 +1421,9 @@ pub struct TriggerTemplateDto { /// §11 tail: `true` for a sealed (non-suppressible) template. #[serde(default)] pub sealed: bool, + /// §11.6: `true` for a shared-collection template. + #[serde(default)] + pub shared: bool, } /// One row of the §11 tail route-template report. diff --git a/crates/picloud-cli/src/cmds/triggers.rs b/crates/picloud-cli/src/cmds/triggers.rs index f10c8d2..b973b08 100644 --- a/crates/picloud-cli/src/cmds/triggers.rs +++ b/crates/picloud-cli/src/cmds/triggers.rs @@ -47,7 +47,7 @@ pub async fn ls_group(group: &str, mode: OutputMode) -> Result<()> { let creds = config::resolve()?; let client = Client::from_creds(&creds)?; let rows = client.group_triggers_list(group).await?; - let mut table = Table::new(["kind", "target", "script", "enabled", "sealed"]); + let mut table = Table::new(["kind", "target", "script", "enabled", "sealed", "shared"]); for t in rows { table.row([ t.kind, @@ -55,6 +55,7 @@ pub async fn ls_group(group: &str, mode: OutputMode) -> Result<()> { t.script, t.enabled.to_string(), t.sealed.to_string(), + t.shared.to_string(), ]); } table.print(mode); diff --git a/crates/picloud-cli/tests/cli.rs b/crates/picloud-cli/tests/cli.rs index 4ef032e..1fa94cd 100644 --- a/crates/picloud-cli/tests/cli.rs +++ b/crates/picloud-cli/tests/cli.rs @@ -43,6 +43,7 @@ mod routes; mod scripts; mod sealed; mod secrets; +mod shared_triggers; mod staleness; mod suppress; mod tree; diff --git a/crates/picloud-cli/tests/shared_triggers.rs b/crates/picloud-cli/tests/shared_triggers.rs new file mode 100644 index 0000000..6822be5 --- /dev/null +++ b/crates/picloud-cli/tests/shared_triggers.rs @@ -0,0 +1,157 @@ +//! §11.6 — shared-collection triggers, declarative authoring end to end via +//! `pic`. A group declares a shared kv collection + a `[[triggers.kv]] +//! shared = true` handler watching it; the template applies, `pic triggers ls +//! --group` shows `shared = true`; a shared trigger on an UNDECLARED collection +//! is rejected, and `shared = true` on an app trigger is rejected. +//! +//! The live FIRING (a shared write matches the shared trigger, a per-app write +//! does not) is pinned deterministically by +//! `manager-core/tests/shared_triggers.rs` — driving the async dispatcher from a +//! journey is deliberately avoided (codebase norm). + +use std::fs; + +use tempfile::TempDir; + +use crate::common; +use crate::common::cleanup::{AppGuard, GroupGuard, ScriptGuard}; + +fn manifest_dir() -> TempDir { + let dir = TempDir::new().expect("tempdir"); + fs::create_dir_all(dir.path().join("scripts")).expect("scripts dir"); + dir +} + +fn group_script_id(env: &common::TestEnv, group: &str, name: &str) -> String { + let ls = common::pic_as(env) + .args(["scripts", "ls", "--group", group]) + .output() + .expect("scripts ls"); + let table = String::from_utf8(ls.stdout).unwrap(); + table + .lines() + .map(common::cells) + .find(|c| c.get(2) == Some(&name)) + .and_then(|c| c.first().map(|s| (*s).to_string())) + .unwrap_or_else(|| panic!("group script `{name}` not found:\n{table}")) +} + +#[ignore = "needs DATABASE_URL pointing at a running Postgres"] +#[test] +fn shared_kv_trigger_applies_lists_and_validates() { + let Some(fx) = common::fixture_or_skip() else { + return; + }; + let env = common::admin_env(fx); + let group = common::unique_slug("shtrig-grp"); + + let _g = GroupGuard::new(&env.url, &env.token, &group); + common::pic_as(&env) + .args(["groups", "create", &group]) + .assert() + .success(); + + // Group handler for the shared collection. + let dir = manifest_dir(); + fs::write( + dir.path().join("scripts/on-cat.rhai"), + r#"log::info("shared catalog write"); "ok""#, + ) + .unwrap(); + common::pic_as(&env) + .args(["scripts", "deploy"]) + .arg(dir.path().join("scripts/on-cat.rhai")) + .args(["--group", &group, "--name", "on-cat"]) + .assert() + .success(); + let _gs = ScriptGuard::new( + &env.url, + &env.token, + &group_script_id(&env, &group, "on-cat"), + ); + + // Group declares a shared kv collection `catalog` + a shared kv trigger. + let gmanifest = format!( + "[group]\nslug = \"{group}\"\nname = \"ShTrigG\"\n\ + collections = [{{ name = \"catalog\", kind = \"kv\" }}]\n\n\ + [[triggers.kv]]\nscript = \"on-cat\"\ncollection_glob = \"catalog\"\nshared = true\n" + ); + let gpath = dir.path().join("group.toml"); + fs::write(&gpath, &gmanifest).unwrap(); + common::pic_as(&env) + .args(["apply", "--file"]) + .arg(&gpath) + .assert() + .success(); + + // `pic triggers ls --group` shows shared = true for the kv trigger. + let ls = String::from_utf8( + common::pic_as(&env) + .args(["triggers", "ls", "--group", &group]) + .output() + .unwrap() + .stdout, + ) + .unwrap(); + let row = ls + .lines() + .map(common::cells) + .find(|c| c.contains(&"on-cat")) + .unwrap_or_else(|| panic!("no on-cat trigger row:\n{ls}")); + assert!( + row.contains(&"true"), + "the shared column must read true for the shared trigger:\n{ls}" + ); + + // A shared trigger on a collection the group does NOT declare shared is + // rejected at apply. + let bad_group = format!( + "[group]\nslug = \"{group}\"\nname = \"ShTrigG\"\n\ + collections = [{{ name = \"catalog\", kind = \"kv\" }}]\n\n\ + [[triggers.kv]]\nscript = \"on-cat\"\ncollection_glob = \"undeclared\"\nshared = true\n" + ); + fs::write(&gpath, &bad_group).unwrap(); + let out = common::pic_as(&env) + .args(["apply", "--file"]) + .arg(&gpath) + .output() + .expect("apply bad"); + assert!( + !out.status.success(), + "a shared trigger on an undeclared collection must be rejected" + ); + + // `shared = true` on an APP trigger is rejected. + let app = common::unique_slug("shtrig-app"); + let _a = AppGuard::new(&env.url, &env.token, &app); + common::pic_as(&env) + .args(["apps", "create", &app]) + .assert() + .success(); + fs::write( + dir.path().join("scripts/app-h.rhai"), + r#"log::info("app"); "ok""#, + ) + .unwrap(); + let amanifest = format!( + "[app]\nslug = \"{app}\"\nname = \"App\"\n\n\ + [[scripts]]\nname = \"app-h\"\nfile = \"scripts/app-h.rhai\"\n\n\ + [[triggers.kv]]\nscript = \"app-h\"\ncollection_glob = \"widgets\"\nshared = true\n" + ); + let apath = dir.path().join("app.toml"); + fs::write(&apath, &amanifest).unwrap(); + let out = common::pic_as(&env) + .args(["apply", "--file"]) + .arg(&apath) + .output() + .expect("apply app"); + assert!( + !out.status.success(), + "a shared trigger on an app is rejected (apps don't own shared collections)" + ); + let err = String::from_utf8_lossy(&out.stderr); + assert!( + err.to_lowercase().contains("shared"), + "the rejection must mention shared:\n{err}" + ); +} diff --git a/docs/design/groups-and-project-tool.md b/docs/design/groups-and-project-tool.md index bc1e1ae..0f65648 100644 --- a/docs/design/groups-and-project-tool.md +++ b/docs/design/groups-and-project-tool.md @@ -1160,11 +1160,23 @@ Resolved items now live inline next to their topic. What genuinely remains: > (app A writes, app B reads/finds/gets the same bytes; a sibling-subtree app gets > `CollectionNotShared`). > - > **Deferred (documented gaps):** write-triggers/events on shared collections (the "group trigger - > has no app to watch" problem); **topics/queue** shared collections (trigger-centric, same gap); - > per-group total-size quotas + write-rate limits; CAS/`set_if`; an operator admin API for shared - > blobs (scripts use the SDK; `pic collections ls` shows the marker — matches KV/docs); app-declared - > collections. Multi-node tree-apply leans on the runtime backstop for no-op edges, as elsewhere. + > **Shared-collection triggers (✅, M2).** A write to a shared collection now fires a trigger, + > resolving the "group trigger has no app to watch" gap. A group-owned trigger marked `shared = true` + > (`shared BOOLEAN` on `triggers`, `0061`) watches the group's shared collection; the per-app match + > queries add `AND t.shared = FALSE` and new `list_matching_shared_{kv,docs,files}` select + > `shared = TRUE` triggers on the OWNING group — the `shared` flag is the namespace boundary between a + > shared collection and a same-named per-app one. `ServiceEventEmitter::emit_shared` fires from the + > group services (wired via `with_events`), stamping the WRITER `app_id` so the handler runs under the + > writer (the "group template runs under the firing app" model). Authored on a group + > `[[triggers.kv|docs|files]]`; `validate_bundle_for` rejects `shared` on an app owner, a non-collection + > kind, or an undeclared collection. Read-only `shared` column in `pic triggers ls --group`; pinned by + > `tests/shared_triggers.rs` + the `shared_triggers` journey. + > + > **Deferred (documented gaps):** shared **pubsub** triggers (no shared topic store yet); **topics/queue** + > shared collections (trigger-centric, same gap); per-group total-size quotas + write-rate limits; + > CAS/`set_if`; an operator admin API for shared blobs (scripts use the SDK; `pic collections ls` shows + > the marker — matches KV/docs); app-declared collections. Multi-node tree-apply leans on the runtime + > backstop for no-op edges, as elsewhere. ### 11.1 Re-sequencing review (post-Phase-3)