Merge develop into infrahub-develop

[polmichel]

Supersedes #1315, which was blocked on merge conflicts.

Summary

Merges develop into infrahub-develop. All of develop's changes except one were already present in infrahub-develop; the merged tree is byte-identical to infrahub-develop.

Why the net diff is empty

GitHub shows 0 files changed — this is expected, not a mistake. Relative to the merge base, develop touches only 5 files, and 4 are already byte-identical on infrahub-develop (absorbed via earlier stable → develop → infrahub-develop syncs):

• .github/workflows/ci.yml, CHANGELOG.md (1.23.1 notes), changelog/1263.fixed.md, changelog/+relationship-peer-count.fixed.md — already present.
• infrahub_sdk/protocols.py — the only real delta (refresh_tokens from Add the refresh tokens relationship to the account protocols #1307), resolved to the destination's regenerated output (see below).

Once that conflict resolves to the regenerated version, no content difference remains. The merge only reconciles history (marking develop as merged into infrahub-develop); it carries no new content.

Per commit that develop brings in (not on infrahub-develop), here is where its content already lives — or why it's moot:

Commit on develop	Already covered on infrahub-develop by
4cac0c5 ci: gate integration tests on unit-test success	✅ 7bd5c94 — identical change
9b39ab4 chore(release): 1.23.1 notes	✅ 1f11b06 — same release (adds ## [1.23.1], consumes the fragments)
bfdcefe chore(release): 1.23.1 notes (duplicate)	✅ 1f11b06 — same release
66a2543 Add refresh_tokens to the account (#1307)	⚠️ not replicated — superseded by 49d47b8 (#1285): the regeneration dropped tokens/external_identities (internal peers, never exposed by /api/schema); refresh_tokens is the same category and is excluded by the current generator
4eb1b35 Merge #1283 (pipeline-fail-fast)	— merge commit, no unique content (brought 4cac0c5 onto develop)
7c9d15f Merge #1302 from stable	— merge commit, no unique content
de1ad7e Merge #1314 from stable	— merge commit, no unique content

Conflicts resolved

• infrahub_sdk/protocols.py — CoreGenericAccount / CoreGenericAccountSync. infrahub-develop had already regenerated the whole file (49d47b8, feat(protocols): regenerate protocols with peer-typed relationships [IFC-3054] #1285) against a newer core schema (typed RelationshipManager[CoreGroup], alphabetical ordering, member_of_groups/subscriber_of_groups). develop (via Add the refresh tokens relationship to the account protocols #1307) added refresh_tokens to the account in the older generated shape (tokens/refresh_tokens/external_identities). Since protocols.py is generated and never hand-merged, took the destination's regenerated output; the older-schema account shape is superseded by the newer generation. (2b66d9f)

Conflicts raised for review

• None blocking, but note: the newer regeneration (49d47b8) intentionally dropped tokens / external_identities — "their peers are internal, so /api/schema never exposed them and nothing consumes them." refresh_tokens (Add the refresh tokens relationship to the account protocols #1307) is the same kind of internal-peer relationship, so the current generator legitimately excludes it too.

Generated files regenerated

• infrahub_sdk/protocols.py is generated by the main Infrahub backend (invoke backend.generate); no live Infrahub/schema is available in this repo, so the destination's existing regeneration was accepted rather than re-run.

Validation

• protocols.py parses; ruff + ty clean.
• tests/unit/sdk/test_protocols_generator.py — 19/19 pass.
• Not run locally: full pytest suite (blocked by a psutil.cpu_freq() crash in the pytest-infrahub-performance-test plugin on Python 3.14/macOS — environment bug, runs on Linux in CI).

---

Summary by cubic

Merges develop into infrahub-develop; the result is byte-identical to infrahub-develop.

The only conflict was in infrahub_sdk/protocols.py. Took the destination's regenerated output, which supersedes the older-schema account shape from develop (#1307) that added refresh_tokens. The file is generated and never hand-merged.

^{Written for commit 2b66d9f. Summary will update on new commits.}

[cloudflare-workers-and-pages]

Deploying infrahub-sdk-python with    Cloudflare Pages

Latest commit:	2b66d9f
Status:	✅  Deploy successful!
Preview URL:	https://d83f06ff.infrahub-sdk-python.pages.dev
Branch Preview URL:	https://merge-develop-into-infrahub.infrahub-sdk-python.pages.dev

View logs