From b01565f799a563d2a3598c86e20b83ad7a4f090e Mon Sep 17 00:00:00 2001
From: William Mantly <wmantly@gmail.com>
Date: Tue, 4 Aug 2026 23:01:13 -0400
Subject: [PATCH] docs: group naming matches docs/GROUPS.md; roll up sso
 v1.27.0 (v1.37.0)

- GROUPS.md: per-resource groups are {site}_{kind}_{name}_{level}; site carries god + site-wide only
- gitlink: sso-manager-node e8d0420 (v1.27.0)
---
 CHANGELOG.md     |  6 ++++++
 docs/GROUPS.md   | 24 ++++++++++++------------
 sso-manager-node |  2 +-
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9796480..6590401 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,12 @@ orchestration code; see each submodule's own `CHANGELOG.md`
 [sso-manager-node](https://github.com/theta42/sso-manager-node/blob/master/CHANGELOG.md))
 for what changed inside the apps it composes.
 
+## [v1.37.0] - 2026-08-04
+
+### Changed
+- **Group naming corrected to match docs/GROUPS.md** — per-resource groups are `{site}_{kind}_{name}_{level}` (kind always present; a host `host_theta-env` → `site_local_host_theta-env_access`, a service → `site_local_app_sso-manager_access`). The spec's §3 text was updated to state this explicitly.
+- **Roll up sso v1.27.0** — group names match the docs, a site carries only god + site-wide groups, duplicate group links removed, `/api/agent/*` no longer 404s, shared-secrets POST/GET fixed, Vault Apps tab lists minted tokens, discovery promote + plugin run logs fixed. See the [sso changelog](https://github.com/theta42/sso-manager-node/blob/master/CHANGELOG.md).
+
 ## [v1.36.1] - 2026-08-04
 
 ### Fixed
diff --git a/docs/GROUPS.md b/docs/GROUPS.md
index b5fb0f3..fa0adcc 100644
--- a/docs/GROUPS.md
+++ b/docs/GROUPS.md
@@ -76,17 +76,15 @@ enumerated as LDAP members, and cannot be used as Unix groups.
 
 - The **structural delimiter is `_`**. It appears only between the fixed segments
   of a group name.
-- **The `S` site segment is the site resource's slug verbatim.** In the SSO
-  Directory, site/host resource slugs carry a kind prefix (`site_local`,
-  `host_theta-env`); the group builders keep them verbatim rather than
-  re-slugifying (which would corrupt the delimiter: `site_local` → `site-local`)
-  or inserting a separate kind segment. So a host resource `host_theta-env` under
-  site `site_local` yields `site_local_host_theta-env_access` (the `host_` is part
-  of the resource slug), and the site's own admin group is `site_local_super_admin`.
-  Services are stored without a prefix, giving `site_local_sso-manager_access`.
-  The kind (`host`/`app`) is used only to pick the **aggregate** the resource's
-  group nests into (`{site}_hosts_*` / `{site}_apps_*`), not the resource's own
-  group name.
+- **The `S` site segment is the site resource's slug verbatim** (`site_local`),
+  NOT re-slugified (which would corrupt the delimiter: `site_local` → `site-local`).
+- **Per-resource groups are `{S}_{kind}_{name}_{level}`.** `kind` is `host` or
+  `app`; `name` is the resource's **name slug with the kind prefix stripped** — a
+  host resource `host_theta-env` has name `theta-env`, so its groups are
+  `site_local_host_theta-env_access` / `_admin`. A service (the group model's
+  `app`, docs §11) `sso-manager` gives `site_local_app_sso-manager_access`. The
+  kind segment is always present, which is what makes a resource's name
+  unambiguous even if a host and a service share a name.
 - **Within a segment, normalize to lowercase** — spaces and stray `_` → `-`; strip
   other non-`[a-z0-9-]`. A host named `Web 01` and a site `Main Office` (resource
   slugs `host_web-01` and `site_main-office`) yield groups `site_main-office_host_web-01_*`.
@@ -150,7 +148,9 @@ def effective(resource, level_or_cap, site):
     if level_or_cap in ("admin","access"):
         agg = f"{site}_{resource.kind}s_{level_or_cap}"
         if user in agg:                      return True
-    specific = f"{site}_{resource.slug}_{level_or_cap}"   # slug carries its kind
+    # resource.name is the resource's name slug (kind prefix stripped); the kind
+    # is its own segment. A host `host_theta-env` has name `theta-env`, kind `host`.
+    specific = f"{site}_{resource.kind}_{resource.name}_{level_or_cap}"
     if user in specific:                     return True
     if level_or_cap == "access":             return effective(resource, "admin", site)
     if level_or_cap == "admin":              return False          # access does not imply admin
diff --git a/sso-manager-node b/sso-manager-node
index 8db00f0..e8d0420 160000
--- a/sso-manager-node
+++ b/sso-manager-node
@@ -1 +1 @@
-Subproject commit 8db00f0ed60512fab1151e53dd9f2fe16187e437
+Subproject commit e8d04203c38b0d65d65826b68f2dbcc2010727db