npm - @serve.zone/interfaces - Versions diffs - 16.0.1 → 16.2.0 - Mend

@serve.zone/interfaces 16.0.1 → 16.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/changelog.md +16 -0
package/dist_ts/00_commitinfo_data.js +1 -1
package/dist_ts/data/deploymentadoption.d.ts +62 -1
package/dist_ts/data/deploymentadoption.js +212 -2
package/dist_ts/requests/deployment.d.ts +12 -0
package/dist_ts/requests/service.d.ts +19 -1
package/package.json +1 -1
package/ts/00_commitinfo_data.ts +1 -1
package/ts/data/deploymentadoption.ts +300 -1
package/ts/requests/deployment.ts +20 -0
package/ts/requests/service.ts +32 -0

package/changelog.md CHANGED Viewed

@@ -1,5 +1,21 @@
 # Changelog
+## 2026-07-20 - 16.2.0
+### Security
+- add least-privilege adoption image tag bootstrap (deployment)
+  - Promote only the exact healthy live service digest from its server-derived mutable registry target to a canonical bare semantic-version tag.
+  - Return complete OCI index, platform, release, and digest-pinned evidence without granting general registry manifest writes.
+  - Add an explicit rollout-adoption bootstrap for legacy services whose immutable target differs from the retained runtime, with a generation-one digest-pinned plan and pollable rollout status.
+## 2026-07-20 - 16.1.0
+### Security
+- require acknowledged Coreflow retention before completing adoption (deployment)
+  - Add a two-phase, session-bound retention-attestation contract with exact operation, configuration, runtime, and reporter evidence.
 ## 2026-07-20 - 16.0.1
 ### Security

package/dist_ts/00_commitinfo_data.js CHANGED Viewed

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

package/dist_ts/data/deploymentadoption.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import type { IDeploymentPreflightRuntimeTask, IOciPlatformDescriptorSummary } from './deploymentpreflight.js';
-import type { IImmutableImageDeploymentPlan, IImmutableImageTargetScope, TOciManifestMediaType, TSha256Digest } from './immutableimage.js';
+import type { IDeployment } from './deployment.js';
+import type { IImageRolloutStatus, IImmutableImageDeploymentPlan, IImmutableRolloutReportEnvelope, IImmutableImageTargetScope, TOciManifestMediaType, TSha256Digest } from './immutableimage.js';
 import type { IRegistryTarget } from './registry.js';
 export type TServiceDeploymentAdoptionDecision = 'GO' | 'NO-GO';
 /**
@@ -23,6 +24,44 @@ export interface IServiceDeploymentAdoptionInput extends IServiceDeploymentAdopt
     idempotencyKey: string;
     expectedAdoptionDigest: TServiceDeploymentAdoptionDigest;
 }
+export interface IServiceDeploymentAdoptionImagePromotionInput extends IServiceDeploymentAdoptionPreflightInput {
+    targetReleaseTag: string;
+    expectedSourceImageDigest?: TSha256Digest;
+    idempotencyKey: string;
+}
+export interface IServiceDeploymentAdoptionImagePromotionResult {
+    status: 'promoted' | 'already-promoted';
+    organizationId: string;
+    serviceId: string;
+    sourceTag: string;
+    releaseTag: string;
+    registryHost: string;
+    repository: string;
+    digest: TSha256Digest;
+    mediaType: 'application/vnd.oci.image.index.v1+json' | 'application/vnd.docker.distribution.manifest.list.v2+json';
+    platforms: IOciPlatformDescriptorSummary[];
+    releaseId: string;
+    digestPinnedImageReference: string;
+}
+export interface IServiceDeploymentAdoptionRolloutInput extends IServiceDeploymentAdoptionPreflightInput {
+    releaseTag: string;
+    expectedTargetImageDigest: TSha256Digest;
+    idempotencyKey: string;
+}
+export interface IServiceDeploymentAdoptionRolloutResult {
+    status: 'rollout-started' | 'rollout-in-progress' | 'rollout-succeeded' | 'rollout-failed';
+    idempotentReplay: boolean;
+    operationId: string;
+    organizationId: string;
+    serviceId: string;
+    registryHost: string;
+    repository: string;
+    releaseTag: string;
+    digest: TSha256Digest;
+    releaseId: string;
+    plan: IImmutableImageDeploymentPlan;
+    rolloutStatus: IImageRolloutStatus;
+}
 interface IServiceDeploymentAdoptionReportBase {
     schemaVersion: 1;
     mutationPerformed: false;
@@ -91,7 +130,29 @@ export interface IServiceDeploymentAdoptionResult {
     idempotentReplay: boolean;
     plan: IImmutableImageDeploymentPlan;
 }
+export type TServiceDeploymentAdoptionRetentionPhase = 'prepare' | 'commit';
+/**
+ * A session-bound Coreflow assertion that its local live runtime can be
+ * retained for the exact adoption plan without mutating the Docker service.
+ */
+export interface IServiceDeploymentAdoptionRetentionAttestation {
+    schemaVersion: 1;
+    phase: TServiceDeploymentAdoptionRetentionPhase;
+    retainedWithoutMutation: true;
+    serviceId: string;
+    operationId: string;
+    adoptionConfigurationDigest: TSha256Digest;
+    immutableReport: IImmutableRolloutReportEnvelope;
+    deployments: IDeployment[];
+    attestedAt: number;
+}
+export declare const validateServiceDeploymentAdoptionRetentionAttestation: (attestationArg: unknown) => string[];
+export declare const normalizeServiceDeploymentAdoptionReleaseTag: (tagArg: unknown) => string | undefined;
 export declare const validateServiceDeploymentAdoptionPreflightInput: (inputArg: unknown) => string[];
 export declare const validateServiceDeploymentAdoptionInput: (inputArg: unknown) => string[];
+export declare const validateServiceDeploymentAdoptionImagePromotionInput: (inputArg: unknown) => string[];
+export declare const validateServiceDeploymentAdoptionImagePromotionResult: (resultArg: unknown) => string[];
+export declare const validateServiceDeploymentAdoptionRolloutInput: (inputArg: unknown) => string[];
+export declare const validateServiceDeploymentAdoptionRolloutResult: (resultArg: unknown) => string[];
 export declare const validateServiceDeploymentAdoptionReport: (reportArg: unknown) => string[];
 export {};

package/dist_ts/data/deploymentadoption.js CHANGED Viewed

@@ -1,5 +1,40 @@
-import { normalizeImmutableReleaseTag, normalizeSha256Digest } from './immutableimage.js';
+import { normalizeImmutableReleaseTag, normalizeSha256Digest, validateImageRolloutStatus, validateImmutableImageDeploymentPlan, } from './immutableimage.js';
+export const validateServiceDeploymentAdoptionRetentionAttestation = (attestationArg) => {
+    if (!isRecord(attestationArg))
+        return ['retention attestation must be an object'];
+    const errors = [];
+    if (attestationArg.schemaVersion !== 1)
+        errors.push('retention attestation schemaVersion must be 1');
+    if (attestationArg.phase !== 'prepare' && attestationArg.phase !== 'commit') {
+        errors.push('retention attestation phase is invalid');
+    }
+    if (attestationArg.retainedWithoutMutation !== true) {
+        errors.push('retention attestation must assert mutation-free retention');
+    }
+    if (!isBoundedIdentifier(attestationArg.serviceId)
+        || !isBoundedIdentifier(attestationArg.operationId)) {
+        errors.push('retention attestation service and operation IDs must be bounded identifiers');
+    }
+    if (!isCanonicalDigest(attestationArg.adoptionConfigurationDigest)) {
+        errors.push('retention attestation configuration digest must be canonical');
+    }
+    if (!Number.isSafeInteger(attestationArg.attestedAt) || attestationArg.attestedAt < 1) {
+        errors.push('retention attestation timestamp must be a positive integer');
+    }
+    if (!isRecord(attestationArg.immutableReport)) {
+        errors.push('retention attestation requires an immutable report envelope');
+    }
+    if (!Array.isArray(attestationArg.deployments) || attestationArg.deployments.length < 1) {
+        errors.push('retention attestation requires at least one deployment');
+    }
+    else if (attestationArg.deployments.some((deploymentArg) => (!isRecord(deploymentArg)
+        || deploymentArg.serviceId !== attestationArg.serviceId))) {
+        errors.push('retention attestation deployments must belong to the exact service');
+    }
+    return errors;
+};
 const boundaryIdentifierRegex = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
+const immutableSemverReleaseTagRegex = /^(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)(?:-(?:0|[1-9][0-9]*|[A-Za-z-][0-9A-Za-z-]*)(?:\.(?:0|[1-9][0-9]*|[A-Za-z-][0-9A-Za-z-]*))*)?$/;
 const indexMediaTypes = new Set([
     'application/vnd.oci.image.index.v1+json',
     'application/vnd.docker.distribution.manifest.list.v2+json',
@@ -26,6 +61,12 @@ const isRecord = (valueArg) => Boolean(valueArg) && typeof valueArg === 'object'
 const isBoundedIdentifier = (valueArg) => typeof valueArg === 'string' && boundaryIdentifierRegex.test(valueArg);
 const isCanonicalDigest = (valueArg) => Boolean(normalizeSha256Digest(valueArg)) && normalizeSha256Digest(valueArg) === valueArg;
 const isNonNegativeInteger = (valueArg) => Number.isSafeInteger(valueArg) && valueArg >= 0;
+export const normalizeServiceDeploymentAdoptionReleaseTag = (tagArg) => {
+    const normalizedTag = normalizeImmutableReleaseTag(tagArg);
+    return normalizedTag && immutableSemverReleaseTagRegex.test(normalizedTag)
+        ? normalizedTag
+        : undefined;
+};
 export const validateServiceDeploymentAdoptionPreflightInput = (inputArg) => {
     if (!isRecord(inputArg))
         return ['adoption preflight input must be an object'];
@@ -52,6 +93,175 @@ export const validateServiceDeploymentAdoptionInput = (inputArg) => {
     }
     return errors;
 };
+export const validateServiceDeploymentAdoptionImagePromotionInput = (inputArg) => {
+    const errors = validateServiceDeploymentAdoptionPreflightInput(inputArg);
+    if (!isRecord(inputArg))
+        return errors;
+    if (!normalizeServiceDeploymentAdoptionReleaseTag(inputArg.targetReleaseTag)) {
+        errors.push('targetReleaseTag must be a canonical OCI-safe semantic version tag');
+    }
+    if (!isBoundedIdentifier(inputArg.idempotencyKey)) {
+        errors.push('idempotencyKey must be a bounded canonical identifier');
+    }
+    if (inputArg.expectedSourceImageDigest !== undefined
+        && !isCanonicalDigest(inputArg.expectedSourceImageDigest)) {
+        errors.push('expectedSourceImageDigest must be a canonical sha256 digest when provided');
+    }
+    return errors;
+};
+export const validateServiceDeploymentAdoptionImagePromotionResult = (resultArg) => {
+    if (!isRecord(resultArg))
+        return ['adoption image promotion result must be an object'];
+    const errors = [];
+    if (resultArg.status !== 'promoted' && resultArg.status !== 'already-promoted') {
+        errors.push('status must identify a promoted or already-promoted result');
+    }
+    for (const key of ['organizationId', 'serviceId', 'releaseId']) {
+        if (!isBoundedIdentifier(resultArg[key])) {
+            errors.push(`${key} must be a bounded canonical identifier`);
+        }
+    }
+    if (typeof resultArg.sourceTag !== 'string'
+        || resultArg.sourceTag.trim() !== resultArg.sourceTag
+        || resultArg.sourceTag.length < 1
+        || resultArg.sourceTag.length > 128) {
+        errors.push('sourceTag must be a bounded canonical registry tag');
+    }
+    if (!normalizeServiceDeploymentAdoptionReleaseTag(resultArg.releaseTag)) {
+        errors.push('releaseTag must be a canonical OCI-safe semantic version tag');
+    }
+    if (typeof resultArg.registryHost !== 'string'
+        || resultArg.registryHost.trim() !== resultArg.registryHost
+        || !resultArg.registryHost) {
+        errors.push('registryHost must be a non-empty canonical string');
+    }
+    if (typeof resultArg.repository !== 'string'
+        || resultArg.repository.trim() !== resultArg.repository
+        || !resultArg.repository) {
+        errors.push('repository must be a non-empty canonical string');
+    }
+    if (!isCanonicalDigest(resultArg.digest)) {
+        errors.push('digest must be a canonical sha256 digest');
+    }
+    if (!indexMediaTypes.has(resultArg.mediaType)) {
+        errors.push('mediaType must identify an OCI image index');
+    }
+    if (!Array.isArray(resultArg.platforms)) {
+        errors.push('platforms must contain OCI platform evidence');
+    }
+    else {
+        for (const architecture of ['amd64', 'arm64']) {
+            if (!resultArg.platforms.some((platformArg) => isRecord(platformArg)
+                && platformArg.os === 'linux'
+                && platformArg.architecture === architecture
+                && platformArg.runnable === true
+                && platformArg.manifestPresent === true
+                && isCanonicalDigest(platformArg.digest))) {
+                errors.push(`platforms must contain runnable linux/${architecture} evidence`);
+            }
+        }
+    }
+    if (isCanonicalDigest(resultArg.digest)
+        && typeof resultArg.registryHost === 'string'
+        && typeof resultArg.repository === 'string'
+        && resultArg.digestPinnedImageReference
+            !== `${resultArg.registryHost}/${resultArg.repository}@${resultArg.digest}`) {
+        errors.push('digestPinnedImageReference must bind the exact registry digest');
+    }
+    return errors;
+};
+export const validateServiceDeploymentAdoptionRolloutInput = (inputArg) => {
+    const errors = validateServiceDeploymentAdoptionPreflightInput(inputArg);
+    if (!isRecord(inputArg))
+        return errors;
+    if (!normalizeServiceDeploymentAdoptionReleaseTag(inputArg.releaseTag)) {
+        errors.push('releaseTag must be a canonical OCI-safe semantic version tag');
+    }
+    if (!isCanonicalDigest(inputArg.expectedTargetImageDigest)) {
+        errors.push('expectedTargetImageDigest must be a canonical sha256 digest');
+    }
+    if (!isBoundedIdentifier(inputArg.idempotencyKey)) {
+        errors.push('idempotencyKey must be a bounded canonical identifier');
+    }
+    return errors;
+};
+export const validateServiceDeploymentAdoptionRolloutResult = (resultArg) => {
+    if (!isRecord(resultArg))
+        return ['adoption rollout result must be an object'];
+    const errors = [];
+    if (![
+        'rollout-started',
+        'rollout-in-progress',
+        'rollout-succeeded',
+        'rollout-failed',
+    ].includes(resultArg.status)) {
+        errors.push('status must identify a supported adoption rollout state');
+    }
+    if (typeof resultArg.idempotentReplay !== 'boolean') {
+        errors.push('idempotentReplay must be boolean');
+    }
+    for (const key of ['operationId', 'organizationId', 'serviceId', 'releaseId']) {
+        if (!isBoundedIdentifier(resultArg[key]))
+            errors.push(`${key} must be a bounded identifier`);
+    }
+    if (!normalizeServiceDeploymentAdoptionReleaseTag(resultArg.releaseTag)) {
+        errors.push('releaseTag must be a canonical OCI-safe semantic version tag');
+    }
+    if (!isCanonicalDigest(resultArg.digest)) {
+        errors.push('digest must be a canonical sha256 digest');
+    }
+    if (!isRecord(resultArg.plan)) {
+        errors.push('plan must be present');
+    }
+    else {
+        errors.push(...validateImmutableImageDeploymentPlan(resultArg.plan).map((errorArg) => `plan: ${errorArg}`));
+        if (resultArg.plan.operationId !== resultArg.operationId
+            || resultArg.plan.releaseId !== resultArg.releaseId
+            || resultArg.plan.releaseTag !== resultArg.releaseTag
+            || resultArg.plan.requestedDigest !== resultArg.digest
+            || resultArg.plan.registryHost !== resultArg.registryHost
+            || resultArg.plan.repository !== resultArg.repository
+            || resultArg.plan.mode !== 'promotion'
+            || resultArg.plan.rolloutGeneration !== 1) {
+            errors.push('plan must bind the exact generation-one adoption rollout result');
+        }
+    }
+    if (!isRecord(resultArg.rolloutStatus)) {
+        errors.push('rolloutStatus must be present');
+    }
+    else {
+        errors.push(...validateImageRolloutStatus(resultArg.rolloutStatus).map((errorArg) => `rolloutStatus: ${errorArg}`));
+        if (isRecord(resultArg.plan)
+            && (resultArg.rolloutStatus.rolloutId !== resultArg.plan.rolloutId
+                || resultArg.rolloutStatus.rolloutGeneration !== resultArg.plan.rolloutGeneration
+                || resultArg.rolloutStatus.expectedDigest !== resultArg.digest)) {
+            errors.push('rolloutStatus must bind the exact adoption rollout plan');
+        }
+    }
+    if (isRecord(resultArg.rolloutStatus)) {
+        const rolloutStatus = resultArg.rolloutStatus.status;
+        const successful = rolloutStatus === 'succeeded';
+        const failed = rolloutStatus === 'failed'
+            || rolloutStatus === 'mismatched'
+            || rolloutStatus === 'rolling-back'
+            || rolloutStatus === 'rolled-back';
+        if ((resultArg.status === 'rollout-succeeded') !== successful) {
+            errors.push('rollout-succeeded must exactly match a succeeded rolloutStatus');
+        }
+        if ((resultArg.status === 'rollout-failed') !== failed) {
+            errors.push('rollout-failed must exactly match a failed or mismatched rolloutStatus');
+        }
+        if ((resultArg.status === 'rollout-started' || resultArg.status === 'rollout-in-progress')
+            && (successful || failed)) {
+            errors.push('an active rollout result must not contain a terminal rolloutStatus');
+        }
+    }
+    if (typeof resultArg.registryHost !== 'string' || !resultArg.registryHost
+        || typeof resultArg.repository !== 'string' || !resultArg.repository) {
+        errors.push('registryHost and repository must be non-empty strings');
+    }
+    return errors;
+};
 export const validateServiceDeploymentAdoptionReport = (reportArg) => {
     if (!isRecord(reportArg))
         return ['adoption report must be an object'];
@@ -303,4 +513,4 @@ export const validateServiceDeploymentAdoptionReport = (reportArg) => {
     }
     return errors;
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploymentadoption.js","sourceRoot":"","sources":["../../ts/data/deploymentadoption.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploymentadoption.js","sourceRoot":"","sources":["../../ts/data/deploymentadoption.ts"],"names":[],"mappings":"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"}

package/dist_ts/requests/deployment.d.ts CHANGED Viewed

@@ -3,6 +3,7 @@ import type { IDeployment } from '../data/deployment.js';
 import type { IService } from '../data/service.js';
 import type { IIdentity } from '../data/user.js';
 import type { IImmutableRolloutReportEnvelope } from '../data/immutableimage.js';
+import type { IServiceDeploymentAdoptionRetentionAttestation, TServiceDeploymentAdoptionRetentionPhase } from '../data/deploymentadoption.js';
 export interface IDeploymentWorkspaceFileEntry {
     type: 'file' | 'directory';
     name: string;
@@ -199,6 +200,17 @@ export interface IReq_Cloudly_Coreflow_GetServiceDeployments extends plugins.typ
         deployments: IDeployment[];
     };
 }
+export interface IReq_Cloudly_Coreflow_AttestServiceDeploymentAdoption extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Cloudly_Coreflow_AttestServiceDeploymentAdoption> {
+    method: 'coreflowAttestServiceDeploymentAdoption';
+    request: {
+        phase: TServiceDeploymentAdoptionRetentionPhase;
+        service: IService;
+    };
+    response: {
+        found: boolean;
+        attestation?: IServiceDeploymentAdoptionRetentionAttestation;
+    };
+}
 export interface IReq_Cloudly_Coreflow_RestartDeployment extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IReq_Cloudly_Coreflow_RestartDeployment> {
     method: 'coreflowRestartDeployment';
     request: {

package/dist_ts/requests/service.d.ts CHANGED Viewed

@@ -7,7 +7,25 @@ import type { IImageRelease } from '../data/immutableimage.js';
 import type { IDeploymentPreflightReport, IDeploymentPreflightRequestData } from '../data/deploymentpreflight.js';
 import type { IDeploymentReservationInput, IServiceDeploymentOperation, IServiceDeploymentStatus } from '../data/deploymentoperation.js';
 import type { TSha256Digest } from '../data/immutableimage.js';
-import type { IServiceDeploymentAdoptionInput, IServiceDeploymentAdoptionPreflightInput, IServiceDeploymentAdoptionReport, IServiceDeploymentAdoptionResult } from '../data/deploymentadoption.js';
+import type { IServiceDeploymentAdoptionInput, IServiceDeploymentAdoptionImagePromotionInput, IServiceDeploymentAdoptionImagePromotionResult, IServiceDeploymentAdoptionRolloutInput, IServiceDeploymentAdoptionRolloutResult, IServiceDeploymentAdoptionPreflightInput, IServiceDeploymentAdoptionReport, IServiceDeploymentAdoptionResult } from '../data/deploymentadoption.js';
+export interface IRequest_Any_Cloudly_BootstrapServiceDeploymentAdoptionRollout extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_Any_Cloudly_BootstrapServiceDeploymentAdoptionRollout> {
+    method: 'bootstrapServiceDeploymentAdoptionRollout';
+    request: IServiceDeploymentAdoptionRolloutInput & {
+        identity: IIdentityCredential;
+    };
+    response: {
+        result: IServiceDeploymentAdoptionRolloutResult;
+    };
+}
+export interface IRequest_Any_Cloudly_PromoteServiceDeploymentAdoptionImage extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_Any_Cloudly_PromoteServiceDeploymentAdoptionImage> {
+    method: 'promoteServiceDeploymentAdoptionImage';
+    request: IServiceDeploymentAdoptionImagePromotionInput & {
+        identity: IIdentityCredential;
+    };
+    response: {
+        result: IServiceDeploymentAdoptionImagePromotionResult;
+    };
+}
 export interface IRequest_Any_Cloudly_GetServiceDeploymentAdoptionPreflight extends plugins.typedrequestInterfaces.implementsTR<plugins.typedrequestInterfaces.ITypedRequest, IRequest_Any_Cloudly_GetServiceDeploymentAdoptionPreflight> {
     method: 'getServiceDeploymentAdoptionPreflight';
     request: IServiceDeploymentAdoptionPreflightInput & {

package/package.json CHANGED Viewed

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

package/ts/00_commitinfo_data.ts CHANGED Viewed

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

package/ts/data/deploymentadoption.ts CHANGED Viewed

@@ -2,13 +2,21 @@ import type {
   IDeploymentPreflightRuntimeTask,
   IOciPlatformDescriptorSummary,
 } from './deploymentpreflight.js';
+import type { IDeployment } from './deployment.js';
 import type {
+  IImageRolloutStatus,
   IImmutableImageDeploymentPlan,
+  IImmutableRolloutReportEnvelope,
   IImmutableImageTargetScope,
   TOciManifestMediaType,
   TSha256Digest,
 } from './immutableimage.js';
-import { normalizeImmutableReleaseTag, normalizeSha256Digest } from './immutableimage.js';
+import {
+  normalizeImmutableReleaseTag,
+  normalizeSha256Digest,
+  validateImageRolloutStatus,
+  validateImmutableImageDeploymentPlan,
+} from './immutableimage.js';
 import type { IRegistryTarget } from './registry.js';
 export type TServiceDeploymentAdoptionDecision = 'GO' | 'NO-GO';
@@ -56,6 +64,56 @@ extends IServiceDeploymentAdoptionPreflightInput {
   expectedAdoptionDigest: TServiceDeploymentAdoptionDigest;
 }
+export interface IServiceDeploymentAdoptionImagePromotionInput
+extends IServiceDeploymentAdoptionPreflightInput {
+  targetReleaseTag: string;
+  expectedSourceImageDigest?: TSha256Digest;
+  idempotencyKey: string;
+}
+export interface IServiceDeploymentAdoptionImagePromotionResult {
+  status: 'promoted' | 'already-promoted';
+  organizationId: string;
+  serviceId: string;
+  sourceTag: string;
+  releaseTag: string;
+  registryHost: string;
+  repository: string;
+  digest: TSha256Digest;
+  mediaType:
+    | 'application/vnd.oci.image.index.v1+json'
+    | 'application/vnd.docker.distribution.manifest.list.v2+json';
+  platforms: IOciPlatformDescriptorSummary[];
+  releaseId: string;
+  digestPinnedImageReference: string;
+}
+export interface IServiceDeploymentAdoptionRolloutInput
+extends IServiceDeploymentAdoptionPreflightInput {
+  releaseTag: string;
+  expectedTargetImageDigest: TSha256Digest;
+  idempotencyKey: string;
+}
+export interface IServiceDeploymentAdoptionRolloutResult {
+  status:
+    | 'rollout-started'
+    | 'rollout-in-progress'
+    | 'rollout-succeeded'
+    | 'rollout-failed';
+  idempotentReplay: boolean;
+  operationId: string;
+  organizationId: string;
+  serviceId: string;
+  registryHost: string;
+  repository: string;
+  releaseTag: string;
+  digest: TSha256Digest;
+  releaseId: string;
+  plan: IImmutableImageDeploymentPlan;
+  rolloutStatus: IImageRolloutStatus;
+}
 interface IServiceDeploymentAdoptionReportBase {
   schemaVersion: 1;
   mutationPerformed: false;
@@ -137,7 +195,62 @@ export interface IServiceDeploymentAdoptionResult {
   plan: IImmutableImageDeploymentPlan;
 }
+export type TServiceDeploymentAdoptionRetentionPhase = 'prepare' | 'commit';
+/**
+ * A session-bound Coreflow assertion that its local live runtime can be
+ * retained for the exact adoption plan without mutating the Docker service.
+ */
+export interface IServiceDeploymentAdoptionRetentionAttestation {
+  schemaVersion: 1;
+  phase: TServiceDeploymentAdoptionRetentionPhase;
+  retainedWithoutMutation: true;
+  serviceId: string;
+  operationId: string;
+  adoptionConfigurationDigest: TSha256Digest;
+  immutableReport: IImmutableRolloutReportEnvelope;
+  deployments: IDeployment[];
+  attestedAt: number;
+}
+export const validateServiceDeploymentAdoptionRetentionAttestation = (
+  attestationArg: unknown,
+): string[] => {
+  if (!isRecord(attestationArg)) return ['retention attestation must be an object'];
+  const errors: string[] = [];
+  if (attestationArg.schemaVersion !== 1) errors.push('retention attestation schemaVersion must be 1');
+  if (attestationArg.phase !== 'prepare' && attestationArg.phase !== 'commit') {
+    errors.push('retention attestation phase is invalid');
+  }
+  if (attestationArg.retainedWithoutMutation !== true) {
+    errors.push('retention attestation must assert mutation-free retention');
+  }
+  if (!isBoundedIdentifier(attestationArg.serviceId)
+    || !isBoundedIdentifier(attestationArg.operationId)) {
+    errors.push('retention attestation service and operation IDs must be bounded identifiers');
+  }
+  if (!isCanonicalDigest(attestationArg.adoptionConfigurationDigest)) {
+    errors.push('retention attestation configuration digest must be canonical');
+  }
+  if (!Number.isSafeInteger(attestationArg.attestedAt) || (attestationArg.attestedAt as number) < 1) {
+    errors.push('retention attestation timestamp must be a positive integer');
+  }
+  if (!isRecord(attestationArg.immutableReport)) {
+    errors.push('retention attestation requires an immutable report envelope');
+  }
+  if (!Array.isArray(attestationArg.deployments) || attestationArg.deployments.length < 1) {
+    errors.push('retention attestation requires at least one deployment');
+  } else if (attestationArg.deployments.some((deploymentArg) => (
+    !isRecord(deploymentArg)
+    || deploymentArg.serviceId !== attestationArg.serviceId
+  ))) {
+    errors.push('retention attestation deployments must belong to the exact service');
+  }
+  return errors;
+};
 const boundaryIdentifierRegex = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
+const immutableSemverReleaseTagRegex = /^(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)(?:-(?:0|[1-9][0-9]*|[A-Za-z-][0-9A-Za-z-]*)(?:\.(?:0|[1-9][0-9]*|[A-Za-z-][0-9A-Za-z-]*))*)?$/;
 const indexMediaTypes = new Set<TOciManifestMediaType>([
   'application/vnd.oci.image.index.v1+json',
   'application/vnd.docker.distribution.manifest.list.v2+json',
@@ -173,6 +286,15 @@ const isCanonicalDigest = (valueArg: unknown): valueArg is TSha256Digest =>
 const isNonNegativeInteger = (valueArg: unknown): valueArg is number =>
   Number.isSafeInteger(valueArg) && (valueArg as number) >= 0;
+export const normalizeServiceDeploymentAdoptionReleaseTag = (
+  tagArg: unknown,
+): string | undefined => {
+  const normalizedTag = normalizeImmutableReleaseTag(tagArg);
+  return normalizedTag && immutableSemverReleaseTagRegex.test(normalizedTag)
+    ? normalizedTag
+    : undefined;
+};
 export const validateServiceDeploymentAdoptionPreflightInput = (
   inputArg: unknown,
 ): string[] => {
@@ -201,6 +323,183 @@ export const validateServiceDeploymentAdoptionInput = (inputArg: unknown): strin
   return errors;
 };
+export const validateServiceDeploymentAdoptionImagePromotionInput = (
+  inputArg: unknown,
+): string[] => {
+  const errors = validateServiceDeploymentAdoptionPreflightInput(inputArg);
+  if (!isRecord(inputArg)) return errors;
+  if (!normalizeServiceDeploymentAdoptionReleaseTag(inputArg.targetReleaseTag)) {
+    errors.push('targetReleaseTag must be a canonical OCI-safe semantic version tag');
+  }
+  if (!isBoundedIdentifier(inputArg.idempotencyKey)) {
+    errors.push('idempotencyKey must be a bounded canonical identifier');
+  }
+  if (inputArg.expectedSourceImageDigest !== undefined
+    && !isCanonicalDigest(inputArg.expectedSourceImageDigest)) {
+    errors.push('expectedSourceImageDigest must be a canonical sha256 digest when provided');
+  }
+  return errors;
+};
+export const validateServiceDeploymentAdoptionImagePromotionResult = (
+  resultArg: unknown,
+): string[] => {
+  if (!isRecord(resultArg)) return ['adoption image promotion result must be an object'];
+  const errors: string[] = [];
+  if (resultArg.status !== 'promoted' && resultArg.status !== 'already-promoted') {
+    errors.push('status must identify a promoted or already-promoted result');
+  }
+  for (const key of ['organizationId', 'serviceId', 'releaseId'] as const) {
+    if (!isBoundedIdentifier(resultArg[key])) {
+      errors.push(`${key} must be a bounded canonical identifier`);
+    }
+  }
+  if (typeof resultArg.sourceTag !== 'string'
+    || resultArg.sourceTag.trim() !== resultArg.sourceTag
+    || resultArg.sourceTag.length < 1
+    || resultArg.sourceTag.length > 128) {
+    errors.push('sourceTag must be a bounded canonical registry tag');
+  }
+  if (!normalizeServiceDeploymentAdoptionReleaseTag(resultArg.releaseTag)) {
+    errors.push('releaseTag must be a canonical OCI-safe semantic version tag');
+  }
+  if (typeof resultArg.registryHost !== 'string'
+    || resultArg.registryHost.trim() !== resultArg.registryHost
+    || !resultArg.registryHost) {
+    errors.push('registryHost must be a non-empty canonical string');
+  }
+  if (typeof resultArg.repository !== 'string'
+    || resultArg.repository.trim() !== resultArg.repository
+    || !resultArg.repository) {
+    errors.push('repository must be a non-empty canonical string');
+  }
+  if (!isCanonicalDigest(resultArg.digest)) {
+    errors.push('digest must be a canonical sha256 digest');
+  }
+  if (!indexMediaTypes.has(resultArg.mediaType as TOciManifestMediaType)) {
+    errors.push('mediaType must identify an OCI image index');
+  }
+  if (!Array.isArray(resultArg.platforms)) {
+    errors.push('platforms must contain OCI platform evidence');
+  } else {
+    for (const architecture of ['amd64', 'arm64']) {
+      if (!resultArg.platforms.some((platformArg) => isRecord(platformArg)
+        && platformArg.os === 'linux'
+        && platformArg.architecture === architecture
+        && platformArg.runnable === true
+        && platformArg.manifestPresent === true
+        && isCanonicalDigest(platformArg.digest))) {
+        errors.push(`platforms must contain runnable linux/${architecture} evidence`);
+      }
+    }
+  }
+  if (isCanonicalDigest(resultArg.digest)
+    && typeof resultArg.registryHost === 'string'
+    && typeof resultArg.repository === 'string'
+    && resultArg.digestPinnedImageReference
+      !== `${resultArg.registryHost}/${resultArg.repository}@${resultArg.digest}`) {
+    errors.push('digestPinnedImageReference must bind the exact registry digest');
+  }
+  return errors;
+};
+export const validateServiceDeploymentAdoptionRolloutInput = (
+  inputArg: unknown,
+): string[] => {
+  const errors = validateServiceDeploymentAdoptionPreflightInput(inputArg);
+  if (!isRecord(inputArg)) return errors;
+  if (!normalizeServiceDeploymentAdoptionReleaseTag(inputArg.releaseTag)) {
+    errors.push('releaseTag must be a canonical OCI-safe semantic version tag');
+  }
+  if (!isCanonicalDigest(inputArg.expectedTargetImageDigest)) {
+    errors.push('expectedTargetImageDigest must be a canonical sha256 digest');
+  }
+  if (!isBoundedIdentifier(inputArg.idempotencyKey)) {
+    errors.push('idempotencyKey must be a bounded canonical identifier');
+  }
+  return errors;
+};
+export const validateServiceDeploymentAdoptionRolloutResult = (
+  resultArg: unknown,
+): string[] => {
+  if (!isRecord(resultArg)) return ['adoption rollout result must be an object'];
+  const errors: string[] = [];
+  if (![
+    'rollout-started',
+    'rollout-in-progress',
+    'rollout-succeeded',
+    'rollout-failed',
+  ].includes(resultArg.status as string)) {
+    errors.push('status must identify a supported adoption rollout state');
+  }
+  if (typeof resultArg.idempotentReplay !== 'boolean') {
+    errors.push('idempotentReplay must be boolean');
+  }
+  for (const key of ['operationId', 'organizationId', 'serviceId', 'releaseId'] as const) {
+    if (!isBoundedIdentifier(resultArg[key])) errors.push(`${key} must be a bounded identifier`);
+  }
+  if (!normalizeServiceDeploymentAdoptionReleaseTag(resultArg.releaseTag)) {
+    errors.push('releaseTag must be a canonical OCI-safe semantic version tag');
+  }
+  if (!isCanonicalDigest(resultArg.digest)) {
+    errors.push('digest must be a canonical sha256 digest');
+  }
+  if (!isRecord(resultArg.plan)) {
+    errors.push('plan must be present');
+  } else {
+    errors.push(...validateImmutableImageDeploymentPlan(
+      resultArg.plan as unknown as IImmutableImageDeploymentPlan,
+    ).map((errorArg) => `plan: ${errorArg}`));
+    if (resultArg.plan.operationId !== resultArg.operationId
+      || resultArg.plan.releaseId !== resultArg.releaseId
+      || resultArg.plan.releaseTag !== resultArg.releaseTag
+      || resultArg.plan.requestedDigest !== resultArg.digest
+      || resultArg.plan.registryHost !== resultArg.registryHost
+      || resultArg.plan.repository !== resultArg.repository
+      || resultArg.plan.mode !== 'promotion'
+      || resultArg.plan.rolloutGeneration !== 1) {
+      errors.push('plan must bind the exact generation-one adoption rollout result');
+    }
+  }
+  if (!isRecord(resultArg.rolloutStatus)) {
+    errors.push('rolloutStatus must be present');
+  } else {
+    errors.push(...validateImageRolloutStatus(
+      resultArg.rolloutStatus as unknown as IImageRolloutStatus,
+    ).map((errorArg) => `rolloutStatus: ${errorArg}`));
+    if (isRecord(resultArg.plan)
+      && (resultArg.rolloutStatus.rolloutId !== resultArg.plan.rolloutId
+        || resultArg.rolloutStatus.rolloutGeneration !== resultArg.plan.rolloutGeneration
+        || resultArg.rolloutStatus.expectedDigest !== resultArg.digest)) {
+      errors.push('rolloutStatus must bind the exact adoption rollout plan');
+    }
+  }
+  if (isRecord(resultArg.rolloutStatus)) {
+    const rolloutStatus = resultArg.rolloutStatus.status;
+    const successful = rolloutStatus === 'succeeded';
+    const failed = rolloutStatus === 'failed'
+      || rolloutStatus === 'mismatched'
+      || rolloutStatus === 'rolling-back'
+      || rolloutStatus === 'rolled-back';
+    if ((resultArg.status === 'rollout-succeeded') !== successful) {
+      errors.push('rollout-succeeded must exactly match a succeeded rolloutStatus');
+    }
+    if ((resultArg.status === 'rollout-failed') !== failed) {
+      errors.push('rollout-failed must exactly match a failed or mismatched rolloutStatus');
+    }
+    if ((resultArg.status === 'rollout-started' || resultArg.status === 'rollout-in-progress')
+      && (successful || failed)) {
+      errors.push('an active rollout result must not contain a terminal rolloutStatus');
+    }
+  }
+  if (typeof resultArg.registryHost !== 'string' || !resultArg.registryHost
+    || typeof resultArg.repository !== 'string' || !resultArg.repository) {
+    errors.push('registryHost and repository must be non-empty strings');
+  }
+  return errors;
+};
 export const validateServiceDeploymentAdoptionReport = (reportArg: unknown): string[] => {
   if (!isRecord(reportArg)) return ['adoption report must be an object'];
   const errors: string[] = [];

package/ts/requests/deployment.ts CHANGED Viewed

@@ -3,6 +3,10 @@ import type { IDeployment } from '../data/deployment.js';
 import type { IService } from '../data/service.js';
 import type { IIdentity } from '../data/user.js';
 import type { IImmutableRolloutReportEnvelope } from '../data/immutableimage.js';
+import type {
+  IServiceDeploymentAdoptionRetentionAttestation,
+  TServiceDeploymentAdoptionRetentionPhase,
+} from '../data/deploymentadoption.js';
 export interface IDeploymentWorkspaceFileEntry {
   type: 'file' | 'directory';
@@ -291,6 +295,22 @@ extends plugins.typedrequestInterfaces.implementsTR<
   };
 }
+export interface IReq_Cloudly_Coreflow_AttestServiceDeploymentAdoption
+extends plugins.typedrequestInterfaces.implementsTR<
+  plugins.typedrequestInterfaces.ITypedRequest,
+  IReq_Cloudly_Coreflow_AttestServiceDeploymentAdoption
+> {
+  method: 'coreflowAttestServiceDeploymentAdoption';
+  request: {
+    phase: TServiceDeploymentAdoptionRetentionPhase;
+    service: IService;
+  };
+  response: {
+    found: boolean;
+    attestation?: IServiceDeploymentAdoptionRetentionAttestation;
+  };
+}
 export interface IReq_Cloudly_Coreflow_RestartDeployment
 extends plugins.typedrequestInterfaces.implementsTR<
   plugins.typedrequestInterfaces.ITypedRequest,

package/ts/requests/service.ts CHANGED Viewed

@@ -17,11 +17,43 @@ import type {
 import type { TSha256Digest } from '../data/immutableimage.js';
 import type {
   IServiceDeploymentAdoptionInput,
+  IServiceDeploymentAdoptionImagePromotionInput,
+  IServiceDeploymentAdoptionImagePromotionResult,
+  IServiceDeploymentAdoptionRolloutInput,
+  IServiceDeploymentAdoptionRolloutResult,
   IServiceDeploymentAdoptionPreflightInput,
   IServiceDeploymentAdoptionReport,
   IServiceDeploymentAdoptionResult,
 } from '../data/deploymentadoption.js';
+export interface IRequest_Any_Cloudly_BootstrapServiceDeploymentAdoptionRollout
+extends plugins.typedrequestInterfaces.implementsTR<
+  plugins.typedrequestInterfaces.ITypedRequest,
+  IRequest_Any_Cloudly_BootstrapServiceDeploymentAdoptionRollout
+> {
+  method: 'bootstrapServiceDeploymentAdoptionRollout';
+  request: IServiceDeploymentAdoptionRolloutInput & {
+    identity: IIdentityCredential;
+  };
+  response: {
+    result: IServiceDeploymentAdoptionRolloutResult;
+  };
+}
+export interface IRequest_Any_Cloudly_PromoteServiceDeploymentAdoptionImage
+extends plugins.typedrequestInterfaces.implementsTR<
+  plugins.typedrequestInterfaces.ITypedRequest,
+  IRequest_Any_Cloudly_PromoteServiceDeploymentAdoptionImage
+> {
+  method: 'promoteServiceDeploymentAdoptionImage';
+  request: IServiceDeploymentAdoptionImagePromotionInput & {
+    identity: IIdentityCredential;
+  };
+  response: {
+    result: IServiceDeploymentAdoptionImagePromotionResult;
+  };
+}
 export interface IRequest_Any_Cloudly_GetServiceDeploymentAdoptionPreflight
 extends plugins.typedrequestInterfaces.implementsTR<
   plugins.typedrequestInterfaces.ITypedRequest,