@contrail/cli 3.6.0-alpha-3 → 3.6.0-alpha-4

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/3.6.0-alpha-3 darwin-arm64 node-v22.19.0
+@contrail/cli/3.6.0-alpha-4 darwin-arm64 node-v22.19.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND
@@ -54,7 +54,7 @@ To get instructions on how to set up autocomplete for your shell, run `contrail
 * [`contrail entities create PATH`](#contrail-entities-create-path)
 * [`contrail entities delete ENTITYNAME`](#contrail-entities-delete-entityname)
 * [`contrail entities get TYPEPATH`](#contrail-entities-get-typepath)
-* [`contrail entities update ENTITYNAME ID`](#contrail-entities-update-entityname-id)
+* [`contrail entities update ENTITYNAME [ID]`](#contrail-entities-update-entityname-id)
 * [`contrail file upload FILELOCATION CONTENTTYPE`](#contrail-file-upload-filelocation-contenttype)
 * [`contrail groups export`](#contrail-groups-export)
 * [`contrail groups import GROUPSFILE`](#contrail-groups-import-groupsfile)
@@ -495,7 +495,7 @@ Set a variable in the configuration
 ```
 USAGE
   $ contrail config set [-l error|warn|info|debug] [-e true|false] [--orgSlug <value>] [--environment
-    dev|development|prod|production] [--apiUserToken <value>] [--config <value>]
+    dev|development|prod|production|local] [--apiUserToken <value>] [--config <value>]
 
 FLAGS
   -e, --alwaysConfirmEnv=<option>  [default: true] The Environment variables
@@ -505,7 +505,7 @@ FLAGS
   --apiUserToken=<value>           The API User Token
   --config=<value>                 The config name
   --environment=<option>           The Environment
-                                   <options: dev|development|prod|production>
+                                   <options: dev|development|prod|production|local>
   --orgSlug=<value>                The org slug
 
 DESCRIPTION
@@ -625,14 +625,15 @@ EXAMPLES
 
 ```
 USAGE
-  $ contrail entities get TYPEPATH [-l error|warn|info|debug] [-e true|false] [-o <value>] [-s] [-r <value>] [-p
-    <value>] [-P] [-t <value>]
+  $ contrail entities get TYPEPATH [-l error|warn|info|debug] [-e true|false] [-o <value>] [-p <value>] [-P] [-s
+    <value>] [-S] [-t <value>] [-r <value>]
 
 ARGUMENTS
   TYPEPATH  The name of the entity type to fetch
 
 FLAGS
   -P, --paginated                  If true, fetches all entities in a paginated manner
+  -S, --skipHydrateRelationships   Skip hydrating relationships when fetching the entity
   -e, --alwaysConfirmEnv=<option>  [default: true] The Environment variables
                                    <options: true|false>
   -l, --logLevel=<option>          The Log Level
@@ -640,7 +641,7 @@ FLAGS
   -o, --outputFile=<value>         File to save the output (optional)
   -p, --propertySlugs=<value>      Comma-separated list of property slugs to include in the output
   -r, --relations=<value>          Comma-separated list of relations to include in the output
-  -s, --skipHydrateRelationships   Skip hydrating relationships when fetching the entity
+  -s, --skip=<value>               Number of entities to skip (used with paginated fetch)
   -t, --take=<value>               Number of entities to fetch in a single request (default is 100)
 
 DESCRIPTION
@@ -656,19 +657,20 @@ EXAMPLES
   $ contrail entities get events -- timestamp=..2025-09-16T23:59:59Z
 ```
 
-## `contrail entities update ENTITYNAME ID`
+## `contrail entities update ENTITYNAME [ID]`
 
 (BETA) Update an entity
 
 ```
 USAGE
-  $ contrail entities update ENTITYNAME ID [-l error|warn|info|debug] [-e true|false] [-s] [-d] [-i <value>]
+  $ contrail entities update ENTITYNAME [ID] [-l error|warn|info|debug] [-e true|false] [-s] [-d] [-i <value>] [-F]
 
 ARGUMENTS
   ENTITYNAME  The name of the entity type to update
   ID          The unique identifier of the entity
 
 FLAGS
+  -F, --force                      Force update without validation. Internal use only
   -d, --dryRun                     If true, does not create the entity but simulates the creation
   -e, --alwaysConfirmEnv=<option>  [default: true] The Environment variables
                                    <options: true|false>

package/dist/auth/login.js

@@ -55,7 +55,9 @@ async function authUser() {
             logger_1.default.info(`Failed to refresh token: ${e}. Requesting auth credentials...`);
         }
     }
-    return await authenticateWithUsernamePassword(config);
+    const authContext = await authenticateWithUsernamePassword(config);
+    await (0, config_1.storeConfig)(authContext);
+    return authContext;
 }
 exports.authUser = authUser;
 async function getOrgSlug(config) {
@@ -77,7 +79,7 @@ async function authenticateWithApiKey(config, apiKey, orgSlug) {
     const apiGateway = config?.apiGateway ?? CONFIGURATION.apiGateway;
     sdk_1.Auth.config = {
         apiUserToken: apiKey,
-        apiRefreshToken: null,
+        apiRefreshToken: undefined,
         apiGateway,
         orgSlug,
     };
@@ -145,20 +147,25 @@ async function authenticateWithUsernamePassword(config) {
 async function setAuthContext(user, params) {
     const apiGateway = params?.apiGateway ?? CONFIGURATION.apiGateway;
     const { vibeAccessToken, vibeRefreshToken } = await getVibeAccessTokenFromCognitoAccessToken(user.idToken.jwtToken, apiGateway);
-    // Set Auth Config
     sdk_1.Auth.config = {
         apiUserToken: vibeAccessToken,
         apiRefreshToken: vibeRefreshToken,
         apiGateway,
         orgSlug: params.orgSlug,
     };
-    // SET SDK CONFIG
     (0, sdk_1.setConfig)(sdk_1.Auth.config);
     return refreshCurrentUserOrg();
 }
 async function refreshCurrentUserOrg() {
     logger_1.default.debug('refreshing current user org...');
-    const currentUser = await (0, sdk_1.getCurrentUser)();
+    const currentUser = await (0, sdk_1.getCurrentUser)().catch((e) => {
+        console.error('error getting current user', e.message);
+        if (isExpiredTokenError(e)) {
+            console.log('try frefreshing');
+            return;
+        }
+        throw e;
+    });
     if (!currentUser) {
         const config = await (0, config_1.getConfig)();
         try {
@@ -181,6 +188,9 @@ async function refreshCurrentUserOrg() {
     // await checkTelemetry(current_Version);
     return Object.assign({}, sdk_1.Auth.config);
 }
+function isExpiredTokenError(e) {
+    return e?.message?.includes('token is expired');
+}
 async function getVibeAccessTokenFromCognitoAccessToken(cognitoAccessToken, apiGateway) {
     const url = `${apiGateway}/auth/cognito/`;
     const response = await fetch(url, {

package/dist/commands/config/set.js

@@ -15,7 +15,7 @@ class SetConfig extends basecommand_1.BaseCommand {
         environment: core_1.Flags.string({
             description: 'The Environment',
             required: false,
-            options: ['dev', 'development', 'prod', 'production'],
+            options: ['dev', 'development', 'prod', 'production', 'local'],
         }),
         apiUserToken: core_1.Flags.string({
             description: 'The API User Token',

package/dist/commands/entities/get.d.ts

@@ -4,11 +4,12 @@ export default class GetEntity extends BaseCommand {
     static examples: string[];
     static flags: {
         outputFile: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        skipHydrateRelationships: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        relations: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         propertySlugs: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         paginated: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        skip: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        skipHydrateRelationships: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         take: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        relations: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };

package/dist/commands/entities/get.js

@@ -26,17 +26,6 @@ class GetEntity extends basecommand_1.BaseCommand {
             description: 'File to save the output (optional)',
             required: false,
         }),
-        skipHydrateRelationships: core_1.Flags.boolean({
-            char: 's',
-            description: 'Skip hydrating relationships when fetching the entity',
-            required: false,
-            default: false,
-        }),
-        relations: core_1.Flags.string({
-            char: 'r',
-            description: 'Comma-separated list of relations to include in the output',
-            required: false,
-        }),
         propertySlugs: core_1.Flags.string({
             char: 'p',
             description: 'Comma-separated list of property slugs to include in the output',
@@ -48,12 +37,28 @@ class GetEntity extends basecommand_1.BaseCommand {
             required: false,
             default: false,
         }),
+        skip: core_1.Flags.integer({
+            char: 's',
+            description: 'Number of entities to skip (used with paginated fetch)',
+            required: false,
+        }),
+        skipHydrateRelationships: core_1.Flags.boolean({
+            char: 'S',
+            description: 'Skip hydrating relationships when fetching the entity',
+            required: false,
+            default: false,
+        }),
         take: core_1.Flags.integer({
             char: 't',
             description: 'Number of entities to fetch in a single request (default is 100)',
             required: false,
             default: MAX_NUMBER_OF_ENTITIES_TO_FETCH,
         }),
+        relations: core_1.Flags.string({
+            char: 'r',
+            description: 'Comma-separated list of relations to include in the output',
+            required: false,
+        }),
     };
     static args = {
         typePath: core_1.Args.string({
@@ -67,9 +72,9 @@ class GetEntity extends basecommand_1.BaseCommand {
         await (0, login_1.authUser)();
         const { args, flags, argv } = await this.parse(GetEntity);
         const { typePath } = args;
-        const { outputFile, propertySlugs, relations: relationString, skipHydrateRelationships, paginated: shouldUsePaginatedFind, take: numToTake, } = flags;
+        const { outputFile, paginated: shouldUsePaginatedFind, propertySlugs, relations: relationString, skip, skipHydrateRelationships, take, } = flags;
         SHOULD_USE_PAGINATED_FIND = shouldUsePaginatedFind;
-        MAX_NUMBER_OF_ENTITIES_TO_FETCH = numToTake;
+        MAX_NUMBER_OF_ENTITIES_TO_FETCH = take;
         if (MAX_NUMBER_OF_ENTITIES_TO_FETCH)
             console.log(`Will limit output to ${MAX_NUMBER_OF_ENTITIES_TO_FETCH} entities.`);
         const propertySpecificationArgs = argv
@@ -93,10 +98,11 @@ class GetEntity extends basecommand_1.BaseCommand {
             // thinks it is hard to read. Consider breaking it into smaller functions.
             if (SHOULD_USE_PAGINATED_FIND) {
                 const stream = streamPaginatedFind(typePath, {
+                    criteria: convertPropertySpecIntoCriteria(propertySpecBySlug),
                     skipHydrateRelationships,
+                    skip,
                     relations,
                     propertySlugs: propertySlugsArray,
-                    criteria: convertPropertySpecIntoCriteria(propertySpecBySlug),
                 });
                 const writer = outputFile ? fs_1.default.createWriteStream(outputFile) : process.stdout;
                 writer.write('[\n');
@@ -116,6 +122,8 @@ class GetEntity extends basecommand_1.BaseCommand {
                     skipHydrateRelationships,
                     relations,
                     propertySlugs: propertySlugsArray,
+                    skip,
+                    take,
                 });
                 if (outputFile) {
                     fs_1.default.writeFileSync(outputFile, JSON.stringify(response, null, 2));
@@ -133,17 +141,14 @@ class GetEntity extends basecommand_1.BaseCommand {
 }
 exports.default = GetEntity;
 async function getEntityByTypePath(typePath, propertySpec, options = {}) {
-    const { propertySlugs, relations, skipHydrateRelationships } = options;
+    const { propertySlugs, relations, skipHydrateRelationships, skip, take } = options;
     const id = propertySpec?.get('id')?.toString() || undefined;
+    const criteria = convertPropertySpecIntoCriteria(propertySpec || new Map());
     const { root: entityName } = (0, types_1.parseTypePath)(typePath);
-    let criteria = {};
     if (entityName === 'custom-entity' && !id) {
         criteria.typePath = typePath;
     }
-    else {
-        criteria = convertPropertySpecIntoCriteria(propertySpec || new Map());
-    }
-    return find(entityName, { id, skipHydrateRelationships, relations, propertySlugs, criteria });
+    return find(entityName, { id, skipHydrateRelationships, relations, propertySlugs, criteria, skip, take });
 }
 function convertPropertySpecIntoCriteria(propertySpec) {
     const criteria = {};
@@ -154,11 +159,13 @@ function convertPropertySpecIntoCriteria(propertySpec) {
 }
 async function find(entityName, options = {}) {
     const client = new sdk_1.Entities();
-    const { criteria, id, propertySlugs, skipHydrateRelationships, relations } = options;
+    const { criteria, id, propertySlugs, skipHydrateRelationships, relations, skip, take } = options;
     const queryOptions = {
         entityName,
         skipHydrateRelationships,
         relations,
+        skip,
+        take
     };
     if (propertySlugs && propertySlugs.length > 0) {
         queryOptions.customParams = { propertySlugs: propertySlugs.join(',') };

package/dist/commands/entities/update.d.ts

@@ -6,6 +6,7 @@ export default class UpdateEntity extends BaseCommand {
         skipHydrateRelationships: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         dryRun: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         inputFile: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        force: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };

package/dist/commands/entities/update.js

@@ -33,6 +33,11 @@ class UpdateEntity extends basecommand_1.BaseCommand {
             description: 'File containing properties to update the entity (optional)',
             required: false,
         }),
+        force: core_1.Flags.boolean({
+            char: 'F',
+            description: 'Force update without validation. Internal use only',
+            required: false,
+        })
     };
     static args = {
         entityName: core_1.Args.string({
@@ -41,7 +46,7 @@ class UpdateEntity extends basecommand_1.BaseCommand {
         }),
         id: core_1.Args.string({
             description: 'The unique identifier of the entity',
-            required: true,
+            required: false,
         }),
     };
     static strict = false;
@@ -49,34 +54,34 @@ class UpdateEntity extends basecommand_1.BaseCommand {
         this.log('🚨 This command is in BETA and may change or be removed at any time.');
         await (0, login_1.authUser)();
         const { args, argv } = await this.parse(UpdateEntity);
-        const { id, entityName } = args;
-        const { dryRun: isDryRun, inputFile: inputFilename, skipHydrateRelationships } = this.flags;
+        const { id: specifiedId, entityName } = args;
+        const { dryRun: isDryRun, inputFile: inputFilename, skipHydrateRelationships, force } = this.flags;
         const propertySpecArgs = argv.slice(1, argv.length).filter(propertySpecifications_1.isValidPropertySpecification);
         const propertySpec = (0, propertySpecifications_1.parsePropertySpecificationsIntoMap)(propertySpecArgs);
-        if (propertySpec.size === 0) {
-            throw new Error('No valid properties provided for update');
-        }
-        if (inputFilename && id) {
+        if (inputFilename && specifiedId) {
             throw new Error('You cannot use --input and --id together. Please specify one or the other.');
         }
-        const partialEntitiesArray = inputFilename
-            ? (0, file_helpers_1.parseFileAsJsonArray)(inputFilename).map(({ id }) => ({ id }))
-            : [{ id }];
+        const entitiesToUpdate = inputFilename
+            ? (0, file_helpers_1.parseFileAsJsonArray)(inputFilename)
+            : [{ id: specifiedId }];
         const results = {
             idsSuccessfullyUpdated: new Set(),
             idsFailedToUpdate: new Set(),
-            numEntriesSkipped: partialEntitiesArray.filter(({ id }) => !id).length,
+            numEntriesSkipped: entitiesToUpdate.filter(({ id }) => !id).length,
         };
-        const idsToUpdate = partialEntitiesArray.map(({ id }) => id).filter(Boolean);
+        const entitiesWithId = entitiesToUpdate.filter(({ id }) => id);
         propertySpec.delete('id'); // Remove 'id' from the property spec if it exists
-        const changes = [...propertySpec.entries()].reduce((acc, [key, value]) => {
+        // will be applied to all entities
+        const fixedValues = [...propertySpec.entries()].reduce((acc, [key, value]) => {
             acc[key] = value;
             return acc;
         }, {});
-        async function updateEntity(id) {
+        async function updateEntity(entity) {
+            const newEntityState = { ...entity, ...fixedValues };
+            const id = entity.id;
             const promise = isDryRun
-                ? mockUpdateById(entityName, id, changes, { skipHydrateRelationships })
-                : updateEntityById(entityName, id, changes, { skipHydrateRelationships });
+                ? mockUpdateById(entityName, id, newEntityState, { skipHydrateRelationships })
+                : updateEntityById(entityName, id, newEntityState, { skipHydrateRelationships, force });
             promise
                 .catch(() => {
                 results.idsFailedToUpdate.add(id);
@@ -87,8 +92,8 @@ class UpdateEntity extends basecommand_1.BaseCommand {
             return promise;
         }
         try {
-            const limit = (0, p_limit_1.default)(5); // Limit concurrency to 5
-            const responses = await Promise.all(idsToUpdate.map((id) => limit(() => updateEntity(id))));
+            const limit = (0, p_limit_1.default)(20);
+            const responses = await Promise.all(entitiesWithId.map((entity) => limit(() => updateEntity(entity))));
             const messagePrefix = isDryRun
                 ? 'Dry run. Update skipped. Changes would be:'
                 : 'Entity updated successfully:';
@@ -105,8 +110,10 @@ class UpdateEntity extends basecommand_1.BaseCommand {
 exports.default = UpdateEntity;
 async function updateEntityById(entityName, id, changes, options = {}) {
     const client = new sdk_1.Entities();
-    const { skipHydrateRelationships } = options;
-    return client.update({ entityName, id, object: changes, skipHydrateRelationships });
+    const { skipHydrateRelationships, force } = options;
+    const fullPath = force ? `maintenance/items/${id}` : undefined;
+    console.log(fullPath);
+    return client.update({ entityName, id, object: changes, skipHydrateRelationships, fullPath });
 }
 async function mockUpdateById(entityName, id, changes, options = {}) {
     const client = new sdk_1.Entities();

package/dist/helpers/config/config.d.ts

@@ -1,16 +1,17 @@
 export declare const ENVIRONMENTS: {
     dev: string;
     prod: string;
+    local: string;
 };
 export declare function initializeVibeIQConfig(): Promise<void>;
 export declare function readVibeIQConfig(): Promise<any>;
 export declare function writeVibeIQConfig(config: any): Promise<void>;
 export declare function storeVibeIQConfig(incomingConfig: any): Promise<void>;
 export declare function createConfig(fileName: any): Promise<void>;
-export declare function writeConfig(config: any, configName?: string): Promise<void>;
+export declare function writeConfig(config: any, configName?: string | null): Promise<void>;
 export declare function getConfig(): Promise<any>;
-export declare function storeConfig(incomingConfig: any, configName?: string, merge?: boolean): Promise<void>;
+export declare function storeConfig(incomingConfig: any, configName?: string | null, merge?: boolean): Promise<void>;
 export declare function getConfigFiles(): Promise<any>;
 export declare function getConfigContent(fileName: string): Promise<any>;
-export declare function validateEnvironments(envName?: any): Promise<any>;
+export declare function validateEnvironments(envName?: string | null): Promise<any>;
 export declare function checkTelemetry(cliVersion: string): Promise<void>;

package/dist/helpers/config/config.js

@@ -15,6 +15,7 @@ const defaultConfigFileLocation = (0, node_path_1.join)(configDirectoryLocation,
 exports.ENVIRONMENTS = {
     dev: 'https://api.dev.vibeiq.com/dev/api',
     prod: 'https://api.vibeiq.com/prod/api',
+    local: 'http://localhost:3000/api',
 };
 async function initializeVibeIQConfig() {
     try {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.6.0-alpha-3",
+  "version": "3.6.0-alpha-4",
   "commands": {
     "app:create": {
       "id": "app:create",
@@ -604,7 +604,8 @@
             "dev",
             "development",
             "prod",
-            "production"
+            "production",
+            "local"
           ]
         },
         "apiUserToken": {
@@ -905,22 +906,6 @@
           "required": false,
           "multiple": false
         },
-        "skipHydrateRelationships": {
-          "name": "skipHydrateRelationships",
-          "type": "boolean",
-          "char": "s",
-          "description": "Skip hydrating relationships when fetching the entity",
-          "required": false,
-          "allowNo": false
-        },
-        "relations": {
-          "name": "relations",
-          "type": "option",
-          "char": "r",
-          "description": "Comma-separated list of relations to include in the output",
-          "required": false,
-          "multiple": false
-        },
         "propertySlugs": {
           "name": "propertySlugs",
           "type": "option",
@@ -937,6 +922,22 @@
           "required": false,
           "allowNo": false
         },
+        "skip": {
+          "name": "skip",
+          "type": "option",
+          "char": "s",
+          "description": "Number of entities to skip (used with paginated fetch)",
+          "required": false,
+          "multiple": false
+        },
+        "skipHydrateRelationships": {
+          "name": "skipHydrateRelationships",
+          "type": "boolean",
+          "char": "S",
+          "description": "Skip hydrating relationships when fetching the entity",
+          "required": false,
+          "allowNo": false
+        },
         "take": {
           "name": "take",
           "type": "option",
@@ -944,6 +945,14 @@
           "description": "Number of entities to fetch in a single request (default is 100)",
           "required": false,
           "multiple": false
+        },
+        "relations": {
+          "name": "relations",
+          "type": "option",
+          "char": "r",
+          "description": "Comma-separated list of relations to include in the output",
+          "required": false,
+          "multiple": false
         }
       },
       "args": {
@@ -1017,6 +1026,14 @@
           "description": "File containing properties to update the entity (optional)",
           "required": false,
           "multiple": false
+        },
+        "force": {
+          "name": "force",
+          "type": "boolean",
+          "char": "F",
+          "description": "Force update without validation. Internal use only",
+          "required": false,
+          "allowNo": false
         }
       },
       "args": {
@@ -1028,7 +1045,7 @@
         "id": {
           "name": "id",
           "description": "The unique identifier of the entity",
-          "required": true
+          "required": false
         }
       }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "3.6.0-alpha-3",
+  "version": "3.6.0-alpha-4",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",