refactor: move contracts.ts into src/kernel — Phase 5

.fallowrc.json

@@ -10,7 +10,7 @@
     "src/install-source.ts",
     "src/android-adb.ts",
     "src/android-snapshot-helper.ts",
-    "src/contracts.ts",
+    "src/kernel/contracts.ts",
     "src/selectors.ts",
     "src/finders.ts",
     "src/bin.ts",

fallow-baselines/health.json

@@ -133,7 +133,7 @@
         "count": 1
       }
     },
-    "src/contracts.ts": {
+    "src/kernel/contracts.ts": {
       "crap_moderate": {
         "count": 1
       }

rslib.config.ts

@@ -31,7 +31,7 @@ export default defineConfig({
           'install-source': 'src/install-source.ts',
           'android-adb': 'src/android-adb.ts',
           'android-snapshot-helper': 'src/android-snapshot-helper.ts',
-          contracts: 'src/contracts.ts',
+          contracts: 'src/kernel/contracts.ts',
           selectors: 'src/selectors.ts',
           finders: 'src/finders.ts',
           'internal/bin': 'src/bin.ts',

src/__tests__/client.test.ts

@@ -2,7 +2,7 @@ import { test } from 'vitest';
 import assert from 'node:assert/strict';
 import { createAgentDeviceClient, type AgentDeviceClientConfig } from '../client.ts';
 import { runCommand } from '../commands/command-surface.ts';
-import type { DaemonRequest, DaemonResponse } from '../contracts.ts';
+import type { DaemonRequest, DaemonResponse } from '../kernel/contracts.ts';
 import { AppError } from '../kernel/errors.ts';
 
 function createTransport(

src/__tests__/contracts-schema-public.test.ts

@@ -26,7 +26,7 @@ import {
   type AppErrorCode,
   type Rect,
   type SnapshotNode,
-} from '../contracts.ts';
+} from '../kernel/contracts.ts';
 
 const invalidArgsCode = 'INVALID_ARGS' satisfies AppErrorCode;
 const rect = { x: 1, y: 2, width: 3, height: 4 } satisfies Rect;

src/backend.ts

@@ -1,7 +1,7 @@
 import type { AlertAction, AlertInfo } from './alert-contract.ts';
 import type { AppsFilter } from './contracts/app-inventory.ts';
 import type { Point, SnapshotNode, SnapshotOptions, SnapshotState } from './kernel/snapshot.ts';
-import type { NetworkIncludeMode } from './contracts.ts';
+import type { NetworkIncludeMode } from './kernel/contracts.ts';
 import type { DeviceTarget, Platform, PlatformSelector } from './kernel/device.ts';
 import type { BackMode } from './core/back-mode.ts';
 import type { RepeatedInput } from './commands/command-input.ts';

src/batch-contract.ts

@@ -1,4 +1,4 @@
-import { daemonRuntimeSchema, type SessionRuntimeHints } from './contracts.ts';
+import { daemonRuntimeSchema, type SessionRuntimeHints } from './kernel/contracts.ts';
 import { AppError } from './kernel/errors.ts';
 import { isRecord } from './utils/parsing.ts';
 

src/cli.ts

@@ -34,7 +34,7 @@ import {
 } from './remote-connection-state.ts';
 import { resolveRemoteAuthForCli } from './cli/auth-session.ts';
 import type { CliFlags, FlagKey } from './utils/cli-flags.ts';
-import type { SessionRuntimeHints } from './contracts.ts';
+import type { SessionRuntimeHints } from './kernel/contracts.ts';
 
 type CliDeps = {
   sendToDaemon: typeof sendToDaemon;

src/cli/batch-steps.ts

@@ -1,5 +1,5 @@
 import type { BatchStep } from '../client-types.ts';
-import { type SessionRuntimeHints } from '../contracts.ts';
+import { type SessionRuntimeHints } from '../kernel/contracts.ts';
 import { parseBatchStepRuntime } from '../batch-contract.ts';
 import { readInputFromCli } from '../commands/cli-grammar.ts';
 import { isCommandName, type CommandName } from '../commands/command-metadata.ts';

src/cli/commands/__tests__/generic.test.ts

@@ -1,7 +1,7 @@
 import { test } from 'vitest';
 import assert from 'node:assert/strict';
 import { createAgentDeviceClient } from '../../../client.ts';
-import type { DaemonResponse } from '../../../contracts.ts';
+import type { DaemonResponse } from '../../../kernel/contracts.ts';
 import type { CliFlags } from '../../../utils/cli-flags.ts';
 import type { ClientBackedCliCommandName } from '../../../command-catalog.ts';
 import { runGenericClientBackedCommand } from '../generic.ts';

src/cli/commands/__tests__/screenshot.test.ts

@@ -1,7 +1,7 @@
 import { test } from 'vitest';
 import assert from 'node:assert/strict';
 import { createAgentDeviceClient } from '../../../client.ts';
-import type { DaemonResponse } from '../../../contracts.ts';
+import type { DaemonResponse } from '../../../kernel/contracts.ts';
 import type { CliFlags } from '../../../utils/cli-flags.ts';
 import { screenshotCommand } from '../screenshot.ts';
 

src/cli/commands/agent-cdp.ts

@@ -1,7 +1,7 @@
 import { runCmdStreaming } from '../../utils/exec.ts';
 import { AppError } from '../../kernel/errors.ts';
 import { isRemoteBridgeBackend } from './remote-bridge.ts';
-import type { SessionRuntimeHints } from '../../contracts.ts';
+import type { SessionRuntimeHints } from '../../kernel/contracts.ts';
 import type { CliFlags } from '../../utils/cli-flags.ts';
 
 const AGENT_CDP_VERSION = '1.6.0';

src/cli/commands/connection-runtime.ts

@@ -17,7 +17,7 @@ import {
 import { profileToCliFlags } from '../../utils/remote-config.ts';
 import type { BatchStep } from '../../client-types.ts';
 import { AppError } from '../../kernel/errors.ts';
-import type { LeaseBackend, SessionRuntimeHints } from '../../contracts.ts';
+import type { LeaseBackend, SessionRuntimeHints } from '../../kernel/contracts.ts';
 import type { CliFlags } from '../../utils/cli-flags.ts';
 import type { AgentDeviceClient, Lease } from '../../client.ts';
 import type { MetroPrepareKind } from '../../metro/client-metro.ts';

src/cli/commands/connection.ts

@@ -24,7 +24,7 @@ import {
   stopReactDevtoolsCleanup,
 } from './connection-runtime.ts';
 import { writeCommandOutput } from './shared.ts';
-import type { LeaseBackend } from '../../contracts.ts';
+import type { LeaseBackend } from '../../kernel/contracts.ts';
 import type { CliFlags } from '../../utils/cli-flags.ts';
 import type { ClientCommandHandler } from './router-types.ts';
 

src/cli/commands/generic.ts

@@ -6,7 +6,7 @@ import type { CliOutput } from '../../commands/command-contract.ts';
 import type { ReplaySuiteResult } from '../../daemon/types.ts';
 import type { CliFlags } from '../../utils/cli-flags.ts';
 import { readCommandMessage } from '../../utils/success-text.ts';
-import { isNonDefaultResponseLevel } from '../../contracts.ts';
+import { isNonDefaultResponseLevel } from '../../kernel/contracts.ts';
 import { writeCommandOutput } from './shared.ts';
 import type { ClientBackedCliCommandName } from '../../command-catalog.ts';
 import type { ClientCommandParams } from './router-types.ts';

src/cli/commands/screenshot.ts

@@ -1,6 +1,6 @@
 import { formatScreenshotDiffText, formatSnapshotDiffText } from '../../utils/output.ts';
 import { AppError } from '../../kernel/errors.ts';
-import { isNonDefaultResponseLevel } from '../../contracts.ts';
+import { isNonDefaultResponseLevel } from '../../kernel/contracts.ts';
 import { resolveUserPath } from '../../utils/path-resolution.ts';
 import type { AgentDeviceBackend } from '../../backend.ts';
 import type { AgentDeviceClient, CaptureScreenshotResult } from '../../client.ts';

src/client-types.ts

@@ -11,7 +11,7 @@ import type {
   ResponseLevel,
   SessionIsolationMode,
   SessionRuntimeHints,
-} from './contracts.ts';
+} from './kernel/contracts.ts';
 import type { DeviceKind, DeviceTarget, Platform, PlatformSelector } from './kernel/device.ts';
 import type { BackMode } from './core/back-mode.ts';
 import type { ClickButton } from './core/click-button.ts';

src/client.ts

@@ -47,7 +47,7 @@ import type {
   MetroPrepareOptions,
 } from './client-types.ts';
 import type { CommandResult } from './core/command-descriptor/command-result.ts';
-import { isNonDefaultResponseLevel, type ResponseLevel } from './contracts.ts';
+import { isNonDefaultResponseLevel, type ResponseLevel } from './kernel/contracts.ts';
 import { readSerializedSnapshotCaptureAnnotations } from './snapshot-capture-annotations.ts';
 import { readSnapshotDiagnosticsSummary } from './snapshot-diagnostics.ts';
 import type { CommandFlags } from './core/dispatch-context.ts';

src/commands/batch/metadata.ts

@@ -7,7 +7,7 @@ import {
   readBatchStepRecord,
   type BatchStepErrorFactory,
 } from '../../batch-contract.ts';
-import { type SessionRuntimeHints } from '../../contracts.ts';
+import { type SessionRuntimeHints } from '../../kernel/contracts.ts';
 import {
   STRUCTURED_BATCH_COMMAND_NAMES,
   readStructuredBatchCommandName,

src/commands/batch/public.test.ts

@@ -8,7 +8,7 @@ import {
   runBatch,
   validateAndNormalizeBatchSteps,
 } from '../../batch.ts';
-import type { DaemonRequest } from '../../contracts.ts';
+import type { DaemonRequest } from '../../kernel/contracts.ts';
 
 test('public batch entrypoint exports daemon-compatible orchestration helpers', async () => {
   const seenCommands: string[] = [];

src/commands/management/install.ts

@@ -1,5 +1,5 @@
 import { INTERNAL_COMMANDS, PUBLIC_COMMANDS } from '../../command-catalog.ts';
-import type { DaemonInstallSource } from '../../contracts.ts';
+import type { DaemonInstallSource } from '../../kernel/contracts.ts';
 import type { CliFlags } from '../../utils/cli-flags.ts';
 import type { CommandSchemaOverride } from '../../utils/cli-command-schema-types.ts';
 import { AppError } from '../../kernel/errors.ts';

src/commands/observability/index.ts

@@ -1,5 +1,5 @@
 import type { LogsOptions, NetworkOptions } from '../../client-types.ts';
-import { NETWORK_INCLUDE_MODES, type NetworkIncludeMode } from '../../contracts.ts';
+import { NETWORK_INCLUDE_MODES, type NetworkIncludeMode } from '../../kernel/contracts.ts';
 import { AppError } from '../../kernel/errors.ts';
 import { parseStringMember } from '../../utils/string-enum.ts';
 import type { CommandSchemaOverride } from '../../utils/cli-command-schema-types.ts';

src/commands/observability/output.ts

@@ -1,5 +1,5 @@
 import type { BackendNetworkEntry } from '../../backend.ts';
-import type { NetworkIncludeMode } from '../../contracts.ts';
+import type { NetworkIncludeMode } from '../../kernel/contracts.ts';
 import type { NetworkEntry } from '../../daemon/network-log.ts';
 import type { CliOutput } from '../command-contract.ts';
 import { resultOutput, type CliOutputFormatter } from '../output-common.ts';

src/core/batch.ts

@@ -1,4 +1,4 @@
-import { type DaemonRequest, type DaemonResponse } from '../contracts.ts';
+import { type DaemonRequest, type DaemonResponse } from '../kernel/contracts.ts';
 import { AppError, asAppError } from '../kernel/errors.ts';
 import { isRecord } from '../utils/parsing.ts';
 import {

src/core/lease-scope.ts

@@ -1,4 +1,4 @@
-import type { LeaseBackend } from '../contracts.ts';
+import type { LeaseBackend } from '../kernel/contracts.ts';
 import { stripUndefined } from '../utils/parsing.ts';
 
 const PROXY_LEASE_PROVIDER = 'proxy';

src/daemon-error.ts

@@ -1,5 +1,5 @@
 import { AppError, toAppErrorCode } from './kernel/errors.ts';
-import type { DaemonError } from './contracts.ts';
+import type { DaemonError } from './kernel/contracts.ts';
 
 export function throwDaemonError(error: DaemonError): never {
   throw new AppError(toAppErrorCode(error.code), error.message, {

src/daemon/__tests__/request-router-cost.test.ts

@@ -19,7 +19,7 @@ import { createRequestHandler } from '../request-router.ts';
 import type { DaemonRequest, SessionState } from '../types.ts';
 import { LeaseRegistry } from '../lease-registry.ts';
 import { makeSessionStore } from '../../__tests__/test-utils/store-factory.ts';
-import { daemonCommandRequestSchema } from '../../contracts.ts';
+import { daemonCommandRequestSchema } from '../../kernel/contracts.ts';
 import { emitDiagnostic } from '../../utils/diagnostics.ts';
 
 const mockDispatch = vi.mocked(dispatchCommand);

src/daemon/__tests__/request-router-response-level.test.ts

@@ -35,7 +35,7 @@ import { createRequestHandler } from '../request-router.ts';
 import type { DaemonRequest, SessionState } from '../types.ts';
 import { LeaseRegistry } from '../lease-registry.ts';
 import { makeSessionStore } from '../../__tests__/test-utils/store-factory.ts';
-import { daemonCommandRequestSchema } from '../../contracts.ts';
+import { daemonCommandRequestSchema } from '../../kernel/contracts.ts';
 
 const mockDispatch = vi.mocked(dispatchCommand);
 

src/daemon/config.ts

@@ -9,7 +9,7 @@ import type {
   DaemonServerMode,
   DaemonTransportPreference,
   SessionIsolationMode,
-} from '../contracts.ts';
+} from '../kernel/contracts.ts';
 export type { DaemonServerMode, DaemonTransportPreference, SessionIsolationMode };
 
 export type DaemonPaths = {

src/daemon/handlers/session-observability.ts

@@ -34,7 +34,7 @@ import {
 import { handleNativePerfCommand as handleAndroidNativePerfCommand } from './session-native-perf.ts';
 import { errorResponse, requireCommandSupported, type DaemonFailureResponse } from './response.ts';
 import { handleNativePerfCommand as handleAppleNativePerfCommand } from './session-perf-xctrace.ts';
-import { NETWORK_INCLUDE_MODES, type NetworkIncludeMode } from '../../contracts.ts';
+import { NETWORK_INCLUDE_MODES, type NetworkIncludeMode } from '../../kernel/contracts.ts';
 import type { LogBackend } from '../network-log.ts';
 import {
   LOG_ACTION_VALUES as LOG_ACTIONS,

src/daemon/http-server.ts

@@ -8,8 +8,8 @@ import type {
   JsonRpcId,
   JsonRpcRequestEnvelope,
   LeaseBackend,
-} from '../contracts.ts';
-import { commandRpcParamsSchema } from '../contracts.ts';
+} from '../kernel/contracts.ts';
+import { commandRpcParamsSchema } from '../kernel/contracts.ts';
 import type { DaemonInstallSource, DaemonInvokeFn, DaemonRequest } from './types.ts';
 import { normalizeTenantId } from './config.ts';
 import {

src/daemon/lease-context.ts

@@ -1,5 +1,5 @@
 import type { DaemonRequest } from './types.ts';
-import type { LeaseBackend } from '../contracts.ts';
+import type { LeaseBackend } from '../kernel/contracts.ts';
 import type { DeviceLease } from './lease-registry.ts';
 import type { RunnerLogicalLeaseContext } from '../core/runner-lease-context.ts';
 import { stripUndefined } from '../utils/parsing.ts';

src/daemon/lease-registry.ts

@@ -1,5 +1,5 @@
 import crypto from 'node:crypto';
-import type { LeaseBackend } from '../contracts.ts';
+import type { LeaseBackend } from '../kernel/contracts.ts';
 import { AppError } from '../kernel/errors.ts';
 import { normalizeTenantId } from './config.ts';
 

src/daemon/network-log.ts

@@ -18,7 +18,7 @@ const ANDROID_NEARBY_LINE_RADIUS = 5;
 const ANDROID_PACKET_SCAN_RADIUS = 12;
 const NETWORK_LOG_MEMORY_PATH = '<memory>';
 
-import type { NetworkIncludeMode } from '../contracts.ts';
+import type { NetworkIncludeMode } from '../kernel/contracts.ts';
 export type { NetworkIncludeMode };
 export type LogBackend = 'ios-simulator' | 'ios-device' | 'android' | 'macos';
 

src/daemon/request-router.ts

@@ -5,7 +5,7 @@ import {
 import { AppError, normalizeError, retriableForErrorCode } from '../kernel/errors.ts';
 import { supportedPlatformsForCommand } from '../core/capabilities.ts';
 import { timingSafeStringEqual } from '../utils/timing-safe-equal.ts';
-import type { DaemonError, ResponseCost } from '../contracts.ts';
+import type { DaemonError, ResponseCost } from '../kernel/contracts.ts';
 import type { DaemonInvokeFn, DaemonRequest, DaemonResponse, DaemonResponseData } from './types.ts';
 import { RESPONSE_VIEWS } from './response-views.ts';
 import { SessionStore } from './session-store.ts';

src/daemon/response-views.ts

@@ -1,4 +1,4 @@
-import type { ResponseLevel } from '../contracts.ts';
+import type { ResponseLevel } from '../kernel/contracts.ts';
 import type { ScreenshotOverlayRef, SnapshotNode } from '../kernel/snapshot.ts';
 import type { DaemonResponseData } from './types.ts';
 

src/daemon/types.ts

@@ -8,8 +8,8 @@ import type {
   DaemonError,
   LeaseBackend,
   SessionRuntimeHints as PublicSessionRuntimeHints,
-} from '../contracts.ts';
-export type { DaemonLockPolicy } from '../contracts.ts';
+} from '../kernel/contracts.ts';
+export type { DaemonLockPolicy } from '../kernel/contracts.ts';
 import type { CommandFlags } from '../core/dispatch.ts';
 import type { GestureReferenceFrame, ScrollDirection } from '../core/scroll-gesture.ts';
 import type { LogBackend } from './network-log.ts';

src/index.ts

@@ -28,7 +28,7 @@ export type {
 } from './cli-test-reporters/types.ts';
 
 export type { CommandResult } from './core/command-descriptor/command-result.ts';
-export type { ResponseLevel } from './contracts.ts';
+export type { ResponseLevel } from './kernel/contracts.ts';
 export type { BootCommandResult, ShutdownCommandResult } from './contracts/device.ts';
 export type { ViewportCommandResult } from './contracts/viewport.ts';
 

src/contracts.ts → src/kernel/contracts.ts

@@ -1,14 +1,14 @@
-export type { AppErrorCode } from './kernel/errors.ts';
-export { defaultHintForCode, normalizeError } from './kernel/errors.ts';
+export type { AppErrorCode } from './errors.ts';
+export { defaultHintForCode, normalizeError } from './errors.ts';
 export type {
   DebugSymbolsCrashFrame,
   DebugSymbolsCrashSummary,
   DebugSymbolsImage,
   DebugSymbolsOptions,
   DebugSymbolsResult,
-} from './contracts/debug-symbols.ts';
-import type { PlatformSelector } from './kernel/device.ts';
-import { PLATFORM_SELECTORS } from './kernel/device.ts';
+} from '../contracts/debug-symbols.ts';
+import type { PlatformSelector } from './device.ts';
+import { PLATFORM_SELECTORS } from './device.ts';
 
 export type SessionRuntimeHints = {
   platform?: 'ios' | 'android';
@@ -212,8 +212,8 @@ export type JsonRpcRequestEnvelope<TParams = unknown> = {
   params?: TParams;
 };
 
-export { centerOfRect } from './kernel/snapshot.ts';
-export type { Rect, SnapshotNode } from './kernel/snapshot.ts';
+export { centerOfRect } from './snapshot.ts';
+export type { Rect, SnapshotNode } from './snapshot.ts';
 
 type RuntimeSchema<T> = {
   parse(input: unknown): T;

src/mcp/command-tools.ts

@@ -1,6 +1,6 @@
 import type { AgentDeviceClient, AgentDeviceClientConfig } from '../client-types.ts';
 import type { JsonSchema } from '../commands/command-contract.ts';
-import { RESPONSE_LEVELS, type ResponseLevel } from '../contracts.ts';
+import { RESPONSE_LEVELS, type ResponseLevel } from '../kernel/contracts.ts';
 import { formatCliOutput } from '../commands/cli-output.ts';
 import {
   isCommandName,

src/mcp/router.ts

@@ -1,6 +1,6 @@
 import { listCommandTools, commandToolExecutor, type ToolResult } from './command-tools.ts';
 import { readVersion } from '../utils/version.ts';
-import type { JsonRpcId, JsonRpcRequestEnvelope } from '../contracts.ts';
+import type { JsonRpcId, JsonRpcRequestEnvelope } from '../kernel/contracts.ts';
 
 const MCP_SERVER_NAME = 'agent-device';
 const SUPPORTED_PROTOCOL_VERSION = '2025-11-25';

src/mcp/server.ts

@@ -1,5 +1,5 @@
 import { handleMcpMessage, type JsonRpcMessage } from './router.ts';
-import { jsonRpcRequestSchema, type JsonRpcId } from '../contracts.ts';
+import { jsonRpcRequestSchema, type JsonRpcId } from '../kernel/contracts.ts';
 
 type JsonRpcResponse = Awaited<NonNullable<ReturnType<typeof handleMcpMessage>>>;
 type MessageSink = (payload: unknown) => void;

src/metro/metro-types.ts

@@ -1,4 +1,4 @@
-import type { SessionRuntimeHints } from '../contracts.ts';
+import type { SessionRuntimeHints } from '../kernel/contracts.ts';
 
 /** Re-export of {@link SessionRuntimeHints} under the Metro-specific alias used by public API consumers. */
 export type MetroRuntimeHints = SessionRuntimeHints;

src/metro/metro.ts

@@ -1,4 +1,4 @@
-import type { SessionRuntimeHints } from '../contracts.ts';
+import type { SessionRuntimeHints } from '../kernel/contracts.ts';
 import {
   buildMetroRuntimeHints,
   prepareMetroRuntime,

src/remote-config-schema.ts

@@ -4,7 +4,7 @@ import type {
   DaemonTransportPreference,
   LeaseBackend,
   SessionIsolationMode,
-} from './contracts.ts';
+} from './kernel/contracts.ts';
 import { PLATFORM_SELECTORS, type DeviceTarget, type PlatformSelector } from './kernel/device.ts';
 import type { MetroPrepareKind } from './metro/client-metro.ts';