@@ -3,9 +3,9 @@ import { readOptionalInteger } from '@agent-device/contracts/command';
 import { emitRequestProgress, throwIfRequestCanceled } from '@agent-device/host-kit/request';
 import { Deadline, sleep } from '@agent-device/host-kit/retry';
 import { AppError } from '@agent-device/kernel/errors';
-import type { DeviceInfo } from '@agent-device/contracts/device';
+import type { DeviceInfo } from '@agent-device/kernel/device';
 import type { DaemonRequest } from '../core/daemon-request.ts';
-import type { DaemonFailureResponse } from '../core/daemon-response.ts';
+import type { DaemonFailureResponse } from '@agent-device/kernel/contracts';
 import type { SessionStore } from '../core/session-store.ts';
 import type { SessionRecoveryOptions } from '../core/session-recovery-hints.ts';
 import { isImplicitSessionScopeConflict } from './session-routing.ts';
 
@@ -66,10 +66,7 @@ import {
 import { appendResponseWarning } from './session-open-warnings.ts';
 import { buildDeviceClaimConflictError } from '../../../resources/device/device-claim-conflict.ts';
 import { deviceClaimRuleForOwner } from '../../../resources/device/device-claim-rule.ts';
-import {
-  errorResponse,
-  type DaemonResponse,
-} from '@agent-device/kernel/contracts';
+import { errorResponse, type DaemonResponse } from '@agent-device/kernel/contracts';
 
 export type SessionOpenResult =
   | Readonly<{ type: 'opened'; response: DaemonResponse; ref: SessionRef }>