@serve.zone/interfaces 24.0.0 → 24.1.0

package/changelog.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 2026-08-01 - 24.1.0
+
+### Features
+
+- Add Spark Swarm observation v2 so workers can report local membership without
+  inventing a manager-only Docker cluster ID while manager snapshots are
+  digest-verified whenever supplied.
+
 ## 2026-07-31 - 24.0.0
 
 ### Breaking Changes

package/dist_ts/00_commitinfo_data.js

@@ -3,7 +3,7 @@
  */
 export const commitinfo = {
     name: '@serve.zone/interfaces',
-    version: '24.0.0',
+    version: '24.1.0',
     description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
 };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHVGQUF1RjtDQUNyRyxDQUFBIn0=

package/dist_ts/data/clusternode.d.ts

@@ -118,6 +118,28 @@ export type TSparkSwarmObservationV1 = (ISparkSwarmObservationBaseV1 & {
     controlAvailable: boolean;
     managerSnapshot?: ISwarmManagerSnapshotV1;
 });
+interface ISparkSwarmObservationBaseV2 {
+    schemaVersion: 2;
+    reporterSessionId: string;
+    observationSequence: number;
+    observedAt: number;
+}
+export type TSparkSwarmObservationV2 = (ISparkSwarmObservationBaseV2 & {
+    state: 'unknown';
+    reason: 'docker-unavailable' | 'query-failed' | 'not-initialized';
+}) | (ISparkSwarmObservationBaseV2 & {
+    state: 'not-member';
+}) | (ISparkSwarmObservationBaseV2 & {
+    state: 'member';
+    localSwarmNodeId: string;
+    controlAvailable: false;
+}) | (ISparkSwarmObservationBaseV2 & {
+    state: 'member';
+    swarmClusterId: string;
+    localSwarmNodeId: string;
+    controlAvailable: true;
+    managerSnapshot?: ISwarmManagerSnapshotV1;
+});
 /** Cloudly derives node and cluster scope from this authenticated Spark request. */
 export interface ISparkSwarmObservationRequest {
     nodeId: string;
@@ -160,6 +182,7 @@ export type TClusterRuntimeTargetSetV1 = IClusterRuntimeTargetSetReadyV1 | IClus
 export declare const createSwarmManagerSnapshotDigestInput: (swarmClusterIdArg: string, snapshotArg: ISwarmManagerSnapshotV1) => string;
 export declare const computeSwarmManagerSnapshotDigest: (swarmClusterIdArg: string, snapshotArg: ISwarmManagerSnapshotV1) => Promise<TSha256Digest>;
 export declare const validateSparkSwarmObservation: (observationArg: unknown) => Promise<string[]>;
+export declare const validateSparkSwarmObservationV2: (observationArg: unknown) => Promise<string[]>;
 export declare const createClusterRuntimeTargetSetDigestInput: (targetSetArg: IClusterRuntimeTargetSetReadyV1) => string;
 export declare const computeClusterRuntimeTargetSetDigest: (targetSetArg: IClusterRuntimeTargetSetReadyV1) => Promise<TSha256Digest>;
 export declare const validateClusterRuntimeTargetSet: (targetSetArg: unknown) => Promise<string[]>;

package/dist_ts/data/clusternode.js

@@ -219,6 +219,71 @@ export const validateSparkSwarmObservation = async (observationArg) => {
         return ['Spark Swarm observation must be safely inspectable'];
     }
 };
+export const validateSparkSwarmObservationV2 = async (observationArg) => {
+    try {
+        if (!isRuntimeRecord(observationArg))
+            return ['Spark Swarm observation v2 must be an object'];
+        const observation = observationArg;
+        const commonKeys = [
+            'schemaVersion',
+            'reporterSessionId',
+            'observationSequence',
+            'observedAt',
+            'state',
+        ];
+        const expectedKeys = observation.state === 'unknown'
+            ? [...commonKeys, 'reason']
+            : observation.state === 'not-member'
+                ? commonKeys
+                : observation.state === 'member' && observation.controlAvailable === false
+                    ? [...commonKeys, 'localSwarmNodeId', 'controlAvailable']
+                    : observation.state === 'member' && observation.controlAvailable === true
+                        ? [
+                            ...commonKeys,
+                            'swarmClusterId',
+                            'localSwarmNodeId',
+                            'controlAvailable',
+                            ...(observation.managerSnapshot === undefined ? [] : ['managerSnapshot']),
+                        ]
+                        : [];
+        if (expectedKeys.length === 0 || !hasExactRuntimeKeys(observation, expectedKeys)) {
+            return ['Spark Swarm observation v2 must use its exact state schema'];
+        }
+        const errors = [];
+        if (observation.schemaVersion !== 2) {
+            errors.push('Spark Swarm observation v2 schemaVersion must be 2');
+        }
+        if (!isRuntimeIdentifier(observation.reporterSessionId)
+            || !isPositiveSafeInteger(observation.observationSequence)
+            || !isPositiveSafeInteger(observation.observedAt)) {
+            errors.push('Spark Swarm observation v2 identity, sequence, and timestamp must be canonical');
+        }
+        if (observation.state === 'unknown'
+            && !['docker-unavailable', 'query-failed', 'not-initialized']
+                .includes(observation.reason)) {
+            errors.push('Spark Swarm observation v2 unknown reason must be canonical');
+        }
+        if (observation.state === 'member') {
+            if (!isRuntimeIdentifier(observation.localSwarmNodeId)
+                || typeof observation.controlAvailable !== 'boolean') {
+                errors.push('Spark Swarm member observation v2 must have canonical local authority');
+            }
+            if (observation.controlAvailable === true) {
+                if (!isRuntimeIdentifier(observation.swarmClusterId)) {
+                    errors.push('Spark Swarm manager observation v2 must have canonical cluster authority');
+                }
+                else if (observation.managerSnapshot !== undefined
+                    && isRuntimeIdentifier(observation.localSwarmNodeId)) {
+                    errors.push(...await validateSwarmManagerSnapshot(observation.swarmClusterId, observation.localSwarmNodeId, observation.managerSnapshot));
+                }
+            }
+        }
+        return errors;
+    }
+    catch {
+        return ['Spark Swarm observation v2 must be safely inspectable'];
+    }
+};
 const canonicalRuntimeTarget = (targetArg) => ({
     cloudlyNodeId: targetArg.cloudlyNodeId,
     swarmClusterId: targetArg.swarmClusterId,
@@ -353,4 +418,4 @@ export const isClusterRuntimeTargetSetFresh = (targetSetArg, nowArg) => (targetS
     && Number.isSafeInteger(nowArg)
     && nowArg >= targetSetArg.acceptedAt
     && nowArg < targetSetArg.freshUntil);
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"clusternode.js","sourceRoot":"","sources":["../../ts/data/clusternode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AA8LzC,MAAM,sBAAsB,GAAG,qCAAqC,CAAC;AACrE,MAAM,kBAAkB,GAAG,uBAAuB,CAAC;AACnD,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAA8B;IAC5D,aAAa;IACb,aAAa;CACd,CAAC,CAAC;AACH,MAAM,iBAAiB,GAAG,IAAI,CAAC;AAE/B,MAAM,eAAe,GAAG,CAAC,QAAiB,EAAuC,EAAE,CAAC,CAClF,OAAO,CAAC,QAAQ,CAAC,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAC9E,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAC1B,QAAiC,EACjC,OAAiB,EACR,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;AAEnG,MAAM,mBAAmB,GAAG,CAAC,QAAiB,EAAsB,EAAE,CAAC,CACrE,OAAO,QAAQ,KAAK,QAAQ,IAAI,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,CACtE,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,QAAiB,EAAsB,EAAE,CAAC,CACvE,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAK,QAAmB,GAAG,CAAC,CAC3D,CAAC;AAEF,MAAM,aAAa,GAAG,KAAK,EAAE,QAAgB,EAA0B,EAAE;IACvE,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CACjE,SAAS,EACT,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CACnC,CAAC,CAAC;IACH,OAAO,UAAU,CAAC,GAAG,MAAM,CAAC;SACzB,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;SACvD,IAAI,CAAC,EAAE,CAAC,EAAmB,CAAC;AACjC,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CACzB,OAAoC,EACX,EAAE,CAAC,CAAC;IAC7B,WAAW,EAAE,OAAO,CAAC,WAAW;IAChC,QAAQ,EAAE,OAAO,CAAC,QAAQ;IAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;IAC1B,IAAI,EAAE,OAAO,CAAC,IAAI;IAClB,YAAY,EAAE,OAAO,CAAC,YAAY;IAClC,KAAK,EAAE,OAAO,CAAC,KAAK;IACpB,aAAa,EAAE,OAAO,CAAC,aAAa;QAClC,CAAC,CAAC;YACE,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,MAAM;YACpC,YAAY,EAAE,OAAO,CAAC,aAAa,CAAC,YAAY;SACjD;QACH,CAAC,CAAC,IAAI;CACT,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,qCAAqC,GAAG,CACnD,iBAAyB,EACzB,WAAoC,EAC5B,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC;IAC1B,aAAa,EAAE,CAAC;IAChB,OAAO,EAAE,mCAAmC;IAC5C,cAAc,EAAE,iBAAiB;IACjC,eAAe,EAAE,WAAW,CAAC,eAAe;IAC5C,SAAS,EAAE,WAAW,CAAC,SAAS;IAChC,YAAY,EAAE,WAAW,CAAC,YAAY;IACtC,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,kBAAkB,CAAC;CACjD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,iCAAiC,GAAG,KAAK,EACpD,iBAAyB,EACzB,WAAoC,EACZ,EAAE,CAAC,aAAa,CACxC,qCAAqC,CAAC,iBAAiB,EAAE,WAAW,CAAC,CACtE,CAAC;AAEF,MAAM,4BAA4B,GAAG,KAAK,EACxC,iBAAyB,EACzB,mBAA2B,EAC3B,WAAoB,EACD,EAAE;IACrB,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC;WAC5B,CAAC,mBAAmB,CAAC,WAAW,EAAE;YACnC,iBAAiB;YACjB,gBAAgB;YAChB,WAAW;YACX,cAAc;YACd,OAAO;SACR,CAAC,EAAE,CAAC;QACL,OAAO,CAAC,wDAAwD,CAAC,CAAC;IACpE,CAAC;IACD,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,WAAW,CAAC,eAAe,KAAK,CAAC,EAAE,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;IAC/D,CAAC;IACD,IAAI,OAAO,WAAW,CAAC,cAAc,KAAK,QAAQ;WAC7C,CAAC,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE,CAAC;QAC1D,MAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;IACvE,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC;WAChC,WAAW,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;WAC9B,WAAW,CAAC,KAAK,CAAC,MAAM,GAAG,iBAAiB,EAAE,CAAC;QAClD,MAAM,CAAC,IAAI,CAAC,sEAAsE,CAAC,CAAC;QACpF,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,IAAI,WAAW,CAAC,SAAS,KAAK,WAAW,CAAC,KAAK,CAAC,MAAM;WACjD,CAAC,qBAAqB,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;IACzE,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,eAAmC,CAAC;IACxC,KAAK,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;QAC3D,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9B,MAAM,CAAC,IAAI,CAAC,sCAAsC,KAAK,qBAAqB,CAAC,CAAC;YAC9E,SAAS;QACX,CAAC;QACD,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC;QAC7C,MAAM,YAAY,GAAG;YACnB,aAAa;YACb,UAAU;YACV,UAAU;YACV,MAAM;YACN,cAAc;YACd,OAAO;YACP,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SACxC,CAAC;QACF,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,EAAE,CAAC;YAChD,MAAM,CAAC,IAAI,CAAC,sCAAsC,KAAK,kCAAkC,CAAC,CAAC;QAC7F,CAAC;QACD,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxF,MAAM,CAAC,IAAI,CAAC,sCAAsC,KAAK,8BAA8B,CAAC,CAAC;QACzF,CAAC;QACD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,QAAuC,CAAC,EAAE,CAAC;YAC3E,MAAM,CAAC,IAAI,CAAC,sCAAsC,KAAK,8BAA8B,CAAC,CAAC;QACzF,CAAC;QACD,IAAI,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAc,CAAC;eACtD,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAsB,CAAC;eACtE,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAe,CAAC,EAAE,CAAC;YACrF,MAAM,CAAC,IAAI,CAAC,sCAAsC,KAAK,qCAAqC,CAAC,CAAC;QAChG,CAAC;QACD,IAAI,SAAS,EAAE,CAAC;YACd,YAAY,EAAE,CAAC;YACf,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,aAAa,CAAC;mBACtC,CAAC,mBAAmB,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;mBACvE,OAAO,OAAO,CAAC,aAAa,CAAC,MAAM,KAAK,SAAS;mBACjD,CAAC,CAAC,SAAS,EAAE,aAAa,EAAE,WAAW,CAAC;qBACxC,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,YAAsB,CAAC,EAAE,CAAC;gBAC5D,MAAM,CAAC,IAAI,CAAC,sCAAsC,KAAK,mCAAmC,CAAC,CAAC;YAC9F,CAAC;iBAAM,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;gBACxC,WAAW,EAAE,CAAC;YAChB,CAAC;QACH,CAAC;QACD,IAAI,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YAC7C,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;gBACrC,MAAM,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;YACtE,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,mBAAmB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1C,IAAI,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACpC,MAAM,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;YACxE,CAAC;YACD,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,mBAAmB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtF,MAAM,OAAO,GAAG,GAAG,OAAO,CAAC,WAAW,KAAK,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC;YACnF,IAAI,eAAe,KAAK,SAAS,IAAI,OAAO,IAAI,eAAe,EAAE,CAAC;gBAChE,MAAM,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC;YAC5E,CAAC;YACD,eAAe,GAAG,OAAO,CAAC;QAC5B,CAAC;IACH,CAAC;IACD,IAAI,WAAW,CAAC,YAAY,KAAK,YAAY,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC;QAClG,MAAM,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC;IAC5E,CAAC;IACD,IAAI,WAAW,GAAG,CAAC;QAAE,MAAM,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAC;IAChG,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CACrD,eAAe,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,WAAW,KAAK,mBAAmB,CACxE,CAAC,CAAC;IACH,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC;WAC3B,UAAU,CAAC,IAAI,KAAK,SAAS;WAC7B,UAAU,CAAC,YAAY,KAAK,QAAQ;WACpC,UAAU,CAAC,KAAK,KAAK,OAAO;WAC5B,CAAC,eAAe,CAAC,UAAU,CAAC,aAAa,CAAC;WAC1C,UAAU,CAAC,aAAa,CAAC,YAAY,KAAK,WAAW,EAAE,CAAC;QAC3D,MAAM,CAAC,IAAI,CAAC,yEAAyE,CAAC,CAAC;IACzF,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;WAClB,WAAW,CAAC,cAAc,KAAK,MAAM,iCAAiC,CACvE,iBAAiB,EACjB,WAAiD,CAClD,EAAE,CAAC;QACJ,MAAM,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;IACpE,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,6BAA6B,GAAG,KAAK,EAChD,cAAuB,EACJ,EAAE;IACrB,IAAI,CAAC;QACH,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC;YAAE,OAAO,CAAC,2CAA2C,CAAC,CAAC;QAC3F,MAAM,WAAW,GAAG,cAAyC,CAAC;QAC9D,MAAM,UAAU,GAAG;YACjB,eAAe;YACf,mBAAmB;YACnB,qBAAqB;YACrB,YAAY;YACZ,OAAO;SACR,CAAC;QACF,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,KAAK,SAAS;YAClD,CAAC,CAAC,CAAC,GAAG,UAAU,EAAE,QAAQ,CAAC;YAC3B,CAAC,CAAC,WAAW,CAAC,KAAK,KAAK,YAAY;gBAClC,CAAC,CAAC,UAAU;gBACZ,CAAC,CAAC,WAAW,CAAC,KAAK,KAAK,QAAQ;oBAC9B,CAAC,CAAC;wBACE,GAAG,UAAU;wBACb,gBAAgB;wBAChB,kBAAkB;wBAClB,kBAAkB;wBAClB,GAAG,CAAC,WAAW,CAAC,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;qBAC1E;oBACH,CAAC,CAAC,EAAE,CAAC;QACX,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,CAAC;YACjF,OAAO,CAAC,yDAAyD,CAAC,CAAC;QACrE,CAAC;QACD,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,IAAI,WAAW,CAAC,aAAa,KAAK,CAAC;YAAE,MAAM,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;QACpG,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,iBAAiB,CAAC;eAClD,CAAC,qBAAqB,CAAC,WAAW,CAAC,mBAAmB,CAAC;eACvD,CAAC,qBAAqB,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;YACpD,MAAM,CAAC,IAAI,CAAC,6EAA6E,CAAC,CAAC;QAC7F,CAAC;QACD,IAAI,WAAW,CAAC,KAAK,KAAK,SAAS;eAC9B,CAAC,CAAC,oBAAoB,EAAE,cAAc,EAAE,iBAAiB,CAAC;iBAC1D,QAAQ,CAAC,WAAW,CAAC,MAAgB,CAAC,EAAE,CAAC;YAC5C,MAAM,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;QAC1E,CAAC;QACD,IAAI,WAAW,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YACnC,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,cAAc,CAAC;mBAC/C,CAAC,mBAAmB,CAAC,WAAW,CAAC,gBAAgB,CAAC;mBAClD,OAAO,WAAW,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;gBACvD,MAAM,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;YACpF,CAAC;YACD,IAAI,WAAW,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;gBAC9C,IAAI,WAAW,CAAC,gBAAgB,KAAK,IAAI,EAAE,CAAC;oBAC1C,MAAM,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;gBACxE,CAAC;qBAAM,IAAI,mBAAmB,CAAC,WAAW,CAAC,cAAc,CAAC;uBACrD,mBAAmB,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE,CAAC;oBACvD,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,4BAA4B,CAC/C,WAAW,CAAC,cAAc,EAC1B,WAAW,CAAC,gBAAgB,EAC5B,WAAW,CAAC,eAAe,CAC5B,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,oDAAoD,CAAC,CAAC;IAChE,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAC7B,SAAkC,EACT,EAAE,CAAC,CAAC;IAC7B,aAAa,EAAE,SAAS,CAAC,aAAa;IACtC,cAAc,EAAE,SAAS,CAAC,cAAc;IACxC,WAAW,EAAE,SAAS,CAAC,WAAW;IAClC,QAAQ,EAAE,SAAS,CAAC,QAAQ;IAC5B,QAAQ,EAAE,SAAS,CAAC,QAAQ;CAC7B,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,wCAAwC,GAAG,CACtD,YAA6C,EACrC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC;IAC1B,aAAa,EAAE,YAAY,CAAC,aAAa;IACzC,OAAO,EAAE,uCAAuC;IAChD,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;IAC/C,cAAc,EAAE,YAAY,CAAC,cAAc;IAC3C,UAAU,EAAE,YAAY,CAAC,UAAU;IACnC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;CAC1D,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,oCAAoC,GAAG,KAAK,EACvD,YAA6C,EACrB,EAAE,CAAC,aAAa,CAAC,wCAAwC,CAAC,YAAY,CAAC,CAAC,CAAC;AAEnG,MAAM,CAAC,MAAM,+BAA+B,GAAG,KAAK,EAClD,YAAqB,EACF,EAAE;IACrB,IAAI,CAAC;QACH,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC;YAAE,OAAO,CAAC,8CAA8C,CAAC,CAAC;QAC5F,IAAI,YAAY,CAAC,KAAK,KAAK,aAAa,EAAE,CAAC;YACzC,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE;gBACrC,eAAe;gBACf,OAAO;gBACP,kBAAkB;gBAClB,YAAY;gBACZ,WAAW;gBACX,QAAQ;aACT,CAAC,EAAE,CAAC;gBACH,OAAO,CAAC,kEAAkE,CAAC,CAAC;YAC9E,CAAC;YACD,MAAM,MAAM,GAAa,EAAE,CAAC;YAC5B,IAAI,YAAY,CAAC,aAAa,KAAK,CAAC;mBAC/B,CAAC,mBAAmB,CAAC,YAAY,CAAC,gBAAgB,CAAC;mBACnD,CAAC,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,UAAU,CAAC;mBAC7C,YAAY,CAAC,UAAqB,GAAG,CAAC;mBACvC,CAAC,qBAAqB,CAAC,YAAY,CAAC,SAAS,CAAC;mBAC9C,CAAC;oBACF,gBAAgB;oBAChB,OAAO;oBACP,sBAAsB;oBACtB,mBAAmB;oBACnB,wBAAwB;iBACzB,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAgB,CAAC,EAAE,CAAC;gBAC5C,MAAM,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;YACjF,CAAC;YACD,IAAI,YAAY,CAAC,MAAM,KAAK,gBAAgB,IAAI,YAAY,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;gBAC9E,MAAM,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;YACtE,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,IAAI,YAAY,CAAC,KAAK,KAAK,OAAO;eAC7B,CAAC,mBAAmB,CAAC,YAAY,EAAE;gBACpC,eAAe;gBACf,OAAO;gBACP,kBAAkB;gBAClB,gBAAgB;gBAChB,YAAY;gBACZ,iBAAiB;gBACjB,YAAY;gBACZ,YAAY;gBACZ,SAAS;aACV,CAAC,EAAE,CAAC;YACL,OAAO,CAAC,4DAA4D,CAAC,CAAC;QACxE,CAAC;QACD,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,IAAI,YAAY,CAAC,aAAa,KAAK,CAAC;eAC/B,CAAC,mBAAmB,CAAC,YAAY,CAAC,gBAAgB,CAAC;eACnD,CAAC,mBAAmB,CAAC,YAAY,CAAC,cAAc,CAAC;eACjD,CAAC,qBAAqB,CAAC,YAAY,CAAC,UAAU,CAAC;eAC/C,CAAC,qBAAqB,CAAC,YAAY,CAAC,UAAU,CAAC;eAC/C,CAAC,qBAAqB,CAAC,YAAY,CAAC,UAAU,CAAC;eAC9C,YAAY,CAAC,UAAqB,IAAK,YAAY,CAAC,UAAqB;eAC1E,OAAO,YAAY,CAAC,eAAe,KAAK,QAAQ;eAChD,CAAC,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE,CAAC;YAC5D,MAAM,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;QACrF,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC;eACnC,YAAY,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;eACjC,YAAY,CAAC,OAAO,CAAC,MAAM,GAAG,iBAAiB,EAAE,CAAC;YACrD,MAAM,CAAC,IAAI,CAAC,4EAA4E,CAAC,CAAC;YAC1F,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;QACzC,MAAM,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;QAC1C,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;QACpC,IAAI,eAAmC,CAAC;QACxC,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YAChE,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC;mBAC1B,CAAC,mBAAmB,CAAC,SAAS,EAAE;oBACjC,eAAe;oBACf,gBAAgB;oBAChB,aAAa;oBACb,UAAU;oBACV,UAAU;iBACX,CAAC;mBACC,CAAC,mBAAmB,CAAC,SAAS,CAAC,aAAa,CAAC;mBAC7C,CAAC,mBAAmB,CAAC,SAAS,CAAC,cAAc,CAAC;mBAC9C,CAAC,mBAAmB,CAAC,SAAS,CAAC,WAAW,CAAC;mBAC3C,CAAC,mBAAmB,CAAC,SAAS,CAAC,QAAQ,CAAC;mBACxC,SAAS,CAAC,cAAc,KAAK,YAAY,CAAC,cAAc;mBACxD,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,QAAuC,CAAC,EAAE,CAAC;gBAC9E,MAAM,CAAC,IAAI,CAAC,sCAAsC,KAAK,qBAAqB,CAAC,CAAC;gBAC9E,SAAS;YACX,CAAC;YACD,MAAM,OAAO,GAAG,GAAG,SAAS,CAAC,aAAa,KAAK,SAAS,CAAC,cAAc,KACrE,SAAS,CAAC,WACZ,KAAK,SAAS,CAAC,QAAQ,KAAK,SAAS,CAAC,QAAQ,EAAE,CAAC;YACjD,IAAI,eAAe,KAAK,SAAS,IAAI,OAAO,IAAI,eAAe,EAAE,CAAC;gBAChE,MAAM,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC;YAC5E,CAAC;YACD,eAAe,GAAG,OAAO,CAAC;YAC1B,MAAM,UAAU,GAAG,GAAG,SAAS,CAAC,cAAc,KAAK,SAAS,CAAC,WAAW,EAAE,CAAC;YAC3E,IAAI,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC;mBAC1C,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC;mBAC/B,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACvC,MAAM,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;YAClE,CAAC;YACD,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;YAC5C,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAChC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;eAClB,YAAY,CAAC,eAAe,KAAK,MAAM,oCAAoC,CAC5E,YAA0D,CAC3D,EAAE,CAAC;YACJ,MAAM,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;QAClE,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,uDAAuD,CAAC,CAAC;IACnE,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAC5C,YAAwC,EACxC,MAAc,EACmC,EAAE,CAAC,CACpD,YAAY,CAAC,KAAK,KAAK,OAAO;OAC3B,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC;OAC5B,MAAM,IAAI,YAAY,CAAC,UAAU;OACjC,MAAM,GAAG,YAAY,CAAC,UAAU,CACpC,CAAC"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"clusternode.js","sourceRoot":"","sources":["../../ts/data/clusternode.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serve.zone/interfaces",
-  "version": "24.0.0",
+  "version": "24.1.0",
   "private": false,
   "description": "Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.",
   "exports": {

package/readme.md

@@ -99,6 +99,14 @@ Coreflow connection:
   credential, reconciles manager consensus privately, and publishes one fresh
   single-Swarm target authority or a targetless unavailable state. Structural
   contract validation does not itself establish manager consensus.
+- `TSparkSwarmObservationV2` lets workers report only their local Swarm node ID,
+  because Docker does not expose the Swarm cluster ID to workers. Cloudly may
+  associate that node with a cluster only through authenticated node scope and
+  accepted manager consensus. V2 is a producer contract only until a later
+  consumer release defines transport, replay handling, and activation.
+  `validateSparkSwarmObservationV2` validates the exact structure and any
+  attached manager snapshot; it does not establish consensus or runtime
+  authority.
 - WorkloadInit approval binds a clean stable release identity, version-tagged
   OCI index, exact amd64 and arm64 platform/executable digests, policy
   generation, and a Cloudly summary of detached Cosign DSSE/SLSA verification.

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@serve.zone/interfaces',
-  version: '24.0.0',
+  version: '24.1.0',
   description: 'Shared TypeScript interfaces and TypedRequest contracts for the serve.zone ecosystem.'
 }

package/ts/data/clusternode.ts

@@ -136,6 +136,34 @@ export type TSparkSwarmObservationV1 =
       managerSnapshot?: ISwarmManagerSnapshotV1;
     });
 
+interface ISparkSwarmObservationBaseV2 {
+  schemaVersion: 2;
+  reporterSessionId: string;
+  observationSequence: number;
+  observedAt: number;
+}
+
+export type TSparkSwarmObservationV2 =
+  | (ISparkSwarmObservationBaseV2 & {
+      state: 'unknown';
+      reason: 'docker-unavailable' | 'query-failed' | 'not-initialized';
+    })
+  | (ISparkSwarmObservationBaseV2 & {
+      state: 'not-member';
+    })
+  | (ISparkSwarmObservationBaseV2 & {
+      state: 'member';
+      localSwarmNodeId: string;
+      controlAvailable: false;
+    })
+  | (ISparkSwarmObservationBaseV2 & {
+      state: 'member';
+      swarmClusterId: string;
+      localSwarmNodeId: string;
+      controlAvailable: true;
+      managerSnapshot?: ISwarmManagerSnapshotV1;
+    });
+
 /** Cloudly derives node and cluster scope from this authenticated Spark request. */
 export interface ISparkSwarmObservationRequest {
   nodeId: string;
@@ -450,6 +478,75 @@ export const validateSparkSwarmObservation = async (
   }
 };
 
+export const validateSparkSwarmObservationV2 = async (
+  observationArg: unknown,
+): Promise<string[]> => {
+  try {
+    if (!isRuntimeRecord(observationArg)) return ['Spark Swarm observation v2 must be an object'];
+    const observation = observationArg as Record<string, unknown>;
+    const commonKeys = [
+      'schemaVersion',
+      'reporterSessionId',
+      'observationSequence',
+      'observedAt',
+      'state',
+    ];
+    const expectedKeys = observation.state === 'unknown'
+      ? [...commonKeys, 'reason']
+      : observation.state === 'not-member'
+        ? commonKeys
+        : observation.state === 'member' && observation.controlAvailable === false
+          ? [...commonKeys, 'localSwarmNodeId', 'controlAvailable']
+          : observation.state === 'member' && observation.controlAvailable === true
+            ? [
+                ...commonKeys,
+                'swarmClusterId',
+                'localSwarmNodeId',
+                'controlAvailable',
+                ...(observation.managerSnapshot === undefined ? [] : ['managerSnapshot']),
+              ]
+            : [];
+    if (expectedKeys.length === 0 || !hasExactRuntimeKeys(observation, expectedKeys)) {
+      return ['Spark Swarm observation v2 must use its exact state schema'];
+    }
+    const errors: string[] = [];
+    if (observation.schemaVersion !== 2) {
+      errors.push('Spark Swarm observation v2 schemaVersion must be 2');
+    }
+    if (!isRuntimeIdentifier(observation.reporterSessionId)
+      || !isPositiveSafeInteger(observation.observationSequence)
+      || !isPositiveSafeInteger(observation.observedAt)) {
+      errors.push('Spark Swarm observation v2 identity, sequence, and timestamp must be canonical');
+    }
+    if (observation.state === 'unknown'
+      && !['docker-unavailable', 'query-failed', 'not-initialized']
+        .includes(observation.reason as string)) {
+      errors.push('Spark Swarm observation v2 unknown reason must be canonical');
+    }
+    if (observation.state === 'member') {
+      if (!isRuntimeIdentifier(observation.localSwarmNodeId)
+        || typeof observation.controlAvailable !== 'boolean') {
+        errors.push('Spark Swarm member observation v2 must have canonical local authority');
+      }
+      if (observation.controlAvailable === true) {
+        if (!isRuntimeIdentifier(observation.swarmClusterId)) {
+          errors.push('Spark Swarm manager observation v2 must have canonical cluster authority');
+        } else if (observation.managerSnapshot !== undefined
+          && isRuntimeIdentifier(observation.localSwarmNodeId)) {
+          errors.push(...await validateSwarmManagerSnapshot(
+            observation.swarmClusterId,
+            observation.localSwarmNodeId,
+            observation.managerSnapshot,
+          ));
+        }
+      }
+    }
+    return errors;
+  } catch {
+    return ['Spark Swarm observation v2 must be safely inspectable'];
+  }
+};
+
 const canonicalRuntimeTarget = (
   targetArg: IClusterRuntimeTargetV1,
 ): IClusterRuntimeTargetV1 => ({