refactor: import package types directly — no internal re-export laundering (#1640)

* refactor: import package types directly instead of re-exporting from internal modules

Post-#1636 review feedback: internal src modules were re-exporting package
types (export type { X } from '@agent-device/...'), giving one declaration
several import paths and hiding its provenance. New rule applied repo-wide:
internal modules import directly from the owning package; only published
entry surfaces (src/sdk/* entries, client-types, finders, metro composition,
remote-config-schema) may re-export.

Eleven internal re-exports removed and ~110 import sites redirected to the
packages, the big two being CommandFlags (core/dispatch chain, 39 sites) and
SessionAction (daemon/types.ts, 19 sites). Two were already dead
(RefFrameEffect via daemon-command-registry, DiffSnapshotCommandResult via
capture/runtime/snapshot). Entry-surface chains now re-export from the
package rather than laundering through a second internal module
(client-types/client-metro MetroBridgeScope).

Side effect: the R9 type cycle shrinks again, 49 -> 47 (daemon-server
19 -> 17); ceilings lowered to match.

* refactor: drop command-schema's CliFlags re-export (#1640 review P2)

The one consumer (cli/parser/args.ts, a multi-line import the sweep's
single-line scan missed) now imports CliFlags from contracts/command;
FlagDefinition/FlagKey stay — they are src-declared types, not package
laundering.

Author: thymikee

CONTEXT.md

@@ -322,7 +322,7 @@ The perfect-shape refactor is complete and merged. Its end-state:
   theirs.
 - Type-cycle growth (R9). R4 keeps the VALUE import graph acyclic, so every remaining cycle is
   created by type-only imports — free at runtime, invisible to R5/R6, and the largest single
-  obstacle to reading a subsystem in isolation: inside a strongly-connected component of 49 files,
+  obstacle to reading a subsystem in isolation: inside a strongly-connected component of 47 files,
   no file has a self-contained slice. `TYPE_CYCLE_BASELINE`, derived from the zone ceilings in
   `scripts/layering/daemon-modularity.ts`, ratchets it for **growth only**, deliberately unlike R6: reducing it
   is a real refactor rather than a file move, so a hard equality would turn every unrelated
@@ -334,7 +334,7 @@ The perfect-shape refactor is complete and merged. Its end-state:
   #1632 sank `backend.ts`'s two upward type imports — 27 files stranded out of the component at
   once.
 - Daemon modularity ratchets (R10). The same tooling-only declaration pins R7's writer-owned
-  field/owner-claim counts, R9's 49 members by zone (`commands` 14, `daemon-server` 19, `core` 10,
+  field/owner-claim counts, R9's 47 members by zone (`commands` 14, `daemon-server` 17, `core` 10,
   `platforms` 2, root 3, `client` 1), and the external production importers of `daemon/types.ts`
   (down to 2: the client normalizers and remote artifacts). R7 counts and external importers may
   only shrink; no zone may grow inside R9, and replay/Maestro/replay-test engine files remain outside

scripts/layering/daemon-modularity.test.ts

@@ -51,8 +51,8 @@ test('daemon modularity baseline records the measured R7 ownership pressure', ()
     Object.values(SESSION_STATE_FIELD_OWNERS).reduce((sum, owners) => sum + owners.length, 0),
     DAEMON_MODULARITY_BASELINE.sessionState.ownerFileClaims,
   );
-  assert.equal(TYPE_CYCLE_BASELINE, 49);
-  assert.equal(DAEMON_MODULARITY_BASELINE.largestTypeCycle.zoneMembers['daemon-server'], 19);
+  assert.equal(TYPE_CYCLE_BASELINE, 47);
+  assert.equal(DAEMON_MODULARITY_BASELINE.largestTypeCycle.zoneMembers['daemon-server'], 17);
   assert.equal('daemon' in DAEMON_MODULARITY_BASELINE.largestTypeCycle.zoneMembers, false);
 });
 

scripts/layering/daemon-modularity.ts

@@ -7,7 +7,7 @@ const LARGEST_TYPE_CYCLE_ZONE_CEILINGS: Readonly<Record<string, number>> = {
   client: 1,
   commands: 14,
   core: 10,
-  'daemon-server': 19,
+  'daemon-server': 17,
   platforms: 2,
 };
 

src/__tests__/daemon-client-progress.test.ts

@@ -1,9 +1,9 @@
+import type { RequestProgressEvent } from '@agent-device/contracts/progress';
 import assert from 'node:assert/strict';
 import { EventEmitter } from 'node:events';
 import type { Socket } from 'node:net';
 import { test } from 'vitest';
 import type { DaemonRequest, DaemonResponse } from '../daemon/types.ts';
-import type { RequestProgressEvent } from '../request/progress.ts';
 import { readDaemonSocketProgressResponse } from '../daemon/client/daemon-client-progress.ts';
 import { AppError } from '@agent-device/kernel/errors';
 

src/agent-device-client.ts

@@ -1,3 +1,4 @@
+import type { CommandFlags } from '@agent-device/contracts/command';
 import {
   readSerializedSnapshotCaptureAnnotations,
   readSnapshotDiagnosticsSummary,
@@ -68,7 +69,6 @@ import {
 import { systemCommandFamily } from './commands/system/index.ts';
 import type { ProjectedNavigationCommandClient } from './commands/system/navigation-projection.ts';
 import type { CommandResult } from './core/command-descriptor/command-result.ts';
-import type { CommandFlags } from './core/dispatch-context.ts';
 import { sendToDaemon } from './daemon/client/daemon-client.ts';
 import { resolveDaemonPaths } from './daemon/config.ts';
 import { prepareMetroRuntime, reloadMetro } from './metro/client-metro.ts';

src/cli-schema/cli-config.ts

@@ -1,8 +1,9 @@
+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 { type CliFlags, type FlagKey } from '../commands/cli-grammar/flag-types.ts';
+import { type FlagKey } from '../commands/cli-grammar/flag-types.ts';
 import { expandUserHomePath, resolveUserPath } from '../utils/path-resolution.ts';
 import {
   getConfigurableOptionSpecs,

src/cli-schema/command-schema.ts

@@ -7,14 +7,10 @@ import {
   COMMON_COMMAND_SUPPORTED_FLAG_KEYS,
   GLOBAL_FLAG_KEYS,
 } from '../commands/cli-grammar/flag-groups.ts';
-import {
-  type CliFlags,
-  type FlagDefinition,
-  type FlagKey,
-} from '../commands/cli-grammar/flag-types.ts';
+import { type FlagDefinition, type FlagKey } from '../commands/cli-grammar/flag-types.ts';
 import { AppError } from '@agent-device/kernel/errors';
 
-export type { CliFlags, FlagDefinition, FlagKey };
+export type { FlagDefinition, FlagKey };
 export type { CommandSchema };
 export { getFlagDefinition, getFlagDefinitions, GLOBAL_FLAG_KEYS };
 

src/cli/commands/connection-runtime.ts

@@ -1,3 +1,4 @@
+import type { MetroBridgeScope } from '@agent-device/contracts/remote';
 import { resolveDaemonPaths } from '../../daemon/config.ts';
 import { stopReactDevtoolsCompanion } from '../../client/client-react-devtools-companion.ts';
 import { stopMetroTunnel } from '../../metro/metro.ts';
@@ -10,7 +11,6 @@ import {
   type DeviceInfo,
 } from '@agent-device/kernel/device';
 import { shouldAgentCdpUseRemoteBridgeUrl } from './agent-cdp.ts';
-import type { MetroBridgeScope } from '../../client/client-companion-tunnel-contract.ts';
 import {
   buildRemoteConnectionDaemonState,
   buildRemoteConnectionRequestMetadata,

src/cli/parser/args.ts

@@ -1,3 +1,4 @@
+import type { CliFlags } from '@agent-device/contracts/command';
 import { AppError } from '@agent-device/kernel/errors';
 import { mergeDefinedFlags } from '../../utils/merge-flags.ts';
 import {
@@ -6,7 +7,6 @@ import {
   getCommandSchema,
   getFlagDefinition,
   getFlagDefinitions,
-  type CliFlags,
   type FlagDefinition,
   type FlagKey,
 } from '../../cli-schema/command-schema.ts';

src/client/client-companion-tunnel-contract.ts

@@ -19,7 +19,6 @@ export const ENV_COMPANION_TUNNEL_SESSION = 'AGENT_DEVICE_COMPANION_TUNNEL_SESSI
 
 // The scope SHAPE is declared in contracts/ so zones that only need the shape do not have to
 // declare themselves in terms of client/. Re-exported here for this module's existing consumers.
-export type { CompanionTunnelScope, MetroBridgeScope } from '@agent-device/contracts/remote';
 import type { CompanionTunnelScope } from '@agent-device/contracts/remote';
 
 export class MissingCompanionEnvError extends Error {