From 040bb02e92a7a36faa4d5e082e06e9ddc210757b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= <thymikee@gmail.com>
Date: Thu, 15 Oct 2026 12:50:24 +0200
Subject: [PATCH 1/3] refactor(daemon): move the daemon-only transport tests
 into the package

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 packages/daemon/package.json                              | 5 +----
 .../__tests__}/daemon-http-boundary-cancellation.test.ts  | 2 +-
 .../src/server/__tests__}/daemon-http-disconnect.test.ts  | 2 +-
 .../server/__tests__}/daemon-http-lease-allocate.test.ts  | 2 +-
 .../__tests__}/daemon-http-resumable-upload.test.ts       | 4 ++--
 .../daemon/src/server/__tests__}/daemon-lifecycle.test.ts | 2 +-
 .../daemon/src/server}/__tests__/daemon-proxy.test.ts     | 2 +-
 .../daemon/src/server/__tests__}/daemon-transport.test.ts | 8 ++------
 packages/daemon/tsconfig.json                             | 3 +++
 packages/test-kit/src/boundary-fault-matrix.ts            | 8 ++++----
 pnpm-lock.yaml                                            | 3 +++
 11 files changed, 20 insertions(+), 21 deletions(-)
 rename {test/integration/provider-scenarios => packages/daemon/src/server/__tests__}/daemon-http-boundary-cancellation.test.ts (97%)
 rename {test/integration/provider-scenarios => packages/daemon/src/server/__tests__}/daemon-http-disconnect.test.ts (99%)
 rename {test/integration/provider-scenarios => packages/daemon/src/server/__tests__}/daemon-http-lease-allocate.test.ts (96%)
 rename {test/integration/provider-scenarios => packages/daemon/src/server/__tests__}/daemon-http-resumable-upload.test.ts (95%)
 rename {test/integration/provider-scenarios => packages/daemon/src/server/__tests__}/daemon-lifecycle.test.ts (96%)
 rename {src => packages/daemon/src/server}/__tests__/daemon-proxy.test.ts (99%)
 rename {test/integration/provider-scenarios => packages/daemon/src/server/__tests__}/daemon-transport.test.ts (97%)

diff --git a/packages/daemon/package.json b/packages/daemon/package.json
index dddd2e3edb..8217b8a1e5 100644
--- a/packages/daemon/package.json
+++ b/packages/daemon/package.json
@@ -25,6 +25,7 @@
     "@agent-device/test-kit": "workspace:*"
   },
   "devDependencies": {
+    "@agent-device/proxy": "workspace:*",
     "fast-check": "^4.9.0",
     "oxc-parser": "^0.146.0",
     "vitest": "5.0.4",
@@ -351,10 +352,6 @@
       "types": "./src/server/http/http-server.ts",
       "default": "./src/server/http/http-server.ts"
     },
-    "./testing/server/server-lifecycle": {
-      "types": "./src/server/http/server-lifecycle.ts",
-      "default": "./src/server/http/server-lifecycle.ts"
-    },
     "./testing/server/server-shutdown": {
       "types": "./src/server/http/server-shutdown.ts",
       "default": "./src/server/http/server-shutdown.ts"
diff --git a/test/integration/provider-scenarios/daemon-http-boundary-cancellation.test.ts b/packages/daemon/src/server/__tests__/daemon-http-boundary-cancellation.test.ts
similarity index 97%
rename from test/integration/provider-scenarios/daemon-http-boundary-cancellation.test.ts
rename to packages/daemon/src/server/__tests__/daemon-http-boundary-cancellation.test.ts
index f8264f785f..44130280ac 100644
--- a/test/integration/provider-scenarios/daemon-http-boundary-cancellation.test.ts
+++ b/packages/daemon/src/server/__tests__/daemon-http-boundary-cancellation.test.ts
@@ -4,7 +4,7 @@ import assert from 'node:assert/strict';
 import http from 'node:http';
 import { test } from 'vitest';
 import { getRequestSignal } from '@agent-device/host-kit/request';
-import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
+import { createDaemonHttpServer } from '../http/http-server.ts';
 import {
   closeLoopbackServer,
   listenOnLoopback,
diff --git a/test/integration/provider-scenarios/daemon-http-disconnect.test.ts b/packages/daemon/src/server/__tests__/daemon-http-disconnect.test.ts
similarity index 99%
rename from test/integration/provider-scenarios/daemon-http-disconnect.test.ts
rename to packages/daemon/src/server/__tests__/daemon-http-disconnect.test.ts
index 1551450eac..32248d1a1f 100644
--- a/test/integration/provider-scenarios/daemon-http-disconnect.test.ts
+++ b/packages/daemon/src/server/__tests__/daemon-http-disconnect.test.ts
@@ -4,7 +4,7 @@ import assert from 'node:assert/strict';
 import http from 'node:http';
 import { test } from 'vitest';
 import { getRequestSignal } from '@agent-device/host-kit/request';
-import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
+import { createDaemonHttpServer } from '../http/http-server.ts';
 import {
   closeLoopbackServer,
   listenOnLoopback,
diff --git a/test/integration/provider-scenarios/daemon-http-lease-allocate.test.ts b/packages/daemon/src/server/__tests__/daemon-http-lease-allocate.test.ts
similarity index 96%
rename from test/integration/provider-scenarios/daemon-http-lease-allocate.test.ts
rename to packages/daemon/src/server/__tests__/daemon-http-lease-allocate.test.ts
index b988bd6f5d..57771fcbf2 100644
--- a/test/integration/provider-scenarios/daemon-http-lease-allocate.test.ts
+++ b/packages/daemon/src/server/__tests__/daemon-http-lease-allocate.test.ts
@@ -2,7 +2,7 @@ import type { DaemonWireRequest } from '@agent-device/contracts/command';
 import type { DaemonResponse } from '@agent-device/kernel/contracts';
 import assert from 'node:assert/strict';
 import { test } from 'vitest';
-import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
+import { createDaemonHttpServer } from '../http/http-server.ts';
 import {
   closeLoopbackServer,
   listenOnLoopback,
diff --git a/test/integration/provider-scenarios/daemon-http-resumable-upload.test.ts b/packages/daemon/src/server/__tests__/daemon-http-resumable-upload.test.ts
similarity index 95%
rename from test/integration/provider-scenarios/daemon-http-resumable-upload.test.ts
rename to packages/daemon/src/server/__tests__/daemon-http-resumable-upload.test.ts
index a94dea45a7..90b0fed8d3 100644
--- a/test/integration/provider-scenarios/daemon-http-resumable-upload.test.ts
+++ b/packages/daemon/src/server/__tests__/daemon-http-resumable-upload.test.ts
@@ -7,8 +7,8 @@ import { test } from 'vitest';
 import {
   cleanupUploadedArtifact,
   prepareUploadedArtifact,
-} from '@agent-device/daemon/testing/artifact-tracking';
-import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
+} from '../../resources/artifact-tracking.ts';
+import { createDaemonHttpServer } from '../http/http-server.ts';
 import {
   closeLoopbackServer,
   listenOnLoopback,
diff --git a/test/integration/provider-scenarios/daemon-lifecycle.test.ts b/packages/daemon/src/server/__tests__/daemon-lifecycle.test.ts
similarity index 96%
rename from test/integration/provider-scenarios/daemon-lifecycle.test.ts
rename to packages/daemon/src/server/__tests__/daemon-lifecycle.test.ts
index 2abbfff01f..2534a07c72 100644
--- a/test/integration/provider-scenarios/daemon-lifecycle.test.ts
+++ b/packages/daemon/src/server/__tests__/daemon-lifecycle.test.ts
@@ -2,7 +2,7 @@ import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import path from 'node:path';
 import { test } from 'vitest';
-import { parseIntegerEnv } from '@agent-device/daemon/testing/server/server-lifecycle';
+import { parseIntegerEnv } from '../http/server-lifecycle.ts';
 import { tryAcquireDaemonRegistration } from '@agent-device/daemon-contracts/daemon-registration-owner';
 import { resolveDaemonPaths } from '@agent-device/daemon-contracts/daemon-resolution';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
diff --git a/src/__tests__/daemon-proxy.test.ts b/packages/daemon/src/server/__tests__/daemon-proxy.test.ts
similarity index 99%
rename from src/__tests__/daemon-proxy.test.ts
rename to packages/daemon/src/server/__tests__/daemon-proxy.test.ts
index 5410d77b04..fd40213128 100644
--- a/src/__tests__/daemon-proxy.test.ts
+++ b/packages/daemon/src/server/__tests__/daemon-proxy.test.ts
@@ -3,7 +3,7 @@ import assert from 'node:assert/strict';
 import crypto from 'node:crypto';
 import http from 'node:http';
 import { createDaemonProxyServer } from '@agent-device/proxy';
-import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
+import { createDaemonHttpServer } from '../http/http-server.ts';
 import { getRequestSignal } from '@agent-device/host-kit/request';
 import { readHostCpuArch } from '@agent-device/host-kit/process';
 import { executeRunScriptHttpRequest } from '@agent-device/maestro/run-script-http';
diff --git a/test/integration/provider-scenarios/daemon-transport.test.ts b/packages/daemon/src/server/__tests__/daemon-transport.test.ts
similarity index 97%
rename from test/integration/provider-scenarios/daemon-transport.test.ts
rename to packages/daemon/src/server/__tests__/daemon-transport.test.ts
index 3a51e5510c..03d4ac4cbe 100644
--- a/test/integration/provider-scenarios/daemon-transport.test.ts
+++ b/packages/daemon/src/server/__tests__/daemon-transport.test.ts
@@ -1,14 +1,10 @@
-import type { DaemonRequest } from '@agent-device/daemon';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
 import type { DaemonResponse } from '@agent-device/kernel/contracts';
 import assert from 'node:assert/strict';
 import http from 'node:http';
 import net from 'node:net';
 import { test } from 'vitest';
-import {
-  createSocketServer,
-  listenHttpServer,
-  listenNetServer,
-} from '@agent-device/daemon/testing/server/transport';
+import { createSocketServer, listenHttpServer, listenNetServer } from '../http/transport.ts';
 import { getRequestSignal } from '@agent-device/host-kit/request';
 import { closeLoopbackServer, skipWhenLoopbackUnavailable } from '@agent-device/test-kit/loopback';
 
diff --git a/packages/daemon/tsconfig.json b/packages/daemon/tsconfig.json
index 71114553ab..29a92493c5 100644
--- a/packages/daemon/tsconfig.json
+++ b/packages/daemon/tsconfig.json
@@ -50,6 +50,9 @@
     {
       "path": "../platform-web"
     },
+    {
+      "path": "../proxy"
+    },
     {
       "path": "../replay-port"
     },
diff --git a/packages/test-kit/src/boundary-fault-matrix.ts b/packages/test-kit/src/boundary-fault-matrix.ts
index c747da4584..9d5d962899 100644
--- a/packages/test-kit/src/boundary-fault-matrix.ts
+++ b/packages/test-kit/src/boundary-fault-matrix.ts
@@ -78,22 +78,22 @@ export const BOUNDARY_FAULT_MATRIX = {
   cancellation: {
     mutation: {
       kind: 'covered',
-      evidence: ['test/integration/provider-scenarios/daemon-http-boundary-cancellation.test.ts'],
+      evidence: ['packages/daemon/src/server/__tests__/daemon-http-boundary-cancellation.test.ts'],
       invariants: ['request-scoped-cancellation', 'request-signal-cleanup'],
     },
     read: {
       kind: 'covered',
-      evidence: ['test/integration/provider-scenarios/daemon-http-boundary-cancellation.test.ts'],
+      evidence: ['packages/daemon/src/server/__tests__/daemon-http-boundary-cancellation.test.ts'],
       invariants: ['request-scoped-cancellation', 'request-signal-cleanup'],
     },
     'artifact-producing': {
       kind: 'covered',
-      evidence: ['test/integration/provider-scenarios/daemon-http-boundary-cancellation.test.ts'],
+      evidence: ['packages/daemon/src/server/__tests__/daemon-http-boundary-cancellation.test.ts'],
       invariants: ['request-scoped-cancellation', 'request-signal-cleanup'],
     },
     'session-lifecycle': {
       kind: 'covered',
-      evidence: ['test/integration/provider-scenarios/daemon-http-boundary-cancellation.test.ts'],
+      evidence: ['packages/daemon/src/server/__tests__/daemon-http-boundary-cancellation.test.ts'],
       invariants: ['request-scoped-cancellation', 'request-signal-cleanup'],
     },
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 72a443b3a2..1c830bb47b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -340,6 +340,9 @@ importers:
         specifier: workspace:*
         version: link:../test-kit
     devDependencies:
+      '@agent-device/proxy':
+        specifier: workspace:*
+        version: link:../proxy
       fast-check:
         specifier: ^4.9.0
         version: 4.9.0

From 50382fab9c7d589960aa7644196bcc6eed857415 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= <thymikee@gmail.com>
Date: Thu, 15 Oct 2026 12:51:34 +0200
Subject: [PATCH 2/3] chore(daemon): declare the proxy dependency the moved
 test needs

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 packages/daemon/package.json | 2 +-
 pnpm-lock.yaml               | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/daemon/package.json b/packages/daemon/package.json
index 8217b8a1e5..a26ec86a75 100644
--- a/packages/daemon/package.json
+++ b/packages/daemon/package.json
@@ -18,6 +18,7 @@
     "@agent-device/platform-android": "workspace:*",
     "@agent-device/platform-apple": "workspace:*",
     "@agent-device/platform-web": "workspace:*",
+    "@agent-device/proxy": "workspace:*",
     "@agent-device/replay-port": "workspace:*",
     "@agent-device/replay-test": "workspace:*",
     "@agent-device/selectors": "workspace:*",
@@ -25,7 +26,6 @@
     "@agent-device/test-kit": "workspace:*"
   },
   "devDependencies": {
-    "@agent-device/proxy": "workspace:*",
     "fast-check": "^4.9.0",
     "oxc-parser": "^0.146.0",
     "vitest": "5.0.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1c830bb47b..9dea7d0e86 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -324,6 +324,9 @@ importers:
       '@agent-device/platform-web':
         specifier: workspace:*
         version: link:../platform-web
+      '@agent-device/proxy':
+        specifier: workspace:*
+        version: link:../proxy
       '@agent-device/replay-port':
         specifier: workspace:*
         version: link:../replay-port
@@ -340,9 +343,6 @@ importers:
         specifier: workspace:*
         version: link:../test-kit
     devDependencies:
-      '@agent-device/proxy':
-        specifier: workspace:*
-        version: link:../proxy
       fast-check:
         specifier: ^4.9.0
         version: 4.9.0

From e34bace1cd3720c54db7a3f35cee983f99ea90f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= <thymikee@gmail.com>
Date: Thu, 15 Oct 2026 14:00:17 +0200
Subject: [PATCH 3/3] refactor(daemon): name each moved transport test for the
 module it sits beside

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../src/server/__tests__/http-server-rpc-lifetime.test.ts | 2 +-
 .../http-server-boundary-cancellation.test.ts}            | 2 +-
 .../http-server-disconnect.test.ts}                       | 2 +-
 .../http-server-lease-allocate.test.ts}                   | 2 +-
 .../http-server-proxy.test.ts}                            | 2 +-
 .../http-server-resumable-upload.test.ts}                 | 2 +-
 .../server-lifecycle.test.ts}                             | 2 +-
 .../daemon-transport.test.ts => http/transport.test.ts}   | 2 +-
 packages/test-kit/src/boundary-fault-matrix.ts            | 8 ++++----
 9 files changed, 12 insertions(+), 12 deletions(-)
 rename packages/daemon/src/server/{__tests__/daemon-http-boundary-cancellation.test.ts => http/http-server-boundary-cancellation.test.ts} (98%)
 rename packages/daemon/src/server/{__tests__/daemon-http-disconnect.test.ts => http/http-server-disconnect.test.ts} (99%)
 rename packages/daemon/src/server/{__tests__/daemon-http-lease-allocate.test.ts => http/http-server-lease-allocate.test.ts} (97%)
 rename packages/daemon/src/server/{__tests__/daemon-proxy.test.ts => http/http-server-proxy.test.ts} (99%)
 rename packages/daemon/src/server/{__tests__/daemon-http-resumable-upload.test.ts => http/http-server-resumable-upload.test.ts} (98%)
 rename packages/daemon/src/server/{__tests__/daemon-lifecycle.test.ts => http/server-lifecycle.test.ts} (97%)
 rename packages/daemon/src/server/{__tests__/daemon-transport.test.ts => http/transport.test.ts} (99%)

diff --git a/packages/daemon/src/server/__tests__/http-server-rpc-lifetime.test.ts b/packages/daemon/src/server/__tests__/http-server-rpc-lifetime.test.ts
index ad4198c377..109849ae0e 100644
--- a/packages/daemon/src/server/__tests__/http-server-rpc-lifetime.test.ts
+++ b/packages/daemon/src/server/__tests__/http-server-rpc-lifetime.test.ts
@@ -12,7 +12,7 @@ const TOKEN = 'lifetime-token';
 // the rerun below would be refused as `duplicate_request_id`. The token gate refuses a call that
 // already registered — admission order is pinned in `http-server-rpc-admission.test.ts` — so
 // this is where that release is pinned. Disconnect and streaming releases live in
-// `daemon-http-server.test.ts` and `daemon-http-boundary-cancellation.test.ts`.
+// `daemon-http-server.test.ts` and `http-server-boundary-cancellation.test.ts`.
 test('an rpc request registers its tracking id while in flight and releases it once answered', async (t) => {
   if (await skipWhenLoopbackUnavailable(t)) return;
   const { port, server } = await startRpcServer(TOKEN, async (request) => {
diff --git a/packages/daemon/src/server/__tests__/daemon-http-boundary-cancellation.test.ts b/packages/daemon/src/server/http/http-server-boundary-cancellation.test.ts
similarity index 98%
rename from packages/daemon/src/server/__tests__/daemon-http-boundary-cancellation.test.ts
rename to packages/daemon/src/server/http/http-server-boundary-cancellation.test.ts
index 44130280ac..cb635b9149 100644
--- a/packages/daemon/src/server/__tests__/daemon-http-boundary-cancellation.test.ts
+++ b/packages/daemon/src/server/http/http-server-boundary-cancellation.test.ts
@@ -4,7 +4,7 @@ import assert from 'node:assert/strict';
 import http from 'node:http';
 import { test } from 'vitest';
 import { getRequestSignal } from '@agent-device/host-kit/request';
-import { createDaemonHttpServer } from '../http/http-server.ts';
+import { createDaemonHttpServer } from './http-server.ts';
 import {
   closeLoopbackServer,
   listenOnLoopback,
diff --git a/packages/daemon/src/server/__tests__/daemon-http-disconnect.test.ts b/packages/daemon/src/server/http/http-server-disconnect.test.ts
similarity index 99%
rename from packages/daemon/src/server/__tests__/daemon-http-disconnect.test.ts
rename to packages/daemon/src/server/http/http-server-disconnect.test.ts
index 32248d1a1f..fab916dd07 100644
--- a/packages/daemon/src/server/__tests__/daemon-http-disconnect.test.ts
+++ b/packages/daemon/src/server/http/http-server-disconnect.test.ts
@@ -4,7 +4,7 @@ import assert from 'node:assert/strict';
 import http from 'node:http';
 import { test } from 'vitest';
 import { getRequestSignal } from '@agent-device/host-kit/request';
-import { createDaemonHttpServer } from '../http/http-server.ts';
+import { createDaemonHttpServer } from './http-server.ts';
 import {
   closeLoopbackServer,
   listenOnLoopback,
diff --git a/packages/daemon/src/server/__tests__/daemon-http-lease-allocate.test.ts b/packages/daemon/src/server/http/http-server-lease-allocate.test.ts
similarity index 97%
rename from packages/daemon/src/server/__tests__/daemon-http-lease-allocate.test.ts
rename to packages/daemon/src/server/http/http-server-lease-allocate.test.ts
index 57771fcbf2..769a458e7f 100644
--- a/packages/daemon/src/server/__tests__/daemon-http-lease-allocate.test.ts
+++ b/packages/daemon/src/server/http/http-server-lease-allocate.test.ts
@@ -2,7 +2,7 @@ import type { DaemonWireRequest } from '@agent-device/contracts/command';
 import type { DaemonResponse } from '@agent-device/kernel/contracts';
 import assert from 'node:assert/strict';
 import { test } from 'vitest';
-import { createDaemonHttpServer } from '../http/http-server.ts';
+import { createDaemonHttpServer } from './http-server.ts';
 import {
   closeLoopbackServer,
   listenOnLoopback,
diff --git a/packages/daemon/src/server/__tests__/daemon-proxy.test.ts b/packages/daemon/src/server/http/http-server-proxy.test.ts
similarity index 99%
rename from packages/daemon/src/server/__tests__/daemon-proxy.test.ts
rename to packages/daemon/src/server/http/http-server-proxy.test.ts
index fd40213128..86332eb96c 100644
--- a/packages/daemon/src/server/__tests__/daemon-proxy.test.ts
+++ b/packages/daemon/src/server/http/http-server-proxy.test.ts
@@ -3,7 +3,7 @@ import assert from 'node:assert/strict';
 import crypto from 'node:crypto';
 import http from 'node:http';
 import { createDaemonProxyServer } from '@agent-device/proxy';
-import { createDaemonHttpServer } from '../http/http-server.ts';
+import { createDaemonHttpServer } from './http-server.ts';
 import { getRequestSignal } from '@agent-device/host-kit/request';
 import { readHostCpuArch } from '@agent-device/host-kit/process';
 import { executeRunScriptHttpRequest } from '@agent-device/maestro/run-script-http';
diff --git a/packages/daemon/src/server/__tests__/daemon-http-resumable-upload.test.ts b/packages/daemon/src/server/http/http-server-resumable-upload.test.ts
similarity index 98%
rename from packages/daemon/src/server/__tests__/daemon-http-resumable-upload.test.ts
rename to packages/daemon/src/server/http/http-server-resumable-upload.test.ts
index 90b0fed8d3..ffd3e4b47a 100644
--- a/packages/daemon/src/server/__tests__/daemon-http-resumable-upload.test.ts
+++ b/packages/daemon/src/server/http/http-server-resumable-upload.test.ts
@@ -8,7 +8,7 @@ import {
   cleanupUploadedArtifact,
   prepareUploadedArtifact,
 } from '../../resources/artifact-tracking.ts';
-import { createDaemonHttpServer } from '../http/http-server.ts';
+import { createDaemonHttpServer } from './http-server.ts';
 import {
   closeLoopbackServer,
   listenOnLoopback,
diff --git a/packages/daemon/src/server/__tests__/daemon-lifecycle.test.ts b/packages/daemon/src/server/http/server-lifecycle.test.ts
similarity index 97%
rename from packages/daemon/src/server/__tests__/daemon-lifecycle.test.ts
rename to packages/daemon/src/server/http/server-lifecycle.test.ts
index 2534a07c72..5c505ff137 100644
--- a/packages/daemon/src/server/__tests__/daemon-lifecycle.test.ts
+++ b/packages/daemon/src/server/http/server-lifecycle.test.ts
@@ -2,7 +2,7 @@ import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import path from 'node:path';
 import { test } from 'vitest';
-import { parseIntegerEnv } from '../http/server-lifecycle.ts';
+import { parseIntegerEnv } from './server-lifecycle.ts';
 import { tryAcquireDaemonRegistration } from '@agent-device/daemon-contracts/daemon-registration-owner';
 import { resolveDaemonPaths } from '@agent-device/daemon-contracts/daemon-resolution';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
diff --git a/packages/daemon/src/server/__tests__/daemon-transport.test.ts b/packages/daemon/src/server/http/transport.test.ts
similarity index 99%
rename from packages/daemon/src/server/__tests__/daemon-transport.test.ts
rename to packages/daemon/src/server/http/transport.test.ts
index 03d4ac4cbe..7c12e8d9d6 100644
--- a/packages/daemon/src/server/__tests__/daemon-transport.test.ts
+++ b/packages/daemon/src/server/http/transport.test.ts
@@ -4,7 +4,7 @@ import assert from 'node:assert/strict';
 import http from 'node:http';
 import net from 'node:net';
 import { test } from 'vitest';
-import { createSocketServer, listenHttpServer, listenNetServer } from '../http/transport.ts';
+import { createSocketServer, listenHttpServer, listenNetServer } from './transport.ts';
 import { getRequestSignal } from '@agent-device/host-kit/request';
 import { closeLoopbackServer, skipWhenLoopbackUnavailable } from '@agent-device/test-kit/loopback';
 
diff --git a/packages/test-kit/src/boundary-fault-matrix.ts b/packages/test-kit/src/boundary-fault-matrix.ts
index 9d5d962899..8ce74ef7dd 100644
--- a/packages/test-kit/src/boundary-fault-matrix.ts
+++ b/packages/test-kit/src/boundary-fault-matrix.ts
@@ -78,22 +78,22 @@ export const BOUNDARY_FAULT_MATRIX = {
   cancellation: {
     mutation: {
       kind: 'covered',
-      evidence: ['packages/daemon/src/server/__tests__/daemon-http-boundary-cancellation.test.ts'],
+      evidence: ['packages/daemon/src/server/http/http-server-boundary-cancellation.test.ts'],
       invariants: ['request-scoped-cancellation', 'request-signal-cleanup'],
     },
     read: {
       kind: 'covered',
-      evidence: ['packages/daemon/src/server/__tests__/daemon-http-boundary-cancellation.test.ts'],
+      evidence: ['packages/daemon/src/server/http/http-server-boundary-cancellation.test.ts'],
       invariants: ['request-scoped-cancellation', 'request-signal-cleanup'],
     },
     'artifact-producing': {
       kind: 'covered',
-      evidence: ['packages/daemon/src/server/__tests__/daemon-http-boundary-cancellation.test.ts'],
+      evidence: ['packages/daemon/src/server/http/http-server-boundary-cancellation.test.ts'],
       invariants: ['request-scoped-cancellation', 'request-signal-cleanup'],
     },
     'session-lifecycle': {
       kind: 'covered',
-      evidence: ['packages/daemon/src/server/__tests__/daemon-http-boundary-cancellation.test.ts'],
+      evidence: ['packages/daemon/src/server/http/http-server-boundary-cancellation.test.ts'],
       invariants: ['request-scoped-cancellation', 'request-signal-cleanup'],
     },
   },