refactor: extract remote/ folder — Phase 5

.fallowrc.json

@@ -6,7 +6,7 @@
     "src/io.ts",
     "src/artifacts.ts",
     "src/metro/metro.ts",
-    "src/remote-config.ts",
+    "src/remote/remote-config.ts",
     "src/install-source.ts",
     "src/android-adb.ts",
     "src/android-snapshot-helper.ts",

fallow-baselines/health.json

@@ -151,7 +151,7 @@
         "count": 1
       }
     },
-    "src/daemon-artifacts.ts": {
+    "src/remote/daemon-artifacts.ts": {
       "crap_moderate": {
         "count": 2
       }
@@ -506,20 +506,20 @@
         "count": 1
       }
     },
-    "src/remote-config-core.ts": {
+    "src/remote/remote-config-core.ts": {
       "complexity_high": {
         "count": 1
       },
       "crap_high": {
         "count": 1
       }
     },
-    "src/remote-connection-state.ts": {
+    "src/remote/remote-connection-state.ts": {
       "crap_high": {
         "count": 1
       }
     },
-    "src/upload-client.ts": {
+    "src/remote/upload-client.ts": {
       "crap_moderate": {
         "count": 1
       }

rslib.config.ts

@@ -27,7 +27,7 @@ export default defineConfig({
           artifacts: 'src/artifacts.ts',
           batch: 'src/batch.ts',
           metro: 'src/metro/metro.ts',
-          'remote-config': 'src/remote-config.ts',
+          'remote-config': 'src/remote/remote-config.ts',
           'install-source': 'src/install-source.ts',
           'android-adb': 'src/android-adb.ts',
           'android-snapshot-helper': 'src/android-snapshot-helper.ts',

src/__tests__/cli-agent-cdp-session.test.ts

@@ -15,7 +15,10 @@ vi.mock('../cli/commands/agent-cdp.ts', async (importOriginal) => {
 import { runCli } from '../cli.ts';
 import { runAgentCdpCommand } from '../cli/commands/agent-cdp.ts';
 import { installIsolatedCliTestEnv } from './cli-test-env.ts';
-import { hashRemoteConfigFile, writeRemoteConnectionState } from '../remote-connection-state.ts';
+import {
+  hashRemoteConfigFile,
+  writeRemoteConnectionState,
+} from '../remote/remote-connection-state.ts';
 import type { DaemonResponse } from '../daemon-client.ts';
 
 afterEach(() => {

src/__tests__/cli-config.test.ts

@@ -7,7 +7,7 @@ import {
   hashRemoteConfigFile,
   readActiveConnectionState,
   readRemoteConnectionState,
-} from '../remote-connection-state.ts';
+} from '../remote/remote-connection-state.ts';
 import { runCliCapture, type CapturedDaemonRequest } from './cli-capture.ts';
 
 function makeTempWorkspace(): { root: string; home: string; project: string } {

src/__tests__/cli-react-devtools-session.test.ts

@@ -11,7 +11,10 @@ vi.mock('../cli/commands/react-devtools.ts', () => ({
 import { runCli } from '../cli.ts';
 import { runReactDevtoolsCommand } from '../cli/commands/react-devtools.ts';
 import { installIsolatedCliTestEnv } from './cli-test-env.ts';
-import { hashRemoteConfigFile, writeRemoteConnectionState } from '../remote-connection-state.ts';
+import {
+  hashRemoteConfigFile,
+  writeRemoteConnectionState,
+} from '../remote/remote-connection-state.ts';
 import type { DaemonResponse } from '../daemon-client.ts';
 
 afterEach(() => {

src/__tests__/cloud-connect-auth.test.ts

@@ -5,7 +5,7 @@ import os from 'node:os';
 import path from 'node:path';
 import { connectCommand } from '../cli/commands/connection.ts';
 import { resolveCloudAccessForConnect } from '../cli/auth-session.ts';
-import { readActiveConnectionState } from '../remote-connection-state.ts';
+import { readActiveConnectionState } from '../remote/remote-connection-state.ts';
 import type { AgentDeviceClient } from '../client.ts';
 
 afterEach(() => {

src/__tests__/cloud-connect-profile.test.ts

@@ -9,7 +9,7 @@ import {
   hashRemoteConfigFile,
   readActiveConnectionState,
   type RemoteConnectionState,
-} from '../remote-connection-state.ts';
+} from '../remote/remote-connection-state.ts';
 import type { AgentDeviceClient } from '../client.ts';
 
 vi.mock('../cli/auth-session.ts', () => ({

src/__tests__/daemon-proxy.test.ts

@@ -2,7 +2,7 @@ import { test } from 'vitest';
 import assert from 'node:assert/strict';
 import crypto from 'node:crypto';
 import http from 'node:http';
-import { createDaemonProxyServer } from '../daemon-proxy.ts';
+import { createDaemonProxyServer } from '../remote/daemon-proxy.ts';
 import { DAEMON_RPC_PROTOCOL_VERSION } from '../daemon/http-health.ts';
 import {
   closeLoopbackServer,

src/__tests__/remote-config-public.test.ts

@@ -3,7 +3,7 @@ import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
-import { resolveRemoteConfigProfile, resolveRemoteConfigPath } from '../remote-config.ts';
+import { resolveRemoteConfigProfile, resolveRemoteConfigPath } from '../remote/remote-config.ts';
 
 test('public remote-config helpers resolve file paths and merged profiles', () => {
   const root = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-device-remote-config-public-'));

src/__tests__/remote-connection.test.ts

@@ -30,7 +30,7 @@ import {
   readActiveConnectionState,
   readRemoteConnectionState,
   writeRemoteConnectionState,
-} from '../remote-connection-state.ts';
+} from '../remote/remote-connection-state.ts';
 import type { AgentDeviceClient } from '../client.ts';
 
 afterEach(() => {

src/__tests__/upload-client.test.ts

@@ -6,7 +6,7 @@ import http, { type IncomingMessage, type ServerResponse } from 'node:http';
 import os from 'node:os';
 import path from 'node:path';
 import { once } from 'node:events';
-import { uploadArtifact } from '../upload-client.ts';
+import { uploadArtifact } from '../remote/upload-client.ts';
 import type { UploadProgressEvent } from '../upload-progress.ts';
 import { runCmdSync, withCommandExecutorOverride } from '../utils/exec.ts';
 

src/cli.ts

@@ -31,7 +31,7 @@ import { maybeRunUpgradeNotifier } from './utils/update-check.ts';
 import {
   resolveRemoteConnectionDefaults,
   type RemoteConnectionRequestMetadata,
-} from './remote-connection-state.ts';
+} from './remote/remote-connection-state.ts';
 import { resolveRemoteAuthForCli } from './cli/auth-session.ts';
 import type { CliFlags, FlagKey } from './utils/cli-flags.ts';
 import type { SessionRuntimeHints } from './kernel/contracts.ts';

src/cli/cloud-connection-profile.ts

@@ -1,5 +1,5 @@
 import crypto from 'node:crypto';
-import type { RemoteConfigProfile } from '../remote-config-schema.ts';
+import type { RemoteConfigProfile } from '../remote/remote-config-schema.ts';
 import { AppError } from '../kernel/errors.ts';
 import type { CliFlags } from '../utils/cli-flags.ts';
 import type { EnvMap } from '../utils/env-map.ts';

src/cli/commands/connection-runtime.ts

@@ -1,7 +1,7 @@
 import { resolveDaemonPaths } from '../../daemon/config.ts';
 import { stopReactDevtoolsCompanion } from '../../client-react-devtools-companion.ts';
 import { stopMetroTunnel } from '../../metro/metro.ts';
-import { resolveRemoteConfigProfile } from '../../remote-config.ts';
+import { resolveRemoteConfigProfile } from '../../remote/remote-config.ts';
 import { resolveDevice, type DeviceInfo } from '../../kernel/device.ts';
 import { shouldAgentCdpUseRemoteBridgeUrl } from './agent-cdp.ts';
 import type { MetroBridgeScope } from '../../client-companion-tunnel-contract.ts';
@@ -13,7 +13,7 @@ import {
   writeRemoteConnectionState,
   type RemoteConnectionState,
   type RemoteConnectionRequestMetadata,
-} from '../../remote-connection-state.ts';
+} from '../../remote/remote-connection-state.ts';
 import { profileToCliFlags } from '../../utils/remote-config.ts';
 import type { BatchStep } from '../../client-types.ts';
 import { AppError } from '../../kernel/errors.ts';

src/cli/commands/connection.ts

@@ -1,6 +1,6 @@
 import crypto from 'node:crypto';
 import { resolveDaemonPaths } from '../../daemon/config.ts';
-import { resolveRemoteConfigProfile } from '../../remote-config.ts';
+import { resolveRemoteConfigProfile } from '../../remote/remote-config.ts';
 import {
   buildRemoteConnectionDaemonState,
   fingerprint,
@@ -11,7 +11,7 @@ import {
   writeRemoteConnectionState,
   type RemoteConnectionState,
   type RemoteConnectionRequestMetadata,
-} from '../../remote-connection-state.ts';
+} from '../../remote/remote-connection-state.ts';
 import { AppError } from '../../kernel/errors.ts';
 import { resolveCloudConnectProfile } from '../cloud-connection-profile.ts';
 import { resolveProxyConnectProfile } from '../proxy-connection-profile.ts';

src/cli/commands/proxy.ts

@@ -1,5 +1,5 @@
 import { randomBytes } from 'node:crypto';
-import { createDaemonProxyServer } from '../../daemon-proxy.ts';
+import { createDaemonProxyServer } from '../../remote/daemon-proxy.ts';
 import { buildDaemonHttpBaseUrl } from '../../daemon/http-contract.ts';
 import { ensureDaemon, resolveClientSettings } from '../../daemon-client-lifecycle.ts';
 import { AppError } from '../../kernel/errors.ts';

src/cli/generated-remote-config.ts

@@ -1,8 +1,11 @@
 import crypto from 'node:crypto';
 import fs from 'node:fs';
 import path from 'node:path';
-import { resolveRemoteConfigProfile } from '../remote-config.ts';
-import type { RemoteConfigProfile, ResolvedRemoteConfigProfile } from '../remote-config-schema.ts';
+import { resolveRemoteConfigProfile } from '../remote/remote-config.ts';
+import type {
+  RemoteConfigProfile,
+  ResolvedRemoteConfigProfile,
+} from '../remote/remote-config-schema.ts';
 import { AppError, asAppError } from '../kernel/errors.ts';
 import type { EnvMap } from '../utils/env-map.ts';
 import type { CliFlags } from '../utils/cli-flags.ts';

src/cli/proxy-connection-profile.ts

@@ -1,5 +1,5 @@
 import crypto from 'node:crypto';
-import type { RemoteConfigProfile } from '../remote-config-schema.ts';
+import type { RemoteConfigProfile } from '../remote/remote-config-schema.ts';
 import { AppError } from '../kernel/errors.ts';
 import type { CliFlags } from '../utils/cli-flags.ts';
 import type { EnvMap } from '../utils/env-map.ts';

src/client-types.ts

@@ -44,7 +44,7 @@ export type { TargetShutdownResult } from './target-shutdown-contract.ts';
 import type { PerfAction, PerfArea, PerfKind, PerfSubject } from './contracts/perf.ts';
 import type { AlertAction } from './alert-contract.ts';
 import type { DebugSymbolsOptions, DebugSymbolsResult } from './contracts/debug-symbols.ts';
-import type { RemoteConnectionProfileFields } from './remote-config-schema.ts';
+import type { RemoteConnectionProfileFields } from './remote/remote-config-schema.ts';
 import type { CommandResult } from './core/command-descriptor/command-result.ts';
 
 export type { FindLocator } from './utils/finders.ts';

src/daemon-client-rpc.ts

@@ -1,7 +1,7 @@
 import { AppError, toAppErrorCode } from './kernel/errors.ts';
 import { createRequestId } from './utils/diagnostics.ts';
 import type { DaemonRequest, DaemonResponse } from './daemon/types.ts';
-import { materializeRemoteArtifacts } from './daemon-artifacts.ts';
+import { materializeRemoteArtifacts } from './remote/daemon-artifacts.ts';
 import type { DaemonInfo } from './daemon-client-metadata.ts';
 import {
   leaseScopeFromRequest,

src/daemon-client.ts

@@ -4,7 +4,7 @@ import type {
 } from './daemon/types.ts';
 import { createRequestId, emitDiagnostic, withDiagnosticTimer } from './utils/diagnostics.ts';
 import { INTERNAL_COMMANDS, PUBLIC_COMMANDS } from './command-catalog.ts';
-import { prepareRemoteRequestArtifacts } from './daemon-artifacts.ts';
+import { prepareRemoteRequestArtifacts } from './remote/daemon-artifacts.ts';
 import {
   cleanupDaemonAfterRequest,
   ensureDaemon,
@@ -13,7 +13,7 @@ import {
 import { sendRequest } from './daemon-client-transport.ts';
 
 export { computeDaemonCodeSignature } from './daemon/code-signature.ts';
-export { downloadRemoteArtifact } from './daemon-artifacts.ts';
+export { downloadRemoteArtifact } from './remote/daemon-artifacts.ts';
 export {
   cleanupFailedDaemonStartupMetadata,
   resolveDaemonStartupHint,

src/daemon-artifacts.ts → src/remote/daemon-artifacts.ts

@@ -3,15 +3,15 @@ import http from 'node:http';
 import https from 'node:https';
 import path from 'node:path';
 import { pipeline } from 'node:stream/promises';
-import { AppError } from './kernel/errors.ts';
-import type { DaemonArtifact, DaemonRequest, DaemonResponse } from './daemon/types.ts';
-import { buildDaemonHttpAuthHeaders } from './daemon/http-contract.ts';
+import { AppError } from '../kernel/errors.ts';
+import type { DaemonArtifact, DaemonRequest, DaemonResponse } from '../daemon/types.ts';
+import { buildDaemonHttpAuthHeaders } from '../daemon/http-contract.ts';
 import {
   appendRecordingExtensionWhenMissing,
   recordingExtensionForPlatform,
-} from './recording/output-path.ts';
+} from '../recording/output-path.ts';
 import { uploadArtifact } from './upload-client.ts';
-import { createStderrUploadProgressReporter, type UploadProgressSink } from './upload-progress.ts';
+import { createStderrUploadProgressReporter, type UploadProgressSink } from '../upload-progress.ts';
 
 // Mirrors the current daemon RPC timeout, but artifact download timeouts may diverge.
 const REMOTE_ARTIFACT_DOWNLOAD_TIMEOUT_MS = 90_000;

src/daemon-proxy.ts → src/remote/daemon-proxy.ts

@@ -2,15 +2,15 @@ import http, { type IncomingMessage, type ServerResponse } from 'node:http';
 import { Readable } from 'node:stream';
 import { pipeline } from 'node:stream/promises';
 import { randomUUID } from 'node:crypto';
-import { AppError, normalizeError } from './kernel/errors.ts';
-import { readNodeHttpRequestBody } from './utils/node-http.ts';
-import { timingSafeStringEqual } from './utils/timing-safe-equal.ts';
+import { AppError, normalizeError } from '../kernel/errors.ts';
+import { readNodeHttpRequestBody } from '../utils/node-http.ts';
+import { timingSafeStringEqual } from '../utils/timing-safe-equal.ts';
 import {
   DAEMON_HTTP_BASE_PATH,
   buildDaemonHttpAuthHeaders,
   buildDaemonHttpUrl,
-} from './daemon/http-contract.ts';
-import { buildDaemonHealthPayload } from './daemon/http-health.ts';
+} from '../daemon/http-contract.ts';
+import { buildDaemonHealthPayload } from '../daemon/http-health.ts';
 
 export type DaemonProxyOptions = {
   upstreamBaseUrl: string;

src/remote-config-core.ts → src/remote/remote-config-core.ts

@@ -8,9 +8,9 @@ import {
   type RemoteConfigProfileOptions,
   type ResolvedRemoteConfigProfile,
 } from './remote-config-schema.ts';
-import { AppError } from './kernel/errors.ts';
-import { resolveUserPath } from './utils/path-resolution.ts';
-import { parseSourceValue } from './utils/source-value.ts';
+import { AppError } from '../kernel/errors.ts';
+import { resolveUserPath } from '../utils/path-resolution.ts';
+import { parseSourceValue } from '../utils/source-value.ts';
 
 function readRemoteConfigFile(options: RemoteConfigProfileOptions): ResolvedRemoteConfigProfile {
   const env = options.env ?? process.env;

src/remote-config-schema.ts → src/remote/remote-config-schema.ts

@@ -1,12 +1,12 @@
-import { buildPrimaryEnvVarName } from './utils/source-value.ts';
+import { buildPrimaryEnvVarName } from '../utils/source-value.ts';
 import type {
   DaemonServerMode,
   DaemonTransportPreference,
   LeaseBackend,
   SessionIsolationMode,
-} from './kernel/contracts.ts';
-import { PLATFORM_SELECTORS, type DeviceTarget, type PlatformSelector } from './kernel/device.ts';
-import type { MetroPrepareKind } from './metro/client-metro.ts';
+} from '../kernel/contracts.ts';
+import { PLATFORM_SELECTORS, type DeviceTarget, type PlatformSelector } from '../kernel/device.ts';
+import type { MetroPrepareKind } from '../metro/client-metro.ts';
 
 export type RemoteConfigMetroOptions = {
   metroProjectRoot?: string;

src/remote-connection-state.ts → src/remote/remote-connection-state.ts

@@ -2,15 +2,15 @@ import crypto from 'node:crypto';
 import fs from 'node:fs';
 import path from 'node:path';
 import { resolveRemoteConfigPath, resolveRemoteConfigProfile } from './remote-config-core.ts';
-import { AppError } from './kernel/errors.ts';
-import { emitDiagnostic } from './utils/diagnostics.ts';
-import type { CliFlags } from './utils/cli-flags.ts';
-import type { LeaseBackend, SessionRuntimeHints } from './kernel/contracts.ts';
+import { AppError } from '../kernel/errors.ts';
+import { emitDiagnostic } from '../utils/diagnostics.ts';
+import type { CliFlags } from '../utils/cli-flags.ts';
+import type { LeaseBackend, SessionRuntimeHints } from '../kernel/contracts.ts';
 import {
   leaseScopeFromOptions,
   leaseScopeToCommandFlags,
   leaseScopeToConnectionMetadata,
-} from './core/lease-scope.ts';
+} from '../core/lease-scope.ts';
 
 export type RemoteConnectionState = {
   version: 1;

src/upload-client-artifact.ts → src/remote/upload-client-artifact.ts

@@ -4,8 +4,8 @@ import os from 'node:os';
 import path from 'node:path';
 import { Writable } from 'node:stream';
 import { pipeline } from 'node:stream/promises';
-import { AppError } from './kernel/errors.ts';
-import { runCmd } from './utils/exec.ts';
+import { AppError } from '../kernel/errors.ts';
+import { runCmd } from '../utils/exec.ts';
 
 const ARTIFACT_HASH_ALGORITHM = 'sha256';
 const DEFAULT_CONTENT_TYPE = 'application/octet-stream';

src/upload-client.ts → src/remote/upload-client.ts

@@ -1,9 +1,9 @@
 import { randomUUID } from 'node:crypto';
-import { AppError } from './kernel/errors.ts';
-import { buildDaemonHttpAuthHeaders } from './daemon/http-contract.ts';
+import { AppError } from '../kernel/errors.ts';
+import { buildDaemonHttpAuthHeaders } from '../daemon/http-contract.ts';
 import { prepareUploadArtifact, type PreparedUploadArtifact } from './upload-client-artifact.ts';
-import { isRetryableUploadStreamError, streamFileToHttpRequest } from './upload-stream.ts';
-import type { UploadProgressSink } from './upload-progress.ts';
+import { isRetryableUploadStreamError, streamFileToHttpRequest } from '../upload-stream.ts';
+import type { UploadProgressSink } from '../upload-progress.ts';
 
 const UPLOAD_PREFLIGHT_TIMEOUT_MS = 30 * 1000;
 const ARTIFACT_HASH_ALGORITHM = 'sha256';

src/utils/__tests__/cli-option-schema.test.ts

@@ -8,7 +8,10 @@ import {
   resolveSourceValueDefinition,
 } from '../cli-option-schema.ts';
 import { AppError } from '../../kernel/errors.ts';
-import { REMOTE_CONFIG_FIELD_SPECS, getRemoteConfigEnvNames } from '../../remote-config-schema.ts';
+import {
+  REMOTE_CONFIG_FIELD_SPECS,
+  getRemoteConfigEnvNames,
+} from '../../remote/remote-config-schema.ts';
 
 test('option schema exposes config/env metadata for global options', () => {
   const spec = getOptionSpec('platform');

src/utils/cli-flags.ts

@@ -15,7 +15,7 @@ import {
   type SessionRuntimeHints,
   type SessionIsolationMode,
 } from '../kernel/contracts.ts';
-import type { RemoteConfigMetroOptions } from '../remote-config-schema.ts';
+import type { RemoteConfigMetroOptions } from '../remote/remote-config-schema.ts';
 import {
   SCREENSHOT_SPECIFIC_FLAG_DEFINITIONS,
   type ScreenshotRequestFlags,