refactor: move utilities to owning modules (#2225)

Author: thymikee

src/cli-schema/cli-config.ts

@@ -2,7 +2,7 @@ import type { CliFlags } from '@agent-device/contracts/command';
 import fs from 'node:fs';
 import path from 'node:path';
 import { AppError } from '@agent-device/kernel/errors';
-import { mergeDefinedFlags } from '../utils/merge-flags.ts';
+import { mergeDefinedFlags } from './merge-flags.ts';
 import { type FlagKey } from '../commands/cli-grammar/flag-types.ts';
 import { expandUserHomePath, resolveUserPath } from '@agent-device/host-kit/file';
 import {

src/utils/merge-flags.ts src/cli-schema/merge-flags.tssrc/utils/merge-flags.ts renamed to src/cli-schema/merge-flags.ts

@@ -34,7 +34,7 @@ import {
   withDiagnosticsScope,
 } from '@agent-device/host-kit/diagnostics';
 import { resolveDaemonPaths } from './daemon/config.ts';
-import { applyDefaultPlatformBinding, resolveBindingSettings } from './utils/session-binding.ts';
+import { applyDefaultPlatformBinding, resolveBindingSettings } from './cli/session-binding.ts';
 import { resolveCliOptions } from './cli/resolve-cli-options.ts';
 import { maybeRunUpgradeNotifier } from './cli/update-check.ts';
 import {

src/cli.ts

@@ -1,6 +1,6 @@
 import { test } from 'vitest';
 import assert from 'node:assert/strict';
-import { parseArgs, usageForCommand } from '../../cli/parser/args.ts';
+import { parseArgs, usageForCommand } from '../args.ts';
 
 test('parseArgs accepts perf area subcommands', () => {
   const frames = parseArgs(['perf', 'frames'], { strictFlags: true });

src/utils/__tests__/perf-args.test.ts …c/cli/parser/__tests__/perf-args.test.tssrc/utils/__tests__/perf-args.test.ts renamed to src/cli/parser/__tests__/perf-args.test.ts src/utils/__tests__/perf-args.test.ts renamed to src/cli/parser/__tests__/perf-args.test.ts

@@ -1,6 +1,6 @@
 import type { CliFlags } from '@agent-device/contracts/command';
 import { AppError } from '@agent-device/kernel/errors';
-import { mergeDefinedFlags } from '../../utils/merge-flags.ts';
+import { mergeDefinedFlags } from '../../cli-schema/merge-flags.ts';
 import {
   applyCommandDefaults,
   assertCommandPositionalArity,

src/cli/parser/args.ts

@@ -1,5 +1,5 @@
 import type { CliFlags } from '@agent-device/contracts/command';
-import { mergeDefinedFlags } from '../utils/merge-flags.ts';
+import { mergeDefinedFlags } from '../cli-schema/merge-flags.ts';
 import { finalizeParsedArgs, parseRawArgs } from './parser/args.ts';
 import { resolveConfigBackedFlagDefaults } from '../cli-schema/cli-config.ts';
 import { resolveRemoteConfigDefaults } from './remote-config-flags.ts';

src/cli/resolve-cli-options.ts

@@ -28,7 +28,7 @@ import {
   type ScrollEdgeTarget,
 } from '../../../snapshot/scroll-edge-state.ts';
 import { successText } from '@agent-device/kernel/success-text';
-import { requireIntInRange } from '../../../utils/validation.ts';
+import { requireIntInRange } from '../../../core/validation.ts';
 import { toBackendContext } from '../../runtime-common.ts';
 import {
   toBackendResult,

src/utils/session-binding.ts src/cli/session-binding.tssrc/utils/session-binding.ts renamed to src/cli/session-binding.ts

@@ -33,7 +33,7 @@ import {
   classifyOffscreenScrollDirection,
   type OffscreenScrollDirection,
 } from '@agent-device/capture-kit/mobile-snapshot-semantics';
-import { truncateUtf8 } from '../../../utils/truncate-utf8.ts';
+import { truncateUtf8 } from './truncate-utf8.ts';
 import type {
   InteractionTarget,
   PointTarget,

src/commands/interaction/runtime/gestures.ts

@@ -1,6 +1,6 @@
 import { test } from 'vitest';
 import assert from 'node:assert/strict';
-import { truncateUtf8 } from '../truncate-utf8.ts';
+import { truncateUtf8 } from './truncate-utf8.ts';
 
 test('truncateUtf8 leaves short strings untouched', () => {
   assert.equal(truncateUtf8('Save', 256), 'Save');