@aifabrix/builder 2.56.0 → 2.58.0

package/lib/schema/installation-environment.schema.json

@@ -0,0 +1,601 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://raw.githubusercontent.com/esystemsdev/aifabrix-builder/refs/heads/main/lib/schema/installation-environment.schema.json",
+  "title": "AI Fabrix Installation Environment File",
+  "description": "Committed, non-secret infrastructure/<resource-group>/environment-dev|tst|pro.json. Inherited shared values name environment-infra.json as their source; request is the exact non-secret Miso deploy projection.",
+  "metadata": {
+    "key": "installation-environment-schema",
+    "name": "Installation Environment File Schema",
+    "description": "JSON schema for installation workspace environment-dev.json, environment-tst.json and environment-pro.json",
+    "version": "2.0.0",
+    "type": "schema",
+    "category": "infrastructure",
+    "author": "AI Fabrix Team",
+    "createdAt": "2026-09-16T00:00:00Z",
+    "updatedAt": "2026-09-16T00:00:00Z",
+    "compatibility": {
+      "minVersion": "2.0.0",
+      "maxVersion": "2.0.0",
+      "deprecated": false
+    },
+    "tags": [
+      "schema",
+      "environment",
+      "installation"
+    ],
+    "dependencies": [
+      "environment-deploy-request.schema.json"
+    ],
+    "changelog": [
+      {
+        "version": "2.0.0",
+        "date": "2026-09-16T00:00:00Z",
+        "breaking": false,
+        "changes": [
+          "Initial installation environment file schema"
+        ]
+      }
+    ]
+  },
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "schemaVersion",
+    "environment",
+    "name",
+    "preset",
+    "controllerUrl",
+    "serviceName",
+    "location",
+    "subscriptionId",
+    "resourceGroupName",
+    "networking",
+    "allowedIPs",
+    "infrastructureAccess",
+    "applications",
+    "variables",
+    "request",
+    "deployment"
+  ],
+  "properties": {
+    "schemaVersion": {
+      "const": "2.0.0"
+    },
+    "environment": {
+      "type": "object",
+      "required": [
+        "value",
+        "source",
+        "description"
+      ],
+      "additionalProperties": false,
+      "properties": {
+        "value": {
+          "enum": [
+            "dev",
+            "tst",
+            "pro"
+          ]
+        },
+        "source": {
+          "type": "string",
+          "minLength": 1
+        },
+        "description": {
+          "type": "string",
+          "minLength": 1
+        }
+      }
+    },
+    "name": {
+      "type": "object",
+      "required": [
+        "value",
+        "source",
+        "description"
+      ],
+      "additionalProperties": false,
+      "properties": {
+        "value": {
+          "type": "string",
+          "minLength": 1
+        },
+        "source": {
+          "type": "string",
+          "minLength": 1
+        },
+        "description": {
+          "type": "string",
+          "minLength": 1
+        }
+      }
+    },
+    "preset": {
+      "type": "object",
+      "required": [
+        "value",
+        "source",
+        "description"
+      ],
+      "additionalProperties": false,
+      "properties": {
+        "value": {
+          "enum": [
+            "s",
+            "m",
+            "l",
+            "xl"
+          ]
+        },
+        "source": {
+          "type": "string",
+          "minLength": 1
+        },
+        "description": {
+          "type": "string",
+          "minLength": 1
+        }
+      }
+    },
+    "controllerUrl": {
+      "type": "object",
+      "required": [
+        "value",
+        "source",
+        "description"
+      ],
+      "additionalProperties": false,
+      "properties": {
+        "value": {
+          "type": [
+            "string",
+            "null"
+          ],
+          "pattern": "^https://"
+        },
+        "source": {
+          "type": "string",
+          "minLength": 1
+        },
+        "description": {
+          "type": "string",
+          "minLength": 1
+        },
+        "valueFromEnv": {
+          "const": "CONTROLLER_URL"
+        }
+      }
+    },
+    "serviceName": {
+      "type": "object",
+      "required": [
+        "source",
+        "description"
+      ],
+      "additionalProperties": false,
+      "anyOf": [
+        {
+          "required": [
+            "value"
+          ]
+        },
+        {
+          "required": [
+            "inheritFrom"
+          ]
+        }
+      ],
+      "properties": {
+        "value": {
+          "type": "string",
+          "pattern": "^[a-z0-9-]{2,40}$"
+        },
+        "inheritFrom": {
+          "type": "string",
+          "pattern": "^[A-Za-z]+(\\.[A-Za-z]+)*$"
+        },
+        "source": {
+          "type": "string",
+          "minLength": 1
+        },
+        "description": {
+          "type": "string",
+          "minLength": 1
+        }
+      }
+    },
+    "location": {
+      "type": "object",
+      "required": [
+        "source",
+        "description"
+      ],
+      "additionalProperties": false,
+      "anyOf": [
+        {
+          "required": [
+            "value"
+          ]
+        },
+        {
+          "required": [
+            "inheritFrom"
+          ]
+        }
+      ],
+      "properties": {
+        "value": {
+          "type": "string",
+          "pattern": "^[a-z0-9]+$"
+        },
+        "inheritFrom": {
+          "type": "string",
+          "pattern": "^[A-Za-z]+(\\.[A-Za-z]+)*$"
+        },
+        "source": {
+          "type": "string",
+          "minLength": 1
+        },
+        "description": {
+          "type": "string",
+          "minLength": 1
+        }
+      }
+    },
+    "subscriptionId": {
+      "type": "object",
+      "required": [
+        "source",
+        "description"
+      ],
+      "additionalProperties": false,
+      "anyOf": [
+        {
+          "required": [
+            "value"
+          ]
+        },
+        {
+          "required": [
+            "inheritFrom"
+          ]
+        }
+      ],
+      "properties": {
+        "value": {
+          "type": "string",
+          "pattern": "^[0-9a-fA-F-]{36}$"
+        },
+        "inheritFrom": {
+          "type": "string",
+          "pattern": "^[A-Za-z]+(\\.[A-Za-z]+)*$"
+        },
+        "source": {
+          "type": "string",
+          "minLength": 1
+        },
+        "description": {
+          "type": "string",
+          "minLength": 1
+        }
+      }
+    },
+    "resourceGroupName": {
+      "type": "object",
+      "required": [
+        "value",
+        "source",
+        "description"
+      ],
+      "additionalProperties": false,
+      "properties": {
+        "value": {
+          "type": [
+            "string",
+            "null"
+          ],
+          "pattern": "^[a-zA-Z0-9._()-]{1,90}$"
+        },
+        "source": {
+          "type": "string",
+          "minLength": 1
+        },
+        "description": {
+          "type": "string",
+          "minLength": 1
+        }
+      }
+    },
+    "networking": {
+      "type": "object",
+      "required": [
+        "value",
+        "source",
+        "description"
+      ],
+      "additionalProperties": false,
+      "properties": {
+        "value": {
+          "type": "object"
+        },
+        "source": {
+          "type": "string",
+          "minLength": 1
+        },
+        "description": {
+          "type": "string",
+          "minLength": 1
+        }
+      }
+    },
+    "allowedIPs": {
+      "type": "object",
+      "required": [
+        "value",
+        "source",
+        "description"
+      ],
+      "additionalProperties": false,
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "source": {
+          "type": "string",
+          "minLength": 1
+        },
+        "description": {
+          "type": "string",
+          "minLength": 1
+        }
+      }
+    },
+    "infrastructureAccess": {
+      "type": "object",
+      "required": [
+        "value",
+        "source",
+        "description"
+      ],
+      "additionalProperties": false,
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "type": "object"
+          }
+        },
+        "source": {
+          "type": "string",
+          "minLength": 1
+        },
+        "description": {
+          "type": "string",
+          "minLength": 1
+        }
+      }
+    },
+    "applications": {
+      "type": "object",
+      "required": [
+        "value",
+        "source",
+        "description"
+      ],
+      "additionalProperties": false,
+      "properties": {
+        "value": {
+          "type": "array",
+          "uniqueItems": true,
+          "items": {
+            "type": "string",
+            "pattern": "^[a-z0-9-]+$"
+          }
+        },
+        "source": {
+          "type": "string",
+          "minLength": 1
+        },
+        "description": {
+          "type": "string",
+          "minLength": 1
+        }
+      }
+    },
+    "variables": {
+      "type": "object",
+      "additionalProperties": false,
+      "patternProperties": {
+        "^[A-Z_][A-Z0-9_]*$": {
+          "type": "object",
+          "required": [
+            "valueFromEnv",
+            "requiredBy",
+            "source",
+            "description"
+          ],
+          "additionalProperties": false,
+          "properties": {
+            "valueFromEnv": {
+              "type": "string",
+              "pattern": "^[A-Z_][A-Z0-9_]*$"
+            },
+            "requiredBy": {
+              "type": "array",
+              "uniqueItems": true,
+              "items": {
+                "type": "string"
+              }
+            },
+            "source": {
+              "type": "string",
+              "minLength": 1
+            },
+            "description": {
+              "type": "string",
+              "minLength": 1
+            },
+            "resolution": {
+              "enum": [
+                "resolved",
+                "missing"
+              ]
+            }
+          }
+        }
+      }
+    },
+    "request": {
+      "type": "object",
+      "required": [
+        "value",
+        "source",
+        "description"
+      ],
+      "additionalProperties": false,
+      "properties": {
+        "value": {
+          "anyOf": [
+            {
+              "type": "null"
+            },
+            {
+              "type": "object",
+              "required": [
+                "environmentConfig"
+              ],
+              "additionalProperties": false,
+              "properties": {
+                "environmentConfig": {
+                  "type": "object",
+                  "additionalProperties": false,
+                  "required": [
+                    "key",
+                    "environment",
+                    "preset",
+                    "serviceName",
+                    "location",
+                    "resourceGroupName",
+                    "subscriptionId"
+                  ],
+                  "properties": {
+                    "key": {
+                      "type": "string"
+                    },
+                    "environment": {
+                      "type": "string"
+                    },
+                    "preset": {
+                      "type": "string"
+                    },
+                    "serviceName": {
+                      "type": "string"
+                    },
+                    "location": {
+                      "type": "string"
+                    },
+                    "resourceGroupName": {
+                      "type": "string"
+                    },
+                    "subscriptionId": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "source": {
+          "type": "string",
+          "minLength": 1
+        },
+        "description": {
+          "type": "string",
+          "minLength": 1
+        }
+      }
+    },
+    "deployment": {
+      "type": "object",
+      "required": [
+        "status",
+        "id"
+      ],
+      "additionalProperties": false,
+      "properties": {
+        "status": {
+          "type": "object",
+          "required": [
+            "value",
+            "source",
+            "description"
+          ],
+          "additionalProperties": false,
+          "properties": {
+            "value": {
+              "enum": [
+                "not-deployed",
+                "running",
+                "completed",
+                "failed",
+                "error",
+                "cancelled",
+                "timeout"
+              ]
+            },
+            "source": {
+              "type": "string",
+              "minLength": 1
+            },
+            "description": {
+              "type": "string",
+              "minLength": 1
+            }
+          }
+        },
+        "id": {
+          "type": "object",
+          "required": [
+            "value",
+            "source",
+            "description"
+          ],
+          "additionalProperties": false,
+          "properties": {
+            "value": {
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "source": {
+              "type": "string",
+              "minLength": 1
+            },
+            "description": {
+              "type": "string",
+              "minLength": 1
+            }
+          }
+        },
+        "updatedAt": {
+          "type": [
+            "string",
+            "null"
+          ],
+          "format": "date-time"
+        },
+        "error": {
+          "type": [
+            "string",
+            "null"
+          ]
+        }
+      }
+    }
+  }
+}

package/lib/utils/app-register-config.js

@@ -80,10 +80,8 @@ async function createMinimalAppIfNeeded(appKey, options) {
  * @returns {string} Image reference string
  */
 function buildImageReference(variables, appKey) {
-  const imageName = variables.image?.name || variables.app?.key || appKey;
-  const registry = variables.image?.registry;
-  const tag = variables.image?.tag || 'latest';
-  return registry ? `${registry}/${imageName}:${tag}` : `${imageName}:${tag}`;
+  const { buildManifestImageReference } = require('./resolve-docker-image-ref');
+  return buildManifestImageReference(variables, appKey);
 }
 
 /**

package/lib/utils/build-resolve-image.js

@@ -14,7 +14,8 @@ const { execWithDockerEnv } = require('./docker-exec');
 const { buildDevImageName, buildDevImageRepositoryPath } = require('./image-name');
 const {
   getRepositoryPathFromConfig,
-  resolveDockerImageRef
+  resolveDockerImageRef,
+  stripRegistryHostFromRepository
 } = require('./resolve-docker-image-ref');
 
 /**
@@ -48,26 +49,6 @@ function repositoryTail(repoPath) {
   return parts[parts.length - 1] || repoPath;
 }
 
-/**
- * Remove registry host prefix from a Docker repository path (local build only).
- * @param {string} repository
- * @returns {string}
- */
-function stripRegistryHostFromRepository(repository) {
-  if (!repository || typeof repository !== 'string') {
-    return repository;
-  }
-  const parts = repository.split('/');
-  if (parts.length <= 1) {
-    return repository;
-  }
-  const host = parts[0];
-  if (host.includes('.') || host.includes(':') || host === 'localhost') {
-    return parts.slice(1).join('/');
-  }
-  return repository;
-}
-
 /**
  * Strip dev-scoped or -extra suffix from a Docker repository path.
  * @param {string} repo

package/lib/utils/cli-utils.js

@@ -198,6 +198,9 @@ function isAzureCliToolingError(errorMsg) {
   return false;
 }
 
+/** Registry-credential and per-tag push errors that already name the host and the next step. */
+const REGISTRY_ACTIONABLE_ERROR = /dev set-registry|Push failed for |No registry credentials are available/;
+
 /**
  * Format Azure-related errors
  * @param {string} errorMsg - Error message
@@ -221,6 +224,10 @@ function formatAzureError(errorMsg) {
   if (errorMsg.includes('Docker build failed') || errorMsg.includes('Build failed: Docker')) {
     return null;
   }
+  // Registry-credential and per-tag push errors already carry host-specific next steps.
+  if (REGISTRY_ACTIONABLE_ERROR.test(errorMsg)) {
+    return null;
+  }
   const lowerMsg = String(errorMsg || '').toLowerCase();
   const hasAcrDomain = /\b[a-z0-9.-]+\.azurecr\.io\b/i.test(errorMsg);
   const hasAcrKeyword = /\bacr\b/.test(lowerMsg);
@@ -238,7 +245,7 @@ function formatAzureError(errorMsg) {
   if (errorMsg.includes('Registry URL is required')) {
     return [
       '   Registry URL is required.',
-      '   Provide via --registry flag or configure in application.yaml under image.registry'
+      '   Provide via --registry, set a default with aifabrix dev set-registry <host>, or configure image.registry in application.yaml'
     ];
   }
   return null;