@aderis-erp/cli 1.0.14 → 1.0.17

package/dist/commands/saved-views.js

@@ -1,6 +1,6 @@
 import { Command, Args, Flags } from '@oclif/core';
 import { apiRequest, ApiError, normalizeSortBy } from '../lib/api-client.js';
-import { getCurrentContext, getContext, getBaseUrls } from '../lib/config.js';
+import { getCurrentContext, getContext, getBaseUrls, hasCredentials, missingCredentialsMessage } from '../lib/config.js';
 // Add 'import' action if both create and update exist
 const HAS_IMPORT = false;
 const HAS_EXPORT = false;
@@ -23,7 +23,7 @@ export default class SavedViews extends Command {
         id: Args.string({ description: 'Resource ID (for get, update, delete operations)', required: false }),
     };
     static flags = {
-        context: Flags.string({ char: 'c', description: 'Context to use' }),
+        context: Flags.string({ char: 'c', aliases: ['config'], env: 'ADERIS_CONTEXT', description: 'Context to use for this command, overriding the current context (alias: --config)' }),
         output: Flags.string({ char: 'o', description: 'Output format (default: table for import, json for other commands)', options: ['json', 'table', 'csv'] }),
         table: Flags.boolean({ char: 't', description: 'Output as table (shortcut for --output table)' }),
         csv: Flags.boolean({ description: 'Output as CSV (shortcut for --output csv)' }),
@@ -37,7 +37,7 @@ export default class SavedViews extends Command {
         'sort-by': Flags.string({ description: 'Sort field(s), comma-separated. Direction (:ASC/:DESC) is optional; date-like fields default to DESC, others to ASC.' }),
         filter: Flags.string({ description: 'Filter (e.g. --filter status=ACTIVE). Operators: in:A,B, like:%, gt:, lt:, null:', multiple: true }),
         query: Flags.string({ description: 'Additional query params as JSON' }),
-        fields: Flags.string({ description: 'Comma-separated list of fields to show (e.g. --fields=id,name,status)' }),
+        fields: Flags.string({ description: 'Comma-separated list of fields to return, applied by the API (e.g. --fields=id,name,status)' }),
         sanitize: Flags.boolean({ description: 'Remove null values, audit fields, and duplicate UUIDs from output' }),
         'show-http-request': Flags.boolean({ description: 'Show HTTP request details (method, URL, body)' }),
     };
@@ -95,9 +95,9 @@ export default class SavedViews extends Command {
         }
         const context = flags.context ? getContext(flags.context) : getCurrentContext();
         if (!context)
-            this.error('No context configured. Run: aderis auth login --new');
-        if (!context.tokens)
-            this.error('Not logged in. Run: aderis auth login');
+            this.error(flags.context ? `Context "${flags.context}" not found. List contexts with: aderis config list` : 'No context configured. Run: aderis auth login --new');
+        if (!hasCredentials(context))
+            this.error(missingCredentialsMessage(context));
         const queryParams = {};
         if (flags.page)
             queryParams.page = flags.page;
@@ -109,6 +109,8 @@ export default class SavedViews extends Command {
             queryParams.search = flags.search;
         if (flags['sort-by'])
             queryParams.sortBy = normalizeSortBy(flags['sort-by']);
+        if (flags.fields)
+            queryParams.fields = flags.fields;
         if (flags.query) {
             try {
                 Object.assign(queryParams, JSON.parse(flags.query));
@@ -311,11 +313,6 @@ export default class SavedViews extends Command {
                     output = obj[arrayKeys[0]];
                 }
             }
-            // Filter fields if --fields flag is provided
-            if (flags.fields) {
-                const fieldList = flags.fields.split(',').map(f => f.trim());
-                output = this.filterFields(output, fieldList);
-            }
             // Sanitize output if requested
             if (flags.sanitize) {
                 output = this.sanitizeOutput(output);
@@ -340,9 +337,9 @@ export default class SavedViews extends Command {
     async runImport(flags) {
         const context = flags.context ? getContext(flags.context) : getCurrentContext();
         if (!context)
-            this.error('No context configured. Run: aderis auth login --new');
-        if (!context.tokens)
-            this.error('Not logged in. Run: aderis auth login');
+            this.error(flags.context ? `Context "${flags.context}" not found. List contexts with: aderis config list` : 'No context configured. Run: aderis auth login --new');
+        if (!hasCredentials(context))
+            this.error(missingCredentialsMessage(context));
         // Get data from file, --data, or --set flags
         let items = [];
         if (flags.file) {
@@ -552,9 +549,9 @@ export default class SavedViews extends Command {
     async runExport(flags) {
         const context = flags.context ? getContext(flags.context) : getCurrentContext();
         if (!context)
-            this.error('No context configured. Run: aderis auth login --new');
-        if (!context.tokens)
-            this.error('Not logged in. Run: aderis auth login');
+            this.error(flags.context ? `Context "${flags.context}" not found. List contexts with: aderis config list` : 'No context configured. Run: aderis auth login --new');
+        if (!hasCredentials(context))
+            this.error(missingCredentialsMessage(context));
         const listEndpoint = ENDPOINTS['list'];
         if (!listEndpoint)
             this.error('Export requires a list endpoint');
@@ -570,6 +567,8 @@ export default class SavedViews extends Command {
             baseParams.sortBy = normalizeSortBy(flags['sort-by']);
         if (flags.include)
             baseParams.include = flags.include;
+        if (flags.fields)
+            baseParams.fields = flags.fields;
         if (flags.query) {
             try {
                 Object.assign(baseParams, JSON.parse(flags.query));
@@ -624,12 +623,7 @@ export default class SavedViews extends Command {
             }
         }
         process.stderr.write(' done\n');
-        // Filter fields if specified
         let output = allItems;
-        if (flags.fields) {
-            const fieldList = flags.fields.split(',').map(f => f.trim());
-            output = this.filterFields(allItems, fieldList);
-        }
         // Sanitize output if requested
         if (flags.sanitize) {
             output = this.sanitizeOutput(output);
@@ -646,9 +640,9 @@ export default class SavedViews extends Command {
     async runCamt053Import(flags) {
         const context = flags.context ? getContext(flags.context) : getCurrentContext();
         if (!context)
-            this.error('No context configured. Run: aderis auth login --new');
-        if (!context.tokens)
-            this.error('Not logged in. Run: aderis auth login');
+            this.error(flags.context ? `Context "${flags.context}" not found. List contexts with: aderis config list` : 'No context configured. Run: aderis auth login --new');
+        if (!hasCredentials(context))
+            this.error(missingCredentialsMessage(context));
         if (!flags.file) {
             this.error('CAMT.053 import requires --file (-f) flag with path to XML file');
         }
@@ -736,9 +730,9 @@ export default class SavedViews extends Command {
         }
         const context = flags.context ? getContext(flags.context) : getCurrentContext();
         if (!context)
-            this.error('No context configured. Run: aderis auth login --new');
-        if (!context.tokens)
-            this.error('Not logged in. Run: aderis auth login');
+            this.error(flags.context ? `Context "${flags.context}" not found. List contexts with: aderis config list` : 'No context configured. Run: aderis auth login --new');
+        if (!hasCredentials(context))
+            this.error(missingCredentialsMessage(context));
         // Get data from file, --data, or --set flags
         let items = [];
         if (flags.file) {
@@ -958,56 +952,6 @@ export default class SavedViews extends Command {
             return `\$${op}`;
         return opRe.test(rest) ? `\$${op}:${this.parseFilterValue(rest)}` : `\$${op}:${rest}`;
     }
-    filterFields(data, fields) {
-        const isUnsafeKey = (k) => k === '__proto__' || k === 'constructor' || k === 'prototype';
-        const pick = (obj, keys) => {
-            // Group keys by their first segment so sibling sub-paths
-            // (e.g. 'items.amount' + 'items._type') resolve in one recursive pass
-            // and don't clobber each other on merge.
-            const directKeys = new Set();
-            const nestedKeys = new Map();
-            for (const key of keys) {
-                if (key.split('.').some(isUnsafeKey))
-                    continue;
-                if (key.includes('.')) {
-                    const [first, ...rest] = key.split('.');
-                    if (isUnsafeKey(first))
-                        continue;
-                    const list = nestedKeys.get(first);
-                    if (list) {
-                        list.push(rest.join('.'));
-                    }
-                    else {
-                        nestedKeys.set(first, [rest.join('.')]);
-                    }
-                }
-                else {
-                    directKeys.add(key);
-                }
-            }
-            const result = {};
-            for (const key of directKeys) {
-                if (key in obj)
-                    result[key] = obj[key];
-            }
-            for (const [first, restKeys] of nestedKeys) {
-                const val = obj[first];
-                if (!val || typeof val !== 'object')
-                    continue;
-                if (Array.isArray(val)) {
-                    result[first] = val.map(item => pick(item, restKeys));
-                }
-                else {
-                    result[first] = pick(val, restKeys);
-                }
-            }
-            return result;
-        };
-        if (Array.isArray(data)) {
-            return data.map(item => pick(item, fields));
-        }
-        return pick(data, fields);
-    }
     sanitizeOutput(data) {
         const auditFields = ['_type', 'tenantId', 'createdAt', 'updatedAt', 'createdBy', 'updatedBy'];
         const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;

package/dist/commands/scheduled-processor-mappings.d.ts

@@ -31,7 +31,6 @@ export default class ScheduledProcessorMappings extends Command {
     private runCamt053Import;
     private runNestedImport;
     private parseFilterValue;
-    private filterFields;
     private sanitizeOutput;
     private getColumns;
     private getValue;

package/dist/commands/scheduled-processor-mappings.js

@@ -1,6 +1,6 @@
 import { Command, Args, Flags } from '@oclif/core';
 import { apiRequest, ApiError, normalizeSortBy } from '../lib/api-client.js';
-import { getCurrentContext, getContext, getBaseUrls } from '../lib/config.js';
+import { getCurrentContext, getContext, getBaseUrls, hasCredentials, missingCredentialsMessage } from '../lib/config.js';
 // Add 'import' action if both create and update exist
 const HAS_IMPORT = true;
 const HAS_EXPORT = true;
@@ -29,7 +29,7 @@ export default class ScheduledProcessorMappings extends Command {
         id: Args.string({ description: 'Resource ID (for get, update, delete operations)', required: false }),
     };
     static flags = {
-        context: Flags.string({ char: 'c', description: 'Context to use' }),
+        context: Flags.string({ char: 'c', aliases: ['config'], env: 'ADERIS_CONTEXT', description: 'Context to use for this command, overriding the current context (alias: --config)' }),
         output: Flags.string({ char: 'o', description: 'Output format (default: table for import, json for other commands)', options: ['json', 'table', 'csv'] }),
         table: Flags.boolean({ char: 't', description: 'Output as table (shortcut for --output table)' }),
         csv: Flags.boolean({ description: 'Output as CSV (shortcut for --output csv)' }),
@@ -43,7 +43,7 @@ export default class ScheduledProcessorMappings extends Command {
         'sort-by': Flags.string({ description: 'Sort field(s), comma-separated. Direction (:ASC/:DESC) is optional; date-like fields default to DESC, others to ASC.' }),
         filter: Flags.string({ description: 'Filter (e.g. --filter status=ACTIVE). Operators: in:A,B, like:%, gt:, lt:, null:', multiple: true }),
         query: Flags.string({ description: 'Additional query params as JSON' }),
-        fields: Flags.string({ description: 'Comma-separated list of fields to show (e.g. --fields=id,name,status)' }),
+        fields: Flags.string({ description: 'Comma-separated list of fields to return, applied by the API (e.g. --fields=id,name,status)' }),
         sanitize: Flags.boolean({ description: 'Remove null values, audit fields, and duplicate UUIDs from output' }),
         'show-http-request': Flags.boolean({ description: 'Show HTTP request details (method, URL, body)' }),
     };
@@ -101,9 +101,9 @@ export default class ScheduledProcessorMappings extends Command {
         }
         const context = flags.context ? getContext(flags.context) : getCurrentContext();
         if (!context)
-            this.error('No context configured. Run: aderis auth login --new');
-        if (!context.tokens)
-            this.error('Not logged in. Run: aderis auth login');
+            this.error(flags.context ? `Context "${flags.context}" not found. List contexts with: aderis config list` : 'No context configured. Run: aderis auth login --new');
+        if (!hasCredentials(context))
+            this.error(missingCredentialsMessage(context));
         const queryParams = {};
         if (flags.page)
             queryParams.page = flags.page;
@@ -115,6 +115,8 @@ export default class ScheduledProcessorMappings extends Command {
             queryParams.search = flags.search;
         if (flags['sort-by'])
             queryParams.sortBy = normalizeSortBy(flags['sort-by']);
+        if (flags.fields)
+            queryParams.fields = flags.fields;
         if (flags.query) {
             try {
                 Object.assign(queryParams, JSON.parse(flags.query));
@@ -317,11 +319,6 @@ export default class ScheduledProcessorMappings extends Command {
                     output = obj[arrayKeys[0]];
                 }
             }
-            // Filter fields if --fields flag is provided
-            if (flags.fields) {
-                const fieldList = flags.fields.split(',').map(f => f.trim());
-                output = this.filterFields(output, fieldList);
-            }
             // Sanitize output if requested
             if (flags.sanitize) {
                 output = this.sanitizeOutput(output);
@@ -346,9 +343,9 @@ export default class ScheduledProcessorMappings extends Command {
     async runImport(flags) {
         const context = flags.context ? getContext(flags.context) : getCurrentContext();
         if (!context)
-            this.error('No context configured. Run: aderis auth login --new');
-        if (!context.tokens)
-            this.error('Not logged in. Run: aderis auth login');
+            this.error(flags.context ? `Context "${flags.context}" not found. List contexts with: aderis config list` : 'No context configured. Run: aderis auth login --new');
+        if (!hasCredentials(context))
+            this.error(missingCredentialsMessage(context));
         // Get data from file, --data, or --set flags
         let items = [];
         if (flags.file) {
@@ -558,9 +555,9 @@ export default class ScheduledProcessorMappings extends Command {
     async runExport(flags) {
         const context = flags.context ? getContext(flags.context) : getCurrentContext();
         if (!context)
-            this.error('No context configured. Run: aderis auth login --new');
-        if (!context.tokens)
-            this.error('Not logged in. Run: aderis auth login');
+            this.error(flags.context ? `Context "${flags.context}" not found. List contexts with: aderis config list` : 'No context configured. Run: aderis auth login --new');
+        if (!hasCredentials(context))
+            this.error(missingCredentialsMessage(context));
         const listEndpoint = ENDPOINTS['list'];
         if (!listEndpoint)
             this.error('Export requires a list endpoint');
@@ -576,6 +573,8 @@ export default class ScheduledProcessorMappings extends Command {
             baseParams.sortBy = normalizeSortBy(flags['sort-by']);
         if (flags.include)
             baseParams.include = flags.include;
+        if (flags.fields)
+            baseParams.fields = flags.fields;
         if (flags.query) {
             try {
                 Object.assign(baseParams, JSON.parse(flags.query));
@@ -630,12 +629,7 @@ export default class ScheduledProcessorMappings extends Command {
             }
         }
         process.stderr.write(' done\n');
-        // Filter fields if specified
         let output = allItems;
-        if (flags.fields) {
-            const fieldList = flags.fields.split(',').map(f => f.trim());
-            output = this.filterFields(allItems, fieldList);
-        }
         // Sanitize output if requested
         if (flags.sanitize) {
             output = this.sanitizeOutput(output);
@@ -652,9 +646,9 @@ export default class ScheduledProcessorMappings extends Command {
     async runCamt053Import(flags) {
         const context = flags.context ? getContext(flags.context) : getCurrentContext();
         if (!context)
-            this.error('No context configured. Run: aderis auth login --new');
-        if (!context.tokens)
-            this.error('Not logged in. Run: aderis auth login');
+            this.error(flags.context ? `Context "${flags.context}" not found. List contexts with: aderis config list` : 'No context configured. Run: aderis auth login --new');
+        if (!hasCredentials(context))
+            this.error(missingCredentialsMessage(context));
         if (!flags.file) {
             this.error('CAMT.053 import requires --file (-f) flag with path to XML file');
         }
@@ -742,9 +736,9 @@ export default class ScheduledProcessorMappings extends Command {
         }
         const context = flags.context ? getContext(flags.context) : getCurrentContext();
         if (!context)
-            this.error('No context configured. Run: aderis auth login --new');
-        if (!context.tokens)
-            this.error('Not logged in. Run: aderis auth login');
+            this.error(flags.context ? `Context "${flags.context}" not found. List contexts with: aderis config list` : 'No context configured. Run: aderis auth login --new');
+        if (!hasCredentials(context))
+            this.error(missingCredentialsMessage(context));
         // Get data from file, --data, or --set flags
         let items = [];
         if (flags.file) {
@@ -964,56 +958,6 @@ export default class ScheduledProcessorMappings extends Command {
             return `\$${op}`;
         return opRe.test(rest) ? `\$${op}:${this.parseFilterValue(rest)}` : `\$${op}:${rest}`;
     }
-    filterFields(data, fields) {
-        const isUnsafeKey = (k) => k === '__proto__' || k === 'constructor' || k === 'prototype';
-        const pick = (obj, keys) => {
-            // Group keys by their first segment so sibling sub-paths
-            // (e.g. 'items.amount' + 'items._type') resolve in one recursive pass
-            // and don't clobber each other on merge.
-            const directKeys = new Set();
-            const nestedKeys = new Map();
-            for (const key of keys) {
-                if (key.split('.').some(isUnsafeKey))
-                    continue;
-                if (key.includes('.')) {
-                    const [first, ...rest] = key.split('.');
-                    if (isUnsafeKey(first))
-                        continue;
-                    const list = nestedKeys.get(first);
-                    if (list) {
-                        list.push(rest.join('.'));
-                    }
-                    else {
-                        nestedKeys.set(first, [rest.join('.')]);
-                    }
-                }
-                else {
-                    directKeys.add(key);
-                }
-            }
-            const result = {};
-            for (const key of directKeys) {
-                if (key in obj)
-                    result[key] = obj[key];
-            }
-            for (const [first, restKeys] of nestedKeys) {
-                const val = obj[first];
-                if (!val || typeof val !== 'object')
-                    continue;
-                if (Array.isArray(val)) {
-                    result[first] = val.map(item => pick(item, restKeys));
-                }
-                else {
-                    result[first] = pick(val, restKeys);
-                }
-            }
-            return result;
-        };
-        if (Array.isArray(data)) {
-            return data.map(item => pick(item, fields));
-        }
-        return pick(data, fields);
-    }
     sanitizeOutput(data) {
         const auditFields = ['_type', 'tenantId', 'createdAt', 'updatedAt', 'createdBy', 'updatedBy'];
         const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;

package/dist/commands/schedules.d.ts

@@ -31,7 +31,6 @@ export default class Schedules extends Command {
     private runCamt053Import;
     private runNestedImport;
     private parseFilterValue;
-    private filterFields;
     private sanitizeOutput;
     private getColumns;
     private getValue;

package/dist/commands/schedules.js

@@ -1,6 +1,6 @@
 import { Command, Args, Flags } from '@oclif/core';
 import { apiRequest, ApiError, normalizeSortBy } from '../lib/api-client.js';
-import { getCurrentContext, getContext, getBaseUrls } from '../lib/config.js';
+import { getCurrentContext, getContext, getBaseUrls, hasCredentials, missingCredentialsMessage } from '../lib/config.js';
 // Add 'import' action if both create and update exist
 const HAS_IMPORT = true;
 const HAS_EXPORT = true;
@@ -33,7 +33,7 @@ export default class Schedules extends Command {
         id: Args.string({ description: 'Resource ID (for get, update, delete operations)', required: false }),
     };
     static flags = {
-        context: Flags.string({ char: 'c', description: 'Context to use' }),
+        context: Flags.string({ char: 'c', aliases: ['config'], env: 'ADERIS_CONTEXT', description: 'Context to use for this command, overriding the current context (alias: --config)' }),
         output: Flags.string({ char: 'o', description: 'Output format (default: table for import, json for other commands)', options: ['json', 'table', 'csv'] }),
         table: Flags.boolean({ char: 't', description: 'Output as table (shortcut for --output table)' }),
         csv: Flags.boolean({ description: 'Output as CSV (shortcut for --output csv)' }),
@@ -47,7 +47,7 @@ export default class Schedules extends Command {
         'sort-by': Flags.string({ description: 'Sort field(s), comma-separated. Direction (:ASC/:DESC) is optional; date-like fields default to DESC, others to ASC.' }),
         filter: Flags.string({ description: 'Filter (e.g. --filter status=ACTIVE). Operators: in:A,B, like:%, gt:, lt:, null:', multiple: true }),
         query: Flags.string({ description: 'Additional query params as JSON' }),
-        fields: Flags.string({ description: 'Comma-separated list of fields to show (e.g. --fields=id,name,status)' }),
+        fields: Flags.string({ description: 'Comma-separated list of fields to return, applied by the API (e.g. --fields=id,name,status)' }),
         sanitize: Flags.boolean({ description: 'Remove null values, audit fields, and duplicate UUIDs from output' }),
         'show-http-request': Flags.boolean({ description: 'Show HTTP request details (method, URL, body)' }),
     };
@@ -105,9 +105,9 @@ export default class Schedules extends Command {
         }
         const context = flags.context ? getContext(flags.context) : getCurrentContext();
         if (!context)
-            this.error('No context configured. Run: aderis auth login --new');
-        if (!context.tokens)
-            this.error('Not logged in. Run: aderis auth login');
+            this.error(flags.context ? `Context "${flags.context}" not found. List contexts with: aderis config list` : 'No context configured. Run: aderis auth login --new');
+        if (!hasCredentials(context))
+            this.error(missingCredentialsMessage(context));
         const queryParams = {};
         if (flags.page)
             queryParams.page = flags.page;
@@ -119,6 +119,8 @@ export default class Schedules extends Command {
             queryParams.search = flags.search;
         if (flags['sort-by'])
             queryParams.sortBy = normalizeSortBy(flags['sort-by']);
+        if (flags.fields)
+            queryParams.fields = flags.fields;
         if (flags.query) {
             try {
                 Object.assign(queryParams, JSON.parse(flags.query));
@@ -321,11 +323,6 @@ export default class Schedules extends Command {
                     output = obj[arrayKeys[0]];
                 }
             }
-            // Filter fields if --fields flag is provided
-            if (flags.fields) {
-                const fieldList = flags.fields.split(',').map(f => f.trim());
-                output = this.filterFields(output, fieldList);
-            }
             // Sanitize output if requested
             if (flags.sanitize) {
                 output = this.sanitizeOutput(output);
@@ -350,9 +347,9 @@ export default class Schedules extends Command {
     async runImport(flags) {
         const context = flags.context ? getContext(flags.context) : getCurrentContext();
         if (!context)
-            this.error('No context configured. Run: aderis auth login --new');
-        if (!context.tokens)
-            this.error('Not logged in. Run: aderis auth login');
+            this.error(flags.context ? `Context "${flags.context}" not found. List contexts with: aderis config list` : 'No context configured. Run: aderis auth login --new');
+        if (!hasCredentials(context))
+            this.error(missingCredentialsMessage(context));
         // Get data from file, --data, or --set flags
         let items = [];
         if (flags.file) {
@@ -562,9 +559,9 @@ export default class Schedules extends Command {
     async runExport(flags) {
         const context = flags.context ? getContext(flags.context) : getCurrentContext();
         if (!context)
-            this.error('No context configured. Run: aderis auth login --new');
-        if (!context.tokens)
-            this.error('Not logged in. Run: aderis auth login');
+            this.error(flags.context ? `Context "${flags.context}" not found. List contexts with: aderis config list` : 'No context configured. Run: aderis auth login --new');
+        if (!hasCredentials(context))
+            this.error(missingCredentialsMessage(context));
         const listEndpoint = ENDPOINTS['list'];
         if (!listEndpoint)
             this.error('Export requires a list endpoint');
@@ -580,6 +577,8 @@ export default class Schedules extends Command {
             baseParams.sortBy = normalizeSortBy(flags['sort-by']);
         if (flags.include)
             baseParams.include = flags.include;
+        if (flags.fields)
+            baseParams.fields = flags.fields;
         if (flags.query) {
             try {
                 Object.assign(baseParams, JSON.parse(flags.query));
@@ -634,12 +633,7 @@ export default class Schedules extends Command {
             }
         }
         process.stderr.write(' done\n');
-        // Filter fields if specified
         let output = allItems;
-        if (flags.fields) {
-            const fieldList = flags.fields.split(',').map(f => f.trim());
-            output = this.filterFields(allItems, fieldList);
-        }
         // Sanitize output if requested
         if (flags.sanitize) {
             output = this.sanitizeOutput(output);
@@ -656,9 +650,9 @@ export default class Schedules extends Command {
     async runCamt053Import(flags) {
         const context = flags.context ? getContext(flags.context) : getCurrentContext();
         if (!context)
-            this.error('No context configured. Run: aderis auth login --new');
-        if (!context.tokens)
-            this.error('Not logged in. Run: aderis auth login');
+            this.error(flags.context ? `Context "${flags.context}" not found. List contexts with: aderis config list` : 'No context configured. Run: aderis auth login --new');
+        if (!hasCredentials(context))
+            this.error(missingCredentialsMessage(context));
         if (!flags.file) {
             this.error('CAMT.053 import requires --file (-f) flag with path to XML file');
         }
@@ -746,9 +740,9 @@ export default class Schedules extends Command {
         }
         const context = flags.context ? getContext(flags.context) : getCurrentContext();
         if (!context)
-            this.error('No context configured. Run: aderis auth login --new');
-        if (!context.tokens)
-            this.error('Not logged in. Run: aderis auth login');
+            this.error(flags.context ? `Context "${flags.context}" not found. List contexts with: aderis config list` : 'No context configured. Run: aderis auth login --new');
+        if (!hasCredentials(context))
+            this.error(missingCredentialsMessage(context));
         // Get data from file, --data, or --set flags
         let items = [];
         if (flags.file) {
@@ -968,56 +962,6 @@ export default class Schedules extends Command {
             return `\$${op}`;
         return opRe.test(rest) ? `\$${op}:${this.parseFilterValue(rest)}` : `\$${op}:${rest}`;
     }
-    filterFields(data, fields) {
-        const isUnsafeKey = (k) => k === '__proto__' || k === 'constructor' || k === 'prototype';
-        const pick = (obj, keys) => {
-            // Group keys by their first segment so sibling sub-paths
-            // (e.g. 'items.amount' + 'items._type') resolve in one recursive pass
-            // and don't clobber each other on merge.
-            const directKeys = new Set();
-            const nestedKeys = new Map();
-            for (const key of keys) {
-                if (key.split('.').some(isUnsafeKey))
-                    continue;
-                if (key.includes('.')) {
-                    const [first, ...rest] = key.split('.');
-                    if (isUnsafeKey(first))
-                        continue;
-                    const list = nestedKeys.get(first);
-                    if (list) {
-                        list.push(rest.join('.'));
-                    }
-                    else {
-                        nestedKeys.set(first, [rest.join('.')]);
-                    }
-                }
-                else {
-                    directKeys.add(key);
-                }
-            }
-            const result = {};
-            for (const key of directKeys) {
-                if (key in obj)
-                    result[key] = obj[key];
-            }
-            for (const [first, restKeys] of nestedKeys) {
-                const val = obj[first];
-                if (!val || typeof val !== 'object')
-                    continue;
-                if (Array.isArray(val)) {
-                    result[first] = val.map(item => pick(item, restKeys));
-                }
-                else {
-                    result[first] = pick(val, restKeys);
-                }
-            }
-            return result;
-        };
-        if (Array.isArray(data)) {
-            return data.map(item => pick(item, fields));
-        }
-        return pick(data, fields);
-    }
     sanitizeOutput(data) {
         const auditFields = ['_type', 'tenantId', 'createdAt', 'updatedAt', 'createdBy', 'updatedBy'];
         const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;

package/dist/commands/switch.js

@@ -1,7 +1,7 @@
 import { confirm, select } from '@inquirer/prompts';
 import { Command } from '@oclif/core';
-import { loginAndSwitchTenant } from '../lib/auth.js';
-import { getContext, getCurrentContext, listContexts, setCurrentContext } from '../lib/config.js';
+import { loginAndSwitchTenant, tenantLabel } from '../lib/auth/index.js';
+import { getAuthType, getContext, getCurrentContext, hasCredentials, listContexts, setCurrentContext, } from '../lib/config.js';
 export default class Switch extends Command {
     static description = 'Switch context and tenant interactively';
     static examples = ['<%= config.bin %> switch'];
@@ -23,9 +23,10 @@ export default class Switch extends Command {
         const selectedContext = await select({
             choices: sortedContexts.map((ctx) => {
                 const isCurrent = current?.name === ctx.name;
-                const auth = ctx.tokens ? '✓' : '✗';
+                const auth = hasCredentials(ctx) ? '✓' : '✗';
+                const kind = getAuthType(ctx) === 'api_key' ? '  api-key' : '';
                 return {
-                    name: `${ctx.name}  [${ctx.environment}]  auth:${auth}${isCurrent ? '  (current)' : ''}`,
+                    name: `${ctx.name}  [${ctx.environment}]  auth:${auth}${kind}${isCurrent ? '  (current)' : ''}`,
                     value: ctx.name,
                 };
             }),
@@ -35,6 +36,12 @@ export default class Switch extends Command {
             setCurrentContext(selectedContext);
             this.log(`Switched to context: ${selectedContext}`);
         }
+        // An API key is issued for one tenant, so there is no tenant step to run.
+        const selected = getContext(selectedContext);
+        if (selected && getAuthType(selected) === 'api_key') {
+            this.log('This context authenticates with an API key, which is scoped to a single tenant.');
+            return;
+        }
         // Step 2: Select tenant within chosen context.
         // If the session is expired, prompt the user to re-login and then retry.
         const { default: AuthTenant } = await import('./auth/tenant.js');
@@ -55,8 +62,8 @@ export default class Switch extends Command {
         if (!shouldLogin)
             return;
         // If we have a cached tenant list from a previous session, let the user pick
-        // tenant FIRST. Then run the combined login + tenant-switch flow which uses
-        // a single browser tab (chained PKCE rounds with a meta-refresh redirect).
+        // tenant FIRST. Then run the combined login + tenant-switch flow, which
+        // uses a single browser tab.
         const ctx = getContext(selectedContext);
         const cached = ctx?.cachedTenants ?? [];
         if (cached.length > 1) {
@@ -69,7 +76,7 @@ export default class Switch extends Command {
             });
             const selectedTenant = await select({
                 choices: sorted.map((t) => ({
-                    name: t.tenantId === ctx?.tenant_id ? `${t.name}  (previous)` : t.name,
+                    name: t.tenantId === ctx?.tenant_id ? `${tenantLabel(t)}  (previous)` : tenantLabel(t),
                     value: t.tenantId,
                 })),
                 message: 'Select a tenant:',