Moves some files for better organization

Removes re-export of config from configuration

src/annotations/annotationProvider.ts

@@ -8,10 +8,10 @@ import type {
 	Uri,
 } from 'vscode';
 import { Disposable, window } from 'vscode';
-import type { FileAnnotationType } from '../configuration';
+import type { FileAnnotationType } from '../config';
 import { ContextKeys } from '../constants';
 import { setContext } from '../context';
-import { Logger } from '../logger';
+import { Logger } from '../system/logger';
 import type { GitDocumentState, TrackedDocument } from '../trackers/gitDocumentTracker';
 
 export const enum AnnotationStatus {

src/annotations/annotations.ts

@@ -7,14 +7,14 @@ import type {
 	ThemableDecorationRenderOptions,
 } from 'vscode';
 import { OverviewRulerLane, ThemeColor, Uri, window } from 'vscode';
+import type { Config } from '../config';
 import { HeatmapLocations } from '../config';
-import type { Config } from '../configuration';
-import { configuration } from '../configuration';
 import { Colors, GlyphChars } from '../constants';
 import type { CommitFormatOptions } from '../git/formatters/commitFormatter';
 import { CommitFormatter } from '../git/formatters/commitFormatter';
 import type { GitCommit } from '../git/models/commit';
 import { scale, toRgba } from '../system/color';
+import { configuration } from '../system/configuration';
 import { getWidth, interpolate, pad } from '../system/string';
 
 export interface ComputedHeatmap {

src/annotations/autolinks.ts

@@ -1,18 +1,18 @@
 import type { ConfigurationChangeEvent } from 'vscode';
 import { Disposable } from 'vscode';
-import type { AutolinkReference, AutolinkType } from '../configuration';
-import { configuration } from '../configuration';
+import type { AutolinkReference, AutolinkType } from '../config';
 import { GlyphChars } from '../constants';
 import type { Container } from '../container';
 import type { IssueOrPullRequest } from '../git/models/issue';
 import { getIssueOrPullRequestHtmlIcon, getIssueOrPullRequestMarkdownIcon } from '../git/models/issue';
 import type { GitRemote } from '../git/models/remote';
 import type { RemoteProviderReference } from '../git/models/remoteProvider';
-import { Logger } from '../logger';
+import { configuration } from '../system/configuration';
 import { fromNow } from '../system/date';
 import { debug } from '../system/decorators/log';
 import { encodeUrl } from '../system/encoding';
 import { join, map } from '../system/iterable';
+import { Logger } from '../system/logger';
 import type { PromiseCancelledErrorWithId } from '../system/promise';
 import { PromiseCancelledError, raceAll } from '../system/promise';
 import { encodeHtmlWeak, escapeMarkdown, escapeRegex, getSuperscript } from '../system/string';

src/annotations/blameAnnotationProvider.ts

@@ -1,12 +1,12 @@
 import type { CancellationToken, Disposable, Position, TextDocument, TextEditor } from 'vscode';
 import { Hover, languages, Range } from 'vscode';
 import type { FileAnnotationType } from '../config';
-import { configuration } from '../configuration';
 import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
 import type { GitBlame } from '../git/models/blame';
 import type { GitCommit } from '../git/models/commit';
 import { changesMessage, detailsMessage } from '../hovers/hovers';
+import { configuration } from '../system/configuration';
 import { log } from '../system/decorators/log';
 import type { GitDocumentState, TrackedDocument } from '../trackers/gitDocumentTracker';
 import { AnnotationProviderBase } from './annotationProvider';

src/annotations/fileAnnotationController.ts

@@ -20,21 +20,16 @@ import {
 	window,
 	workspace,
 } from 'vscode';
-import {
-	AnnotationsToggleMode,
-	BlameHighlightLocations,
-	ChangesLocations,
-	configuration,
-	FileAnnotationType,
-} from '../configuration';
+import { AnnotationsToggleMode, BlameHighlightLocations, ChangesLocations, FileAnnotationType } from '../config';
 import { Colors, ContextKeys } from '../constants';
 import type { Container } from '../container';
 import { setContext } from '../context';
-import type { KeyboardScope } from '../keyboard';
-import { Logger } from '../logger';
+import { configuration } from '../system/configuration';
 import { once } from '../system/event';
 import { debounce } from '../system/function';
 import { find } from '../system/iterable';
+import type { KeyboardScope } from '../system/keyboard';
+import { Logger } from '../system/logger';
 import { basename } from '../system/path';
 import { isTextEditor } from '../system/utils';
 import type {

src/annotations/gutterBlameAnnotationProvider.ts

@@ -1,17 +1,18 @@
 import type { DecorationOptions, TextEditor, ThemableDecorationAttachmentRenderOptions } from 'vscode';
 import { Range } from 'vscode';
-import type { GravatarDefaultStyle } from '../configuration';
-import { configuration, FileAnnotationType } from '../configuration';
+import type { GravatarDefaultStyle } from '../config';
+import { FileAnnotationType } from '../config';
 import { GlyphChars } from '../constants';
 import type { Container } from '../container';
 import type { CommitFormatOptions } from '../git/formatters/commitFormatter';
 import { CommitFormatter } from '../git/formatters/commitFormatter';
 import type { GitBlame } from '../git/models/blame';
 import type { GitCommit } from '../git/models/commit';
-import { getLogScope } from '../logScope';
 import { filterMap } from '../system/array';
+import { configuration } from '../system/configuration';
 import { log } from '../system/decorators/log';
 import { first } from '../system/iterable';
+import { getLogScope } from '../system/logger.scope';
 import { Stopwatch } from '../system/stopwatch';
 import type { TokenOptions } from '../system/string';
 import { getTokensFromTemplate, getWidth } from '../system/string';

src/annotations/gutterChangesAnnotationProvider.ts

@@ -7,13 +7,14 @@ import type {
 	TextEditorDecorationType,
 } from 'vscode';
 import { Hover, languages, Position, Range, Selection, TextEditorRevealType } from 'vscode';
-import { configuration, FileAnnotationType } from '../configuration';
+import { FileAnnotationType } from '../config';
 import type { Container } from '../container';
 import type { GitCommit } from '../git/models/commit';
 import type { GitDiff } from '../git/models/diff';
 import { localChangesMessage } from '../hovers/hovers';
-import { getLogScope } from '../logScope';
+import { configuration } from '../system/configuration';
 import { log } from '../system/decorators/log';
+import { getLogScope } from '../system/logger.scope';
 import { Stopwatch } from '../system/stopwatch';
 import type { GitDocumentState, TrackedDocument } from '../trackers/gitDocumentTracker';
 import type { AnnotationContext } from './annotationProvider';

src/annotations/gutterHeatmapBlameAnnotationProvider.ts

@@ -1,10 +1,10 @@
 import type { TextEditor, TextEditorDecorationType } from 'vscode';
 import { Range } from 'vscode';
-import { FileAnnotationType } from '../configuration';
+import { FileAnnotationType } from '../config';
 import type { Container } from '../container';
 import type { GitCommit } from '../git/models/commit';
-import { getLogScope } from '../logScope';
 import { log } from '../system/decorators/log';
+import { getLogScope } from '../system/logger.scope';
 import { Stopwatch } from '../system/stopwatch';
 import type { GitDocumentState } from '../trackers/gitDocumentTracker';
 import type { TrackedDocument } from '../trackers/trackedDocument';

src/annotations/lineAnnotationController.ts

@@ -6,18 +6,18 @@ import type {
 	TextEditorDecorationType,
 } from 'vscode';
 import { CancellationTokenSource, DecorationRangeBehavior, Disposable, Range, window } from 'vscode';
-import { configuration } from '../configuration';
 import { GlyphChars } from '../constants';
 import type { Container } from '../container';
 import { CommitFormatter } from '../git/formatters/commitFormatter';
 import type { GitCommit } from '../git/models/commit';
 import type { PullRequest } from '../git/models/pullRequest';
-import { Logger } from '../logger';
-import type { LogScope } from '../logScope';
-import { getLogScope } from '../logScope';
+import { configuration } from '../system/configuration';
 import { debug, log } from '../system/decorators/log';
 import { once } from '../system/event';
 import { count, every, filter } from '../system/iterable';
+import { Logger } from '../system/logger';
+import type { LogScope } from '../system/logger.scope';
+import { getLogScope } from '../system/logger.scope';
 import type { PromiseCancelledErrorWithId } from '../system/promise';
 import { PromiseCancelledError, raceAll } from '../system/promise';
 import { isTextEditor } from '../system/utils';

src/api/actionRunners.ts

@@ -1,11 +1,11 @@
 import type { Event, QuickPickItem } from 'vscode';
 import { Disposable, EventEmitter, window } from 'vscode';
-import type { Config } from '../configuration';
-import { configuration } from '../configuration';
+import type { Config } from '../config';
 import { Commands, ContextKeys } from '../constants';
 import type { Container } from '../container';
 import { setContext } from '../context';
 import { registerCommand } from '../system/command';
+import { configuration } from '../system/configuration';
 import { sortCompare } from '../system/string';
 import { getQuickPickIgnoreFocusOut } from '../system/utils';
 import type { Action, ActionContext, ActionRunner } from './gitlens';

src/avatars.ts

@@ -1,12 +1,12 @@
 import { EventEmitter, Uri } from 'vscode';
 import { md5 } from '@env/crypto';
 import { GravatarDefaultStyle } from './config';
-import { configuration } from './configuration';
 import { ContextKeys } from './constants';
 import { Container } from './container';
 import { getContext } from './context';
 import { getGitHubNoReplyAddressParts } from './git/remotes/github';
 import type { StoredAvatar } from './storage';
+import { configuration } from './system/configuration';
 import { debounce } from './system/function';
 import { filterMap } from './system/iterable';
 import { base64, equalsIgnoreCase } from './system/string';

src/codelens/codeLensController.ts

@@ -1,11 +1,11 @@
 import type { ConfigurationChangeEvent } from 'vscode';
 import { Disposable, languages } from 'vscode';
-import { configuration } from '../configuration';
 import { ContextKeys } from '../constants';
 import type { Container } from '../container';
 import { setContext } from '../context';
-import { Logger } from '../logger';
+import { configuration } from '../system/configuration';
 import { once } from '../system/event';
+import { Logger } from '../system/logger';
 import type {
 	DocumentBlameStateChangeEvent,
 	DocumentDirtyIdleTriggerEvent,

src/codelens/codeLensProvider.ts

@@ -18,18 +18,19 @@ import type {
 	ShowQuickFileHistoryCommandArgs,
 	ToggleFileChangesAnnotationCommandArgs,
 } from '../commands';
-import type { CodeLensConfig, CodeLensLanguageScope } from '../configuration';
-import { CodeLensCommand, CodeLensScopes, configuration, FileAnnotationType } from '../configuration';
+import type { CodeLensConfig, CodeLensLanguageScope } from '../config';
+import { CodeLensCommand, CodeLensScopes, FileAnnotationType } from '../config';
 import { Commands, CoreCommands, Schemes } from '../constants';
 import type { Container } from '../container';
 import type { GitUri } from '../git/gitUri';
 import type { GitBlame, GitBlameLines } from '../git/models/blame';
 import type { GitCommit } from '../git/models/commit';
 import { RemoteResourceType } from '../git/models/remoteResource';
-import { Logger } from '../logger';
 import { asCommand, executeCoreCommand } from '../system/command';
+import { configuration } from '../system/configuration';
 import { is, once } from '../system/function';
 import { filterMap, find, first, join, map } from '../system/iterable';
+import { Logger } from '../system/logger';
 import { isVirtualUri } from '../system/utils';
 
 export class GitRecentChangeCodeLens extends CodeLens {

src/commands/browseRepoAtRevision.ts

@@ -2,9 +2,9 @@ import type { TextEditor, Uri } from 'vscode';
 import { Commands, CoreCommands } from '../constants';
 import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { command, executeCoreCommand } from '../system/command';
+import { Logger } from '../system/logger';
 import { basename } from '../system/path';
 import { openWorkspace, OpenWorkspaceLocation } from '../system/utils';
 import type { CommandContext } from './base';

src/commands/closeUnchangedFiles.ts

@@ -1,12 +1,12 @@
 import type { Uri } from 'vscode';
 import { TabInputCustom, TabInputNotebook, TabInputNotebookDiff, TabInputText, TabInputTextDiff, window } from 'vscode';
-import { UriComparer } from '../comparers';
 import { Commands } from '../constants';
 import type { Container } from '../container';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { getRepositoryOrShowPicker } from '../quickpicks/repositoryPicker';
 import { command } from '../system/command';
+import { UriComparer } from '../system/comparers';
+import { Logger } from '../system/logger';
 import { Command } from './base';
 
 export interface CloseUnchangedFilesCommandArgs {

src/commands/compareWith.ts

@@ -1,10 +1,10 @@
 import type { TextEditor, Uri } from 'vscode';
 import { Commands } from '../constants';
 import type { Container } from '../container';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { getBestRepositoryOrShowPicker } from '../quickpicks/repositoryPicker';
 import { command } from '../system/command';
+import { Logger } from '../system/logger';
 import type { CommandContext } from './base';
 import { ActiveEditorCommand, getCommandUri } from './base';
 

src/commands/copyCurrentBranch.ts

@@ -3,10 +3,10 @@ import { env } from 'vscode';
 import { Commands } from '../constants';
 import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { getBestRepositoryOrShowPicker } from '../quickpicks/repositoryPicker';
 import { command } from '../system/command';
+import { Logger } from '../system/logger';
 import { ActiveEditorCommand, getCommandUri } from './base';
 
 @command()

src/commands/copyDeepLink.ts

@@ -4,11 +4,11 @@ import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
 import { splitBranchNameAndRemote } from '../git/models/branch';
 import type { GitReference } from '../git/models/reference';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { showRemotePicker } from '../quickpicks/remotePicker';
 import { getBestRepositoryOrShowPicker } from '../quickpicks/repositoryPicker';
 import { command } from '../system/command';
+import { Logger } from '../system/logger';
 import { DeepLinkType, deepLinkTypeToString, refTypeToDeepLinkType } from '../uris/deepLinks/deepLink';
 import type { CommandContext } from './base';
 import {

src/commands/copyMessageToClipboard.ts

@@ -4,10 +4,10 @@ import { Commands } from '../constants';
 import type { Container } from '../container';
 import { copyMessageToClipboard } from '../git/actions/commit';
 import { GitUri } from '../git/gitUri';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { command } from '../system/command';
 import { first } from '../system/iterable';
+import { Logger } from '../system/logger';
 import type { CommandContext } from './base';
 import {
 	ActiveEditorCommand,

src/commands/copyShaToClipboard.ts

@@ -1,14 +1,14 @@
 import type { TextEditor, Uri } from 'vscode';
 import { env } from 'vscode';
-import { configuration } from '../configuration';
 import { Commands } from '../constants';
 import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
 import { shortenRevision } from '../git/models/reference';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { command } from '../system/command';
+import { configuration } from '../system/configuration';
 import { first } from '../system/iterable';
+import { Logger } from '../system/logger';
 import type { CommandContext } from './base';
 import {
 	ActiveEditorCommand,

src/commands/diffLineWithPrevious.ts

@@ -3,9 +3,9 @@ import { Commands } from '../constants';
 import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
 import type { GitCommit } from '../git/models/commit';
-import { Logger } from '../logger';
 import { showCommitHasNoPreviousCommitWarningMessage, showGenericErrorMessage } from '../messages';
 import { command, executeCommand } from '../system/command';
+import { Logger } from '../system/logger';
 import { ActiveEditorCommand, getCommandUri } from './base';
 import type { DiffWithCommandArgs } from './diffWith';
 

src/commands/diffLineWithWorking.ts

@@ -5,9 +5,9 @@ import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
 import type { GitCommit } from '../git/models/commit';
 import { uncommittedStaged } from '../git/models/constants';
-import { Logger } from '../logger';
 import { showFileNotUnderSourceControlWarningMessage, showGenericErrorMessage } from '../messages';
 import { command, executeCommand } from '../system/command';
+import { Logger } from '../system/logger';
 import { ActiveEditorCommand, getCommandUri } from './base';
 import type { DiffWithCommandArgs } from './diffWith';
 

src/commands/diffWith.ts

@@ -6,9 +6,9 @@ import type { GitCommit } from '../git/models/commit';
 import { isCommit } from '../git/models/commit';
 import { deletedOrMissing } from '../git/models/constants';
 import { isShaLike, isUncommitted, shortenRevision } from '../git/models/reference';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { command, executeCoreCommand } from '../system/command';
+import { Logger } from '../system/logger';
 import { basename } from '../system/path';
 import { Command } from './base';
 

src/commands/diffWithNext.ts

@@ -3,9 +3,9 @@ import { Commands } from '../constants';
 import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
 import type { GitCommit } from '../git/models/commit';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { command, executeCommand } from '../system/command';
+import { Logger } from '../system/logger';
 import type { CommandContext } from './base';
 import { ActiveEditorCommand, getCommandUri } from './base';
 import type { DiffWithCommandArgs } from './diffWith';

src/commands/diffWithPrevious.ts

@@ -4,9 +4,9 @@ import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
 import type { GitCommit } from '../git/models/commit';
 import { deletedOrMissing } from '../git/models/constants';
-import { Logger } from '../logger';
 import { showCommitHasNoPreviousCommitWarningMessage, showGenericErrorMessage } from '../messages';
 import { command, executeCommand } from '../system/command';
+import { Logger } from '../system/logger';
 import { findOrOpenEditor } from '../system/utils';
 import type { CommandContext } from './base';
 import { ActiveEditorCommand, getCommandUri } from './base';

src/commands/diffWithRevision.ts

@@ -3,11 +3,11 @@ import { Commands, GlyphChars, quickPickTitleMaxChars } from '../constants';
 import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
 import { shortenRevision } from '../git/models/reference';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { showCommitPicker } from '../quickpicks/commitPicker';
 import { CommandQuickPickItem } from '../quickpicks/items/common';
 import { command, executeCommand } from '../system/command';
+import { Logger } from '../system/logger';
 import { pad } from '../system/string';
 import { ActiveEditorCommand, getCommandUri } from './base';
 import type { DiffWithCommandArgs } from './diffWith';

src/commands/diffWithWorking.ts

@@ -4,9 +4,9 @@ import { Commands } from '../constants';
 import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
 import { deletedOrMissing, uncommittedStaged } from '../git/models/constants';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { command, executeCommand } from '../system/command';
+import { Logger } from '../system/logger';
 import { ActiveEditorCommand, getCommandUri } from './base';
 import type { DiffWithCommandArgs } from './diffWith';
 

src/commands/externalDiff.ts

@@ -2,16 +2,16 @@ import type { SourceControlResourceState } from 'vscode';
 import { env, Uri, window } from 'vscode';
 import type { ScmResource } from '../@types/vscode.git.resources';
 import { ScmResourceGroupType, ScmStatus } from '../@types/vscode.git.resources.enums';
-import { configuration } from '../configuration';
 import { Commands } from '../constants';
 import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
 import { isUncommitted } from '../git/models/reference';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { getRepositoryOrShowPicker } from '../quickpicks/repositoryPicker';
 import { filterMap } from '../system/array';
 import { command } from '../system/command';
+import { configuration } from '../system/configuration';
+import { Logger } from '../system/logger';
 import type { CommandContext } from './base';
 import { Command, isCommandContextViewNodeHasFileCommit, isCommandContextViewNodeHasFileRefs } from './base';
 

src/commands/ghpr/openOrCreateWorktree.ts

@@ -7,8 +7,8 @@ import { create as createWorktree, open as openWorktree } from '../../git/action
 import { createReference } from '../../git/models/reference';
 import type { GitRemote } from '../../git/models/remote';
 import { parseGitRemoteUrl } from '../../git/parsers/remoteParser';
-import { Logger } from '../../logger';
 import { command } from '../../system/command';
+import { Logger } from '../../system/logger';
 import { waitUntilNextTick } from '../../system/promise';
 import { Command } from '../base';
 

src/commands/git/push.ts

@@ -1,4 +1,3 @@
-import { configuration } from '../../configuration';
 import { CoreGitConfiguration, GlyphChars } from '../../constants';
 import type { Container } from '../../container';
 import { getRemoteNameFromBranchName } from '../../git/models/branch';
@@ -9,6 +8,7 @@ import { createDirectiveQuickPickItem, Directive } from '../../quickpicks/items/
 import type { FlagsQuickPickItem } from '../../quickpicks/items/flags';
 import { createFlagsQuickPickItem } from '../../quickpicks/items/flags';
 import { isStringArray } from '../../system/array';
+import { configuration } from '../../system/configuration';
 import { fromNow } from '../../system/date';
 import { pad, pluralize } from '../../system/string';
 import type { ViewsWithRepositoryFolders } from '../../views/viewBase';

src/commands/git/remote.ts

@@ -4,11 +4,11 @@ import type { Container } from '../../container';
 import { reveal } from '../../git/actions/remote';
 import type { GitRemote } from '../../git/models/remote';
 import { Repository } from '../../git/models/repository';
-import { Logger } from '../../logger';
 import { showGenericErrorMessage } from '../../messages';
 import type { QuickPickItemOfT } from '../../quickpicks/items/common';
 import type { FlagsQuickPickItem } from '../../quickpicks/items/flags';
 import { createFlagsQuickPickItem } from '../../quickpicks/items/flags';
+import { Logger } from '../../system/logger';
 import type { ViewsWithRepositoryFolders } from '../../views/viewBase';
 import type {
 	AsyncStepResultGenerator,

src/commands/git/search.ts

@@ -1,4 +1,3 @@
-import { configuration } from '../../configuration';
 import { ContextKeys, GlyphChars } from '../../constants';
 import type { Container } from '../../container';
 import { getContext } from '../../context';
@@ -10,6 +9,7 @@ import type { SearchOperators, SearchQuery } from '../../git/search';
 import { getSearchQueryComparisonKey, parseSearchQuery, searchOperators } from '../../git/search';
 import type { QuickPickItemOfT } from '../../quickpicks/items/common';
 import { ActionQuickPickItem } from '../../quickpicks/items/common';
+import { configuration } from '../../system/configuration';
 import { pluralize } from '../../system/string';
 import { SearchResultsNode } from '../../views/nodes/searchResultsNode';
 import type { ViewsWithRepositoryFolders } from '../../views/viewBase';

src/commands/git/stash.ts

@@ -9,12 +9,12 @@ import type { GitStashCommit } from '../../git/models/commit';
 import type { GitStashReference } from '../../git/models/reference';
 import { getReferenceLabel } from '../../git/models/reference';
 import type { Repository } from '../../git/models/repository';
-import { Logger } from '../../logger';
 import { showGenericErrorMessage } from '../../messages';
 import type { QuickPickItemOfT } from '../../quickpicks/items/common';
 import type { FlagsQuickPickItem } from '../../quickpicks/items/flags';
 import { createFlagsQuickPickItem } from '../../quickpicks/items/flags';
 import { formatPath } from '../../system/formatPath';
+import { Logger } from '../../system/logger';
 import { pad } from '../../system/string';
 import type { ViewsWithRepositoryFolders } from '../../views/viewBase';
 import { getSteps } from '../gitCommands.utils';

src/commands/git/worktree.ts

@@ -1,7 +1,6 @@
 import type { MessageItem } from 'vscode';
 import { QuickInputButtons, Uri, window, workspace } from 'vscode';
-import type { Config } from '../../configuration';
-import { configuration } from '../../configuration';
+import type { Config } from '../../config';
 import type { Container } from '../../container';
 import { PlusFeatures } from '../../features';
 import { convertOpenFlagsToLocation, reveal, revealInFileExplorer } from '../../git/actions/worktree';
@@ -21,6 +20,7 @@ import { createQuickPickSeparator } from '../../quickpicks/items/common';
 import { Directive } from '../../quickpicks/items/directive';
 import type { FlagsQuickPickItem } from '../../quickpicks/items/flags';
 import { createFlagsQuickPickItem } from '../../quickpicks/items/flags';
+import { configuration } from '../../system/configuration';
 import { basename, isDescendent } from '../../system/path';
 import { pluralize, truncateLeft } from '../../system/string';
 import { openWorkspace, OpenWorkspaceLocation } from '../../system/utils';

src/commands/gitCommands.ts

@@ -1,12 +1,12 @@
 import type { Disposable, InputBox, QuickInputButton, QuickPick, QuickPickItem } from 'vscode';
 import { InputBoxValidationSeverity, QuickInputButtons, window } from 'vscode';
-import { configuration } from '../configuration';
 import { Commands } from '../constants';
 import { Container } from '../container';
-import type { KeyMapping } from '../keyboard';
 import { Directive, isDirective, isDirectiveQuickPickItem } from '../quickpicks/items/directive';
 import { command } from '../system/command';
+import { configuration } from '../system/configuration';
 import { log } from '../system/decorators/log';
+import type { KeyMapping } from '../system/keyboard';
 import type { Deferred } from '../system/promise';
 import { isPromise } from '../system/promise';
 import type { CommandContext } from './base';

src/commands/gitCommands.utils.ts

@@ -1,9 +1,9 @@
 import { GitCommandSorting } from '../config';
-import { configuration } from '../configuration';
 import { ContextKeys } from '../constants';
 import type { Container } from '../container';
 import { getContext } from '../context';
 import type { RecentUsage } from '../storage';
+import { configuration } from '../system/configuration';
 import { BranchGitCommand } from './git/branch';
 import { CherryPickGitCommand } from './git/cherry-pick';
 import { CoAuthorsGitCommand } from './git/coauthors';

src/commands/logging.ts

@@ -1,7 +1,8 @@
-import { configuration, OutputLevel } from '../configuration';
+import { OutputLevel } from '../config';
 import { Commands } from '../constants';
 import type { Container } from '../container';
 import { command } from '../system/command';
+import { configuration } from '../system/configuration';
 import { Command } from './base';
 
 @command()

src/commands/openAssociatedPullRequestOnRemote.ts

@@ -2,8 +2,8 @@ import type { TextEditor, Uri } from 'vscode';
 import { Commands } from '../constants';
 import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
-import { Logger } from '../logger';
 import { command, executeCommand } from '../system/command';
+import { Logger } from '../system/logger';
 import { ActiveEditorCommand, getCommandUri } from './base';
 import type { OpenPullRequestOnRemoteCommandArgs } from './openPullRequestOnRemote';
 

src/commands/openBranchOnRemote.ts

@@ -3,12 +3,12 @@ import { Commands } from '../constants';
 import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
 import { RemoteResourceType } from '../git/models/remoteResource';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { CommandQuickPickItem } from '../quickpicks/items/common';
 import { ReferencesQuickPickIncludes, showReferencePicker } from '../quickpicks/referencePicker';
 import { getBestRepositoryOrShowPicker } from '../quickpicks/repositoryPicker';
 import { command, executeCommand } from '../system/command';
+import { Logger } from '../system/logger';
 import type { CommandContext } from './base';
 import { ActiveEditorCommand, getCommandUri, isCommandContextViewNodeHasBranch } from './base';
 import type { OpenOnRemoteCommandArgs } from './openOnRemote';

src/commands/openBranchesOnRemote.ts

@@ -3,10 +3,10 @@ import { Commands } from '../constants';
 import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
 import { RemoteResourceType } from '../git/models/remoteResource';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { getBestRepositoryOrShowPicker } from '../quickpicks/repositoryPicker';
 import { command, executeCommand } from '../system/command';
+import { Logger } from '../system/logger';
 import type { CommandContext } from './base';
 import { ActiveEditorCommand, getCommandUri, isCommandContextViewNodeHasRemote } from './base';
 import type { OpenOnRemoteCommandArgs } from './openOnRemote';

src/commands/openChangedFiles.ts

@@ -2,11 +2,11 @@ import type { Uri } from 'vscode';
 import { window } from 'vscode';
 import { Commands } from '../constants';
 import type { Container } from '../container';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { getRepositoryOrShowPicker } from '../quickpicks/repositoryPicker';
 import { filterMap } from '../system/array';
 import { command } from '../system/command';
+import { Logger } from '../system/logger';
 import { findOrOpenEditors } from '../system/utils';
 import { Command } from './base';
 

src/commands/openCommitOnRemote.ts

@@ -4,10 +4,10 @@ import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
 import { deletedOrMissing } from '../git/models/constants';
 import { RemoteResourceType } from '../git/models/remoteResource';
-import { Logger } from '../logger';
 import { showFileNotUnderSourceControlWarningMessage, showGenericErrorMessage } from '../messages';
 import { getBestRepositoryOrShowPicker } from '../quickpicks/repositoryPicker';
 import { command, executeCommand } from '../system/command';
+import { Logger } from '../system/logger';
 import type { CommandContext } from './base';
 import {
 	ActiveEditorCommand,

src/commands/openComparisonOnRemote.ts

@@ -1,9 +1,9 @@
 import { Commands } from '../constants';
 import type { Container } from '../container';
 import { RemoteResourceType } from '../git/models/remoteResource';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { command, executeCommand } from '../system/command';
+import { Logger } from '../system/logger';
 import { ResultsCommitsNode } from '../views/nodes/resultsCommitsNode';
 import type { CommandContext } from './base';
 import { Command } from './base';

src/commands/openCurrentBranchOnRemote.ts

@@ -3,10 +3,10 @@ import { Commands } from '../constants';
 import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
 import { RemoteResourceType } from '../git/models/remoteResource';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { getBestRepositoryOrShowPicker } from '../quickpicks/repositoryPicker';
 import { command, executeCommand } from '../system/command';
+import { Logger } from '../system/logger';
 import { ActiveEditorCommand, getCommandUri } from './base';
 import type { OpenOnRemoteCommandArgs } from './openOnRemote';
 

src/commands/openDirectoryCompare.ts

@@ -2,11 +2,11 @@ import type { TextEditor, Uri } from 'vscode';
 import { Commands } from '../constants';
 import type { Container } from '../container';
 import { openDirectoryCompare } from '../git/actions/commit';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { showReferencePicker } from '../quickpicks/referencePicker';
 import { getBestRepositoryOrShowPicker } from '../quickpicks/repositoryPicker';
 import { command } from '../system/command';
+import { Logger } from '../system/logger';
 import { CompareResultsNode } from '../views/nodes/compareResultsNode';
 import type { CommandContext } from './base';
 import { ActiveEditorCommand, getCommandUri, isCommandContextViewNodeHasRef } from './base';

src/commands/openFileAtRevision.ts

@@ -1,16 +1,16 @@
 import type { TextDocumentShowOptions, TextEditor } from 'vscode';
 import { Uri } from 'vscode';
-import { FileAnnotationType } from '../configuration';
+import { FileAnnotationType } from '../config';
 import { Commands, GlyphChars, quickPickTitleMaxChars } from '../constants';
 import type { Container } from '../container';
 import { openFileAtRevision } from '../git/actions/commit';
 import { GitUri } from '../git/gitUri';
 import { shortenRevision } from '../git/models/reference';
-import { Logger } from '../logger';
 import { showCommitHasNoPreviousCommitWarningMessage, showGenericErrorMessage } from '../messages';
 import { showCommitPicker } from '../quickpicks/commitPicker';
 import { CommandQuickPickItem } from '../quickpicks/items/common';
 import { command } from '../system/command';
+import { Logger } from '../system/logger';
 import { pad } from '../system/string';
 import type { CommandContext } from './base';
 import { ActiveEditorCommand, getCommandUri } from './base';

src/commands/openFileAtRevisionFrom.ts

@@ -1,5 +1,5 @@
 import type { TextDocumentShowOptions, TextEditor, Uri } from 'vscode';
-import type { FileAnnotationType } from '../configuration';
+import type { FileAnnotationType } from '../config';
 import { Commands, GlyphChars, quickPickTitleMaxChars } from '../constants';
 import type { Container } from '../container';
 import { openFileAtRevision } from '../git/actions/commit';

src/commands/openFileOnRemote.ts

@@ -1,17 +1,17 @@
 import type { TextEditor, Uri } from 'vscode';
 import { Range } from 'vscode';
-import { UriComparer } from '../comparers';
-import { BranchSorting, TagSorting } from '../configuration';
+import { BranchSorting, TagSorting } from '../config';
 import { Commands, GlyphChars } from '../constants';
 import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
 import { getBranchNameWithoutRemote, getRemoteNameFromBranchName } from '../git/models/branch';
 import { isSha } from '../git/models/reference';
 import { RemoteResourceType } from '../git/models/remoteResource';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { showReferencePicker } from '../quickpicks/referencePicker';
 import { command, executeCommand } from '../system/command';
+import { UriComparer } from '../system/comparers';
+import { Logger } from '../system/logger';
 import { pad, splitSingle } from '../system/string';
 import { StatusFileNode } from '../views/nodes/statusFileNode';
 import type { CommandContext } from './base';

src/commands/openOnRemote.ts

@@ -5,10 +5,10 @@ import { GitRemote } from '../git/models/remote';
 import type { RemoteResource } from '../git/models/remoteResource';
 import { RemoteResourceType } from '../git/models/remoteResource';
 import type { RemoteProvider } from '../git/remotes/remoteProvider';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { showRemoteProviderPicker } from '../quickpicks/remoteProviderPicker';
 import { command } from '../system/command';
+import { Logger } from '../system/logger';
 import { pad, splitSingle } from '../system/string';
 import { Command } from './base';
 

src/commands/openRepoOnRemote.ts

@@ -3,10 +3,10 @@ import { Commands } from '../constants';
 import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
 import { RemoteResourceType } from '../git/models/remoteResource';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { getBestRepositoryOrShowPicker } from '../quickpicks/repositoryPicker';
 import { command, executeCommand } from '../system/command';
+import { Logger } from '../system/logger';
 import type { CommandContext } from './base';
 import { ActiveEditorCommand, getCommandUri, isCommandContextViewNodeHasRemote } from './base';
 import type { OpenOnRemoteCommandArgs } from './openOnRemote';

src/commands/openRevisionFile.ts

@@ -1,13 +1,13 @@
 import type { TextDocumentShowOptions, TextEditor, Uri } from 'vscode';
-import type { FileAnnotationType } from '../configuration';
+import type { FileAnnotationType } from '../config';
 import { Commands } from '../constants';
 import type { Container } from '../container';
 import { openFileAtRevision } from '../git/actions/commit';
 import { GitUri } from '../git/gitUri';
 import { deletedOrMissing } from '../git/models/constants';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { command } from '../system/command';
+import { Logger } from '../system/logger';
 import { ActiveEditorCommand, getCommandUri } from './base';
 
 export interface OpenRevisionFileCommandArgs {

src/commands/openWorkingFile.ts

@@ -1,12 +1,12 @@
 import type { TextDocumentShowOptions, TextEditor, Uri } from 'vscode';
 import { Range, window } from 'vscode';
-import type { FileAnnotationType } from '../configuration';
+import type { FileAnnotationType } from '../config';
 import { Commands } from '../constants';
 import type { Container } from '../container';
 import { GitUri, isGitUri } from '../git/gitUri';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { command } from '../system/command';
+import { Logger } from '../system/logger';
 import { findOrOpenEditor } from '../system/utils';
 import { ActiveEditorCommand, getCommandUri } from './base';
 

src/commands/quickCommand.steps.ts

@@ -1,5 +1,5 @@
 import type { QuickInputButton, QuickPick } from 'vscode';
-import { BranchSorting, configuration, TagSorting } from '../configuration';
+import { BranchSorting, TagSorting } from '../config';
 import { Commands, GlyphChars, quickPickTitleMaxChars } from '../constants';
 import { Container } from '../container';
 import type { PlusFeatures } from '../features';
@@ -94,6 +94,7 @@ import {
 } from '../quickpicks/remoteProviderPicker';
 import { isSubscriptionPaidPlan, isSubscriptionPreviewTrialExpired } from '../subscription';
 import { filterMap, intersection, isStringArray } from '../system/array';
+import { configuration } from '../system/configuration';
 import { formatPath } from '../system/formatPath';
 import { map } from '../system/iterable';
 import { getSettledValue } from '../system/promise';

src/commands/quickCommand.ts

@@ -1,9 +1,9 @@
 import type { InputBox, QuickInputButton, QuickPick, QuickPickItem } from 'vscode';
-import { configuration } from '../configuration';
 import type { Container } from '../container';
-import type { Keys } from '../keyboard';
 import type { DirectiveQuickPickItem } from '../quickpicks/items/directive';
 import { createDirectiveQuickPickItem, Directive, isDirective } from '../quickpicks/items/directive';
+import { configuration } from '../system/configuration';
+import type { Keys } from '../system/keyboard';
 
 export * from './quickCommand.buttons';
 export * from './quickCommand.steps';

src/commands/resets.ts

@@ -1,9 +1,9 @@
 import { ConfigurationTarget } from 'vscode';
 import { resetAvatarCache } from '../avatars';
-import { configuration } from '../configuration';
 import { Commands } from '../constants';
 import type { Container } from '../container';
 import { command } from '../system/command';
+import { configuration } from '../system/configuration';
 import { Command } from './base';
 
 @command()

src/commands/searchCommits.ts

@@ -1,9 +1,9 @@
-import { configuration } from '../configuration';
 import { Commands } from '../constants';
 import type { Container } from '../container';
 import { executeGitCommand } from '../git/actions';
 import type { SearchQuery } from '../git/search';
 import { command } from '../system/command';
+import { configuration } from '../system/configuration';
 import { SearchResultsNode } from '../views/nodes/searchResultsNode';
 import type { CommandContext } from './base';
 import { Command, isCommandContextViewNodeHasRepository } from './base';

src/commands/setViewsLayout.ts

@@ -1,5 +1,5 @@
 import { window } from 'vscode';
-import { viewsConfigKeys } from '../configuration';
+import { viewsConfigKeys } from '../config';
 import { Commands, CoreCommands } from '../constants';
 import type { Container } from '../container';
 import { command, executeCommand, executeCoreCommand } from '../system/command';

src/commands/showCommitsInView.ts

@@ -6,10 +6,10 @@ import { showDetailsView } from '../git/actions/commit';
 import { GitUri } from '../git/gitUri';
 import { createReference } from '../git/models/reference';
 import { createSearchQueryForCommits } from '../git/search';
-import { Logger } from '../logger';
 import { showFileNotUnderSourceControlWarningMessage, showGenericErrorMessage } from '../messages';
 import { command } from '../system/command';
 import { filterMap } from '../system/iterable';
+import { Logger } from '../system/logger';
 import type { CommandContext } from './base';
 import { ActiveEditorCommand, getCommandUri, isCommandContextViewNodeHasCommit } from './base';
 

src/commands/showLastQuickPick.ts

@@ -1,9 +1,9 @@
 import { commands } from 'vscode';
 import { Commands } from '../constants';
 import type { Container } from '../container';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { command } from '../system/command';
+import { Logger } from '../system/logger';
 import { Command, getLastCommand } from './base';
 
 @command()

src/commands/showQuickCommit.ts

@@ -6,7 +6,6 @@ import { reveal } from '../git/actions/commit';
 import { GitUri } from '../git/gitUri';
 import type { GitCommit, GitStashCommit } from '../git/models/commit';
 import type { GitLog } from '../git/models/log';
-import { Logger } from '../logger';
 import {
 	showCommitNotFoundWarningMessage,
 	showFileNotUnderSourceControlWarningMessage,
@@ -14,6 +13,7 @@ import {
 	showLineUncommittedWarningMessage,
 } from '../messages';
 import { command } from '../system/command';
+import { Logger } from '../system/logger';
 import type { CommandContext } from './base';
 import { ActiveEditorCachedCommand, getCommandUri, isCommandContextViewNodeHasCommit } from './base';
 

src/commands/showQuickCommitFile.ts

@@ -7,7 +7,6 @@ import { GitUri } from '../git/gitUri';
 import type { GitCommit, GitStashCommit } from '../git/models/commit';
 import { isCommit } from '../git/models/commit';
 import type { GitLog } from '../git/models/log';
-import { Logger } from '../logger';
 import {
 	showCommitNotFoundWarningMessage,
 	showFileNotUnderSourceControlWarningMessage,
@@ -15,6 +14,7 @@ import {
 	showLineUncommittedWarningMessage,
 } from '../messages';
 import { command } from '../system/command';
+import { Logger } from '../system/logger';
 import type { CommandContext } from './base';
 import { ActiveEditorCachedCommand, getCommandUri, isCommandContextViewNodeHasCommit } from './base';
 

src/commands/switchMode.ts

@@ -1,11 +1,11 @@
 import { ConfigurationTarget } from 'vscode';
-import { configuration } from '../configuration';
 import { Commands } from '../constants';
 import type { Container } from '../container';
-import { getLogScope } from '../logScope';
 import { showModePicker } from '../quickpicks/modePicker';
 import { command } from '../system/command';
+import { configuration } from '../system/configuration';
 import { log } from '../system/decorators/log';
+import { getLogScope } from '../system/logger.scope';
 import { Command } from './base';
 
 @command()

src/commands/toggleFileAnnotations.ts

@@ -2,13 +2,13 @@ import type { TextEditor, TextEditorEdit, Uri } from 'vscode';
 import { window } from 'vscode';
 import type { AnnotationContext } from '../annotations/annotationProvider';
 import type { ChangesAnnotationContext } from '../annotations/gutterChangesAnnotationProvider';
-import { UriComparer } from '../comparers';
-import { FileAnnotationType } from '../configuration';
+import { FileAnnotationType } from '../config';
 import { Commands } from '../constants';
 import type { Container } from '../container';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { command } from '../system/command';
+import { UriComparer } from '../system/comparers';
+import { Logger } from '../system/logger';
 import { isTextEditor } from '../system/utils';
 import { ActiveEditorCommand, EditorCommand } from './base';
 

src/commands/toggleLineBlame.ts

@@ -1,9 +1,9 @@
 import type { TextEditor, Uri } from 'vscode';
 import { Commands } from '../constants';
 import type { Container } from '../container';
-import { Logger } from '../logger';
 import { showGenericErrorMessage } from '../messages';
 import { command } from '../system/command';
+import { Logger } from '../system/logger';
 import { ActiveEditorCommand } from './base';
 
 @command()

src/config.ts

@@ -1,5 +1,5 @@
-import { LogLevel } from './constants';
 import type { DateTimeFormat } from './system/date';
+import { LogLevel } from './system/logger.constants';
 
 export interface Config {
 	autolinks: AutolinkReference[] | null;

src/constants.ts

@@ -1,5 +1,5 @@
+export const commandPrefix = 'gitlens';
 export const quickPickTitleMaxChars = 80;
-export const slowCallWarningThreshold = 500;
 
 export const ImageMimetypes: Record<string, string> = {
 	'.png': 'image/png',
@@ -403,14 +403,6 @@ export const enum GlyphChars {
 	ZeroWidthSpace = '\u200b',
 }
 
-export const enum LogLevel {
-	Off = 'off',
-	Error = 'error',
-	Warn = 'warn',
-	Info = 'info',
-	Debug = 'debug',
-}
-
 export const enum Schemes {
 	DebugConsole = 'debug',
 	File = 'file',

src/container.ts

@@ -8,8 +8,8 @@ import { ActionRunners } from './api/actionRunners';
 import { setDefaultGravatarsStyle } from './avatars';
 import { GitCodeLensController } from './codelens/codeLensController';
 import type { ToggleFileAnnotationCommandArgs } from './commands';
-import type { FileAnnotationType, ModeConfig } from './configuration';
-import { AnnotationsToggleMode, configuration, DateSource, DateStyle, fromOutputLevel } from './configuration';
+import type { FileAnnotationType, ModeConfig } from './config';
+import { AnnotationsToggleMode, DateSource, DateStyle, fromOutputLevel } from './config';
 import { Commands } from './constants';
 import { EventBus } from './eventBus';
 import { GitFileSystemProvider } from './git/fsProvider';
@@ -18,8 +18,6 @@ import { GitHubAuthenticationProvider } from './git/remotes/github';
 import { GitLabAuthenticationProvider } from './git/remotes/gitlab';
 import { RichRemoteProviderService } from './git/remotes/remoteProviderService';
 import { LineHoverController } from './hovers/lineHoverController';
-import { Keyboard } from './keyboard';
-import { Logger } from './logger';
 import { IntegrationAuthenticationService } from './plus/integrationAuthentication';
 import { SubscriptionAuthenticationProvider } from './plus/subscription/authenticationProvider';
 import { ServerConnection } from './plus/subscription/serverConnection';
@@ -31,15 +29,18 @@ import { TimelineWebviewView } from './plus/webviews/timeline/timelineWebviewVie
 import { StatusBarController } from './statusbar/statusBarController';
 import type { Storage } from './storage';
 import { executeCommand } from './system/command';
+import { configuration } from './system/configuration';
 import { log } from './system/decorators/log';
 import { memoize } from './system/decorators/memoize';
+import { Keyboard } from './system/keyboard';
+import { Logger } from './system/logger';
 import { TelemetryService } from './telemetry/telemetry';
+import { UsageTracker } from './telemetry/usageTracker';
 import { GitTerminalLinkProvider } from './terminal/linkProvider';
 import { GitDocumentTracker } from './trackers/gitDocumentTracker';
 import { GitLineTracker } from './trackers/gitLineTracker';
 import { DeepLinkService } from './uris/deepLinks/deepLinkService';
 import { UriService } from './uris/uriService';
-import { UsageTracker } from './usageTracker';
 import { BranchesView } from './views/branchesView';
 import { CommitsView } from './views/commitsView';
 import { ContributorsView } from './views/contributorsView';

src/env/browser/platform.ts

@@ -8,14 +8,8 @@ export const isMac = _platform === 'macOS' || _userAgent.indexOf('Macintosh') >=
 export const isWindows = _platform === 'Windows' || _userAgent.indexOf('Windows') >= 0;
 
 export function getPlatform(): string {
-	if (isWindows) {
-		return 'web-windows';
-	}
-	if (isMac) {
-		return 'web-macOS';
-	}
-	if (isLinux) {
-		return 'web-linux';
-	}
+	if (isWindows) return 'web-windows';
+	if (isMac) return 'web-macOS';
+	if (isLinux) return 'web-linux';
 	return 'web';
 }

src/env/node/fetch.ts

@@ -2,8 +2,8 @@ import * as process from 'process';
 import * as url from 'url';
 import { HttpsProxyAgent } from 'https-proxy-agent';
 import fetch from 'node-fetch';
-import { configuration } from '../../configuration';
-import { Logger } from '../../logger';
+import { configuration } from '../../system/configuration';
+import { Logger } from '../../system/logger';
 
 export { fetch };
 export type { BodyInit, RequestInfo, RequestInit, Response } from 'node-fetch';

src/env/node/git/git.ts

@@ -4,7 +4,7 @@ import * as process from 'process';
 import type { CancellationToken, OutputChannel } from 'vscode';
 import { Uri, window, workspace } from 'vscode';
 import { hrtime } from '@env/hrtime';
-import { GlyphChars, LogLevel, slowCallWarningThreshold } from '../../../constants';
+import { GlyphChars } from '../../../constants';
 import type { GitCommandOptions, GitSpawnOptions } from '../../../git/commandOptions';
 import { GitErrorHandling } from '../../../git/commandOptions';
 import type { GitDiffFilter } from '../../../git/models/diff';
@@ -14,8 +14,9 @@ import { GitBranchParser } from '../../../git/parsers/branchParser';
 import { GitLogParser } from '../../../git/parsers/logParser';
 import { GitReflogParser } from '../../../git/parsers/reflogParser';
 import { GitTagParser } from '../../../git/parsers/tagParser';
-import { Logger } from '../../../logger';
 import { join } from '../../../system/iterable';
+import { Logger } from '../../../system/logger';
+import { LogLevel, slowCallWarningThreshold } from '../../../system/logger.constants';
 import { dirname, isAbsolute, isFolderGlob, joinPaths, normalizePath, splitPath } from '../../../system/path';
 import { getDurationMilliseconds } from '../../../system/string';
 import { compare, fromString } from '../../../system/version';

src/env/node/git/localGitProvider.ts

@@ -15,7 +15,6 @@ import type {
 	GitExtension,
 } from '../../../@types/vscode.git';
 import { getCachedAvatarUri } from '../../../avatars';
-import { configuration } from '../../../configuration';
 import { CoreGitConfiguration, GlyphChars, Schemes } from '../../../constants';
 import type { Container } from '../../../container';
 import { emojify } from '../../../emojis';
@@ -127,9 +126,6 @@ import { getRemoteProviderMatcher, loadRemoteProviders } from '../../../git/remo
 import type { RichRemoteProvider } from '../../../git/remotes/richRemoteProvider';
 import type { GitSearch, GitSearchResultData, GitSearchResults, SearchQuery } from '../../../git/search';
 import { getGitArgsFromSearchQuery, getSearchQueryComparisonKey } from '../../../git/search';
-import { Logger } from '../../../logger';
-import type { LogScope } from '../../../logScope';
-import { getLogScope } from '../../../logScope';
 import {
 	showGenericErrorMessage,
 	showGitDisabledErrorMessage,
@@ -146,10 +142,14 @@ import type {
 } from '../../../plus/webviews/graph/graphWebview';
 import { countStringLength, filterMap } from '../../../system/array';
 import { TimedCancellationSource } from '../../../system/cancellation';
+import { configuration } from '../../../system/configuration';
 import { gate } from '../../../system/decorators/gate';
 import { debug, log } from '../../../system/decorators/log';
 import { debounce } from '../../../system/function';
 import { filterMap as filterMapIterable, find, first, join, last, map, some } from '../../../system/iterable';
+import { Logger } from '../../../system/logger';
+import type { LogScope } from '../../../system/logger.scope';
+import { getLogScope } from '../../../system/logger.scope';
 import {
 	commonBaseIndex,
 	dirname,

src/env/node/git/locator.ts

@@ -1,6 +1,7 @@
 import { join as joinPaths } from 'path';
 import * as process from 'process';
-import { GlyphChars, LogLevel } from '../../../constants';
+import { GlyphChars } from '../../../constants';
+import { LogLevel } from '../../../system/logger.constants';
 import { any } from '../../../system/promise';
 import { Stopwatch } from '../../../system/stopwatch';
 import { findExecutable, run } from './shell';

src/env/node/git/shell.ts

@@ -6,7 +6,7 @@ import { join as joinPaths } from 'path';
 import * as process from 'process';
 import { decode } from 'iconv-lite';
 import type { CancellationToken } from 'vscode';
-import { Logger } from '../../../logger';
+import { Logger } from '../../../system/logger';
 
 export const isWindows = process.platform === 'win32';
 

src/env/node/git/vslsGitProvider.ts

@@ -5,8 +5,8 @@ import type { GitCommandOptions } from '../../../git/commandOptions';
 import type { GitProviderDescriptor } from '../../../git/gitProvider';
 import { GitProviderId } from '../../../git/gitProvider';
 import type { Repository } from '../../../git/models/repository';
-import { Logger } from '../../../logger';
-import { getLogScope } from '../../../logScope';
+import { Logger } from '../../../system/logger';
+import { getLogScope } from '../../../system/logger.scope';
 import { addVslsPrefixIfNeeded } from '../../../system/path';
 import { Git } from './git';
 import { LocalGitProvider } from './localGitProvider';

src/env/node/platform.ts

@@ -8,14 +8,8 @@ export const isMac = process.platform === 'darwin';
 export const isWindows = process.platform === 'win32';
 
 export function getPlatform(): string {
-	if (isWindows) {
-		return 'windows';
-	}
-	if (isMac) {
-		return 'macOS';
-	}
-	if (isLinux) {
-		return 'linux';
-	}
+	if (isWindows) return 'windows';
+	if (isMac) return 'macOS';
+	if (isLinux) return 'linux';
 	return isWeb ? 'web' : 'unknown';
 }

src/env/node/providers.ts

@@ -1,7 +1,7 @@
-import { configuration } from '../../configuration';
 import type { Container } from '../../container';
 import type { GitCommandOptions } from '../../git/commandOptions';
 import type { GitProvider } from '../../git/gitProvider';
+import { configuration } from '../../system/configuration';
 // import { GitHubGitProvider } from '../../plus/github/githubGitProvider';
 import { Git } from './git/git';
 import { LocalGitProvider } from './git/localGitProvider';

src/extension.ts

@@ -5,8 +5,8 @@ import { isWeb } from '@env/platform';
 import { Api } from './api/api';
 import type { CreatePullRequestActionContext, GitLensApi, OpenPullRequestActionContext } from './api/gitlens';
 import type { CreatePullRequestOnRemoteCommandArgs, OpenPullRequestOnRemoteCommandArgs } from './commands';
-import { configuration, Configuration, fromOutputLevel, OutputLevel } from './configuration';
-import { Commands, ContextKeys, CoreCommands, LogLevel } from './constants';
+import { fromOutputLevel, OutputLevel } from './config';
+import { Commands, ContextKeys, CoreCommands } from './constants';
 import { Container } from './container';
 import { setContext } from './context';
 import { isGitUri } from './git/gitUri';
@@ -14,7 +14,6 @@ import { getBranchNameWithoutRemote, isBranch } from './git/models/branch';
 import { isCommit } from './git/models/commit';
 import { isRepository } from './git/models/repository';
 import { isTag } from './git/models/tag';
-import { Logger } from './logger';
 import {
 	showDebugLoggingWarningMessage,
 	showInsidersErrorMessage,
@@ -24,8 +23,11 @@ import {
 import { registerPartnerActionRunners } from './partners';
 import { Storage, SyncedStorageKeys } from './storage';
 import { executeCommand, executeCoreCommand, registerCommands } from './system/command';
+import { configuration, Configuration } from './system/configuration';
 import { setDefaultDateLocales } from './system/date';
 import { once } from './system/event';
+import { Logger } from './system/logger';
+import { LogLevel } from './system/logger.constants';
 import { flatten } from './system/object';
 import { Stopwatch } from './system/stopwatch';
 import { compare, fromString, satisfies } from './system/version';
@@ -56,7 +58,7 @@ export async function activate(context: ExtensionContext): Promise
 				return undefined;
 			},
 		},
-		fromOutputLevel(configuration.get('outputLevel')),
+		fromOutputLevel(outputLevel),
 		context.extensionMode === ExtensionMode.Development,
 	);
 

src/git/formatters/commitFormatter.ts

@@ -16,12 +16,13 @@ import {
 	ShowQuickCommitFileCommand,
 } from '../../commands';
 import { Command } from '../../commands/base';
-import { configuration, DateStyle, FileAnnotationType } from '../../configuration';
+import { DateStyle, FileAnnotationType } from '../../config';
 import { Commands, GlyphChars } from '../../constants';
 import { Container } from '../../container';
 import { emojify } from '../../emojis';
 import { arePlusFeaturesEnabled } from '../../plus/subscription/utils';
 import type { ShowInCommitGraphCommandArgs } from '../../plus/webviews/graph/graphWebview';
+import { configuration } from '../../system/configuration';
 import { join, map } from '../../system/iterable';
 import { PromiseCancelledError } from '../../system/promise';
 import type { TokenOptions } from '../../system/string';

src/git/gitProviderService.ts

@@ -11,23 +11,23 @@ import type {
 } from 'vscode';
 import { Disposable, EventEmitter, FileType, ProgressLocation, Uri, window, workspace } from 'vscode';
 import { resetAvatarCache } from '../avatars';
-import { configuration } from '../configuration';
 import { ContextKeys, CoreGitConfiguration, GlyphChars, Schemes } from '../constants';
 import type { Container } from '../container';
 import { setContext } from '../context';
 import { AccessDeniedError, ProviderNotFoundError } from '../errors';
 import type { FeatureAccess, Features, PlusFeatures, RepoFeatureAccess } from '../features';
-import { Logger } from '../logger';
-import { getLogScope } from '../logScope';
 import type { SubscriptionChangeEvent } from '../plus/subscription/subscriptionService';
 import type { RepoComparisonKey } from '../repositories';
 import { asRepoComparisonKey, Repositories } from '../repositories';
 import type { Subscription } from '../subscription';
 import { isSubscriptionPaidPlan, SubscriptionPlanId } from '../subscription';
 import { groupByFilterMap, groupByMap, joinUnique } from '../system/array';
+import { configuration } from '../system/configuration';
 import { gate } from '../system/decorators/gate';
 import { debug, log } from '../system/decorators/log';
 import { count, filter, first, flatMap, join, map, some } from '../system/iterable';
+import { Logger } from '../system/logger';
+import { getLogScope } from '../system/logger.scope';
 import { getBestPath, getScheme, isAbsolute, maybeUri, normalizePath } from '../system/path';
 import { cancellable, fastestSettled, getSettledValue, isPromise, PromiseCancelledError } from '../system/promise';
 import { VisitedPathsTrie } from '../system/trie';

src/git/gitUri.ts

@@ -1,13 +1,13 @@
 import { Uri } from 'vscode';
 import { decodeUtf8Hex, encodeUtf8Hex } from '@env/hex';
-import { UriComparer } from '../comparers';
 import { Schemes } from '../constants';
 import { Container } from '../container';
-import { Logger } from '../logger';
 import type { GitHubAuthorityMetadata } from '../plus/remotehub';
+import { UriComparer } from '../system/comparers';
 import { debug } from '../system/decorators/log';
 import { memoize } from '../system/decorators/memoize';
 import { formatPath } from '../system/formatPath';
+import { Logger } from '../system/logger';
 import { basename, getBestPath, normalizePath, relativeDir, splitPath } from '../system/path';
 // import { CharCode } from '../system/string';
 import { isVirtualUri } from '../system/utils';

src/git/models/branch.ts

@@ -1,9 +1,10 @@
-import { BranchSorting, configuration, DateStyle } from '../../configuration';
+import { BranchSorting, DateStyle } from '../../config';
 import { Container } from '../../container';
-import { getLoggableName } from '../../logger';
+import { configuration } from '../../system/configuration';
 import { formatDate, fromNow } from '../../system/date';
 import { debug } from '../../system/decorators/log';
 import { memoize } from '../../system/decorators/memoize';
+import { getLoggableName } from '../../system/logger';
 import { cancellable } from '../../system/promise';
 import { sortCompare } from '../../system/string';
 import type { RemoteProvider } from '../remotes/remoteProvider';

src/git/models/commit.ts

@@ -1,13 +1,13 @@
 import { Uri } from 'vscode';
 import { getAvatarUri, getCachedAvatarUri } from '../../avatars';
-import type { GravatarDefaultStyle } from '../../configuration';
-import { DateSource, DateStyle } from '../../configuration';
+import type { GravatarDefaultStyle } from '../../config';
+import { DateSource, DateStyle } from '../../config';
 import { GlyphChars } from '../../constants';
 import type { Container } from '../../container';
-import { getLoggableName } from '../../logger';
 import { formatDate, fromNow } from '../../system/date';
 import { gate } from '../../system/decorators/gate';
 import { memoize } from '../../system/decorators/memoize';
+import { getLoggableName } from '../../system/logger';
 import { cancellable } from '../../system/promise';
 import { pad, pluralize } from '../../system/string';
 import type { PreviousLineComparisonUrisResult } from '../gitProvider';

src/git/models/contributor.ts

@@ -1,7 +1,8 @@
 import { Uri } from 'vscode';
 import { getAvatarUri } from '../../avatars';
-import type { GravatarDefaultStyle } from '../../configuration';
-import { configuration, ContributorSorting } from '../../configuration';
+import type { GravatarDefaultStyle } from '../../config';
+import { ContributorSorting } from '../../config';
+import { configuration } from '../../system/configuration';
 import { formatDate, fromNow } from '../../system/date';
 import { memoize } from '../../system/decorators/memoize';
 import { sortCompare } from '../../system/string';

src/git/models/pullRequest.ts

@@ -1,5 +1,5 @@
 import { ColorThemeKind, ThemeColor, ThemeIcon, window } from 'vscode';
-import { DateStyle } from '../../configuration';
+import { DateStyle } from '../../config';
 import { Colors } from '../../constants';
 import { Container } from '../../container';
 import { formatDate, fromNow } from '../../system/date';

src/git/models/reference.ts

@@ -1,5 +1,5 @@
-import { configuration } from '../../configuration';
 import { GlyphChars } from '../../constants';
+import { configuration } from '../../system/configuration';
 import { getBranchNameWithoutRemote, getRemoteNameFromBranchName, splitBranchNameAndRemote } from './branch';
 import { deletedOrMissing, uncommitted, uncommittedStaged } from './constants';
 

src/git/models/repository.ts

@@ -3,21 +3,21 @@ import { Disposable, EventEmitter, ProgressLocation, RelativePattern, Uri, windo
 import { md5 } from '@env/crypto';
 import { ForcePushMode } from '../../@types/vscode.git.enums';
 import type { CreatePullRequestActionContext } from '../../api/gitlens';
-import { configuration } from '../../configuration';
 import { CoreGitCommands, CoreGitConfiguration, Schemes } from '../../constants';
 import type { Container } from '../../container';
 import type { FeatureAccess, Features, PlusFeatures } from '../../features';
-import { getLoggableName, Logger } from '../../logger';
-import { getLogScope } from '../../logScope';
 import { showCreatePullRequestPrompt, showGenericErrorMessage } from '../../messages';
 import { asRepoComparisonKey } from '../../repositories';
 import { filterMap, groupByMap } from '../../system/array';
 import { executeActionCommand, executeCoreGitCommand } from '../../system/command';
+import { configuration } from '../../system/configuration';
 import { formatDate, fromNow } from '../../system/date';
 import { gate } from '../../system/decorators/gate';
 import { debug, log, logName } from '../../system/decorators/log';
 import { debounce } from '../../system/function';
 import { filter, join, some } from '../../system/iterable';
+import { getLoggableName, Logger } from '../../system/logger';
+import { getLogScope } from '../../system/logger.scope';
 import { updateRecordValue } from '../../system/object';
 import { basename, normalizePath } from '../../system/path';
 import { runGitCommandInTerminal } from '../../terminal';

src/git/models/tag.ts

@@ -1,8 +1,9 @@
-import { configuration, DateStyle, TagSorting } from '../../configuration';
+import { DateStyle, TagSorting } from '../../config';
 import { Container } from '../../container';
-import { getLoggableName } from '../../logger';
+import { configuration } from '../../system/configuration';
 import { formatDate, fromNow } from '../../system/date';
 import { memoize } from '../../system/decorators/memoize';
+import { getLoggableName } from '../../system/logger';
 import { sortCompare } from '../../system/string';
 import type { GitReference, GitTagReference } from './reference';
 

src/git/remotes/custom.ts

@@ -1,5 +1,5 @@
 import type { Range, Uri } from 'vscode';
-import type { RemotesUrlsConfig } from '../../configuration';
+import type { RemotesUrlsConfig } from '../../config';
 import { interpolate } from '../../system/string';
 import type { Repository } from '../models/repository';
 import { RemoteProvider } from './remoteProvider';

src/git/remotes/remoteProviders.ts

@@ -1,7 +1,7 @@
-import type { RemotesConfig } from '../../configuration';
-import { CustomRemoteType } from '../../configuration';
+import type { RemotesConfig } from '../../config';
+import { CustomRemoteType } from '../../config';
 import type { Container } from '../../container';
-import { Logger } from '../../logger';
+import { Logger } from '../../system/logger';
 import { AzureDevOpsRemote } from './azure-devops';
 import { BitbucketRemote } from './bitbucket';
 import { BitbucketServerRemote } from './bitbucket-server';

src/git/remotes/richRemoteProvider.ts

@@ -2,16 +2,16 @@ import type { AuthenticationSession, AuthenticationSessionsChangeEvent, Event, M
 import { authentication, EventEmitter, window } from 'vscode';
 import { wrapForForcedInsecureSSL } from '@env/fetch';
 import { isWeb } from '@env/platform';
-import { configuration } from '../../configuration';
 import type { Container } from '../../container';
 import { AuthenticationError, ProviderRequestClientError } from '../../errors';
-import { Logger } from '../../logger';
-import { getLogScope } from '../../logScope';
 import { showIntegrationDisconnectedTooManyFailedRequestsWarningMessage } from '../../messages';
 import type { IntegrationAuthenticationSessionDescriptor } from '../../plus/integrationAuthentication';
 import { isSubscriptionPaidPlan, isSubscriptionPreviewTrialExpired } from '../../subscription';
+import { configuration } from '../../system/configuration';
 import { gate } from '../../system/decorators/gate';
 import { debug, log } from '../../system/decorators/log';
+import { Logger } from '../../system/logger';
+import { getLogScope } from '../../system/logger.scope';
 import { isPromise } from '../../system/promise';
 import type { Account } from '../models/author';
 import type { DefaultBranch } from '../models/defaultBranch';

src/hovers/hovers.ts

@@ -2,8 +2,7 @@ import type { CancellationToken, TextDocument } from 'vscode';
 import { MarkdownString } from 'vscode';
 import { hrtime } from '@env/hrtime';
 import { DiffWithCommand, ShowQuickCommitCommand } from '../commands';
-import { configuration } from '../configuration';
-import { GlyphChars, LogLevel } from '../constants';
+import { GlyphChars } from '../constants';
 import { Container } from '../container';
 import { CommitFormatter } from '../git/formatters/commitFormatter';
 import { GitUri } from '../git/gitUri';
@@ -13,9 +12,11 @@ import type { GitDiffHunk, GitDiffHunkLine } from '../git/models/diff';
 import type { PullRequest } from '../git/models/pullRequest';
 import { isUncommittedStaged, shortenRevision } from '../git/models/reference';
 import type { GitRemote } from '../git/models/remote';
-import { Logger } from '../logger';
-import { getNewLogScope } from '../logScope';
+import { configuration } from '../system/configuration';
 import { count } from '../system/iterable';
+import { Logger } from '../system/logger';
+import { LogLevel } from '../system/logger.constants';
+import { getNewLogScope } from '../system/logger.scope';
 import { getSettledValue, PromiseCancelledError } from '../system/promise';
 import { getDurationMilliseconds } from '../system/string';
 

src/hovers/lineHoverController.ts

@@ -1,11 +1,12 @@
 import type { CancellationToken, ConfigurationChangeEvent, Position, TextDocument, TextEditor, Uri } from 'vscode';
 import { Disposable, Hover, languages, Range, window } from 'vscode';
-import { UriComparer } from '../comparers';
-import { configuration, FileAnnotationType } from '../configuration';
+import { FileAnnotationType } from '../config';
 import type { Container } from '../container';
-import { Logger } from '../logger';
+import { UriComparer } from '../system/comparers';
+import { configuration } from '../system/configuration';
 import { debug } from '../system/decorators/log';
 import { once } from '../system/event';
+import { Logger } from '../system/logger';
 import type { LinesChangeEvent } from '../trackers/gitLineTracker';
 import { changesMessage, detailsMessage } from './hovers';
 

src/messages.ts

@@ -1,10 +1,12 @@
 import type { MessageItem } from 'vscode';
 import { ConfigurationTarget, env, Uri, window } from 'vscode';
-import { configuration, SuppressedMessages } from './configuration';
-import { Commands, LogLevel } from './constants';
+import { SuppressedMessages } from './config';
+import { Commands } from './constants';
 import type { GitCommit } from './git/models/commit';
-import { Logger } from './logger';
 import { executeCommand } from './system/command';
+import { configuration } from './system/configuration';
+import { Logger } from './system/logger';
+import { LogLevel } from './system/logger.constants';
 
 export function showCommitHasNoPreviousCommitWarningMessage(commit?: GitCommit): Promise<MessageItem | undefined> {
 	if (commit == null) {

src/plus/github/github.ts

@@ -7,8 +7,6 @@ import type { Event } from 'vscode';
 import { Disposable, EventEmitter, Uri, window } from 'vscode';
 import { fetch, getProxyAgent, wrapForForcedInsecureSSL } from '@env/fetch';
 import { isWeb } from '@env/platform';
-import { configuration } from '../../configuration';
-import { LogLevel } from '../../constants';
 import type { Container } from '../../container';
 import {
 	AuthenticationError,
@@ -27,15 +25,17 @@ import { isSha } from '../../git/models/reference';
 import type { GitUser } from '../../git/models/user';
 import { getGitHubNoReplyAddressParts } from '../../git/remotes/github';
 import type { RichRemoteProvider } from '../../git/remotes/richRemoteProvider';
-import { Logger } from '../../logger';
-import type { LogScope } from '../../logScope';
-import { getLogScope } from '../../logScope';
 import {
 	showIntegrationRequestFailed500WarningMessage,
 	showIntegrationRequestTimedOutWarningMessage,
 } from '../../messages';
 import { uniqueBy } from '../../system/array';
+import { configuration } from '../../system/configuration';
 import { debug } from '../../system/decorators/log';
+import { Logger } from '../../system/logger';
+import { LogLevel } from '../../system/logger.constants';
+import type { LogScope } from '../../system/logger.scope';
+import { getLogScope } from '../../system/logger.scope';
 import { Stopwatch } from '../../system/stopwatch';
 import { base64 } from '../../system/string';
 import type { Version } from '../../system/version';

src/plus/github/githubGitProvider.ts

@@ -11,7 +11,6 @@ import type {
 } from 'vscode';
 import { authentication, EventEmitter, FileType, Uri, window, workspace } from 'vscode';
 import { encodeUtf8Hex } from '@env/hex';
-import { configuration } from '../../configuration';
 import { CharCode, ContextKeys, Schemes } from '../../constants';
 import type { Container } from '../../container';
 import { setContext } from '../../context';
@@ -79,12 +78,13 @@ import { getRemoteProviderMatcher, loadRemoteProviders } from '../../git/remotes
 import type { RichRemoteProvider } from '../../git/remotes/richRemoteProvider';
 import type { GitSearch, GitSearchResultData, GitSearchResults, SearchQuery } from '../../git/search';
 import { getSearchQueryComparisonKey, parseSearchQuery } from '../../git/search';
-import { Logger } from '../../logger';
-import type { LogScope } from '../../logScope';
-import { getLogScope } from '../../logScope';
+import { configuration } from '../../system/configuration';
 import { gate } from '../../system/decorators/gate';
 import { debug, log } from '../../system/decorators/log';
 import { filterMap, first, last, some } from '../../system/iterable';
+import { Logger } from '../../system/logger';
+import type { LogScope } from '../../system/logger.scope';
+import { getLogScope } from '../../system/logger.scope';
 import { isAbsolute, isFolderGlob, maybeUri, normalizePath, relative } from '../../system/path';
 import { fastestSettled, getSettledValue } from '../../system/promise';
 import { serializeWebviewItemContext } from '../../system/webview';

src/plus/gitlab/gitlab.ts

@@ -3,8 +3,6 @@ import { Disposable, Uri, window } from 'vscode';
 import type { RequestInit, Response } from '@env/fetch';
 import { fetch, getProxyAgent, wrapForForcedInsecureSSL } from '@env/fetch';
 import { isWeb } from '@env/platform';
-import { configuration } from '../../configuration';
-import { LogLevel } from '../../constants';
 import type { Container } from '../../container';
 import {
 	AuthenticationError,
@@ -20,14 +18,16 @@ import type { IssueOrPullRequest } from '../../git/models/issue';
 import { IssueOrPullRequestType } from '../../git/models/issue';
 import { PullRequest } from '../../git/models/pullRequest';
 import type { RichRemoteProvider } from '../../git/remotes/richRemoteProvider';
-import { Logger } from '../../logger';
-import type { LogScope } from '../../logScope';
-import { getLogScope } from '../../logScope';
 import {
 	showIntegrationRequestFailed500WarningMessage,
 	showIntegrationRequestTimedOutWarningMessage,
 } from '../../messages';
+import { configuration } from '../../system/configuration';
 import { debug } from '../../system/decorators/log';
+import { Logger } from '../../system/logger';
+import { LogLevel } from '../../system/logger.constants';
+import type { LogScope } from '../../system/logger.scope';
+import { getLogScope } from '../../system/logger.scope';
 import { Stopwatch } from '../../system/stopwatch';
 import { equalsIgnoreCase } from '../../system/string';
 import type { GitLabCommit, GitLabIssue, GitLabMergeRequest, GitLabMergeRequestREST, GitLabUser } from './models';

src/plus/remotehub.ts

@@ -1,7 +1,7 @@
 import type { Uri } from 'vscode';
 import { extensions } from 'vscode';
 import { ExtensionNotFoundError } from '../errors';
-import { Logger } from '../logger';
+import { Logger } from '../system/logger';
 
 export async function getRemoteHubApi(): Promise<RemoteHubApi>;
 export async function getRemoteHubApi(silent: false): Promise<RemoteHubApi>;

src/plus/subscription/authenticationProvider.ts

@@ -6,9 +6,9 @@ import type {
 import { authentication, Disposable, EventEmitter, extensions, window } from 'vscode';
 import { uuid } from '@env/crypto';
 import type { Container } from '../../container';
-import { Logger } from '../../logger';
-import { getLogScope } from '../../logScope';
 import { debug } from '../../system/decorators/log';
+import { Logger } from '../../system/logger';
+import { getLogScope } from '../../system/logger.scope';
 import type { ServerConnection } from './serverConnection';
 
 interface StoredSession {

src/plus/subscription/serverConnection.ts

@@ -4,12 +4,12 @@ import { uuid } from '@env/crypto';
 import type { RequestInfo, RequestInit, Response } from '@env/fetch';
 import { fetch, getProxyAgent } from '@env/fetch';
 import type { Container } from '../../container';
-import { Logger } from '../../logger';
-import { getLogScope } from '../../logScope';
 import { debug } from '../../system/decorators/log';
 import { memoize } from '../../system/decorators/memoize';
 import type { DeferredEvent, DeferredEventExecutor } from '../../system/event';
 import { promisifyDeferred } from '../../system/event';
+import { Logger } from '../../system/logger';
+import { getLogScope } from '../../system/logger.scope';
 
 export const AuthenticationUriPathPrefix = 'did-authenticate';
 // TODO: What user-agent should we use?

src/plus/subscription/subscriptionService.ts

@@ -22,14 +22,11 @@ import {
 } from 'vscode';
 import { fetch, getProxyAgent } from '@env/fetch';
 import { getPlatform } from '@env/platform';
-import { configuration } from '../../configuration';
 import { Commands, ContextKeys } from '../../constants';
 import type { Container } from '../../container';
 import { setContext } from '../../context';
 import { AccountValidationError } from '../../errors';
 import type { RepositoriesChangeEvent } from '../../git/gitProviderService';
-import { Logger } from '../../logger';
-import { getLogScope } from '../../logScope';
 import { showMessage } from '../../messages';
 import type { Subscription } from '../../subscription';
 import {
@@ -46,12 +43,15 @@ import {
 	SubscriptionState,
 } from '../../subscription';
 import { executeCommand, registerCommand } from '../../system/command';
+import { configuration } from '../../system/configuration';
 import { createFromDateDelta } from '../../system/date';
 import { gate } from '../../system/decorators/gate';
 import { debug, log } from '../../system/decorators/log';
 import { memoize } from '../../system/decorators/memoize';
 import type { Deferrable } from '../../system/function';
 import { debounce, once } from '../../system/function';
+import { Logger } from '../../system/logger';
+import { getLogScope } from '../../system/logger.scope';
 import { flatten } from '../../system/object';
 import { pluralize } from '../../system/string';
 import { openWalkthrough } from '../../system/utils';