@salesforce/source-tracking 1.0.2 → 1.1.2

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.1.2](https://github.com/forcedotcom/source-tracking/compare/v1.1.1...v1.1.2) (2022-03-02)
+
+### Bug Fixes
+
+- more metadata polling exclusions based on telemetry ([ae5adf3](https://github.com/forcedotcom/source-tracking/commit/ae5adf34600676f54c0e5efa2f5e7c96e2fd10f6))
+
+### [1.1.1](https://github.com/forcedotcom/source-tracking/compare/v1.1.0...v1.1.1) (2022-02-23)
+
+### Bug Fixes
+
+- message formatting for GA ([194ba4b](https://github.com/forcedotcom/source-tracking/commit/194ba4b4bd08a26e7f7c5c6ef28dc1fb20acc1de))
+
+## [1.1.0](https://github.com/forcedotcom/source-tracking/compare/v1.0.2...v1.1.0) (2022-02-16)
+
+### Features
+
+- smarter polling ([3d5bb05](https://github.com/forcedotcom/source-tracking/commit/3d5bb05ccf05127304037ec6085660be5da8fe24))
+
+### Bug Fixes
+
+- handle lwc in a pkgDir of the same name ([621d8cf](https://github.com/forcedotcom/source-tracking/commit/621d8cfc00f2eb4ded160802b2076e140d0a2d06))
+- increase max-fetch default ([9854ed8](https://github.com/forcedotcom/source-tracking/commit/9854ed8677c13d0b2d818355660ab71c144e6a3e))
+- lastIndexOf handles foo/lwc/foo ([8632ee6](https://github.com/forcedotcom/source-tracking/commit/8632ee61f88faf32024e99f1c5590f6b134a3b08))
+- smarter polling and excluded files ([6df02a7](https://github.com/forcedotcom/source-tracking/commit/6df02a716e238e38b699b98f638ef42ed8cedeca))
+
 ### [1.0.2](https://github.com/forcedotcom/source-tracking/compare/v1.0.1...v1.0.2) (2022-01-25)
 
 ### Bug Fixes

package/lib/compatibility.js

@@ -53,16 +53,17 @@ const throwIfInvalid = ({ org, projectPath, toValidate, command, }) => {
     }
     // We expected it to be the toolbelt version but it is using the new tracking files
     if (toValidate === 'toolbelt') {
-        throw new core_1.SfdxError(messages.getMessage('sourceTrackingFileVersionMismatch', ['new']), 'SourceTrackingFileVersionMismatch', [
-            messages.getMessage('useOtherVersion', ['new', (0, exports.replaceRenamedCommands)(command)]),
-            messages.getMessage('clearSuggestion', ['new', (0, exports.replaceRenamedCommands)('sfdx force:source:tracking:clear')]),
-        ]);
+        // some of the toolbelt commands aren't using SfdxCommand and the SfdxError actions won't be automatically displayed
+        throw new core_1.SfdxError(`${messages.getMessage('sourceTrackingFileVersionMismatch', ['new'])}\n\nTry this:\n${messages.getMessage('useOtherVersion', ['new', (0, exports.replaceRenamedCommands)(command, true)])}.\n${messages.getMessage('clearSuggestion', [
+            'new',
+            (0, exports.replaceRenamedCommands)('sfdx force:source:tracking:clear', true),
+        ])}.`, 'SourceTrackingFileVersionMismatch');
     }
     // We expected it to be the plugin-source version but it is using the old tracking files
     if (toValidate === 'plugin-source') {
         throw new core_1.SfdxError(messages.getMessage('sourceTrackingFileVersionMismatch', ['old']), 'SourceTrackingFileVersionMismatch', [
-            messages.getMessage('useOtherVersion', ['old', (0, exports.replaceRenamedCommands)(command, true)]),
-            messages.getMessage('clearSuggestion', ['old', 'sfdx force:source:tracking:clear']),
+            messages.getMessage('useOtherVersion', ['old', (0, exports.replaceRenamedCommands)(command)]),
+            messages.getMessage('clearSuggestion', ['old', (0, exports.replaceRenamedCommands)('sfdx force:source:tracking:clear')]),
         ]);
     }
 };
@@ -81,10 +82,10 @@ const replaceRenamedCommands = (input, reverse = false) => {
 };
 exports.replaceRenamedCommands = replaceRenamedCommands;
 const renames = new Map([
-    ['force:source:status', 'force:source:beta:status'],
-    ['force:source:push', 'force:source:beta:push'],
-    ['force:source:pull', 'force:source:beta:pull'],
-    ['force:source:tracking:reset', 'force:source:beta:tracking:reset'],
-    ['force:source:tracking:clear', 'force:source:beta:tracking:clear'],
+    ['force:source:status', 'force:source:legacy:status'],
+    ['force:source:push', 'force:source:legacy:push'],
+    ['force:source:pull', 'force:source:legacy:pull'],
+    ['force:source:tracking:reset', 'force:source:legacy:tracking:reset'],
+    ['force:source:tracking:clear', 'force:source:legacy:tracking:clear'],
 ]);
 //# sourceMappingURL=compatibility.js.map

package/lib/shared/metadataKeys.js

@@ -7,12 +7,13 @@ exports.mappingsForSourceMemberTypesToMetadataType = exports.getMetadataKeyFromF
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-const path = require("path");
+const path_1 = require("path");
 const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
 const functions_1 = require("./functions");
-// LWC can have child folders (ex: dynamic templates like /templates/noDataIllustration.html
+// See UT for examples of the complexity this must handle
+// keys always use forward slashes, even on Windows
 const pathAfterFullName = (fileResponse) => fileResponse && fileResponse.filePath
-    ? fileResponse.filePath.substr(fileResponse.filePath.indexOf(fileResponse.fullName)).replace(/\\/gi, '/')
+    ? (0, path_1.join)((0, path_1.dirname)(fileResponse.filePath).substring((0, path_1.dirname)(fileResponse.filePath).lastIndexOf(fileResponse.fullName)), (0, path_1.basename)(fileResponse.filePath)).replace(/\\/gi, '/')
     : '';
 const registry = new source_deploy_retrieve_1.RegistryAccess();
 // only compute once
@@ -25,7 +26,7 @@ const reverseAliasTypes = new Map(aliasTypes.map(([alias, type]) => [type, alias
 const getMetadataKeyFromFileResponse = (fileResponse) => {
     // also create an element for the parent object
     if (fileResponse.type === 'CustomField' && fileResponse.filePath) {
-        const splits = path.normalize(fileResponse.filePath).split(path.sep);
+        const splits = (0, path_1.normalize)(fileResponse.filePath).split(path_1.sep);
         const objectFolderIndex = splits.indexOf('objects');
         return [
             (0, functions_1.getMetadataKey)('CustomObject', splits[objectFolderIndex + 1]),

package/lib/shared/remoteSourceTrackingService.d.ts

@@ -58,6 +58,12 @@ export declare class RemoteSourceTrackingService extends ConfigFile<RemoteSource
     static getInstance(options: RemoteSourceTrackingService.Options): Promise<RemoteSourceTrackingService>;
     static getFileName(): string;
     static getFilePath(orgId: string): string;
+    /**
+     * Delete the RemoteSourceTracking for a given org.
+     *
+     * @param orgId
+     * @returns the path of the deleted source tracking file
+     */
     static delete(orgId: string): Promise<string>;
     /**
      * Initializes the service with existing remote source tracking data, or sets
@@ -119,6 +125,7 @@ export declare class RemoteSourceTrackingService extends ConfigFile<RemoteSource
      * @param pollingTimeout maximum amount of time in seconds to poll for SourceMembers
      */
     pollForSourceTracking(expectedMembers: RemoteSyncInput[]): Promise<void>;
+    private calculateExpectedSourceMembers;
     private calculateTimeout;
     private querySourceMembersFrom;
     private querySourceMembersTo;

package/lib/shared/remoteSourceTrackingService.js

@@ -7,6 +7,7 @@
  */
 /* eslint-disable no-underscore-dangle */
 /* eslint-disable @typescript-eslint/member-ordering */
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.remoteChangeElementToChangeResult = exports.RemoteSourceTrackingService = void 0;
 const path = require("path");
@@ -16,6 +17,12 @@ const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
 const kit_1 = require("@salesforce/kit");
 const metadataKeys_1 = require("./metadataKeys");
 const functions_1 = require("./functions");
+/*
+ * after some results have returned, how many times should we poll for missing sourcemembers
+ * even when there is a longer timeout remaining (because the deployment is very large)
+ */
+const POLLING_DELAY_MS = 1000;
+const CONSECUTIVE_EMPTY_POLLING_RESULT_LIMIT = ((_a = kit_1.env.getNumber('SFDX_SOURCE_MEMBER_POLLING_TIMEOUT')) !== null && _a !== void 0 ? _a : 120) / kit_1.Duration.milliseconds(POLLING_DELAY_MS).seconds;
 /**
  * This service handles source tracking of metadata between a local project and an org.
  * Source tracking state is persisted to .sfdx/orgs/<orgId>/maxRevision.json.
@@ -82,6 +89,12 @@ class RemoteSourceTrackingService extends core_1.ConfigFile {
     static getFilePath(orgId) {
         return path.join('.sfdx', 'orgs', orgId, RemoteSourceTrackingService.getFileName());
     }
+    /**
+     * Delete the RemoteSourceTracking for a given org.
+     *
+     * @param orgId
+     * @returns the path of the deleted source tracking file
+     */
     static async delete(orgId) {
         const fileToDelete = RemoteSourceTrackingService.getFilePath(orgId);
         // the file might not exist, in which case we don't need to delete it
@@ -199,13 +212,9 @@ class RemoteSourceTrackingService extends core_1.ConfigFile {
         // Called during a source:tracking:reset
         this.setServerMaxRevision(0);
         this.initSourceMembers();
-        let members;
-        if (toRevision != null) {
-            members = await this.querySourceMembersTo(toRevision);
-        }
-        else {
-            members = await this.querySourceMembersFrom({ fromRevision: 0 });
-        }
+        const members = toRevision != null
+            ? await this.querySourceMembersTo(toRevision)
+            : await this.querySourceMembersFrom({ fromRevision: 0 });
         await this.trackSourceMembers(members, true);
         return members.map((member) => (0, functions_1.getMetadataKey)(member.MemberType, member.MemberName));
     }
@@ -253,18 +262,20 @@ class RemoteSourceTrackingService extends core_1.ConfigFile {
         }
         let serverMaxRevisionCounter = this.getServerMaxRevision();
         sourceMembers.forEach((change) => {
+            var _a;
             // try accessing the sourceMembers object at the index of the change's name
             // if it exists, we'll update the fields - if it doesn't, we'll create and insert it
             const key = (0, functions_1.getMetadataKey)(change.MemberType, change.MemberName);
-            let sourceMember = this.getSourceMember(key);
-            if (sourceMember) {
+            const sourceMember = (_a = this.getSourceMember(key)) !== null && _a !== void 0 ? _a : {
+                serverRevisionCounter: change.RevisionCounter,
+                lastRetrievedFromServer: null,
+                memberType: change.MemberType,
+                isNameObsolete: change.IsNameObsolete,
+            };
+            if (sourceMember.lastRetrievedFromServer) {
                 // We are already tracking this element so we'll update it
                 if (!quiet) {
-                    let msg = `Updating ${key} to RevisionCounter: ${change.RevisionCounter}`;
-                    if (sync) {
-                        msg += ' and syncing';
-                    }
-                    this.logger.debug(msg);
+                    this.logger.debug(`Updating ${key} to RevisionCounter: ${change.RevisionCounter}${sync ? ' and syncing' : ''}`);
                 }
                 sourceMember.serverRevisionCounter = change.RevisionCounter;
                 sourceMember.isNameObsolete = change.IsNameObsolete;
@@ -272,18 +283,8 @@ class RemoteSourceTrackingService extends core_1.ConfigFile {
             else {
                 // We are not yet tracking it so we'll insert a new record
                 if (!quiet) {
-                    let msg = `Inserting ${key} with RevisionCounter: ${change.RevisionCounter}`;
-                    if (sync) {
-                        msg += ' and syncing';
-                    }
-                    this.logger.debug(msg);
+                    this.logger.debug(`Inserting ${key} with RevisionCounter: ${change.RevisionCounter}${sync ? ' and syncing' : ''}`);
                 }
-                sourceMember = {
-                    serverRevisionCounter: change.RevisionCounter,
-                    lastRetrievedFromServer: null,
-                    memberType: change.MemberType,
-                    isNameObsolete: change.IsNameObsolete,
-                };
             }
             // If we are syncing changes then we need to update the lastRetrievedFromServer field to
             // match the RevisionCounter from the SourceMember.
@@ -348,59 +349,59 @@ class RemoteSourceTrackingService extends core_1.ConfigFile {
             this.logger.warn('Not polling for SourceMembers since SFDX_DISABLE_SOURCE_MEMBER_POLLING = true.');
             return;
         }
-        if (expectedMembers.length === 0) {
+        const outstandingSourceMembers = this.calculateExpectedSourceMembers(expectedMembers);
+        if (expectedMembers.length === 0 || outstandingSourceMembers.size === 0) {
             // Don't bother polling if we're not matching SourceMembers
             return;
         }
-        const outstandingSourceMembers = new Map();
-        // filter known Source tracking issues
-        expectedMembers
-            .filter((fileResponse) => {
-            var _a;
-            // unchanged files will never be in the sourceMembers.  Not really sure why SDR returns them.
-            return fileResponse.state !== source_deploy_retrieve_1.ComponentStatus.Unchanged &&
-                // if a listView is the only change inside an object, the object won't have a sourceMember change.  We won't wait for those to be found
-                fileResponse.type !== 'CustomObject' &&
-                // aura meta.xml aren't tracked as SourceMembers
-                !((_a = fileResponse.filePath) === null || _a === void 0 ? void 0 : _a.endsWith('.cmp-meta.xml'));
-        })
-            .map((member) => {
-            (0, metadataKeys_1.getMetadataKeyFromFileResponse)(member).map((key) => outstandingSourceMembers.set(key, member));
-        });
-        const originalSize = outstandingSourceMembers.size;
-        const fromRevision = this.getServerMaxRevision();
+        const originalOutstandingSize = outstandingSourceMembers.size;
+        // this will be the absolute timeout from the start of the poll.  We can also exit early if it doesn't look like more results are coming in
         const pollingTimeout = this.calculateTimeout(outstandingSourceMembers.size);
-        this.logger.debug(`Polling for ${outstandingSourceMembers.size} SourceMembers from revision ${fromRevision} with timeout of ${pollingTimeout}s`);
+        let highestRevisionSoFar = this.getServerMaxRevision();
         let pollAttempts = 0;
+        let consecutiveEmptyResults = 0;
+        let someResultsReturned = false;
+        this.logger.debug(`Polling for ${outstandingSourceMembers.size} SourceMembers from revision ${highestRevisionSoFar} with timeout of ${pollingTimeout.seconds}s`);
         const poll = async () => {
             pollAttempts += 1; // not used to stop polling, but for debug logging
-            // get sourceMembers since maxRevision
+            // get sourceMembers added since our most recent max
+            // use the "new highest" revision from the last poll that returned results
             const queriedMembers = await this.querySourceMembersFrom({
-                fromRevision,
+                fromRevision: highestRevisionSoFar,
                 quiet: pollAttempts !== 1,
                 useCache: false,
             });
-            // remove anything returned from the query list
-            queriedMembers.map((member) => {
-                outstandingSourceMembers.delete((0, functions_1.getMetadataKey)(member.MemberType, member.MemberName));
-            });
-            this.logger.debug(`[${pollAttempts}] Found ${originalSize - outstandingSourceMembers.size} of ${originalSize} SourceMembers`);
+            if (queriedMembers.length) {
+                queriedMembers.map((member) => {
+                    // remove anything returned from the query list
+                    outstandingSourceMembers.delete((0, functions_1.getMetadataKey)(member.MemberType, member.MemberName));
+                    highestRevisionSoFar = Math.max(highestRevisionSoFar, member.RevisionCounter);
+                });
+                consecutiveEmptyResults = 0;
+                // flips on the first batch of results
+                someResultsReturned = true;
+            }
+            else {
+                consecutiveEmptyResults++;
+            }
+            this.logger.debug(`[${pollAttempts}] Found ${originalOutstandingSize - outstandingSourceMembers.size} of ${originalOutstandingSize} expected SourceMembers`);
             // update but don't sync
             await this.trackSourceMembers(queriedMembers, false);
             // exit if all have returned
             if (outstandingSourceMembers.size === 0) {
                 return;
             }
-            if (outstandingSourceMembers.size < 20) {
-                this.logger.debug(outstandingSourceMembers.size < 20
-                    ? `Still looking for SourceMembers: ${Array.from(outstandingSourceMembers.keys()).join(',')}`
-                    : `Still looking for ${outstandingSourceMembers.size} Source Members`);
+            if (someResultsReturned && consecutiveEmptyResults >= CONSECUTIVE_EMPTY_POLLING_RESULT_LIMIT) {
+                throw new ts_retry_promise_1.NotRetryableError(`Polling found no results for ${consecutiveEmptyResults} consecutive attempts`);
             }
+            this.logger.debug(outstandingSourceMembers.size < 20
+                ? `Still looking for SourceMembers: ${Array.from(outstandingSourceMembers.keys()).join(',')}`
+                : `Still looking for ${outstandingSourceMembers.size} Source Members`);
             throw new Error();
         };
         const pollingFunction = (0, ts_retry_promise_1.retryDecorator)(poll, {
-            timeout: pollingTimeout * 1000,
-            delay: 1000,
+            timeout: pollingTimeout.milliseconds,
+            delay: POLLING_DELAY_MS,
             retries: 'INFINITELY',
         });
         try {
@@ -408,27 +409,96 @@ class RemoteSourceTrackingService extends core_1.ConfigFile {
             this.logger.debug(`Retrieved all SourceMember data after ${pollAttempts} attempts`);
         }
         catch {
-            this.logger.warn(`Polling for SourceMembers timed out after ${pollAttempts} attempts`);
+            this.logger.warn(`Polling for SourceMembers timed out after ${pollAttempts} attempts (last ${consecutiveEmptyResults} were empty) )`);
             if (outstandingSourceMembers.size < 51) {
                 this.logger.debug(`Could not find ${outstandingSourceMembers.size} SourceMembers: ${Array.from(outstandingSourceMembers).join(',')}`);
             }
             else {
                 this.logger.debug(`Could not find SourceMembers for ${outstandingSourceMembers.size} components`);
             }
+            void core_1.Lifecycle.getInstance().emitTelemetry({
+                eventName: 'sourceMemberPollingTimeout',
+                library: 'SourceTracking',
+                timeoutSeconds: pollingTimeout.seconds,
+                attempts: pollAttempts,
+                consecutiveEmptyResults,
+                missingQuantity: outstandingSourceMembers.size,
+                deploymentSize: expectedMembers.length,
+                types: [...new Set(Array.from(outstandingSourceMembers.values()).map((member) => member.type))]
+                    .sort()
+                    .join(','),
+                members: Array.from(outstandingSourceMembers.keys()).join(','),
+            });
         }
     }
+    calculateExpectedSourceMembers(expectedMembers) {
+        const outstandingSourceMembers = new Map();
+        // filter known Source tracking issues
+        expectedMembers
+            .filter((fileResponse) => {
+            var _a, _b, _c, _d, _e, _f, _g, _h;
+            // unchanged files will never be in the sourceMembers.  Not really sure why SDR returns them.
+            return fileResponse.state !== source_deploy_retrieve_1.ComponentStatus.Unchanged &&
+                // if a listView is the only change inside an object, the object won't have a sourceMember change.  We won't wait for those to be found
+                // we don't know which email folder type might be there, so don't require either
+                // Portal doesn't support source tracking, according to the coverage report
+                ![
+                    'CustomObject',
+                    'EmailFolder',
+                    'EmailTemplateFolder',
+                    'StandardValueSet',
+                    'Portal',
+                    'StandardValueSetTranslation',
+                    'SharingRules',
+                    'SharingCriteriaRule',
+                    'GlobalValueSetTranslation',
+                    'AssignmentRules',
+                ].includes(fileResponse.type) &&
+                // don't wait for standard fields on standard objects
+                !(fileResponse.type === 'CustomField' && !((_a = fileResponse.filePath) === null || _a === void 0 ? void 0 : _a.includes('__c'))) &&
+                // they're settings to mdapi, and FooSettings in sourceMembers
+                !fileResponse.type.includes('Settings') &&
+                // mdapi encodes these, sourceMembers don't have encoding
+                !((fileResponse.type === 'Layout' || fileResponse.type === 'BusinessProcess') &&
+                    ((_b = fileResponse.filePath) === null || _b === void 0 ? void 0 : _b.includes('%'))) &&
+                // namespaced labels and CMDT don't resolve correctly
+                !(['CustomLabels', 'CustomMetadata'].includes(fileResponse.type) && ((_c = fileResponse.filePath) === null || _c === void 0 ? void 0 : _c.includes('__'))) &&
+                // don't wait on workflow children
+                !fileResponse.type.startsWith('Workflow') &&
+                // aura xml aren't tracked as SourceMembers
+                !((_d = fileResponse.filePath) === null || _d === void 0 ? void 0 : _d.endsWith('.cmp-meta.xml')) &&
+                !((_e = fileResponse.filePath) === null || _e === void 0 ? void 0 : _e.endsWith('.tokens-meta.xml')) &&
+                !((_f = fileResponse.filePath) === null || _f === void 0 ? void 0 : _f.endsWith('.evt-meta.xml')) &&
+                !((_g = fileResponse.filePath) === null || _g === void 0 ? void 0 : _g.endsWith('.app-meta.xml')) &&
+                !((_h = fileResponse.filePath) === null || _h === void 0 ? void 0 : _h.endsWith('.intf-meta.xml'));
+        })
+            .map((member) => {
+            (0, metadataKeys_1.getMetadataKeyFromFileResponse)(member)
+                // remove some individual members known to not work with tracking even when their type does
+                .filter((key) => 
+            // CustomObject could have been re-added by the key generator from one of its fields
+            !key.startsWith('CustomObject') &&
+                key !== 'Profile__Standard' &&
+                key !== 'CustomTab__standard-home' &&
+                key !== 'AssignmentRules__Case' &&
+                key !== 'ListView__CollaborationGroup.All_ChatterGroups')
+                .map((key) => outstandingSourceMembers.set(key, member));
+        });
+        return outstandingSourceMembers;
+    }
     calculateTimeout(memberCount) {
-        const overriddenTimeout = (0, kit_1.toNumber)(kit_1.env.getString('SFDX_SOURCE_MEMBER_POLLING_TIMEOUT', '0'));
+        var _a;
+        const overriddenTimeout = (_a = kit_1.env.getNumber('SFDX_SOURCE_MEMBER_POLLING_TIMEOUT', 0)) !== null && _a !== void 0 ? _a : 0;
         if (overriddenTimeout > 0) {
             this.logger.debug(`Overriding SourceMember polling timeout to ${overriddenTimeout}`);
-            return overriddenTimeout;
+            return kit_1.Duration.seconds(overriddenTimeout);
         }
         // Calculate a polling timeout for SourceMembers based on the number of
         // member names being polled plus a buffer of 5 seconds.  This will
         // wait 50s for each 1000 components, plus 5s.
         const pollingTimeout = Math.ceil(memberCount * 0.05) + 5;
         this.logger.debug(`Computed SourceMember polling timeout of ${pollingTimeout}s`);
-        return pollingTimeout;
+        return kit_1.Duration.seconds(pollingTimeout);
     }
     async querySourceMembersFrom({ fromRevision, quiet = false, useCache = true, } = {}) {
         const rev = fromRevision != null ? fromRevision : this.getServerMaxRevision();
@@ -460,7 +530,7 @@ class RemoteSourceTrackingService extends core_1.ConfigFile {
             this.logger.debug(query);
         }
         try {
-            const results = await this.org.getConnection().tooling.autoFetchQuery(query);
+            const results = await this.org.getConnection().tooling.autoFetchQuery(query, { maxFetch: 50000 });
             return results.records;
         }
         catch (error) {

package/messages/compatibility.json

@@ -1,5 +1,5 @@
 {
   "sourceTrackingFileVersionMismatch": "This project uses the %s version of source tracking files.",
   "clearSuggestion": "Clear the %s version of the tracking files by running '%s'",
-  "useOtherVersion": "Use the %s version of the command, '%s' to preserve the tracking files)"
+  "useOtherVersion": "Use the %s version of the command, '%s' with your existing tracking files."
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/source-tracking",
   "description": "API for tracking local and remote Salesforce metadata changes",
-  "version": "1.0.2",
+  "version": "1.1.2",
   "author": "Salesforce",
   "license": "BSD-3-Clause",
   "main": "lib/index.js",