CLI-837 Move remaining commands/_common files, reorganize core/host

build-scripts/docs/generate-docs.ts

@@ -30,9 +30,10 @@ import { fileURLToPath } from 'node:url';
 
 import type { Option } from 'commander';
 
+import { COMMAND_TREE } from '@/commands/command-tree.ts';
+import type { SonarCommand } from '@/commands/sonar-command.ts';
+
 import { version } from '../../package.json';
-import type { SonarCommand } from '../../src/commands/_common/sonar-command.ts';
-import { COMMAND_TREE } from '../../src/commands/command-tree.ts';
 import { EXAMPLES } from './examples';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));

build-scripts/fetch-signatures.ts

@@ -21,7 +21,7 @@
 /**
  * Build-time script: download and verify .asc signature files for all
  * external binaries at the pinned version, then embed them
- * into src/core/host/signatures.ts so they compile into the binary.
+ * into src/core/host/install/signatures.ts so they compile into the binary.
  *
  * Run after bumping the version in package.json#externalBinaries:
  *   bun run fetch:signatures
@@ -38,7 +38,7 @@ import { readFileSync, writeFileSync } from 'node:fs';
 import * as openpgp from 'openpgp';
 
 import { SONARSOURCE_BINARIES_URL } from '@/core/config-constants.ts';
-import { SONARSOURCE_PUBLIC_KEY } from '@/core/host/signatures.ts';
+import { SONARSOURCE_PUBLIC_KEY } from '@/core/host/install/signatures.ts';
 
 interface Platform {
   os: string;
@@ -71,7 +71,7 @@ interface SignatureResult {
   armoredSignature: string;
 }
 
-const SIGNATURES_TS_PATH = new URL('../src/core/host/signatures.ts', import.meta.url);
+const SIGNATURES_TS_PATH = new URL('../src/core/host/install/signatures.ts', import.meta.url);
 const PACKAGE_JSON_PATH = new URL('../package.json', import.meta.url);
 
 async function fetchSignatures(): Promise<void> {

build-scripts/setup-integration-resources.ts

@@ -34,17 +34,17 @@ import { existsSync, mkdirSync, statSync } from 'node:fs';
 import { chmod } from 'node:fs/promises';
 import { join } from 'node:path';
 
+import { detectPlatform } from '@/core/host/environment/platform-detector.ts';
 import type { BinarySpec } from '@/core/host/install/binary.ts';
 import { SCA_SCANNER_SPEC } from '@/core/host/install/sca-scanner.ts';
 import { SECRETS_SPEC } from '@/core/host/install/secrets.ts';
-import { detectPlatform } from '@/core/host/platform-detector.ts';
-import { SONAR_CONTEXT_AUGMENTATION_VERSION } from '@/core/host/signatures.ts';
+import { SONAR_CONTEXT_AUGMENTATION_VERSION } from '@/core/host/install/signatures.ts';
 import {
   buildCagDownloadUrl,
   buildDownloadUrl,
   downloadBinary,
   verifyBinarySignature,
-} from '@/core/host/sonarsource-releases.ts';
+} from '@/core/host/install/sonarsource-releases.ts';
 
 import { DEPENDENCY_ARTIFACTS_DIR } from './dependency-artifacts-path.js';
 

src/commands/analyze/analyze-all.ts

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-import type { ResolvedAuth } from '@/core/host/auth-resolver.ts';
+import type { ResolvedAuth } from '@/core/auth/auth-resolver.ts';
 import { resolveSecretsBinaryPath } from '@/core/host/install/secrets.ts';
 import { SECRETS_CALLER_COMMANDS } from '@/core/telemetry/secrets-analysis-telemetry.ts';
 import { SQAA_ANALYZE_CALLER_COMMAND } from '@/core/telemetry/sqaa-analysis-telemetry.ts';

src/commands/analyze/dependency-risk-helpers/manifest-secrets-guard.ts

@@ -21,8 +21,8 @@
 import { tmpdir } from 'node:os';
 import { isAbsolute, join } from 'node:path';
 
+import type { ResolvedAuth } from '@/core/auth/auth-resolver.ts';
 import { CommandFailedError } from '@/core/command-error.ts';
-import type { ResolvedAuth } from '@/core/host/auth-resolver.ts';
 import { formatSpawnOutput } from '@/core/host/install/install-utils.ts';
 import type { ScaScannerInstaller } from '@/core/host/install/sca-scanner.ts';
 import type { SecretsInstaller } from '@/core/host/install/secrets.ts';

src/commands/analyze/dependency-risk-helpers/sca-scan-orchestrator.ts

@@ -21,20 +21,20 @@
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 
+import type { ResolvedAuth } from '@/core/auth/auth-resolver.ts';
 import { SCA_SCANNER_CACHE_DIR } from '@/core/config-constants.ts';
-import type { ResolvedAuth } from '@/core/host/auth-resolver.ts';
 import type { ScaScannerInstaller } from '@/core/host/install/sca-scanner.ts';
 import type { SecretsInstaller } from '@/core/host/install/secrets.ts';
 import logger, { getLogLevelConfig } from '@/core/observability/logger.ts';
 import { type SonarQubeClient } from '@/core/server/client.ts';
+import { assertScaAvailable } from '@/core/server/sca-availability.ts';
 import type { SettingsValue } from '@/core/server/settings-value.ts';
 import {
   emitScaAnalysisTelemetry,
   type ScaCallerCommand,
 } from '@/core/telemetry/sca-analysis-telemetry.ts';
 import { withSpinner } from '@/core/ui';
 
-import { assertScaAvailable } from '../../_common/sca-availability.ts';
 import { parseAnalysisProperties } from './analysis-properties.ts';
 import { preScanManifestsForSecrets } from './manifest-secrets-guard.ts';
 import { type AnalyzeProjectResponse, ScaScannerRunner } from './sca-scanner.ts';

src/commands/analyze/dependency-risk-helpers/sca-urls.ts

@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+import { type ResolvedAuth, resolveFromEndpoint } from '@/core/auth/auth-resolver.ts';
 import { SONARCLOUD_SCA_SCANNER_CDN_URL } from '@/core/config-constants.ts';
-import { type ResolvedAuth, resolveFromEndpoint } from '@/core/host/auth-resolver.ts';
 
 export interface ScaUrls {
   apiBaseUrl: string;

src/commands/analyze/dependency-risks.ts

@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+import { type ResolvedAuth } from '@/core/auth/auth-resolver.ts';
 import { CommandFailedError, InvalidOptionError } from '@/core/command-error.ts';
-import { type ResolvedAuth } from '@/core/host/auth-resolver.ts';
 import { DefaultScaScannerInstaller } from '@/core/host/install/sca-scanner.ts';
 import { DefaultSecretsInstaller } from '@/core/host/install/secrets.ts';
 import { discoverProject } from '@/core/project-info.ts';

src/commands/analyze/secrets.ts

@@ -20,8 +20,8 @@
 import { randomUUID } from 'node:crypto';
 import { existsSync } from 'node:fs';
 
+import type { ResolvedAuth } from '@/core/auth/auth-resolver.ts';
 import { CommandFailedError, InvalidOptionError } from '@/core/command-error.ts';
-import type { ResolvedAuth } from '@/core/host/auth-resolver.ts';
 import { buildSubprocessNetworkEnv } from '@/core/host/connectivity/network-config.ts';
 import { installSecretsBinary } from '@/core/host/install/secrets.ts';
 import logger from '@/core/observability/logger.ts';

src/commands/analyze/sqaa-auth.ts

@@ -20,15 +20,15 @@
 
 // Auth and project-key resolution for SQAA commands.
 
-import { printAgentNonInteractiveAlternativeHint } from '@/commands/_common/agent-prompt-hint.ts';
+import type { ResolvedAuth } from '@/core/auth/auth-resolver.ts';
 import { CommandFailedError } from '@/core/command-error.ts';
-import type { ResolvedAuth } from '@/core/host/auth-resolver.ts';
 import { selectRecordedFeatureForDir } from '@/core/host/recorded-feature-resolver.ts';
 import logger from '@/core/observability/logger.ts';
 import type { InstalledIntegrationFeature, IntegrationStateAttribute } from '@/core/state/state.ts';
 import { loadState } from '@/core/state/state-repository.ts';
 import { noteProject } from '@/core/telemetry/project-uuid.ts';
 import { blank, confirmPrompt, text, warn } from '@/core/ui';
+import { printAgentNonInteractiveAlternativeHint } from '@/core/ui/components/agent-prompt-hint.ts';
 
 import { SQAA_HOOK_FEATURE_ID } from '../integrate/_common/features/sqaa-instructions-feature.ts';
 import { isProjectVortexFeature } from '../integrate/_common/vortex.ts';

src/commands/analyze/sqaa-json-report.ts

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-import type { ResolvedAuth } from '@/core/host/auth-resolver.ts';
+import type { ResolvedAuth } from '@/core/auth/auth-resolver.ts';
 import { timed } from '@/core/observability/timed.ts';
 import type { SqaaAnalysisDepth } from '@/core/server/client.ts';
 

src/commands/analyze/sqaa-run.ts

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-import type { ResolvedAuth } from '@/core/host/auth-resolver.ts';
+import type { ResolvedAuth } from '@/core/auth/auth-resolver.ts';
 import { timed } from '@/core/observability/timed.ts';
 import type { SqaaAnalysisDepth } from '@/core/server/client.ts';
 import {

src/commands/analyze/sqaa-types.ts

@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-import type { ResolvedAuth } from '@/core/host/auth-resolver.ts';
+import type { ResolvedAuth } from '@/core/auth/auth-resolver.ts';
 import type { SqaaAnalysisDepth } from '@/core/server/client.ts';
 import type { SqaaTelemetryCallerCommand } from '@/core/telemetry/sqaa-analysis-telemetry.ts';
 

src/commands/analyze/sqaa.ts

@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+import type { ResolvedAuth } from '@/core/auth/auth-resolver.ts';
 import { InvalidOptionError } from '@/core/command-error.ts';
-import type { ResolvedAuth } from '@/core/host/auth-resolver.ts';
 import type { SqaaAnalysisDepth } from '@/core/server/client.ts';
 import { text } from '@/core/ui';
 

src/commands/api/api.ts

@@ -18,9 +18,9 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+import { type ResolvedAuth } from '@/core/auth/auth-resolver.ts';
 import { InvalidOptionError } from '@/core/command-error.ts';
 import { CLOUD_API_DOCS_URL, SERVER_API_DOCS_URL } from '@/core/config-constants.ts';
-import { type ResolvedAuth } from '@/core/host/auth-resolver.ts';
 import {
   GENERIC_HTTP_METHODS,
   type HttpMethod,

src/commands/auth/login.ts

@@ -18,11 +18,11 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-import { type BrowserAuthResult, generateTokenViaBrowser } from '@/commands/_common/token.ts';
+import { recordConnectionFromAuth } from '@/core/auth/auth-connection-recorder.ts';
+import { isSonarQubeCloud } from '@/core/auth/auth-resolver.ts';
+import { type BrowserAuthResult, generateTokenViaBrowser } from '@/core/auth/token.ts';
 import { CommandFailedError, InvalidOptionError } from '@/core/command-error.ts';
 import { SONARCLOUD_URL, SONARCLOUD_US_URL } from '@/core/config-constants.ts';
-import { recordConnectionFromAuth } from '@/core/host/auth-connection-recorder.ts';
-import { isSonarQubeCloud } from '@/core/host/auth-resolver.ts';
 import {
   deleteStaleTokens,
   getToken as getKeystoreToken,

src/commands/auth/status.ts

@@ -18,10 +18,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-import type { TokenCheckResult } from '@/commands/_common/token.ts';
-import { checkTokenStatus } from '@/commands/_common/token.ts';
+import { ENV_ORG, ENV_SERVER, ENV_TOKEN, resolveFromEnv } from '@/core/auth/auth-resolver.ts';
+import type { TokenCheckResult } from '@/core/auth/token.ts';
+import { checkTokenStatus } from '@/core/auth/token.ts';
 import { CommandFailedError } from '@/core/command-error.ts';
-import { ENV_ORG, ENV_SERVER, ENV_TOKEN, resolveFromEnv } from '@/core/host/auth-resolver.ts';
 import { getToken as getKeystoreToken } from '@/core/host/keychain.ts';
 import { loadState } from '@/core/state/state-repository.ts';
 import { blank, note, print, withSpinner } from '@/core/ui';

src/commands/command-tree.ts

@@ -37,10 +37,9 @@ import {
   SQAA_VERIFY_CALLER_COMMAND,
 } from '@/core/telemetry/sqaa-analysis-telemetry.ts';
 import { blank, error, warn } from '@/core/ui';
+import { parseInteger } from '@/core/ui/parsing.ts';
 
 import { version as VERSION } from '../../package.json';
-import { parseInteger } from './_common/parsing.ts';
-import { SonarCommand } from './_common/sonar-command.ts';
 import { analyzeAll, type AnalyzeAllOptions } from './analyze/analyze-all.ts';
 import type { Severity } from './analyze/dependency-risk-helpers/sca-scanner.ts';
 import { SEVERITIES } from './analyze/dependency-risk-helpers/view-model/build/severity.ts';
@@ -98,6 +97,7 @@ import { listProjects, type ListProjectsOptions } from './list/projects.ts';
 import { remediate, type RemediateOptions } from './remediate';
 import { getBanner, getCustomRootHelp } from './root-help.ts';
 import { runMcp } from './run/mcp.ts';
+import { SonarCommand } from './sonar-command.ts';
 import { systemReset, type SystemResetOptions } from './system/reset.ts';
 import { systemStatus, type SystemStatusOptions } from './system/status.ts';
 import { updateVersion, type UpdateVersionOptions } from './update';

src/commands/context/index.ts

@@ -20,12 +20,12 @@
 
 import { spawn } from 'node:child_process';
 
-import { buildContextAugmentationEnv } from '@/commands/_common/context-augmentation-env.ts';
 import { CONTEXT_AUGMENTATION_FEATURE_ID } from '@/commands/integrate/_common/features/context-augmentation-feature.ts';
 import { isProjectVortexFeature } from '@/commands/integrate/_common/vortex.ts';
+import { resolveAuth, type ResolvedAuth } from '@/core/auth/auth-resolver.ts';
 import { CommandFailedError } from '@/core/command-error.ts';
 import { SONAR_CONTEXT_INVOCATION } from '@/core/config-constants.ts';
-import { resolveAuth, type ResolvedAuth } from '@/core/host/auth-resolver.ts';
+import { buildContextAugmentationEnv } from '@/core/host/context-augmentation-env.ts';
 import { resolveContextWorkspaceRoot } from '@/core/host/git/worktree.ts';
 import { resolveContextAugmentationBinaryPath } from '@/core/host/install/context-augmentation.ts';
 import { getToken } from '@/core/host/keychain.ts';

src/commands/hook/agent-post-tool-use.ts

@@ -23,8 +23,8 @@
 
 import { existsSync, readFileSync } from 'node:fs';
 
+import { resolveAuth } from '@/core/auth/auth-resolver.ts';
 import { AGENTIC_PACK_URL } from '@/core/config-constants.ts';
-import { resolveAuth } from '@/core/host/auth-resolver.ts';
 import { canonicalizePath, toRelativePosixPath } from '@/core/io/fs-utils.ts';
 import logger from '@/core/observability/logger.ts';
 import { timed } from '@/core/observability/timed.ts';

src/commands/hook/codex-post-tool-use.ts

@@ -22,8 +22,8 @@
 
 import { buildSqaaJsonReport } from '@/commands/analyze/sqaa.ts';
 import type { SqaaJsonReport } from '@/commands/analyze/sqaa-display.ts';
+import { resolveAuth } from '@/core/auth/auth-resolver.ts';
 import { AGENTIC_PACK_URL } from '@/core/config-constants.ts';
-import { resolveAuth } from '@/core/host/auth-resolver.ts';
 import logger from '@/core/observability/logger.ts';
 import { SqaaForbiddenError } from '@/core/server/errors.ts';
 import { noteProject } from '@/core/telemetry/project-uuid.ts';

src/commands/hook/git-pre-commit-dependency-risks.ts

@@ -24,8 +24,8 @@
 // missing, scanner failure), and blocks the commit only when risks matching the
 // configured filter are found.
 
+import type { ResolvedAuth } from '@/core/auth/auth-resolver.ts';
 import { CommandFailedError } from '@/core/command-error.ts';
-import type { ResolvedAuth } from '@/core/host/auth-resolver.ts';
 import {
   resolveScaScannerBinaryPath,
   ScaScannerNoopInstaller,

src/commands/hook/git-pre-commit-secrets.ts

@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+import type { ResolvedAuth } from '@/core/auth/auth-resolver.ts';
 import { CommandFailedError } from '@/core/command-error.ts';
-import type { ResolvedAuth } from '@/core/host/auth-resolver.ts';
 import { resolveSecretsBinaryPath } from '@/core/host/install/secrets.ts';
 import { SECRETS_CALLER_COMMANDS } from '@/core/telemetry/secrets-analysis-telemetry.ts';
 import { print } from '@/core/ui';

src/commands/hook/git-pre-commit.ts

@@ -22,8 +22,8 @@
 // when --dependency-risks is set, runs a dependency-risks scan as a follow-up stage.
 // Replaces the shell logic that was previously embedded in the git hook script.
 
+import { resolveAuth } from '@/core/auth/auth-resolver.ts';
 import { InvalidOptionError } from '@/core/command-error.ts';
-import { resolveAuth } from '@/core/host/auth-resolver.ts';
 import { spawnProcess } from '@/core/process/process.ts';
 import { noteProject } from '@/core/telemetry/project-uuid.ts';
 

src/commands/hook/git-pre-push-secrets.ts

@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+import type { ResolvedAuth } from '@/core/auth/auth-resolver.ts';
 import { CommandFailedError } from '@/core/command-error.ts';
-import type { ResolvedAuth } from '@/core/host/auth-resolver.ts';
 import { resolveSecretsBinaryPath } from '@/core/host/install/secrets.ts';
 import { SECRETS_CALLER_COMMANDS } from '@/core/telemetry/secrets-analysis-telemetry.ts';
 

src/commands/hook/git-pre-push.ts

@@ -21,7 +21,7 @@
 // git pre-push callback handler — scans files in new commits for secrets.
 // Replaces the shell logic that was previously embedded in the git hook script.
 
-import { resolveAuth } from '@/core/host/auth-resolver.ts';
+import { resolveAuth } from '@/core/auth/auth-resolver.ts';
 import { spawnProcess } from '@/core/process/process.ts';
 
 import { runSecretsStage } from './git-pre-push-secrets.ts';

src/commands/hook/hook-dependencies.ts

@@ -21,9 +21,9 @@
 // Shared guard for hook handlers — resolves auth and binary path, throwing
 // MissingDependenciesError if either is unavailable so handlers fail loudly.
 
+import type { ResolvedAuth } from '@/core/auth/auth-resolver.ts';
+import { isEnvBasedAuth, resolveAuth } from '@/core/auth/auth-resolver.ts';
 import { CommandFailedError } from '@/core/command-error.ts';
-import type { ResolvedAuth } from '@/core/host/auth-resolver.ts';
-import { isEnvBasedAuth, resolveAuth } from '@/core/host/auth-resolver.ts';
 import { resolveSecretsBinaryPath } from '@/core/host/install/secrets.ts';
 import type { SecretsCallerCommand } from '@/core/telemetry/secrets-analysis-telemetry.ts';
 import { warn } from '@/core/ui';

src/commands/import/index.ts

@@ -18,9 +18,9 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+import type { ResolvedAuth } from '@/core/auth/auth-resolver.ts';
 import { CommandFailedError } from '@/core/command-error.ts';
 import { runWithConcurrencyLimit } from '@/core/concurrency/concurrency-pool.ts';
-import type { ResolvedAuth } from '@/core/host/auth-resolver.ts';
 import {
   type DopRepository,
   type ProvisionedProject,

src/commands/integrate/_common/agent-integrate-postlude.ts

@@ -23,8 +23,8 @@
 // agent-specific feature flags, resolve Vortex, assemble the integration
 // options and recorded attrs, and run the install.
 
+import type { ResolvedAuth } from '@/core/auth/auth-resolver.ts';
 import { installIntegration } from '@/core/framework/features';
-import type { ResolvedAuth } from '@/core/host/auth-resolver.ts';
 
 import { supportedIntegrations } from '../index.ts';
 import {

src/commands/integrate/_common/agent-integrate-prelude.ts

@@ -22,8 +22,8 @@
 
 import { homedir } from 'node:os';
 
+import { isSonarQubeCloud, type ResolvedAuth } from '@/core/auth/auth-resolver.ts';
 import { CommandFailedError, InvalidOptionError } from '@/core/command-error.ts';
-import { isSonarQubeCloud, type ResolvedAuth } from '@/core/host/auth-resolver.ts';
 import { type DiscoveredProject, discoverProject } from '@/core/project-info.ts';
 import type { IntegrationScope } from '@/core/state/state.ts';
 import { intro, warn, withSpinner } from '@/core/ui';

src/commands/integrate/_common/context-augmentation-dependency.ts

@@ -33,8 +33,8 @@ import {
   installContextAugmentationBinary,
   resolveContextAugmentationBinaryPath,
 } from '@/core/host/install/context-augmentation.ts';
-import { CONTEXT_AUGMENTATION_BINARY_NAME } from '@/core/host/install-types.ts';
-import { SONAR_CONTEXT_AUGMENTATION_VERSION } from '@/core/host/signatures.ts';
+import { CONTEXT_AUGMENTATION_BINARY_NAME } from '@/core/host/install/install-types.ts';
+import { SONAR_CONTEXT_AUGMENTATION_VERSION } from '@/core/host/install/signatures.ts';
 
 import { stopAllContextAugmentationTools } from './context-augmentation.ts';