Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

Merge remote-tracking branch 'origin/dev' into feat/hcc-readiness-decouple-v2

Alfredo Lopez68abe7f15a1c
diff --cc host-context-controller/package-lock.json
index 9bb28fb6f,43b739e7a..bbe7bf588
--- a/host-context-controller/package-lock.json
+++ b/host-context-controller/package-lock.json
@@@ -1,12 -1,12 +1,12 @@@
{
"name": "clerum-host-context-controller",
- "version": "0.1.227",
- "version": "0.1.173",
++ "version": "0.1.228",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-host-context-controller",
- "version": "0.1.227",
- "version": "0.1.173",
++ "version": "0.1.228",
"license": "SEE LICENSE IN LICENSE",
"dependencies": {
"@clerum/image-policy": "file:../packages/image-policy",
diff --cc host-context-controller/package.json
index c4467c5ea,4184347bd..96e9a797d
--- a/host-context-controller/package.json
+++ b/host-context-controller/package.json
@@@ -1,6 -1,6 +1,6 @@@
{
"name": "clerum-host-context-controller",
- "version": "0.1.227",
- "version": "0.1.173",
++ "version": "0.1.228",
"description": "Host Context Controller - provides McpServer CRDs to mcp-host via REST API",
"main": "dist/main.js",
"engines": {
diff --cc host-context-controller/src/reconciler.ts
index 4056c621c,b83fc70a1..077dac09f
--- a/host-context-controller/src/reconciler.ts
+++ b/host-context-controller/src/reconciler.ts
@@@ -74,33 -74,12 +79,34 @@@ type McpServerReconcilerDeps =
coreApi?: k8s.CoreV1Api
customApi?: k8s.CustomObjectsApi
networkingApi?: k8s.NetworkingV1Api
+ /**
+ * TEST-ONLY escape hatch. When the inventory-authority fence is not wired
+ * (setInventoryAuthority / setResolveCurrentServer never called), mutation
+ * fences fail CLOSED by default. Unit tests that exercise the reconciler
+ * without a watcher opt in to the legacy assume-current behavior here.
+ * Production construction (k8sClient) must never set this.
+ */
+ assumeInventoryAuthorityWhenUnconfigured?: boolean
+}
+
+export type McpServerInventoryAuthoritySnapshot = {
+ known: boolean
+ generation: number
+}
+
+export type McpServerFullReconcileOptions = {
+ runEffect?: (serverName: string, work: () => Promise<void>) => Promise<void>
+ maxConcurrency?: number
+}
+
+export type McpServerMutationOptions = {
+ isCurrent?: () => boolean
}
- // G2: Pre-deploy handshake constants
- const PRE_DEPLOY_ANNOTATION = 'clerum.io/pre-deploy'
- const NETWORK_READY_ANNOTATION = 'clerum.io/network-ready'
+ // G2: Pre-deploy handshake constants — imported from @clerum/network-policy-core
+ // (single source of truth shared with WRC; a divergence is a compile error rather
+ // than a silent 30s fail-open timeout). clerum.io/network-ready-observed-generation
+ // (Issue #408) is the generation HCC stamps when acking, so WRC can reject a stale ack.
// Issue #223: sha256 of the envSecret content, carried on the POD TEMPLATE (not
// the Deployment object) so that changing it changes the pod template hash and
@@@ -2255,12 -1941,15 +2266,16 @@@ ${authHeaderLines ? '\n # ─�
// NetworkPolicies are in place and workload can proceed.
if (
server.annotations?.[PRE_DEPLOY_ANNOTATION] === 'true' &&
- server.annotations?.[NETWORK_READY_ANNOTATION] !== 'true'
+ (server.annotations?.[NETWORK_READY_ANNOTATION] !== 'true' ||
+ // Issue #408: re-ack when the stamped generation is stale (spec changed since
+ // the last ack). A non-numeric generation keeps the legacy behavior.
+ (typeof server.generation === 'number' &&
+ server.annotations?.[NETWORK_READY_GENERATION_ANNOTATION] !== String(server.generation)))
) {
try {
- await this.setNetworkReadyAnnotation(server)
+ await this.setNetworkReadyAnnotation(server, isCurrent)
} catch (err) {
+ if (!isCurrent()) return
this.setStatus(server.name, {
deployed: false,
ready: false,