diff --git a/.device-evidence/CHECKLIST.md b/.device-evidence/CHECKLIST.md
index 4dc48e688f..b708fc77b8 100644
--- a/.device-evidence/CHECKLIST.md
+++ b/.device-evidence/CHECKLIST.md
@@ -99,9 +99,11 @@ appended warning:
 ### Proof the review asked for on this lane
 
 The false-attribution class is covered by unit tests rather than a device run, because the device
-cannot show a cache hit on command: `src/daemon/__tests__/capture-disclosure-target-activation.test.ts`
-pins that a cache-reused tree discloses nothing, and
-`src/daemon/interaction/internal/__tests__/interaction-target-activation-disclosure.test.ts` pins that
+cannot show a cache hit on command: `packages/daemon/src/execution/__tests__/selector-capture-runtime.test.ts`
+drives a session-snapshot cache hit and pins that the consumed tree earns no repair proof and
+discloses nothing, `packages/daemon/src/core/__tests__/capture-disclosure-target-activation.test.ts`
+pins that the response builder never borrows a repair the stored snapshot happens to carry, and
+`src/__tests__/daemon-composition/interaction/interaction-capture-disclosure.test.ts` pins that
 a press which consumed no capture is not disclosed against an older tree.
 
 ## Why the live activation lane is manual
diff --git a/.fallowrc.json b/.fallowrc.json
index f41e7f33e9..bcfd201c6f 100644
--- a/.fallowrc.json
+++ b/.fallowrc.json
@@ -29,9 +29,6 @@
     "scripts/patch-xcuitest-runner-icon.ts",
     "scripts/write-xcuitest-cache-metadata.ts",
     "scripts/xcuitest-build-settings.ts",
-    // The 11a-4 residue scan runs by hand (and from CI prose until R11 in #3546 owns
-    // the rule); nothing in the dependency graph imports it.
-    "scripts/daemon-edge-residue-scan.mjs",
     "packages/capture-kit/src/ios-snapshot-engine/replay.ts",
     // #1596 regression fixture: runs as a real `node --experimental-strip-types`
     // subprocess (test/integration/daemon-replace-exit-flush.test.ts), so
@@ -68,7 +65,7 @@
     "scripts/help-conformance-sample-outputs.d.mts",
     "scripts/help-conformance-runner-output.d.mts"
   ],
-  "dynamicallyLoaded": ["src/daemon/interaction/index.ts"],
+  "dynamicallyLoaded": ["packages/daemon/src/execution/interaction/index.ts"],
   "ignoreDependencies": [
     "@theme",
     // @agent-device/maestro owns the source import, while the published root
@@ -158,19 +155,23 @@
     },
     {
       // Daemon route handlers are reached only through the dynamic `import()` table in request-handler-chain.ts, which --production analysis cannot follow to a consumer.
-      "file": "src/daemon/handlers/{human-control,lease,session,snapshot,react-native,record-trace}.ts",
+      "file": "packages/daemon/src/sessions/handlers/{human-control,lease,session,snapshot,record-trace}.ts",
       "exports": [
         "handleHumanControlCommand",
         "handleLeaseCommands",
         "handleSessionCommands",
         "handleSnapshotCommands",
-        "handleReactNativeCommands",
         "handleRecordTraceCommands"
       ]
     },
+    {
+      // The react-native route handler lives in the execution layer with its mechanics; same dynamic-loader exemption as the sessions-side route handlers above.
+      "file": "packages/daemon/src/execution/handlers/react-native.ts",
+      "exports": ["handleReactNativeCommands"]
+    },
     {
       // The interaction facade exposes #2178's deferred route handlers plus the existing ref mutation response consumed by help conformance. Fallow's production graph cannot follow the request-handler-chain dynamic imports, so this exact list is the facade contract.
-      "file": "src/daemon/interaction/index.ts",
+      "file": "packages/daemon/src/execution/interaction/index.ts",
       "exports": ["refMutationAdmissionResponse", "handleFindCommands", "handleInteractionCommands"]
     },
     {
@@ -243,7 +244,7 @@
       "exports": ["IS_PREDICATE_USAGE_HINT"]
     },
     {
-      // Workspace-package symbols whose only consumers are test-tree files, which --production analysis does not see. Each import is the package specifier, so the façade entry is load-bearing: parseTargetAnnotationV1Payload from src/daemon/__tests__/session-target-evidence.test.ts, MAESTRO_COMPAT_* from src/cli/parser/__tests__/maestro-support-matrix.test.ts, SCRIPT_FLAG_COMMANDS/scriptFlagEntries from src/commands/replay/script-flag-admission.test.ts (the #3197 two-way drift guard between the .ad grammar and the CLI schema).
+      // Workspace-package symbols whose only consumers are test-tree files, which --production analysis does not see. Each import is the package specifier, so the façade entry is load-bearing: parseTargetAnnotationV1Payload from packages/selectors/src/target-evidence.test.ts, MAESTRO_COMPAT_* from src/cli/parser/__tests__/maestro-support-matrix.test.ts, SCRIPT_FLAG_COMMANDS/scriptFlagEntries from src/commands/replay/script-flag-admission.test.ts (the #3197 two-way drift guard between the .ad grammar and the CLI schema).
       "file": "packages/{ad-script,maestro,capture-kit}/src/index.ts",
       "exports": [
         "parseTargetAnnotationV1Payload",
@@ -254,7 +255,7 @@
       ]
     },
     {
-      // src/daemon/__tests__/request-runtime-binding.test.ts drives the daemon's exact bind through the recovery authority, whose cancellation race is what rejects; production reaches it only through finishRecoveredDurableCapture and recoverDurableCaptureResource in the same package.
+      // packages/daemon/src/core/__tests__/request-runtime-binding.test.ts drives the daemon's exact bind through the recovery authority, whose cancellation race is what rejects; production reaches it only through finishRecoveredDurableCapture and recoverDurableCaptureResource in the same package.
       "file": "packages/capture-kit/src/durable-capture/index.ts",
       "exports": ["acquireDurableCaptureRecoveryAuthorityBeforeDeadline"]
     },
diff --git a/AGENTS.md b/AGENTS.md
index d0b0631dde..3ff131c658 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -49,11 +49,11 @@ Read the declaration rather than maintaining a prose copy:
 
 - commands and their surface, runtime-use, batch, and timeout traits:
   `packages/command-registry/src/registry.ts`
-- daemon route ownership and request-policy traits: `src/daemon/daemon-command-registry.ts`
+- daemon route ownership and request-policy traits: `packages/daemon/src/core/daemon-command-registry.ts`
 - interaction paths and guarantees: `packages/contracts/src/interaction-guarantees.ts`
 - canonical command names: `packages/command-registry/src/catalog.ts`
 - device runtime-use declarations and fact admission:
-  `packages/command-registry/src/registry.ts`, `src/daemon/runtime-admission.ts`, and
+  `packages/command-registry/src/registry.ts`, `packages/daemon/src/core/runtime-admission.ts`, and
   `src/platform-runtime-gateway.ts`
 - common command input fields, and which surface may write an input key (model, operator, retired):
   `src/commands/common-input-fields.ts` and `src/commands/input-audience.ts`
@@ -110,7 +110,7 @@ under `contracts/fixtures/`.
 ## Runtime and diagnostics seams
 
 Diagnostics use `@agent-device/host-kit/diagnostics`. Request diagnostics belong in the session request log;
-session artifact paths come from `src/daemon/session-artifact-paths.ts`. App/device logs remain in `app.log`;
+session artifact paths come from `packages/daemon/src/core/session-artifact-paths.ts`. App/device logs remain in `app.log`;
 Apple runner and xcodebuild output remains in `runner.log`.
 
 Normalize failures with `normalizeError` and preserve `hint`, `diagnosticId`, `logPath`, and typed
diff --git a/docs/adr/0003-daemon-command-registry.md b/docs/adr/0003-daemon-command-registry.md
index db927c1a3f..4d24859c03 100644
--- a/docs/adr/0003-daemon-command-registry.md
+++ b/docs/adr/0003-daemon-command-registry.md
@@ -21,7 +21,7 @@ to public command identity, and it required duplicate command sets to stay align
 Keep public command identity in `src/command-catalog.ts` and public input/output contracts in
 `src/commands/**`.
 
-Add `src/daemon/daemon-command-registry.ts` as the daemon-side source of truth for command route
+Add `packages/daemon/src/core/daemon-command-registry.ts` as the daemon-side source of truth for command route
 ownership and daemon request-policy traits. Request modules consume predicate functions from the
 registry instead of recreating command string sets. Handler modules own execution logic only; they do
 not export duplicate coverage tables to prove route membership.
@@ -67,7 +67,7 @@ exposed through named predicates — a property that survives a projected/derive
 derived daemon registry is therefore permitted **only if** it preserves all of the following invariants:
 
 1. **Daemon-owned declaration.** Route and request-policy traits are declared in a daemon-owned facet
-   (under `src/daemon/`) and *composed* into the registration — never inlined as fields on the public
+   (under `packages/daemon/src/`) and *composed* into the registration — never inlined as fields on the public
    command contract in `src/commands/**` or `src/command-catalog.ts`. Co-locating a registration *call*
    is fine; co-locating *ownership* of daemon policy in the public surface is the contamination this ADR
    rejected (see Alternatives, "Keep daemon groups in `src/command-catalog.ts`").
@@ -85,5 +85,5 @@ derived daemon registry is therefore permitted **only if** it preserves all of t
 A single flat public descriptor whose daemon fields leak into public views is **not** permitted — that is
 the "collapse daemon policy into a public command registry" failure this ADR exists to prevent. Compose
 facets owned by their domains; derive the registry from them. Until that derivation lands and is pinned
-by the registry tests, the hand-authored `src/daemon/daemon-command-registry.ts` remains the source of
+by the registry tests, the hand-authored `packages/daemon/src/core/daemon-command-registry.ts` remains the source of
 truth and the operating rule in `AGENTS.md` is unchanged.
diff --git a/docs/adr/0004-ios-snapshot-backend-strategy.md b/docs/adr/0004-ios-snapshot-backend-strategy.md
index 81e31875ef..9657ecd3d1 100644
--- a/docs/adr/0004-ios-snapshot-backend-strategy.md
+++ b/docs/adr/0004-ios-snapshot-backend-strategy.md
@@ -115,7 +115,7 @@ facet in `@agent-device/capture-kit` owns snapshot policy generally rather than
   stated as a duration budget; the loop derives the deadline from the window's `markedAt` itself, so
   the budget is always spent from the action and a caller has no absolute instant it could get
   wrong.
-  `src/daemon/session-snapshot-freshness.ts` keeps only what needs a session: reading and retiring
+  `packages/daemon/src/core/session-snapshot-freshness.ts` keeps only what needs a session: reading and retiring
   the window on store-owned `SessionState`, and choosing the comparison baseline from snapshot
   lineage. It remains the declared R7 owner of `androidSnapshotFreshness`.
 - **Timeout evidence.** Whether a capture failed because the hierarchy never arrived is decided
@@ -145,12 +145,12 @@ facet in `@agent-device/capture-kit` owns snapshot policy generally rather than
 
 `scripts/layering/snapshot-presentation-boundary.test.ts` enforces the direction, but only across
 the roots `snapshot-policy` declares in `scripts/layering/architecture-ownership.ts`: nothing in
-that snapshot tree may import `src/daemon/`, while the overlay modules beside the tree sit outside
+that snapshot tree may import `packages/daemon/src/`, while the overlay modules beside the tree sit outside
 those roots and are outside that gate. It carries a positive control, because a filter that stopped
 matching would look identical to a boundary being obeyed.
 
 The residual call sites #1983 also named are audited and deliberately left in place.
-`src/daemon/direct-ios-selector.ts` carries no presentation policy: `isLocalIosRunnerSession` and
+`packages/daemon/src/core/direct-ios-selector.ts` carries no presentation policy: `isLocalIosRunnerSession` and
 `readSimpleIosSelectorTarget` are session routing (device family, provider ownership, the
 stabilization window), while `deriveDirectIosNodeSelector` and `isDirectIosSelectorFallbackError`
 are selector derivation and ADR 0011 delegation-on-error. The latter two are pure and
diff --git a/docs/adr/0008-command-descriptor-registry.md b/docs/adr/0008-command-descriptor-registry.md
index 241cca57f9..25bfeeec96 100644
--- a/docs/adr/0008-command-descriptor-registry.md
+++ b/docs/adr/0008-command-descriptor-registry.md
@@ -24,7 +24,7 @@ Accepted
 A command's identity is restated, by hand, across roughly ten tables that must stay aligned by
 convention: `PUBLIC_COMMANDS` (`src/command-catalog.ts`), the per-command metadata and family facets
 (`src/commands/**`), the capability matrix (`src/core/capabilities.ts`), the daemon command registry
-(`src/daemon/daemon-command-registry.ts`, ADR 0003), the structured-batch allowlist
+(`packages/daemon/src/core/daemon-command-registry.ts`, ADR 0003), the structured-batch allowlist
 (`src/batch-policy.ts`), the MCP exposure sets, the Node client interface and impl (`src/client-types.ts`,
 `src/client.ts`), and the generic-dispatch `switch` (`src/core/dispatch.ts`, whose `default: throw` makes a
 missing or renamed command a runtime error, not a compile error). Adding one command touches ~24 files, the
diff --git a/docs/adr/0012-interactive-replay.md b/docs/adr/0012-interactive-replay.md
index 741f33dda4..5eb3256398 100644
--- a/docs/adr/0012-interactive-replay.md
+++ b/docs/adr/0012-interactive-replay.md
@@ -730,7 +730,7 @@ path — no text editing, no silent similarity-heal.
 
 **Core mechanism — the healed script IS `session.actions`.** No new splice engine. `session.actions`
 already accumulates every executed action for the session's lifetime
-(`src/daemon/session-action-recorder.ts:37`, unconditional push), and the divergence refusal is
+(`packages/daemon/src/core/session-action-recorder.ts:92`, unconditional push), and the divergence refusal is
 pre-dispatch (target verification refuses before the device action, decision 3), so a divergent step is
 never pushed. Across a repair session: original steps that verified and dispatched land in
 `session.actions`; the divergent step is absent (refused pre-dispatch, never recorded); the agent's
@@ -766,13 +766,13 @@ works" and "healed scripts are always valid":
   steps are re-executed during the repair replay; only if recording is armed from the start do they land
   in `session.actions` with fresh `target-v1` evidence. Arming late yields a hybrid healed script (an
   annotated corrective step glued to a bare, unannotated prefix) that re-diverges on its own next replay
-  (`src/daemon/interaction/internal/interaction-common.ts:64-65` attaches evidence only when `recordSession` was
+  (`packages/daemon/src/execution/interaction/internal/interaction-common.ts:64-65` attaches evidence only when `recordSession` was
   true when the step ran).
 - **R2 — `--from` continuation only; never re-run the full replay on the same session.** After a
   divergence at step N and the corrective action, the agent must continue with `replay --from k
   --plan-digest <original>`, not a fresh full `replay`. A full re-replay on the same session re-appends
   the already-recorded prefix `1..N-1` to `session.actions` — duplication, because
-  `session-action-recorder.ts:37` pushes unconditionally and replay dispatch does not inject `noRecord`.
+  `session-action-recorder.ts:92` pushes unconditionally and replay dispatch does not inject `noRecord`.
   The two sub-flows differ in `k`: app-state uses `k = N` (re-run the unchanged step after fixing state);
   selector-drift uses `k = N + 1` (the agent already performed step N manually; do not re-run it).
 - **R3 — a mechanical `repairHint` on the divergence payload gates the sub-flow; no LLM-only routing.**
@@ -808,8 +808,8 @@ works" and "healed scripts are always valid":
   instead of leaving it to agent judgment.
 - **R4 — corrective actions must materialize to selector form; the writer fails loudly on a bare `@ref`
   cross-session export.** A `press @e12` normally resolves a `selectorChain` at runtime
-  (`src/daemon/interaction/internal/interaction-touch-targets.ts`), which `buildOptimizedActions`
-  (`src/daemon/session-script-writer.ts:69-83`) rewrites to a selector line. If no `selectorChain` was
+  (`packages/daemon/src/execution/interaction/internal/interaction-touch-targets.ts`), which `buildOptimizedActions`
+  (`packages/daemon/src/core/session-script-writer.ts:368-377`) rewrites to a selector line. If no `selectorChain` was
   captured, the writer must refuse to emit a bare `@ref` line into a persisted `.ad` — a session-bound
   ref will not resolve in a fresh run. It **fails loudly**: an error surfaced to the user with a non-zero
   exit, never a swallowed or silently-dropped line (existing session-write paths swallow such failures;
@@ -893,7 +893,7 @@ by construction. The healed `.ad` is written only when the repair ends (below) a
 - The healed `.ad` is published when a teardown commits the transaction at state `COMPLETE` — normally the
   agent's own `close`/`close --save-script <out>`, but any teardown of a completed transaction commits
   (see the commit state machine below) — reusing the existing `session.actions` serializer
-  (`SessionScriptWriter.write`, `src/daemon/session-script-writer.ts:30-52`) over the post-watermark slice
+  (`SessionScriptWriter.write`, `packages/daemon/src/core/session-script-writer.ts:120-158`) over the post-watermark slice
   only (R6). When no
   `<out>` path is given, the default is the **`<original-stem>.healed.ad` sibling**: the original script's
   path with its `.ad` extension replaced by `.healed.ad` (e.g. `flows/login.ad` → `flows/login.healed.ad`),
@@ -943,7 +943,7 @@ a separate naming change, not part of this decision.
 
 **Scope: this refusal is uniform across repair AND ordinary recording, not repair-only.** Everything
 above is written in the context of decision 6's repair-armed heal, but `publishHealedScriptAtomically`
-(`src/daemon/session-script-writer.ts`) is the single publish primitive `SessionScriptWriter.write` calls
+(`packages/daemon/src/core/session-script-writer.ts`) is the single publish primitive `SessionScriptWriter.write` calls
 for every `--save-script` target, with no repair-armed-vs-ordinary branch — a repair-armed heal
 (`saveScriptBoundary` set) and an ordinary, non-repair `open --save-script`/`close --save-script`
 recording (`saveScriptBoundary` absent) publish through the exact same exclusive `linkSync`. Before this
@@ -1002,10 +1002,10 @@ The tombstone itself expires after its bounded window, after which the key is fu
 > Provenance travels as `internal.replayPlanStep`, stamped by `invokeResolvedReplayAction`
 > (`src/daemon/handlers/session-replay-action-runtime.ts`) — the single point every plan step is
 > dispatched, so the marker covers annotated and unannotated steps alike. `internal` is a daemon-only
-> channel (`toDaemonRequest`, `src/daemon/server/http-rpc-methods.ts`, never copies it off the wire), so
+> channel (`toDaemonRequest`, `packages/daemon/src/server/server/http-rpc-methods.ts`, never copies it off the wire), so
 > authored provenance cannot be spoofed by a client; this is the same channel `replayTargetGuard` and
 > `findResolvedTarget` already use. The rule is written once, in `isInteractiveObservation`
-> (`src/daemon/session-action-recorder.ts`), and both recording call sites consume it.
+> (`packages/daemon/src/core/session-action-recorder.ts`), and both recording call sites consume it.
 >
 > **2. The corrective-read trap: why even out-of-band reads need an opt-in.** Excluding every out-of-band
 > read is still not safe on its own: a divergence's **correction** can itself be a read. In the wave-3 E3 drift, the diverged step **was** a `get`, so its corrective replacement is a
@@ -1044,11 +1044,11 @@ The tombstone itself expires after its bounded window, after which the key is fu
 >
 > **4. How the rule projects across CLI/Node/MCP surfaces.** The exclusion is enforced at a single
 > daemon-side choke point — `isExcludedRepairSegmentObservation` in `recordActionEntry`
-> (`src/daemon/session-action-recorder.ts`), gated on `session.saveScriptBoundary !== undefined` (set ONLY
+> (`packages/daemon/src/core/session-action-recorder.ts`), gated on `session.saveScriptBoundary !== undefined` (set ONLY
 > by a repair-armed `replay --save-script`; an ordinary, non-repair `open --save-script`/`close --save-script`
 > authoring recording never sets it — see decision 6's "Scope" note above) and on the entry's
 > `interactiveObservation` marker, which both recording call sites
-> (`src/daemon/selector-recording.ts` for `get`/`is`/read-only `find`, `src/daemon/snapshot-runtime.ts` for
+> (`packages/daemon/src/core/selector-recording.ts` for `get`/`is`/read-only `find`, `packages/daemon/src/sessions/snapshot-runtime.ts` for
 > `snapshot`) compute from the shared `isInteractiveObservation` predicate rather than each re-deriving it.
 > Every surface reaches this same function because every surface's request reaches the same daemon.
 >
@@ -1159,8 +1159,8 @@ above and the gates they name are the authoritative record of current behavior.
 
 At acceptance, replay was deterministic. `.ad` scripts were plain text — one action per line, `#`
 comments, and a `context platform=... device=... theme=...` header (`src/replay/script.ts`) — recorded
-via `open --save-script` (`src/daemon/session-action-recorder.ts`,
-`src/daemon/session-script-writer.ts`) or hand-written, and executed step-by-step by
+via `open --save-script` (`packages/daemon/src/core/session-action-recorder.ts`,
+`packages/daemon/src/core/session-script-writer.ts`) or hand-written, and executed step-by-step by
 `runReplayScriptFile`
 (`src/daemon/handlers/session-replay-runtime.ts`) under the daemon's `replay`/`test` commands
 (`src/daemon/handlers/session-replay.ts`). Recorded touch/fill/get targets are selector chains with
@@ -1289,15 +1289,15 @@ both `.ad` and Maestro paths) grounds the same conclusions from the caller's sea
   "Retry with --debug and inspect diagnostics log for details." (`defaultHintForCode`,
   `src/kernel/errors.ts:253-254`).
 - **Recordings contain zero verification steps.** The script writer strips every recorded `snapshot`
-  action (`buildOptimizedActions`, `src/daemon/session-script-writer.ts:69`: `if (action.command ===
+  action (`buildOptimizedActions`, `packages/daemon/src/core/session-script-writer.ts:315`: `if (action.command ===
   'snapshot') continue;` — only synthetic ref-scoped snapshots are re-inserted, as resolution aids, not
-  observations), and the record-time flag allowlist (`SANITIZED_FLAG_KEYS`,
-  `src/daemon/session-action-recorder.ts:46-77`) carries neither `settle`/`settleQuietMs` nor `verify`,
+  observations), and the record-time flag allowlist (`RECORDED_FLAG_KEYS` from the flag
+  declarations' `recorded` field, `packages/daemon/src/core/session-action-recorder.ts:367-381`) carries neither `settle`/`settleQuietMs` nor `verify`,
   so `--settle`/`--verify` are dropped from recorded steps. A recording therefore replays actions with
   no outcome observation at all — exactly the gap decision 3's record-time identity evidence fills.
 
 A related, currently under-used precedent: recorded `@ref` steps already carry an optional identity
-hint in the `.ad` file. `appendRefLabel` (`src/daemon/session-script-writer.ts:235-240`) writes the
+hint in the `.ad` file. `appendRefLabel` (`packages/daemon/src/core/session-script-writer.ts:532-537`) writes the
 node's label as a trailing token, parsed back into `action.result.refLabel`
 (`src/replay/script.ts:269,295,315`). Today that label is used only as a fallback LOOKUP key
 (`tryResolveRefNode`'s `fallbackLabel`, `resolution.ts:393,413-430`) when the ref itself fails to
diff --git a/docs/adr/0014-session-ref-frame-lifetime.md b/docs/adr/0014-session-ref-frame-lifetime.md
index fb2059f088..a8943fcf06 100644
--- a/docs/adr/0014-session-ref-frame-lifetime.md
+++ b/docs/adr/0014-session-ref-frame-lifetime.md
@@ -20,7 +20,7 @@ ref-frame vocabulary is promoted into `CONTEXT.md`.
   issuance scope) — kept separate from the latest operational observation (`session.snapshot`).
   The frame is one value on `SessionState`, replaced whole by a transition and never edited in
   place; its type is nominal (`#`-private fields), so no module outside
-  `src/daemon/ref-frame.ts` can construct a frame, edit one, or derive one from an existing
+  `packages/daemon/src/core/ref-frame.ts` can construct a frame, edit one, or derive one from an existing
   frame. What the type cannot judge is a whole frame moved unchanged — clearing the field, or
   assigning another session's frame — which the field-owner gate still covers.
 - A complete snapshot activates an `all` frame; `find`, settled diffs, and replay divergence
diff --git a/docs/adr/0016-active-session-script-publication.md b/docs/adr/0016-active-session-script-publication.md
index c1ee8c4a74..75d30af7fc 100644
--- a/docs/adr/0016-active-session-script-publication.md
+++ b/docs/adr/0016-active-session-script-publication.md
@@ -2,8 +2,8 @@
 
 ## Status
 
-Accepted; implemented on `main` (`src/daemon/handlers/session-script-publication.ts`,
-`src/daemon/session-script-active-publication.ts`), including the #1349 identity-level
+Accepted; implemented on `main` (`packages/daemon/src/sessions/handlers/session-script-publication.ts`,
+`packages/daemon/src/core/session-script-active-publication.ts`), including the #1349 identity-level
 destination-guard amendment.
 
 ## Rules at a glance
diff --git a/docs/adr/0018-unified-event-journal.md b/docs/adr/0018-unified-event-journal.md
index b77bb38d92..3c0a5781e7 100644
--- a/docs/adr/0018-unified-event-journal.md
+++ b/docs/adr/0018-unified-event-journal.md
@@ -64,7 +64,7 @@ redaction discipline, and sink (inventoried 2026-07-24):
    three request-lifecycle points plus `SessionStore.recordAction`, read only by the public
    `events` command. `action.recorded` is already a projection of `session.actions` pushes — the
    model this ADR generalizes. Crucially, not every append happens inside a request:
-   `finalizeRepairTeardown` (`src/daemon/session-store.ts`) records a synthesized `close` action
+   `finalizeRepairTeardown` (`packages/daemon/src/core/session-store.ts`) records a synthesized `close` action
    during idle reap or daemon shutdown, with — per its own comment — "no live request here."
 3. **Progress streaming** (`src/request/progress.ts`, `src/daemon/request-progress-protocol.ts`).
    A closed, typed `RequestProgressEvent` union emitted through a single-sink `AsyncLocalStorage`
@@ -85,7 +85,7 @@ usage at all — the codebase already avoids implicit pub/sub, which this design
 The channels overlap but share nothing: no common envelope, no shared kind vocabulary, and
 consumers couple to emit sites by string. The sharpest instance: agent-cost's `runnerRoundTrips`
 is `countDiagnosticEventsByPhase(['ios_runner_command_send', 'ios_runner_readiness_preflight'])`
-(`src/daemon/request-router.ts`) — a hand-picked name list a new runner phase can silently drift
+(`packages/daemon/src/server/request-router.ts`) — a hand-picked name list a new runner phase can silently drift
 from. That violates two established repo rules: *what enumerates N?* (nothing enumerates
 round-trip phases), and *categories come from recorded fields, never parsed names*.
 
@@ -325,7 +325,7 @@ gets built.
   inconsistency, and three write paths. Kept as the migration's first independently useful step
   instead.
 - **Merge `upload-progress` and `app-events` in:** rejected. Upload progress is a local
-  byte-counter callback that never crosses the request scope; `src/daemon/app-events.ts` is a deep-link
+  byte-counter callback that never crosses the request scope; `packages/daemon/src/execution/app-events.ts` is a deep-link
   builder for the `trigger-app-event` command, not an event channel.
 
 ## Validation required for implementation
diff --git a/docs/adr/0019-request-bound-platform-runtime.md b/docs/adr/0019-request-bound-platform-runtime.md
index 45bd0f0d83..7ef18c7afc 100644
--- a/docs/adr/0019-request-bound-platform-runtime.md
+++ b/docs/adr/0019-request-bound-platform-runtime.md
@@ -24,7 +24,7 @@ is accepted.
 
 Completed 2026-08-27 through #2070–#2072. Every descriptor now declares `none`, `host`,
 `inventory`, or `device-runtime`; capability buckets and the legacy execution shape are gone.
-Production `src/daemon/**` has zero dependencies on concrete platform implementations, enforced by
+Production `packages/daemon/src/**` has zero dependencies on concrete platform implementations, enforced by
 R65. The per-command cutover table was retired after completion as required by section 6; R66 now
 enforces the permanent facts-only admission and runtime-proof invariants without naming historical
 routes or handler functions.
@@ -830,7 +830,7 @@ helper stops follow the owning platform module's lifecycle policy, and close-tim
 neutral owner services.
 
 R65 is the daemon-side end-state enforcement: its planted-red AST tests reject every dependency edge — static,
-dynamic, re-export, and type-only — from production `src/daemon/**` modules (test files excluded,
+dynamic, re-export, and type-only — from production `packages/daemon/src/**` modules (test files excluded,
 matching the layering scanner's scope) to `src/platforms/**` and concrete
 `@agent-device/platform-*` packages. R13 governs concrete package imports across the whole tree,
 while `retired-platforms-zone` prevents the old root seam from being recreated; platform freedom is
@@ -841,13 +841,13 @@ therefore structurally enforced rather than periodically measured.
 Some request-path work asks the host machine something without ever taking a device runtime:
 concrete local readiness, boot-time and runner-session observation, and open-target
 classification. Those asks now cross the daemon boundary as one required dependency,
-`DaemonPlatformServices` (`src/daemon/platform-services.ts`), assembled by the daemon runtime's
+`DaemonPlatformServices` (`packages/daemon/src/core/platform-services.ts`), assembled by the daemon runtime's
 root-composition module in `src/daemon-composition.ts` — which reaches the concrete adapters
 through `src/platform-runtime-daemon-services.ts` behind a function-scoped `await import` — and
 threaded composition → `startDaemonRuntime` deps → `RequestRouterDeps` → the request execution
 scope → the handlers and consumers. Stale-claim reconciliation gets the same treatment
 for the one act it may not perform itself: the composition supplies the `ClaimRecoveryGatewayFactory`
-the daemon declares in `src/daemon/device/claim-recovery-gateway.ts`, built from
+the daemon declares in `packages/daemon/src/resources/device/claim-recovery-gateway.ts`, built from
 `src/platform-runtime-claim-recovery.ts` (likewise deferred), and the daemon keeps the transaction —
 what to rebuild from (the dead owner's recorded state dir), in what order, and when to dispose it.
 
@@ -937,7 +937,7 @@ baseline and are open for revision or rejection.
 
 **Daemon top-level footprint.** `git ls-tree --name-only origin/main src/daemon/ | grep -E
 '\.ts$' | grep -vE '\.test\.ts$' | wc -l` measured 199 production files at `e624ef9d3f`. Proposed
-target: ≤ 60. `src/daemon/**` is a permanent zone under R65; the target is about what remains
+target: ≤ 60. `packages/daemon/src/**` is a permanent zone under R65; the target is about what remains
 there, not about retiring the directory.
 
 **Entry-to-platform hop count.** Corrected 2026-09-03, re-measured for #2278 at `27a97ee619`:
diff --git a/docs/adr/0022-daemon-platform-runtime-coupling.md b/docs/adr/0022-daemon-platform-runtime-coupling.md
index f0976e5726..642f14c031 100644
--- a/docs/adr/0022-daemon-platform-runtime-coupling.md
+++ b/docs/adr/0022-daemon-platform-runtime-coupling.md
@@ -8,17 +8,17 @@ and points at the gates rather than restating the inventory.
 
 Amended 2026-10-11 by #3431: the daemon-runtime composition edges this
 ADR classified (the gateway/diagnostics/resource-cleanup/lifecycle edges, the provider-runtime
-hubs, and the platform-services and claim-recovery dynamic edges) moved out of `src/daemon/` into
+hubs, and the platform-services and claim-recovery dynamic edges) moved out of `packages/daemon/src/` into
 the process-root composition module `src/daemon-composition.ts`, which R76 does not see because it
 is no longer a daemon-zone importer. #3430 then routed the leaked selector-query edge
-(`src/daemon/direct-ios-selector.ts`) through the request-bound runtime binding, so the R76
+(`packages/daemon/src/core/direct-ios-selector.ts`) through the request-bound runtime binding, so the R76
 inventory is empty; with nothing left to classify, the same change collapsed R76 to a plain ban on
 the coupling and deleted the classification machinery, per the rule's own kill criterion. The
 section-2 outcomes below remain the record of how each was classified.
 
 ## 1. Context
 
-The platform-package migration removed direct production dependencies from `src/daemon/**` to
+The platform-package migration removed direct production dependencies from `packages/daemon/src/**` to
 concrete platform code (R65: zero such imports in every form). What it did not prove is that
 every remaining platform-aware responsibility belongs in the daemon. At the audit baseline
 (`658f822c`) nine daemon files held 13 production imports of root `src/platform-runtime-*.ts`
@@ -36,7 +36,7 @@ or owning issue. #2278 audited all four concerns at `27a97ee619`.
    `DAEMON_PLATFORM_RUNTIME_EDGES` in
    [`scripts/layering/daemon-platform-runtime-inventory.ts`](../../scripts/layering/daemon-platform-runtime-inventory.ts)
    is now empty, so the classification table and its symbol-drift and staleness passes are deleted
-   and R76 bans the coupling outright — any production `src/daemon/**` import of the family or of a
+   and R76 bans the coupling outright — any production `packages/daemon/src/**` import of the family or of a
    root hub that reaches it is a violation. The categories and outcomes below remain the record of
    how each edge was judged and retired):
    - **Composition-essential** — assembling neutral runtime implementations at the process root.
@@ -64,7 +64,7 @@ or owning issue. #2278 audited all four concerns at `27a97ee619`.
      are daemon-policy-essential. Selector production and lifecycle participation stay separate.
    - **#2333 (done)** — lifecycle participation of platform resource owners. The
      `apple-runner-owner` and `operation-host` edges are retired; `daemon-runtime.ts` now holds
-     only the typed `PlatformOwnerLifecycle` contract (`src/daemon/platform-owner-lifecycle.ts`),
+     only the typed `PlatformOwnerLifecycle` contract (`packages/daemon/src/core/platform-owner-lifecycle.ts`),
      composed at the root by `platform-runtime-daemon-lifecycle.ts`, which is the sole importer of
      the Apple runner owner, the Android snapshot-helper and Web orphan cleanups, and legacy
      app-log marker recovery. The `resource-cleanup` edge stays, reclassified
@@ -86,11 +86,11 @@ or owning issue. #2278 audited all four concerns at `27a97ee619`.
 3. **Session state and store authority are measured as a symbol-level overlay and ratcheted
    on the handler-owned slice.** At `27a97ee619` the overlay is 112 `SessionState` shape edges
    and 68 `SessionStore` authority edges repo-wide, of which 14 shape / 22 authority files are
-   handler-owned (`src/daemon/handlers/**`). Gate rule **R75 `session-authority-overlay`**
+   handler-owned (`packages/daemon/src/{sessions,execution}/handlers/**`). Gate rule **R75 `session-authority-overlay`**
    (reference measured via `measureRatchets` in `scripts/layering/ratchet-reference.ts`) holds
    the handler-owned file sets at or under the merge-base: handler code may lose files from
    either set, never gain them. The ratchet is added now that the edges are classified;
-   cross-module reads outside `src/daemon/handlers/**` are owned by the logical-module
+   cross-module reads outside `packages/daemon/src/{sessions,execution}/handlers/**` are owned by the logical-module
    declarations (R7/R10) and are not ratcheted here.
 
 4. **The entry-to-platform hop trace was re-run with hop roles**
diff --git a/docs/adr/0023-end-state-hop-trace.md b/docs/adr/0023-end-state-hop-trace.md
index 84fddb1da9..2e93b4262b 100644
--- a/docs/adr/0023-end-state-hop-trace.md
+++ b/docs/adr/0023-end-state-hop-trace.md
@@ -20,7 +20,7 @@ that reading.
 - **Unit**: one distinct production `.ts` file entered on the call path, counted once even if
   re-entered (a lazy `import()` of an already-counted file is not a new hop). Type-only imports
   and files that only supply types are not hops.
-- **Range**: from the daemon's HTTP entry file (`src/daemon/server/http-server.ts`) through the
+- **Range**: from the daemon's HTTP entry file (`packages/daemon/src/server/server/http-server.ts`) through the
   file that issues the concrete platform call, inclusive of both endpoints. For `press`/Android
   that is the serial-scoped `adb shell input tap` invocation; for `snapshot`/iOS it is the
   `socket.write` to the in-simulator AX bridge (primary arm) or the `fetch()` to the XCTest
@@ -59,7 +59,7 @@ that reading.
 41 files: 11 pass-through, 5 translation, 5 policy, 19 orchestration, 1 terminal (adapter).
 
 The request spine also runs side-calls that are not hops — they execute on every request but are
-not the call that continues toward the platform boundary: `src/daemon/server/daemon-idle-reap.ts`
+not the call that continues toward the platform boundary: `packages/daemon/src/sessions/server/daemon-idle-reap.ts`
 (`cancel()` resets the liveness timer as a sibling of `dispatchRequest`),
 `packages/host-kit/src/internal/transport.ts` (`timingSafeStringEqual` compares the auth token
 before the continuation), and `packages/host-kit/src/internal/request-cancel.ts`
@@ -67,35 +67,35 @@ before the continuation), and `packages/host-kit/src/internal/request-cancel.ts`
 
 | # | File | Hand-off | Role | Delete-test |
 |---|------|----------|------|-------------|
-| 1 | `src/daemon/server/http-server.ts` | parses `/rpc`, resolves the token; calls injected `handleRequest` | pass-through | KEEP — HTTP entry boundary |
-| 2 | `src/daemon/server/daemon-runtime.ts` | `handleRequest`: in-flight count, cancels idle reap, `dispatchRequest` | orchestration | KEEP — request lifecycle orchestration |
-| 3 | `src/daemon/request-router.ts` | auth, flag guards, scope creation, locked execution, handler chain | orchestration | KEEP — request admission + dispatch core |
+| 1 | `packages/daemon/src/server/server/http-server.ts` | parses `/rpc`, resolves the token; calls injected `handleRequest` | pass-through | KEEP — HTTP entry boundary |
+| 2 | `packages/daemon/src/server/server/daemon-runtime.ts` | `handleRequest`: in-flight count, cancels idle reap, `dispatchRequest` | orchestration | KEEP — request lifecycle orchestration |
+| 3 | `packages/daemon/src/server/request-router.ts` | auth, flag guards, scope creation, locked execution, handler chain | orchestration | KEEP — request admission + dispatch core |
 | 4 | `packages/host-kit/src/internal/diagnostics.ts` | `withDiagnosticsScope` wraps the request task | pass-through | KEEP — per-request diagnostic attribution |
 | 5 | `src/request/device-inventory-context.ts` | `withDeviceInventoryContext` wraps the task | pass-through | KEEP — request-scoped device inventory context |
 | 6 | `src/core/dispatch-resolve.ts` | `withResolveTargetDeviceCacheScope` wraps the task | orchestration | KEEP — per-request target-resolution cache |
-| 7 | `src/daemon/request-execution-scope.ts` | `createRequestExecutionScope`; `runLocked`/`runAdmitted` | orchestration | KEEP — scoped execution + lock/claim admission |
+| 7 | `packages/daemon/src/server/request-execution-scope.ts` | `createRequestExecutionScope`; `runLocked`/`runAdmitted` | orchestration | KEEP — scoped execution + lock/claim admission |
 | 8 | `src/provider-device-runtime.ts` | `withProviderDeviceRuntimeScope` (`AsyncLocalStorage.run`) | pass-through | KEEP — provider-runtime scope boundary |
-| 9 | `src/daemon/request-handler-chain.ts` | `runRequestHandlerChain` routes to the interaction handler | orchestration | KEEP — command routing |
-| 10 | `src/daemon/interaction/index.ts` | route facade delegates to `handleInteractionCommands` | orchestration | KEEP — shared interaction route facade |
-| 11 | `src/daemon/interaction/internal/interaction.ts` | switches `press` to `dispatchTargetedTouchViaRuntime` | policy | KEEP — touch command routing |
-| 12 | `src/daemon/interaction/internal/interaction-touch-press.ts` | admits the touch, dispatches the runtime interaction | orchestration | KEEP — press admission + orchestration |
-| 13 | `src/daemon/interaction/internal/interaction-touch-prepare.ts` | `prepareTouchDispatch` → `resolveBoundTouchRuntime` | translation | KEEP — shared admission + bind seam |
-| 14 | `src/daemon/touch-runtime.ts` | resolves the plan, `bind(device, tapPointUse)` | orchestration | KEEP — tap runtime binding |
-| 15 | `src/daemon/runtime-admission.ts` | `admitRuntimeOperations`: `inspectFacts`, per-op admission | policy | KEEP — per-operation admission |
-| 16 | `src/daemon/request-runtime-binding.ts` | `bindDevice`: per-device-cached `gateway.bind` | orchestration | KEEP — device runtime binding |
+| 9 | `packages/daemon/src/sessions/request-handler-chain.ts` | `runRequestHandlerChain` routes to the interaction handler | orchestration | KEEP — command routing |
+| 10 | `packages/daemon/src/execution/interaction/index.ts` | route facade delegates to `handleInteractionCommands` | orchestration | KEEP — shared interaction route facade |
+| 11 | `packages/daemon/src/execution/interaction/internal/interaction.ts` | switches `press` to `dispatchTargetedTouchViaRuntime` | policy | KEEP — touch command routing |
+| 12 | `packages/daemon/src/execution/interaction/internal/interaction-touch-press.ts` | admits the touch, dispatches the runtime interaction | orchestration | KEEP — press admission + orchestration |
+| 13 | `packages/daemon/src/execution/interaction/internal/interaction-touch-prepare.ts` | `prepareTouchDispatch` → `resolveBoundTouchRuntime` | translation | KEEP — shared admission + bind seam |
+| 14 | `packages/daemon/src/core/touch-runtime.ts` | resolves the plan, `bind(device, tapPointUse)` | orchestration | KEEP — tap runtime binding |
+| 15 | `packages/daemon/src/core/runtime-admission.ts` | `admitRuntimeOperations`: `inspectFacts`, per-op admission | policy | KEEP — per-operation admission |
+| 16 | `packages/daemon/src/core/request-runtime-binding.ts` | `bindDevice`: per-device-cached `gateway.bind` | orchestration | KEEP — device runtime binding |
 | 17 | `src/platform-runtime-gateway.ts` | `loadLocal` → `loadHost` → `loadRuntime` | orchestration | KEEP — gateway boundary |
 | 18 | `src/platform-runtime.ts` | wires the android module, supplies `loadHost` | pass-through | KEEP — declared ADR §1/§2 registry boundary |
 | 19 | `src/platform-runtime-operation-host.ts` | `createPlatformRuntimeHost` assembles the host | orchestration | KEEP — host composition |
 | 20 | `packages/platform-android/src/index.ts` | `loadRuntime` pairs the plugin with the runtime module | pass-through | KEEP — declared ADR §2 `loadRuntime` boundary |
 | 21 | `packages/platform-android/src/runtime.ts` | `bind`: `inspectFacts` (fan-out site), builds the tap operation | orchestration | KEEP — android runtime owner |
 | 22 | `packages/contracts/src/local-interactor-operation-set.ts` | `bindLocalInteractorOperationSet` → `bindLocalTouchInteractor` | translation | KEEP — tap op mapped to the interactor |
-| 23 | `src/daemon/device-claim-admission.ts` | `admit`: owner claim rule; ordinary owner | policy | KEEP — device claim admission |
-| 24 | `src/daemon/interaction/internal/interaction-touch-runtime.ts` | `dispatchRuntimeInteraction` → `createInteractionRuntimeForRoute` | orchestration | KEEP — interaction runtime dispatch |
-| 25 | `src/daemon/interaction/internal/interaction-runtime.ts` | `createInteractionAgentDevice` with the executor backend | orchestration | KEEP — agent device construction |
+| 23 | `packages/daemon/src/resources/device/device-claim-admission.ts` | `admit`: owner claim rule; ordinary owner | policy | KEEP — device claim admission |
+| 24 | `packages/daemon/src/execution/interaction/internal/interaction-touch-runtime.ts` | `dispatchRuntimeInteraction` → `createInteractionRuntimeForRoute` | orchestration | KEEP — interaction runtime dispatch |
+| 25 | `packages/daemon/src/execution/interaction/internal/interaction-runtime.ts` | `createInteractionAgentDevice` with the executor backend | orchestration | KEEP — agent device construction |
 | 26 | `src/runtime.ts` | `createAgentDevice`: backend + `bindCommands` | orchestration | KEEP — agent device facade |
 | 27 | `src/commands/index.ts` | `bindCommands` → `bindInteractionCommands` | orchestration | KEEP — command catalog boundary |
 | 28 | `src/commands/interaction/runtime/index.ts` | `bindInteractionCommands`: `press` → `pressCommand` | orchestration | KEEP — nine-command binding surface |
-| 29 | `src/daemon/interaction/internal/interaction-touch-android-readiness.ts` | `runWithAndroidDialogReadinessCheck` wraps `run` | policy | KEEP — blocking-dialog readiness gate |
+| 29 | `packages/daemon/src/execution/interaction/internal/interaction-touch-android-readiness.ts` | `runWithAndroidDialogReadinessCheck` wraps `run` | policy | KEEP — blocking-dialog readiness gate |
 | 30 | `src/commands/interaction/runtime/interactions.ts` | `pressCommand` → `tapCommand`: resolve target, `backend.tap` | orchestration | KEEP — tap command execution |
 | 31 | `src/commands/interaction/runtime/resolution.ts` | `resolveInteractionTarget` applies guards, returns the point | translation | KEEP — tap target resolution |
 | 32 | `packages/contracts/src/interactor-operation-binding.ts` | `interactorFor` resolves the local interactor | translation | KEEP — shared interactor resolution seam |
@@ -125,11 +125,11 @@ only by its named composition module per ADR Decision §1).
 `tv-remote`, `viewport` (each `-runtime.ts`).
 
 **Response path (not hops).** 8 files execute only after the platform call:
-`src/daemon/interaction/internal/interaction-touch-response.ts`,
-`src/daemon/interaction/internal/interaction-common.ts`,
-`src/daemon/interaction-surface-signature.ts`, `src/daemon/request-finalization.ts`,
-`src/daemon/session-event-log.ts`, `src/daemon/session-snapshot.ts`,
-`src/daemon/recording-gestures.ts`, `src/daemon/deferred-interaction-outcome.ts`.
+`packages/daemon/src/execution/interaction/internal/interaction-touch-response.ts`,
+`packages/daemon/src/execution/interaction/internal/interaction-common.ts`,
+`packages/daemon/src/core/interaction-surface-signature.ts`, `packages/daemon/src/server/request-finalization.ts`,
+`packages/session-journal/src/session-event-log.ts`, `packages/daemon/src/execution/session-snapshot.ts`,
+`packages/daemon/src/core/recording-gestures.ts`, `packages/daemon/src/core/deferred-interaction-outcome.ts`.
 
 **Forks not followed**: `request-platform-provider-context.ts` (the call is guarded by the
 router's early return for a bare local daemon — zero runtimes + non-web),
@@ -149,31 +149,31 @@ captures join it).
 Shared prefix 30 files; primary arm 47 distinct (30 + 17); fallback arm 49 distinct
 (30 + 19); 66 distinct files across the union. The request spine's side-calls — the idle-reap
 reset, the auth comparison, the cancellation gate, and the Android freshness guard/clear
-(`src/daemon/session-snapshot-freshness.ts`, a guard read plus a post-capture clear that no-ops
+(`packages/daemon/src/core/session-snapshot-freshness.ts`, a guard read plus a post-capture clear that no-ops
 on iOS) — run on this prefix as siblings of the continuation and are not counted.
 
 ### Shared prefix (entry → fork)
 
 | # | File | Hand-off | Role | Delete-test |
 |---|------|----------|------|-------------|
-| 1 | `src/daemon/server/http-server.ts` | parses `/rpc`, resolves the token; calls injected `handleRequest` | pass-through | KEEP — HTTP entry boundary |
-| 2 | `src/daemon/server/daemon-runtime.ts` | `handleRequest`: in-flight count, cancels idle reap, `dispatchRequest` | orchestration | KEEP — request lifecycle orchestration |
-| 3 | `src/daemon/request-router.ts` | auth, flag guards, scope creation, locked execution, handler chain | orchestration | KEEP — request admission + dispatch core |
+| 1 | `packages/daemon/src/server/server/http-server.ts` | parses `/rpc`, resolves the token; calls injected `handleRequest` | pass-through | KEEP — HTTP entry boundary |
+| 2 | `packages/daemon/src/server/server/daemon-runtime.ts` | `handleRequest`: in-flight count, cancels idle reap, `dispatchRequest` | orchestration | KEEP — request lifecycle orchestration |
+| 3 | `packages/daemon/src/server/request-router.ts` | auth, flag guards, scope creation, locked execution, handler chain | orchestration | KEEP — request admission + dispatch core |
 | 4 | `packages/host-kit/src/internal/diagnostics.ts` | `withDiagnosticsScope` wraps the request task | pass-through | KEEP — per-request diagnostic attribution |
 | 5 | `src/request/device-inventory-context.ts` | `withDeviceInventoryContext` wraps the task | pass-through | KEEP — request-scoped device inventory context |
 | 6 | `src/core/dispatch-resolve.ts` | `withResolveTargetDeviceCacheScope` wraps the task | orchestration | KEEP — per-request target-resolution cache |
-| 7 | `src/daemon/request-execution-scope.ts` | `createRequestExecutionScope`; `runLocked`/`runAdmitted` | orchestration | KEEP — scoped execution + lock/claim admission |
+| 7 | `packages/daemon/src/server/request-execution-scope.ts` | `createRequestExecutionScope`; `runLocked`/`runAdmitted` | orchestration | KEEP — scoped execution + lock/claim admission |
 | 8 | `src/provider-device-runtime.ts` | `withProviderDeviceRuntimeScope` (`AsyncLocalStorage.run`) | pass-through | KEEP — provider-runtime scope boundary |
-| 9 | `src/daemon/request-handler-chain.ts` | `runRequestHandlerChain` routes `snapshot` to `runSnapshotHandler` | orchestration | KEEP — command routing |
-| 10 | `src/daemon/handlers/snapshot.ts` | `handleSnapshotCommands` routes the plain arm | policy | KEEP — snapshot command routing |
-| 11 | `src/daemon/snapshot-runtime.ts` | `dispatchSnapshotViaRuntime` → `params.execute` | pass-through | KEEP — snapshot execute seam (route tests pin it) |
-| 12 | `src/daemon/snapshot-command-runtime.ts` | resolves the bound capture; wires session/backend; runs the op | orchestration | KEEP — capture wiring + recording |
-| 13 | `src/daemon/deferred-interaction-outcome.ts` | `resolveDeferredInteractionOutcome` before a fresh capture | policy | KEEP — pending-outcome settlement (may short-circuit) |
-| 14 | `src/daemon/snapshot-capture.ts` | `resolveSnapshotScope` + the capture attempt | orchestration | KEEP — capture attempt + scope resolution |
-| 15 | `src/daemon/snapshot-session.ts` | `resolveSessionDevice` for the capture | translation | KEEP — snapshot session/device resolution |
-| 16 | `src/daemon/snapshot-runtime-binding.ts` | `resolveBoundSnapshotCaptureRuntime`: admit-then-bind | policy | KEEP — ADR 0019 §9 admit-then-bind seam |
-| 17 | `src/daemon/session-runtime-admission.ts` | `admitRuntimePlan` (fan-out site) / `requireRuntimeBinding` | policy | KEEP — runtime plan fact admission |
-| 18 | `src/daemon/request-runtime-binding.ts` | `bindDevice`: per-device-cached `gateway.bind` | orchestration | KEEP — device runtime binding |
+| 9 | `packages/daemon/src/sessions/request-handler-chain.ts` | `runRequestHandlerChain` routes `snapshot` to `runSnapshotHandler` | orchestration | KEEP — command routing |
+| 10 | `packages/daemon/src/sessions/handlers/snapshot.ts` | `handleSnapshotCommands` routes the plain arm | policy | KEEP — snapshot command routing |
+| 11 | `packages/daemon/src/sessions/snapshot-runtime.ts` | `dispatchSnapshotViaRuntime` → `params.execute` | pass-through | KEEP — snapshot execute seam (route tests pin it) |
+| 12 | `packages/daemon/src/sessions/snapshot-command-runtime.ts` | resolves the bound capture; wires session/backend; runs the op | orchestration | KEEP — capture wiring + recording |
+| 13 | `packages/daemon/src/core/deferred-interaction-outcome.ts` | `resolveDeferredInteractionOutcome` before a fresh capture | policy | KEEP — pending-outcome settlement (may short-circuit) |
+| 14 | `packages/daemon/src/core/snapshot-capture.ts` | `resolveSnapshotScope` + the capture attempt | orchestration | KEEP — capture attempt + scope resolution |
+| 15 | `packages/daemon/src/core/snapshot-session.ts` | `resolveSessionDevice` for the capture | translation | KEEP — snapshot session/device resolution |
+| 16 | `packages/daemon/src/core/snapshot-runtime-binding.ts` | `resolveBoundSnapshotCaptureRuntime`: admit-then-bind | policy | KEEP — ADR 0019 §9 admit-then-bind seam |
+| 17 | `packages/daemon/src/core/session-runtime-admission.ts` | `admitRuntimePlan` (fan-out site) / `requireRuntimeBinding` | policy | KEEP — runtime plan fact admission |
+| 18 | `packages/daemon/src/core/request-runtime-binding.ts` | `bindDevice`: per-device-cached `gateway.bind` | orchestration | KEEP — device runtime binding |
 | 19 | `src/platform-runtime-gateway.ts` | `loadLocal` → `loadHost` → `loadRuntime` | orchestration | KEEP — gateway boundary |
 | 20 | `src/platform-runtime.ts` | wires the apple module, supplies `loadHost` | pass-through | KEEP — declared ADR §1/§2 registry boundary |
 | 21 | `src/platform-runtime-operation-host.ts` | `createPlatformRuntimeHost` assembles the host | orchestration | KEEP — host composition |
@@ -242,10 +242,10 @@ Re-entry: arm B #4 enters `packages/platform-apple/src/index.ts` (shared #22) vi
 above, as side-calls of the admission step.
 
 **Response path (not hops).** 22 files execute only after the platform call:
-`src/daemon/ref-frame.ts`, `src/daemon/session-action-recorder.ts`,
-`src/daemon/snapshot-quality-latch.ts`, `src/daemon/request-finalization.ts`,
-`src/daemon/session-event-request.ts`, `src/daemon/session-snapshot.ts` (lineage),
-`src/daemon/sparse-fallback-screenshot.ts`, `src/core/snapshot-state.ts`,
+`packages/daemon/src/core/ref-frame.ts`, `packages/daemon/src/core/session-action-recorder.ts`,
+`packages/daemon/src/sessions/snapshot-quality-latch.ts`, `packages/daemon/src/server/request-finalization.ts`,
+`packages/session-journal/src/session-event-request.ts`, `packages/daemon/src/execution/session-snapshot.ts` (lineage),
+`packages/daemon/src/execution/sparse-fallback-screenshot.ts`, `src/core/snapshot-state.ts`,
 `packages/contracts/src/capture.ts`, `packages/platform-apple/src/runner/snapshot-presentation.ts`,
 `src/snapshot/ios-snapshot-runtime.ts`, the `packages/capture-kit/src/ios-snapshot-engine/`
 modules (engine, invariants, geometry, geometry-policy, projection, graph,
diff --git a/docs/adr/0033-collocation-decision-table.md b/docs/adr/0033-collocation-decision-table.md
index e559470837..f1ed258c1c 100644
--- a/docs/adr/0033-collocation-decision-table.md
+++ b/docs/adr/0033-collocation-decision-table.md
@@ -79,7 +79,7 @@ already owns the operations behind the vocabulary.
 | `src/diagnostics.ts` | keep | The diagnostics seam every zone imports (AGENTS.md mandates it); highest fan-in in the repo is what a substrate looks like, not misplacement. |
 | `src/internal/request-cancel.ts` | keep | Request-cancellation mechanics AGENTS.md routes to `host-kit/request`; internal beside its facade is already the collocation. |
 | `src/request.ts` | keep | Cross-layer request contracts AGENTS.md names as a host-kit seam; consumers span every zone. |
-| `src/session-paths.ts` | keep | Session-artifact path grammar the daemon, cli, and platforms all resolve; AGENTS.md keeps the path *policy* in `src/daemon/session-artifact-paths.ts`, which consumes this. |
+| `src/session-paths.ts` | keep | Session-artifact path grammar the daemon, cli, and platforms all resolve; AGENTS.md keeps the path *policy* in `packages/daemon/src/core/session-artifact-paths.ts`, which consumes this. |
 
 ### kernel
 
@@ -133,7 +133,7 @@ the whole `daemon-contracts` zone has moved into `packages/daemon-contracts` —
 package derive the zone, so every moved file's `ROOT_MODULE_ZONES` row is gone.
 The daemon ⇄ client shared files that remain here (`provider-credential-fingerprint.ts`) trace
 to #2559, which relocated the shared contracts **to the process root** so the client stops
-importing `src/daemon/` at all; R78 keeps any client→daemon
+importing `packages/daemon/src/` at all; R78 keeps any client→daemon
 edge at zero runtime and a five-line recorded type-only residue, and #3288's `daemon-contracts`
 zone was the declaration of that shared-below-both ownership — the extraction makes it
 physical, with R11 and the package's dependency edges holding the same boundary. Rows on
@@ -152,7 +152,7 @@ optimal.
 | `src/platform-runtime-resource-cleanup.ts` | retain for this batch | Same path-keyed R13/ADR 0022 seam. |
 | `src/provider-credential-fingerprint.ts` | keep (type extracted) | Daemon ⇄ client shared contract from the same #2559 decision as `daemon-policy-file.ts`; #3288 declares its zone beside the provider composition that reads the credentials it fingerprints. PR 6 of the daemon extraction moved only the `DaemonProviderCredentials` declaration to `packages/daemon-contracts` (`./provider-credentials`), the same shared-below-both landing as the policy file; the fingerprinting implementation stays here because it reads the installed-plugin manifest. |
 | `src/provider-limrun-runtime.ts` | keep | Proposed → provider-limrun, but there is no seam: the class's constructor self-builds the root dependency factory (`src/sdk/limrun-runtime-dependencies.ts`), which is the ADR 0019 composition seam — it loads the root's adb-host binder, core Android interactor, and platform-runtime app-state helpers that the package must not import. Moving the class means moving that composition, which is design, not a move. |
-| `src/request-progress-protocol.ts` | moved → `packages/daemon-contracts/src/request-progress-protocol.ts` | Daemon ⇄ client shared contract from the same #2559 decision — the client reads it statically (`daemon-client-progress.ts`) and the server through `src/daemon/server/`, so only #2559's shared-placement boundary and the wire-compat ledgers pin it; declared `daemon-contracts` by #3288 and now physically placed by the extraction. Contracts was considered and R18 keeps contracts free of envelope validation mechanics. The wire-ledger keys moved with the file. |
+| `src/request-progress-protocol.ts` | moved → `packages/daemon-contracts/src/request-progress-protocol.ts` | Daemon ⇄ client shared contract from the same #2559 decision — the client reads it statically (`daemon-client-progress.ts`) and the server through `packages/daemon/src/server/`, so only #2559's shared-placement boundary and the wire-compat ledgers pin it; declared `daemon-contracts` by #3288 and now physically placed by the extraction. Contracts was considered and R18 keeps contracts free of envelope validation mechanics. The wire-ledger keys moved with the file. |
 | `src/runtime-command-surface.ts` | moved → `src/command-runtime/runtime-command-surface.ts` ([#3299](https://github.com/callstack/agent-device/pull/3299)) | Physical move landed with `runtime-factory.ts` as one assembly group: the command-surface binding sits beside the factory it composes, under the folder that derives its `command-runtime` zone, so `topFolder` replaces the per-file `ROOT_MODULE_ZONES` row. |
 | `src/runtime-factory.ts` | moved → `src/command-runtime/runtime-factory.ts` ([#3299](https://github.com/callstack/agent-device/pull/3299)) | Physical move landed: the runtime assembly now lives under the folder that derives its `command-runtime` zone, with the same row deletion through folder-derived ownership. |
 
@@ -188,6 +188,23 @@ files have no seam (published facade, public-type collision, root dependency fac
   moved there by [#3297](https://github.com/callstack/agent-device/pull/3297)) are now
   `packages/daemon-contracts/src/` behind narrow per-file subpath exports.
 
+## The daemon package's export surface
+
+`@agent-device/daemon` publishes a façade, not importer reach: one named subpath per
+production/script consumer — a subpath that only tests import is not production surface.
+Everything else a root test reaches lives under the `./testing/` namespace: named
+`./testing/<module>` entries for production modules tests drive, named `./testing/<fixture>`
+entries, and, per fixture folder, a `./testing/<dir>/*` pattern whose target template
+reconstructs the source path. Never a wildcard that also exposes production modules. R11
+refuses any `./testing/` import from a non-test file, so root production code cannot import
+a module the package publishes for tests (a package test double reached through the
+boundary is production code depending on a fake), and root production imports are limited
+to the named production surface. The exports keys stay exact except the per-folder fixture
+patterns; `resolveWorkspaceSpecifier` (layering model) owns Node's exports semantics — the
+layering edges, the depgraph, mutation ownership, and R11's named-surface check call it, and
+the Stryker alias table orders its Vite first-match list to resolve in exactly its order —
+so every lane gives a specifier the module id Node's exports resolution gives it.
+
 ## Refuted alternatives
 
 - **Move every ≥80% community match into its dominant zone.** Rejected: the measure is
diff --git a/docs/agents/cli-flags.md b/docs/agents/cli-flags.md
index b06eb28d27..1b253fef28 100644
--- a/docs/agents/cli-flags.md
+++ b/docs/agents/cli-flags.md
@@ -28,7 +28,7 @@ Thread a flag only through the layers that consume it:
    interface exposes it.
 6. `src/client/client-normalizers.ts`: update daemon flag normalization only when the request still
    needs a public-to-internal translation.
-7. `src/daemon/context.ts` and `src/daemon/dispatch-context.ts`: add the field only when it flows into
+7. `packages/daemon/src/core/context.ts` and `packages/daemon/src/core/dispatch-context.ts`: add the field only when it flows into
    platform dispatch.
 8. Handler/platform modules: thread the option only after the command surface, grammar, and
    projection prove it belongs there.
diff --git a/docs/agents/test-audit.md b/docs/agents/test-audit.md
index c9e9af4c29..b6d2ef3351 100644
--- a/docs/agents/test-audit.md
+++ b/docs/agents/test-audit.md
@@ -50,7 +50,7 @@ Plant the production edit representing the claimed bug: the pre-edit body must s
 
 ## Dispatching subagents
 
-Run parallel read-only lanes with exclusive edit ownership: subsystem lanes (per platform package, `src/daemon`, core packages, `scripts/**`), one cross-cutting junk-pattern sweep, one never-run inventory (Vitest includes, `node --test` globs, gate ids). Mandate in every prompt: READ-ONLY; read the production owner and name the bug; verify skip guards and runner/gate ownership; paste the retention list; false positives cost more than misses.
+Run parallel read-only lanes with exclusive edit ownership: subsystem lanes (per platform package, `packages/daemon`, core packages, `scripts/**`), one cross-cutting junk-pattern sweep, one never-run inventory (Vitest includes, `node --test` globs, gate ids). Mandate in every prompt: READ-ONLY; read the production owner and name the bug; verify skip guards and runner/gate ownership; paste the retention list; false positives cost more than misses.
 
 ## Landing
 
diff --git a/docs/agents/testing.md b/docs/agents/testing.md
index e049a264e3..67b67d00f3 100644
--- a/docs/agents/testing.md
+++ b/docs/agents/testing.md
@@ -68,12 +68,11 @@ Read the entry file before running a lane. Do not copy its environment matrix he
 ## Shared test utilities
 
 Before creating fixtures, look in `@agent-device/test-kit/` (generic) and
-`src/daemon/__tests__/support/` (daemon-shaped). Import named builders
-from the module that defines them; avoid importing
-unrelated helpers through a barrel. Shared `DeviceInfo`, session, snapshot, store, runtime-fact,
-and mocked-binary values belong in a sibling fixture module, not in repeated test literals.
-`PROPERTY_RUNS` and the touch-point/rect arbitraries live in
-`@agent-device/selectors/snapshot-geometry-fixtures`, not `src/__tests__/test-utils/`;
+`packages/daemon/src/__tests__/support/` (daemon-shaped). Import named builders from their
+defining module, never through a barrel. Shared `DeviceInfo`, session, snapshot, store,
+runtime-fact, and mocked-binary values belong in a sibling fixture module, not in repeated
+test literals. `PROPERTY_RUNS` and the touch-point/rect arbitraries live in
+`@agent-device/selectors/snapshot-geometry-fixtures`;
 `makeSnapshotState` lives in `@agent-device/capture-kit/snapshot-state-fixtures`.
 
 Use `mkdtempForTest` or `mkdtempForTestSync`. Global setup redirects `TMPDIR` for the run and
@@ -134,7 +133,7 @@ Run `pnpm depgraph affected` before touching a high-fan-in module:
 
 ```sh
 pnpm depgraph affected packages/host-kit/src/command.ts
-pnpm depgraph affected src/daemon/ref-frame.ts --json --limit 25
+pnpm depgraph affected packages/daemon/src/core/ref-frame.ts --json --limit 25
 ```
 
 Use its dependent, command, and guarantee-cell report to scope inspection. `pnpm check:affected --run`
diff --git a/examples/sdk/tsconfig.json b/examples/sdk/tsconfig.json
index f90c5dd2fe..483a3f32d9 100644
--- a/examples/sdk/tsconfig.json
+++ b/examples/sdk/tsconfig.json
@@ -39,6 +39,7 @@
     { "path": "../../packages/capture-kit" },
     { "path": "../../packages/command-registry" },
     { "path": "../../packages/contracts" },
+    { "path": "../../packages/daemon" },
     { "path": "../../packages/daemon-contracts" },
     { "path": "../../packages/device-selection" },
     { "path": "../../packages/host-kit" },
diff --git a/fallow-baselines/health.json b/fallow-baselines/health.json
index 5fe587874b..69012dce0e 100644
--- a/fallow-baselines/health.json
+++ b/fallow-baselines/health.json
@@ -25,22 +25,22 @@
         "count": 1
       }
     },
-    "src/daemon/interaction/internal/find.ts": {
+    "packages/daemon/src/execution/interaction/internal/find.ts": {
       "complexity_moderate": {
         "count": 1
       }
     },
-    "src/daemon/handlers/snapshot-settings.ts": {
+    "packages/daemon/src/execution/handlers/snapshot-settings.ts": {
       "complexity_moderate": {
         "count": 1
       }
     },
-    "src/daemon/recording-gestures.ts": {
+    "packages/daemon/src/core/recording-gestures.ts": {
       "complexity_moderate": {
         "count": 1
       }
     },
-    "src/daemon/session-selector.ts": {
+    "packages/daemon/src/core/session-selector.ts": {
       "complexity_moderate": {
         "count": 1
       }
@@ -80,13 +80,13 @@
   "target_keys": [
     "src/daemon-client/daemon-client.ts:high impact",
     "src/cli/parser/args.ts:high impact",
-    "src/daemon/lease-context.ts:high impact",
+    "packages/daemon/src/core/lease-context.ts:high impact",
     "packages/replay-port/src/daemon-port/session-replay-heal.ts:high impact",
-    "src/daemon/context.ts:high impact",
-    "src/daemon/handlers/session.ts:complexity",
+    "packages/daemon/src/core/context.ts:high impact",
+    "packages/daemon/src/sessions/handlers/session.ts:complexity",
     "packages/selectors/src/internal/predicates.ts:high impact",
     "packages/provision-kit/src/boot-diagnostics.ts:complexity",
-    "src/daemon/session-routing.ts:high impact",
+    "packages/daemon/src/sessions/session-routing.ts:high impact",
     "src/commands/cli-grammar/common.ts:high impact",
     "packages/kernel/src/success-text.ts:high impact",
     "src/cli.ts:complexity",
@@ -95,8 +95,8 @@
     "packages/kernel/src/rect-center.ts:high impact",
     "packages/platform-apple/src/core/app-launch.ts:complexity",
     "packages/kernel/src/record.ts:high impact",
-    "src/daemon/daemon-command-registry.ts:high impact",
-    "src/daemon/handlers/session-doctor-output.ts:high impact",
+    "packages/daemon/src/core/daemon-command-registry.ts:high impact",
+    "packages/daemon/src/sessions/handlers/session-doctor-output.ts:high impact",
     "packages/platform-apple/src/core/perf-xml.ts:high impact",
     "src/client/screenshot-result.ts:high impact",
     "packages/platform-web/src/json-utils.ts:high impact",
diff --git a/oxlint.config.ts b/oxlint.config.ts
index c2b9e03fa8..e6fd79d90b 100644
--- a/oxlint.config.ts
+++ b/oxlint.config.ts
@@ -124,7 +124,7 @@ export default defineConfig({
     {
       files: [
         'src/daemon-client/daemon-client-rpc.ts',
-        'src/daemon/downloadable-artifact-http.ts',
+        'packages/daemon/src/server/downloadable-artifact-http.ts',
         'src/remote/remote-request-diagnostics.ts',
         'src/remote/upload-stream.ts',
       ],
@@ -135,7 +135,7 @@ export default defineConfig({
     },
     {
       files: [
-        'src/daemon/replay/internal/__tests__/session-replay-target-verification-runtime.test.ts',
+        'packages/daemon/src/sessions/__tests__/replay-target/session-replay-target-verification-runtime.test.ts',
       ],
       rules: {
         'unicorn/prefer-string-raw': 'off',
diff --git a/package.json b/package.json
index b43df4efa5..23706027fb 100644
--- a/package.json
+++ b/package.json
@@ -293,6 +293,7 @@
     "@agent-device/capture-kit": "workspace:*",
     "@agent-device/command-registry": "workspace:*",
     "@agent-device/contracts": "workspace:*",
+    "@agent-device/daemon": "workspace:*",
     "@agent-device/daemon-contracts": "workspace:*",
     "@agent-device/device-selection": "workspace:*",
     "@agent-device/host-kit": "workspace:*",
diff --git a/packages/ad-replay/src/internal/__tests__/step-loop.test.ts b/packages/ad-replay/src/internal/__tests__/step-loop.test.ts
index bb2ce6a98f..0ab25f33f5 100644
--- a/packages/ad-replay/src/internal/__tests__/step-loop.test.ts
+++ b/packages/ad-replay/src/internal/__tests__/step-loop.test.ts
@@ -14,7 +14,7 @@ import type { TargetAnnotationV1 } from '@agent-device/contracts/replay';
  * `packages/replay-port/src/daemon-port/native-command.ts` (`runReplayCommand`) does. The equivalent
  * daemon-level assertions (full `SessionStore`/`runReplayCommand` round
  * trip, including the `--keep-session` live-session postcondition) live in
- * `src/daemon/__tests__/replay-runtime/session-replay-runtime-keep-session.test.ts`
+ * `packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime-keep-session.test.ts`
  * (renamed from `session-replay-terminal-lifecycle.test.ts` by the #1555
  * structural-quality review — see that file's own header for the rationale);
  * this file covers the SAME suppression decision at the cheaper,
diff --git a/packages/ad-script/src/internal/open-script.ts b/packages/ad-script/src/internal/open-script.ts
index 63ac8fc755..451e6a2a37 100644
--- a/packages/ad-script/src/internal/open-script.ts
+++ b/packages/ad-script/src/internal/open-script.ts
@@ -14,7 +14,7 @@ import {
  * (or falls back to) that accumulation. Two independent daemon/package call
  * sites needed exactly this scan and, before this move, each carried its own
  * copy: `packages/ad-replay/src/internal/inspect.ts`'s plan-digest platform
- * precedence, and `src/daemon/replay-device-selection.ts`'s
+ * precedence, and `packages/daemon/src/server/replay-device-selection.ts`'s
  * `readScriptReplaySelection` (fused into its own single pass alongside an
  * app-target scan). A `src/` root file cannot become a façade dependency
  * (R11), and a workspace package may not reach back into root `src/` either
diff --git a/packages/capture-kit/src/mobile-snapshot-semantics.test.ts b/packages/capture-kit/src/mobile-snapshot-semantics.test.ts
index d5b939df62..c875a2b8da 100644
--- a/packages/capture-kit/src/mobile-snapshot-semantics.test.ts
+++ b/packages/capture-kit/src/mobile-snapshot-semantics.test.ts
@@ -644,7 +644,7 @@ test('mobile presentation does not let contradictory scroll indicator add hidden
 });
 
 // #1542: isConfirmedOnScreenProbe is the pure geometry boundary the off-screen
-// refusal double-check's direct probe (src/daemon/offscreen-target-probe.ts)
+// refusal double-check's direct probe (packages/daemon/src/execution/offscreen-target-probe.ts)
 // reduces its confirm/don't-confirm decision to, once it has a fresh,
 // tree-independent read of the target. Each branch below is proved with a
 // counterfactual per docs/agents/testing.md — see the comment on each test
diff --git a/packages/capture-kit/src/mobile-snapshot-semantics.ts b/packages/capture-kit/src/mobile-snapshot-semantics.ts
index 23d21cd508..6c121269d0 100644
--- a/packages/capture-kit/src/mobile-snapshot-semantics.ts
+++ b/packages/capture-kit/src/mobile-snapshot-semantics.ts
@@ -84,7 +84,7 @@ function analyzeMobileSnapshotVisibility(nodes: SnapshotNode[]): {
 
 /**
  * #1542: the pure geometry boundary the off-screen refusal double-check's
- * direct probe (`src/daemon/offscreen-target-probe.ts`) reduces its decision
+ * direct probe (`packages/daemon/src/execution/offscreen-target-probe.ts`) reduces its decision
  * to, once it has a fresh, tree-independent read of one element. A probe
  * confirms the element genuinely on-screen only when BOTH hold: XCTest's own
  * live hit-test says `hittable`, AND the tap point sits inside the root
diff --git a/packages/capture-kit/src/snapshot-chrome.ts b/packages/capture-kit/src/snapshot-chrome.ts
index 10c897c520..3276987fbc 100644
--- a/packages/capture-kit/src/snapshot-chrome.ts
+++ b/packages/capture-kit/src/snapshot-chrome.ts
@@ -375,7 +375,7 @@ export function collectSettleChromeRefs(
  * only excludes nodes whose OWN type is `keyboard` still leaks every key and
  * assistant control as "discriminating" evidence.
  *
- * Used by `src/daemon/interaction-surface-signature.ts`'s post-gesture
+ * Used by `packages/daemon/src/core/interaction-surface-signature.ts`'s post-gesture
  * baseline-distrust discriminating-overlap classification (#1542 defect 2,
  * #1563 review): that comparison operates on flat signature entries with no
  * ref-selection budget of its own, so it needs the ref set directly rather
diff --git a/packages/command-registry/src/registry.ts b/packages/command-registry/src/registry.ts
index 8b0ce02337..a2f8c806e1 100644
--- a/packages/command-registry/src/registry.ts
+++ b/packages/command-registry/src/registry.ts
@@ -136,7 +136,7 @@ export type DescriptorCatalogRecord<Group extends CommandCatalogGroup> = {
 
 /**
  * The literal union of every command whose `daemon.route` is `'session'`.
- * Drives `SESSION_COMMAND_HANDLER_IMPLS` in `src/daemon/handlers/session.ts`: adding a
+ * Drives `SESSION_COMMAND_HANDLER_IMPLS` in `packages/daemon/src/sessions/handlers/session.ts`: adding a
  * session-routed descriptor without a matching handler table entry is a compile error rather
  * than a runtime routing gap caught only by `expectHandlerResponse`.
  */
@@ -165,7 +165,7 @@ export type DescriptorDaemonRouteCommandName =
 
 // ---------------------------------------------------------------------------
 // Daemon request-policy trait bundles — copied VERBATIM from
-// src/daemon/daemon-command-registry.ts (DAEMON_COMMAND_DESCRIPTORS).
+// packages/daemon/src/core/daemon-command-registry.ts (DAEMON_COMMAND_DESCRIPTORS).
 // ---------------------------------------------------------------------------
 
 const ADMISSION_AND_LOCK_EXEMPT = {
@@ -508,7 +508,9 @@ export const RAW_COMMAND_DESCRIPTORS = [
   {
     name: 'human_control',
     deviceClaimPolicy: 'none',
-    ...(ownerFilesEnabled ? { ownerFiles: ['src/daemon/handlers/human-control.ts'] as const } : {}),
+    ...(ownerFilesEnabled
+      ? { ownerFiles: ['packages/daemon/src/sessions/handlers/human-control.ts'] as const }
+      : {}),
     catalog: { group: 'internal', key: 'humanControl' },
     recordsSessionAction: false,
     daemon: {
@@ -526,7 +528,9 @@ export const RAW_COMMAND_DESCRIPTORS = [
   {
     name: 'lease_allocate',
     deviceClaimPolicy: 'none',
-    ...(ownerFilesEnabled ? { ownerFiles: ['src/daemon/handlers/lease.ts'] as const } : {}),
+    ...(ownerFilesEnabled
+      ? { ownerFiles: ['packages/daemon/src/sessions/handlers/lease.ts'] as const }
+      : {}),
     catalog: { group: 'internal', key: 'leaseAllocate' },
     recordsSessionAction: false,
     daemon: {
@@ -541,7 +545,9 @@ export const RAW_COMMAND_DESCRIPTORS = [
   {
     name: 'lease_heartbeat',
     deviceClaimPolicy: 'none',
-    ...(ownerFilesEnabled ? { ownerFiles: ['src/daemon/handlers/lease.ts'] as const } : {}),
+    ...(ownerFilesEnabled
+      ? { ownerFiles: ['packages/daemon/src/sessions/handlers/lease.ts'] as const }
+      : {}),
     catalog: { group: 'internal', key: 'leaseHeartbeat' },
     recordsSessionAction: false,
     daemon: {
@@ -557,7 +563,9 @@ export const RAW_COMMAND_DESCRIPTORS = [
   {
     name: 'lease_release',
     deviceClaimPolicy: 'none',
-    ...(ownerFilesEnabled ? { ownerFiles: ['src/daemon/handlers/lease.ts'] as const } : {}),
+    ...(ownerFilesEnabled
+      ? { ownerFiles: ['packages/daemon/src/sessions/handlers/lease.ts'] as const }
+      : {}),
     catalog: { group: 'internal', key: 'leaseRelease' },
     recordsSessionAction: false,
     daemon: {
@@ -592,7 +600,11 @@ export const RAW_COMMAND_DESCRIPTORS = [
     name: 'session_list',
     deviceClaimPolicy: 'none',
     ...(ownerFilesEnabled
-      ? { ownerFiles: ['src/daemon/session-lifecycle/internal/inventory.ts'] as const }
+      ? {
+          ownerFiles: [
+            'packages/daemon/src/sessions/session-lifecycle/internal/inventory.ts',
+          ] as const,
+        }
       : {}),
     catalog: { group: 'internal', key: 'sessionList' },
     recordsSessionAction: false,
@@ -610,7 +622,11 @@ export const RAW_COMMAND_DESCRIPTORS = [
     name: 'session_save_script',
     deviceClaimPolicy: 'none',
     ...(ownerFilesEnabled
-      ? { ownerFiles: ['src/daemon/handlers/session-script-publication.ts'] as const }
+      ? {
+          ownerFiles: [
+            'packages/daemon/src/sessions/handlers/session-script-publication.ts',
+          ] as const,
+        }
       : {}),
     catalog: { group: 'internal', key: 'sessionSaveScript' },
     recordsSessionAction: false,
@@ -887,8 +903,8 @@ export const RAW_COMMAND_DESCRIPTORS = [
     ...(ownerFilesEnabled
       ? {
           ownerFiles: [
-            'src/daemon/handlers/session-runtime-command.ts',
-            'src/daemon/handlers/session-runtime-port-reverse.ts',
+            'packages/daemon/src/sessions/handlers/session-runtime-command.ts',
+            'packages/daemon/src/sessions/handlers/session-runtime-port-reverse.ts',
           ] as const,
         }
       : {}),
@@ -953,7 +969,11 @@ export const RAW_COMMAND_DESCRIPTORS = [
     name: 'install_source',
     deviceClaimPolicy: 'transient-exclusive',
     ...(ownerFilesEnabled
-      ? { ownerFiles: ['src/daemon/handlers/session-app-source-deployment.ts'] as const }
+      ? {
+          ownerFiles: [
+            'packages/daemon/src/sessions/handlers/session-app-source-deployment.ts',
+          ] as const,
+        }
       : {}),
     catalog: {
       group: 'internal',
@@ -971,7 +991,11 @@ export const RAW_COMMAND_DESCRIPTORS = [
     name: 'release_materialized_paths',
     deviceClaimPolicy: 'none',
     ...(ownerFilesEnabled
-      ? { ownerFiles: ['src/daemon/handlers/session-app-source-deployment.ts'] as const }
+      ? {
+          ownerFiles: [
+            'packages/daemon/src/sessions/handlers/session-app-source-deployment.ts',
+          ] as const,
+        }
       : {}),
     catalog: { group: 'internal', key: 'releaseMaterializedPaths' },
     recordsSessionAction: false,
@@ -1502,7 +1526,9 @@ export const RAW_COMMAND_DESCRIPTORS = [
   },
   {
     name: 'scroll',
-    ...(ownerFilesEnabled ? { ownerFiles: ['src/daemon/scroll-runtime.ts'] as const } : {}),
+    ...(ownerFilesEnabled
+      ? { ownerFiles: ['packages/daemon/src/execution/scroll-runtime.ts'] as const }
+      : {}),
     catalog: { group: 'public' },
     frameworkTier: 'core',
     // R53 retires this command's capability bucket and its `dispatch` leaf together: admission is
@@ -1551,7 +1577,7 @@ export const RAW_COMMAND_DESCRIPTORS = [
       ? {
           ownerFiles: [
             'src/commands/capture/screenshot.ts',
-            'src/daemon/screenshot-runtime.ts',
+            'packages/daemon/src/execution/screenshot-runtime.ts',
           ] as const,
         }
       : {}),
diff --git a/packages/contracts/src/app-state.ts b/packages/contracts/src/app-state.ts
index 746fcc4078..da9e927c37 100644
--- a/packages/contracts/src/app-state.ts
+++ b/packages/contracts/src/app-state.ts
@@ -3,7 +3,7 @@ import type { SessionSurface } from './session-surface.ts';
 
 /**
  * Closed result of the `appstate` command, grounded in the daemon handler's
- * success returns (src/daemon/handlers/session-appstate.ts `handleAppStateCommand`).
+ * success returns (packages/daemon/src/sessions/handlers/session-appstate.ts `handleAppStateCommand`).
  * A discriminated union on `platform`:
  *  - Apple (`ios` / `macos`) session state, with iOS-only device locators that
  *    the previous hand-written mirror omitted; and
diff --git a/packages/contracts/src/clipboard.ts b/packages/contracts/src/clipboard.ts
index 646acdb99c..0a400bcd7f 100644
--- a/packages/contracts/src/clipboard.ts
+++ b/packages/contracts/src/clipboard.ts
@@ -1,6 +1,6 @@
 /**
  * Closed result of the `clipboard` command. Mirrors the session runtime's
- * literal return exactly (`src/daemon/handlers/session-clipboard.ts`): a
+ * literal return exactly (`packages/daemon/src/execution/handlers/session-clipboard.ts`): a
  * discriminated union on `action`. `read` returns the clipboard `text`; `write`
  * reports the written `textLength` plus the `successText` message. The handler
  * spreads nothing else, so each branch is closed.
diff --git a/packages/contracts/src/device.ts b/packages/contracts/src/device.ts
index e135856f58..b4bb813331 100644
--- a/packages/contracts/src/device.ts
+++ b/packages/contracts/src/device.ts
@@ -8,7 +8,7 @@ import type { TargetShutdownResult } from './target-shutdown-contract.ts';
 
 /**
  * Closed result of the `boot` command. Mirrors the daemon handler's only
- * success return EXACTLY (src/daemon/handlers/session-boot.ts via
+ * success return EXACTLY (packages/daemon/src/sessions/handlers/session-boot.ts via
  * session-device-status-response.ts) — the fixed
  * object literal `{ platform, target, device, id, kind, booted }` plus the
  * additive `appleOs` discriminant, emitted only for Apple devices.
@@ -33,7 +33,7 @@ export type BootCommandResult = {
 
 /**
  * Closed result of the `shutdown` command. Mirrors the daemon handler's success
- * return EXACTLY (src/daemon/handlers/session-shutdown.ts via
+ * return EXACTLY (packages/daemon/src/sessions/handlers/session-shutdown.ts via
  * session-device-status-response.ts) — the fixed object
  * literal `{ platform, target, device, id, kind, shutdown }` plus the additive
  * `appleOs` discriminant (Apple devices only). The `shutdown` field is the raw
diff --git a/packages/contracts/src/dispatch-disclosure.fixtures.ts b/packages/contracts/src/dispatch-disclosure.fixtures.ts
index 441205541c..bcf8d9ab65 100644
--- a/packages/contracts/src/dispatch-disclosure.fixtures.ts
+++ b/packages/contracts/src/dispatch-disclosure.fixtures.ts
@@ -38,7 +38,7 @@ export const DISPATCH_DISCLOSURE_TABLE_PATH = path.join(
  */
 export const DISPATCH_DISCLOSURE_DRIVER_OWNERS: Readonly<Record<string, string>> = {
   'daemon.': 'src/__tests__/daemon-composition/interaction/interaction-dispatch-disclosure.test.ts',
-  'daemon.scroll-no-progress': 'src/daemon/__tests__/scroll-movement.test.ts',
+  'daemon.scroll-no-progress': 'packages/daemon/src/execution/__tests__/scroll-movement.test.ts',
   'daemon.route.': 'src/__tests__/daemon-composition/request-dispatch-disclosure.test.ts',
   'post-action-guard.':
     'src/__tests__/daemon-composition/interaction/interaction-dispatch-disclosure.test.ts',
diff --git a/packages/contracts/src/interaction-guarantees.ts b/packages/contracts/src/interaction-guarantees.ts
index 59da90fb15..f783faa40e 100644
--- a/packages/contracts/src/interaction-guarantees.ts
+++ b/packages/contracts/src/interaction-guarantees.ts
@@ -179,7 +179,7 @@ const RUNTIME_TREE_TARGET_STABILITY: GuaranteeEnforcement = {
 // (interaction-response-construction-guard.test.ts) keeps new branches on it.
 const SHARED_RESPONSE_CONSTRUCTION: GuaranteeEnforcement = {
   kind: 'runtime',
-  via: 'src/daemon/interaction/internal/interaction-touch-response.ts#buildInteractionResponseData',
+  via: 'packages/daemon/src/execution/interaction/internal/interaction-touch-response.ts#buildInteractionResponseData',
 };
 
 // runtime-selector, runtime-ref, and coordinate share this waiver: all three finalize through
@@ -192,7 +192,7 @@ const TAP_OUTCOME_NOT_OBSERVED_GAP: GuaranteeEnforcement = {
   trackingIssue: TAP_OUTCOME_NOT_OBSERVED_GAP_ISSUE,
 };
 
-// Both Maestro-compatible fast paths (src/daemon/interaction/internal/interaction-touch-direct-ios.ts)
+// Both Maestro-compatible fast paths (packages/daemon/src/execution/interaction/internal/interaction-touch-direct-ios.ts)
 // dispatch ONE fused XCTest runner request (`command: 'tap'` with a selectorKey/selectorValue) built
 // in packages/platform-apple/src/interactions.ts#tapElementSelector — not the separate
 // packages/maestro/ flow-script engine, which drives standalone `.yaml` Maestro flows and never
@@ -205,7 +205,7 @@ const DIRECT_IOS_SINGLE_QUERY_READINESS: GuaranteeEnforcement = {
 
 // Shares the SAME reasoning as TAP_OUTCOME_NOT_OBSERVED_GAP: the tap outcome is not observed on the
 // success path here either. The shared ambiguous-XCTest-failure corroboration
-// (src/daemon/interaction/internal/interaction-ios-tap-outcome.ts#corroborateIosTapFailure) is
+// (packages/daemon/src/execution/interaction/internal/interaction-ios-tap-outcome.ts#corroborateIosTapFailure) is
 // invoked identically from this fast path and from the tree-based runtime dispatch, but only ever
 // reconsiders a THROWN error — it never validates a call that returned success, so it is not a
 // baseline outcome claim for either path.
@@ -282,7 +282,7 @@ const RUNTIME_TREE_SHARED_GUARANTEES = {
   responseConstruction: SHARED_RESPONSE_CONSTRUCTION,
   responseIdentity: {
     kind: 'runtime',
-    via: 'src/daemon/interaction/internal/interaction-touch-targets.ts#interactionResultExtra',
+    via: 'packages/daemon/src/execution/interaction/internal/interaction-touch-targets.ts#interactionResultExtra',
   },
   verifyEvidence: {
     kind: 'runtime',
@@ -390,7 +390,7 @@ export const INTERACTION_DISPATCH_PATHS: Record<InteractionPathId, InteractionPa
       },
       responseConstruction: {
         kind: 'runtime',
-        via: 'src/daemon/interaction/internal/interaction-gesture-response.ts#gestureResponseData',
+        via: 'packages/daemon/src/execution/interaction/internal/interaction-gesture-response.ts#gestureResponseData',
       },
       responseIdentity: {
         kind: 'runtime',
@@ -482,7 +482,7 @@ export const INTERACTION_DISPATCH_PATHS: Record<InteractionPathId, InteractionPa
       responseConstruction: SHARED_RESPONSE_CONSTRUCTION,
       responseIdentity: {
         kind: 'runtime',
-        via: 'src/daemon/interaction/internal/interaction-touch-targets.ts#interactionResultExtra',
+        via: 'packages/daemon/src/execution/interaction/internal/interaction-touch-targets.ts#interactionResultExtra',
       },
       verifyEvidence: {
         kind: 'delegated',
@@ -646,7 +646,7 @@ export const INTERACTION_DISPATCH_PATHS: Record<InteractionPathId, InteractionPa
       },
       resolutionDisclosure: {
         kind: 'runtime',
-        via: 'src/daemon/interaction/internal/interaction-touch-response.ts#buildInteractionResponseData',
+        via: 'packages/daemon/src/execution/interaction/internal/interaction-touch-response.ts#buildInteractionResponseData',
       },
       targetReadiness: DIRECT_IOS_SINGLE_QUERY_READINESS,
       outcomeObservation: DIRECT_IOS_OUTCOME_NOT_OBSERVED_GAP,
diff --git a/packages/contracts/src/interaction.ts b/packages/contracts/src/interaction.ts
index 3768568600..49a2ead963 100644
--- a/packages/contracts/src/interaction.ts
+++ b/packages/contracts/src/interaction.ts
@@ -96,7 +96,7 @@ export type RecordingTargetOverride = {
  * captured itself, handed to the interaction leaf so the leaf does not resolve
  * the same `@ref` a second time.
  *
- * The sole producer is a mutating `find` (`src/daemon/interaction/internal/find.ts`): it
+ * The sole producer is a mutating `find` (`packages/daemon/src/execution/interaction/internal/find.ts`): it
  * captures, matches by locator, promotes to a hittable ancestor, and mints
  * `@eN` off the node it chose — then re-enters the interaction leaf. Without
  * this channel the leaf repeated an in-memory `@eN` lookup after find had
diff --git a/packages/contracts/src/keyboard.ts b/packages/contracts/src/keyboard.ts
index 57f35729cb..4bafe39c3f 100644
--- a/packages/contracts/src/keyboard.ts
+++ b/packages/contracts/src/keyboard.ts
@@ -1,6 +1,6 @@
 /**
  * Closed result of the `keyboard` command, grounded in the runtime operation
- * results projected by `src/daemon/keyboard-runtime.ts`.
+ * results projected by `packages/daemon/src/execution/keyboard-runtime.ts`.
  *
  * `platform` and `action` are always present; the remaining fields appear per
  * branch (Android `status`/`dismiss` carry the keyboard-state fields; `enter`
diff --git a/packages/daemon-contracts/src/daemon-policy-file.ts b/packages/daemon-contracts/src/daemon-policy-file.ts
index 650f464d85..bef16cd815 100644
--- a/packages/daemon-contracts/src/daemon-policy-file.ts
+++ b/packages/daemon-contracts/src/daemon-policy-file.ts
@@ -9,7 +9,7 @@ import { AppError, errorMessage } from '@agent-device/kernel/errors';
  * ADR 0029: the operator-owned rules one daemon enforces for every request it admits. This module
  * owns the policy file: loading, validation, and the digest. It lives at the process root because
  * the daemon client reads the same digest to refuse reusing a daemon with another policy;
- * enforcement is daemon-owned in `src/daemon/daemon-policy.ts`.
+ * enforcement is daemon-owned in `packages/daemon/src/core/daemon-policy.ts`.
  */
 export const DAEMON_POLICY_ENV = 'AGENT_DEVICE_DAEMON_POLICY';
 
diff --git a/packages/daemon-contracts/src/daemon-resolution.ts b/packages/daemon-contracts/src/daemon-resolution.ts
index db30b20ebd..2081fac0cb 100644
--- a/packages/daemon-contracts/src/daemon-resolution.ts
+++ b/packages/daemon-contracts/src/daemon-resolution.ts
@@ -11,8 +11,8 @@ export type { DaemonServerMode, DaemonTransportPreference };
 /**
  * Where a daemon lives and how to reach it, resolved from raw env/arg values. The client and the
  * daemon both read this subset — the client to find or launch a daemon, the daemon to bind one —
- * so it sits at the process root rather than under `src/daemon/`, where a client would have to
- * reach daemon internals to resolve an address. `src/daemon/config.ts` adds the request-scoping
+ * so it sits at the process root rather than under `packages/daemon/src/`, where a client would have to
+ * reach daemon internals to resolve an address. `packages/daemon/src/core/config.ts` adds the request-scoping
  * rules that only the daemon applies on top of this.
  */
 
diff --git a/packages/daemon-contracts/src/request-progress-protocol.ts b/packages/daemon-contracts/src/request-progress-protocol.ts
index 3399b27dde..2c8e296f42 100644
--- a/packages/daemon-contracts/src/request-progress-protocol.ts
+++ b/packages/daemon-contracts/src/request-progress-protocol.ts
@@ -1,6 +1,6 @@
 import type { RequestProgressEvent } from '@agent-device/contracts/progress';
 // The client and the daemon share this framing, so it sits above both rather than under
-// `src/daemon/`. It takes the request/response vocabulary from the kernel contracts, which is
+// `packages/daemon/src/`. It takes the request/response vocabulary from the kernel contracts, which is
 // what lets a client read the stream without the module depending on daemon-private request state.
 import type { DaemonRequest, DaemonResponse } from '@agent-device/kernel/contracts';
 
diff --git a/packages/daemon/package.json b/packages/daemon/package.json
new file mode 100644
index 0000000000..7986b27838
--- /dev/null
+++ b/packages/daemon/package.json
@@ -0,0 +1,507 @@
+{
+  "name": "@agent-device/daemon",
+  "version": "0.0.0",
+  "private": true,
+  "type": "module",
+  "description": "The agent-device daemon server: request routing, sessions, leases, device claims, snapshot and interaction handling. Internal workspace package bundled into the published agent-device artifact (#3352 daemon extraction).",
+  "dependencies": {
+    "@agent-device/ad-replay": "workspace:*",
+    "@agent-device/ad-script": "workspace:*",
+    "@agent-device/capture-kit": "workspace:*",
+    "@agent-device/command-registry": "workspace:*",
+    "@agent-device/contracts": "workspace:*",
+    "@agent-device/daemon-contracts": "workspace:*",
+    "@agent-device/device-selection": "workspace:*",
+    "@agent-device/host-kit": "workspace:*",
+    "@agent-device/kernel": "workspace:*",
+    "@agent-device/maestro": "workspace:*",
+    "@agent-device/platform-android": "workspace:*",
+    "@agent-device/platform-apple": "workspace:*",
+    "@agent-device/platform-web": "workspace:*",
+    "@agent-device/replay-port": "workspace:*",
+    "@agent-device/replay-test": "workspace:*",
+    "@agent-device/selectors": "workspace:*",
+    "@agent-device/session-journal": "workspace:*",
+    "@agent-device/test-kit": "workspace:*"
+  },
+  "devDependencies": {
+    "fast-check": "^4.9.0",
+    "oxc-parser": "^0.146.0",
+    "vitest": "5.0.4",
+    "yaml": "^2.9.0"
+  },
+  "exports": {
+    "./app-log-files": {
+      "types": "./src/resources/app-log-files.ts",
+      "default": "./src/resources/app-log-files.ts"
+    },
+    "./daemon-command-registry": {
+      "types": "./src/core/daemon-command-registry.ts",
+      "default": "./src/core/daemon-command-registry.ts"
+    },
+    "./daemon-request": {
+      "types": "./src/core/daemon-request.ts",
+      "default": "./src/core/daemon-request.ts"
+    },
+    "./daemon-stop": {
+      "types": "./src/server/daemon-stop.ts",
+      "default": "./src/server/daemon-stop.ts"
+    },
+    "./device/claim-recovery-gateway": {
+      "types": "./src/resources/device/claim-recovery-gateway.ts",
+      "default": "./src/resources/device/claim-recovery-gateway.ts"
+    },
+    "./device/device-claim-inspection": {
+      "types": "./src/resources/device/device-claim-inspection.ts",
+      "default": "./src/resources/device/device-claim-inspection.ts"
+    },
+    "./device/device-claim-owner-recovery": {
+      "types": "./src/server/device/device-claim-owner-recovery.ts",
+      "default": "./src/server/device/device-claim-owner-recovery.ts"
+    },
+    "./device/device-claims": {
+      "types": "./src/resources/device/device-claims.ts",
+      "default": "./src/resources/device/device-claims.ts"
+    },
+    "./managed-session-artifact-path": {
+      "types": "./src/core/managed-session-artifact-path.ts",
+      "default": "./src/core/managed-session-artifact-path.ts"
+    },
+    "./platform-owner-lifecycle": {
+      "types": "./src/core/platform-owner-lifecycle.ts",
+      "default": "./src/core/platform-owner-lifecycle.ts"
+    },
+    "./platform-request-scope": {
+      "types": "./src/server/platform-request-scope.ts",
+      "default": "./src/server/platform-request-scope.ts"
+    },
+    "./platform-resource-cleanup": {
+      "types": "./src/core/platform-resource-cleanup.ts",
+      "default": "./src/core/platform-resource-cleanup.ts"
+    },
+    "./platform-services": {
+      "types": "./src/core/platform-services.ts",
+      "default": "./src/core/platform-services.ts"
+    },
+    "./route-owner-files": {
+      "types": "./src/sessions/route-owner-files.ts",
+      "default": "./src/sessions/route-owner-files.ts"
+    },
+    "./server/daemon-runtime": {
+      "types": "./src/server/server/daemon-runtime.ts",
+      "default": "./src/server/server/daemon-runtime.ts"
+    },
+    "./session-artifact-paths": {
+      "types": "./src/core/session-artifact-paths.ts",
+      "default": "./src/core/session-artifact-paths.ts"
+    },
+    "./testing/__tests__/android-observation-fixture": {
+      "types": "./src/__tests__/support/android-observation-fixture.ts",
+      "default": "./src/__tests__/support/android-observation-fixture.ts"
+    },
+    "./testing/__tests__/application-lifecycle-runtime-fixture": {
+      "types": "./src/__tests__/support/application-lifecycle-runtime-fixture.ts",
+      "default": "./src/__tests__/support/application-lifecycle-runtime-fixture.ts"
+    },
+    "./testing/__tests__/application-lifecycle-runtime-harness": {
+      "types": "./src/__tests__/support/application-lifecycle-runtime-harness.ts",
+      "default": "./src/__tests__/support/application-lifecycle-runtime-harness.ts"
+    },
+    "./testing/__tests__/capture-disclosure-target-activation-fact": {
+      "types": "./src/core/__tests__/capture-disclosure-target-activation-fact.ts",
+      "default": "./src/core/__tests__/capture-disclosure-target-activation-fact.ts"
+    },
+    "./testing/__tests__/device-selection-stub": {
+      "types": "./src/__tests__/support/device-selection-stub.ts",
+      "default": "./src/__tests__/support/device-selection-stub.ts"
+    },
+    "./testing/__tests__/human-control-fixtures": {
+      "types": "./src/__tests__/support/human-control-fixtures.ts",
+      "default": "./src/__tests__/support/human-control-fixtures.ts"
+    },
+    "./testing/__tests__/interaction-get-runtime-fixture": {
+      "types": "./src/execution/__tests__/interaction-get-runtime-fixture.ts",
+      "default": "./src/execution/__tests__/interaction-get-runtime-fixture.ts"
+    },
+    "./testing/__tests__/ios-comparison-key-fixture": {
+      "types": "./src/core/__tests__/ios-comparison-key-fixture.ts",
+      "default": "./src/core/__tests__/ios-comparison-key-fixture.ts"
+    },
+    "./testing/__tests__/legacy-snapshot-capture-fixture": {
+      "types": "./src/__tests__/support/legacy-snapshot-capture-fixture.ts",
+      "default": "./src/__tests__/support/legacy-snapshot-capture-fixture.ts"
+    },
+    "./testing/__tests__/platform-services-fixture": {
+      "types": "./src/__tests__/support/platform-services-fixture.ts",
+      "default": "./src/__tests__/support/platform-services-fixture.ts"
+    },
+    "./testing/__tests__/replay-runtime/replay-command-fixture": {
+      "types": "./src/sessions/__tests__/replay-runtime/replay-command-fixture.ts",
+      "default": "./src/sessions/__tests__/replay-runtime/replay-command-fixture.ts"
+    },
+    "./testing/__tests__/request-router-dispatch-mocks": {
+      "types": "./src/__tests__/support/request-router-dispatch-mocks.ts",
+      "default": "./src/__tests__/support/request-router-dispatch-mocks.ts"
+    },
+    "./testing/__tests__/request-router-open-harness": {
+      "types": "./src/server/__tests__/request-router-open-harness.ts",
+      "default": "./src/server/__tests__/request-router-open-harness.ts"
+    },
+    "./testing/__tests__/runtime-binding-conformance": {
+      "types": "./src/__tests__/support/runtime-binding-conformance.ts",
+      "default": "./src/__tests__/support/runtime-binding-conformance.ts"
+    },
+    "./testing/__tests__/screenshot-runtime-fixture": {
+      "types": "./src/__tests__/support/screenshot-runtime-fixture.ts",
+      "default": "./src/__tests__/support/screenshot-runtime-fixture.ts"
+    },
+    "./testing/__tests__/selector-capture-fixture": {
+      "types": "./src/__tests__/support/selector-capture-fixture.ts",
+      "default": "./src/__tests__/support/selector-capture-fixture.ts"
+    },
+    "./testing/__tests__/session-teardown.fixtures": {
+      "types": "./src/__tests__/support/session-teardown.fixtures.ts",
+      "default": "./src/__tests__/support/session-teardown.fixtures.ts"
+    },
+    "./testing/__tests__/snapshot-runtime-fixture": {
+      "types": "./src/__tests__/support/snapshot-runtime-fixture.ts",
+      "default": "./src/__tests__/support/snapshot-runtime-fixture.ts"
+    },
+    "./testing/__tests__/support/command-surface-fake": {
+      "types": "./src/__tests__/support/command-surface-fake.ts",
+      "default": "./src/__tests__/support/command-surface-fake.ts"
+    },
+    "./testing/__tests__/support/device-claim-store": {
+      "types": "./src/__tests__/support/device-claim-store.ts",
+      "default": "./src/__tests__/support/device-claim-store.ts"
+    },
+    "./testing/__tests__/support/provider-device-admission-fixture": {
+      "types": "./src/__tests__/support/provider-device-admission-fixture.ts",
+      "default": "./src/__tests__/support/provider-device-admission-fixture.ts"
+    },
+    "./testing/__tests__/support/screen-recording-live-handle": {
+      "types": "./src/__tests__/support/screen-recording-live-handle.ts",
+      "default": "./src/__tests__/support/screen-recording-live-handle.ts"
+    },
+    "./testing/__tests__/support/session-factories": {
+      "types": "./src/__tests__/support/session-factories.ts",
+      "default": "./src/__tests__/support/session-factories.ts"
+    },
+    "./testing/__tests__/support/store-factory": {
+      "types": "./src/__tests__/support/store-factory.ts",
+      "default": "./src/__tests__/support/store-factory.ts"
+    },
+    "./testing/__tests__/support/unavailable-device-runtime-gateway": {
+      "types": "./src/__tests__/support/unavailable-device-runtime-gateway.ts",
+      "default": "./src/__tests__/support/unavailable-device-runtime-gateway.ts"
+    },
+    "./testing/__tests__/test-device-runtime-gateway": {
+      "types": "./src/__tests__/support/test-device-runtime-gateway.ts",
+      "default": "./src/__tests__/support/test-device-runtime-gateway.ts"
+    },
+    "./testing/android-system-dialog": {
+      "types": "./src/execution/android-system-dialog.ts",
+      "default": "./src/execution/android-system-dialog.ts"
+    },
+    "./testing/app-events": {
+      "types": "./src/execution/app-events.ts",
+      "default": "./src/execution/app-events.ts"
+    },
+    "./testing/app-log-resource-store": {
+      "types": "./src/resources/app-log-resource-store.ts",
+      "default": "./src/resources/app-log-resource-store.ts"
+    },
+    "./testing/application-lifecycle-recovery": {
+      "types": "./src/server/application-lifecycle-recovery.ts",
+      "default": "./src/server/application-lifecycle-recovery.ts"
+    },
+    "./testing/artifact-tracking": {
+      "types": "./src/resources/artifact-tracking.ts",
+      "default": "./src/resources/artifact-tracking.ts"
+    },
+    "./testing/capture-disclosure": {
+      "types": "./src/core/capture-disclosure.ts",
+      "default": "./src/core/capture-disclosure.ts"
+    },
+    "./testing/context": {
+      "types": "./src/core/context.ts",
+      "default": "./src/core/context.ts"
+    },
+    "./testing/deferred-interaction-outcome": {
+      "types": "./src/core/deferred-interaction-outcome.ts",
+      "default": "./src/core/deferred-interaction-outcome.ts"
+    },
+    "./testing/device/device-claim-conflict": {
+      "types": "./src/resources/device/device-claim-conflict.ts",
+      "default": "./src/resources/device/device-claim-conflict.ts"
+    },
+    "./testing/device/device-claim-paths": {
+      "types": "./src/resources/device/device-claim-paths.ts",
+      "default": "./src/resources/device/device-claim-paths.ts"
+    },
+    "./testing/device/device-ready": {
+      "types": "./src/core/device/device-ready.ts",
+      "default": "./src/core/device/device-ready.ts"
+    },
+    "./testing/generic-leaf-execution": {
+      "types": "./src/core/generic-leaf-execution.ts",
+      "default": "./src/core/generic-leaf-execution.ts"
+    },
+    "./testing/gesture-runtime": {
+      "types": "./src/core/gesture-runtime.ts",
+      "default": "./src/core/gesture-runtime.ts"
+    },
+    "./testing/handlers/__tests__/*": {
+      "types": "./src/__tests__/support/handlers/*.ts",
+      "default": "./src/__tests__/support/handlers/*.ts"
+    },
+    "./testing/handlers/lease": {
+      "types": "./src/sessions/handlers/lease.ts",
+      "default": "./src/sessions/handlers/lease.ts"
+    },
+    "./testing/handlers/session-app-deployment": {
+      "types": "./src/sessions/handlers/session-app-deployment.ts",
+      "default": "./src/sessions/handlers/session-app-deployment.ts"
+    },
+    "./testing/handlers/session-appstate": {
+      "types": "./src/sessions/handlers/session-appstate.ts",
+      "default": "./src/sessions/handlers/session-appstate.ts"
+    },
+    "./testing/handlers/session-doctor": {
+      "types": "./src/sessions/handlers/session-doctor.ts",
+      "default": "./src/sessions/handlers/session-doctor.ts"
+    },
+    "./testing/handlers/session-doctor-app": {
+      "types": "./src/sessions/handlers/session-doctor-app.ts",
+      "default": "./src/sessions/handlers/session-doctor-app.ts"
+    },
+    "./testing/handlers/session-doctor-metro": {
+      "types": "./src/sessions/handlers/session-doctor-metro.ts",
+      "default": "./src/sessions/handlers/session-doctor-metro.ts"
+    },
+    "./testing/handlers/session-replay-command": {
+      "types": "./src/sessions/handlers/session-replay-command.ts",
+      "default": "./src/sessions/handlers/session-replay-command.ts"
+    },
+    "./testing/handlers/snapshot": {
+      "types": "./src/sessions/handlers/snapshot.ts",
+      "default": "./src/sessions/handlers/snapshot.ts"
+    },
+    "./testing/interaction/index": {
+      "types": "./src/execution/interaction/index.ts",
+      "default": "./src/execution/interaction/index.ts"
+    },
+    "./testing/interaction/internal/__tests__/*": {
+      "types": "./src/execution/interaction/internal/__tests__/*.ts",
+      "default": "./src/execution/interaction/internal/__tests__/*.ts"
+    },
+    "./testing/interaction/internal/interaction-android-escape": {
+      "types": "./src/execution/interaction/internal/interaction-android-escape.ts",
+      "default": "./src/execution/interaction/internal/interaction-android-escape.ts"
+    },
+    "./testing/interaction/internal/interaction-ios-tap-outcome": {
+      "types": "./src/execution/interaction/internal/interaction-ios-tap-outcome.ts",
+      "default": "./src/execution/interaction/internal/interaction-ios-tap-outcome.ts"
+    },
+    "./testing/interaction/internal/interaction-touch-android-readiness": {
+      "types": "./src/execution/interaction/internal/interaction-touch-android-readiness.ts",
+      "default": "./src/execution/interaction/internal/interaction-touch-android-readiness.ts"
+    },
+    "./testing/interaction/internal/interaction-touch-response": {
+      "types": "./src/execution/interaction/internal/interaction-touch-response.ts",
+      "default": "./src/execution/interaction/internal/interaction-touch-response.ts"
+    },
+    "./testing/interaction/internal/types": {
+      "types": "./src/core/interaction/internal/types.ts",
+      "default": "./src/core/interaction/internal/types.ts"
+    },
+    "./testing/interactor-resolution": {
+      "types": "./src/core/interactor-resolution.ts",
+      "default": "./src/core/interactor-resolution.ts"
+    },
+    "./testing/ios-app-session-hint": {
+      "types": "./src/core/ios-app-session-hint.ts",
+      "default": "./src/core/ios-app-session-hint.ts"
+    },
+    "./testing/lease-registry": {
+      "types": "./src/resources/lease-registry.ts",
+      "default": "./src/resources/lease-registry.ts"
+    },
+    "./testing/provider-device-admission": {
+      "types": "./src/core/provider-device-admission.ts",
+      "default": "./src/core/provider-device-admission.ts"
+    },
+    "./testing/provider-lease-expiry": {
+      "types": "./src/server/provider-lease-expiry.ts",
+      "default": "./src/server/provider-lease-expiry.ts"
+    },
+    "./testing/ref-frame": {
+      "types": "./src/core/ref-frame.ts",
+      "default": "./src/core/ref-frame.ts"
+    },
+    "./testing/request-binding": {
+      "types": "./src/server/request-binding.ts",
+      "default": "./src/server/request-binding.ts"
+    },
+    "./testing/request-dispatch-disclosure": {
+      "types": "./src/execution/request-dispatch-disclosure.ts",
+      "default": "./src/execution/request-dispatch-disclosure.ts"
+    },
+    "./testing/request-dispatch-ledger": {
+      "types": "./src/core/request-dispatch-ledger.ts",
+      "default": "./src/core/request-dispatch-ledger.ts"
+    },
+    "./testing/request-execution-scope": {
+      "types": "./src/server/request-execution-scope.ts",
+      "default": "./src/server/request-execution-scope.ts"
+    },
+    "./testing/request-finalization": {
+      "types": "./src/server/request-finalization.ts",
+      "default": "./src/server/request-finalization.ts"
+    },
+    "./testing/request-generic-dispatch": {
+      "types": "./src/execution/request-generic-dispatch.ts",
+      "default": "./src/execution/request-generic-dispatch.ts"
+    },
+    "./testing/request-handler-chain": {
+      "types": "./src/sessions/request-handler-chain.ts",
+      "default": "./src/sessions/request-handler-chain.ts"
+    },
+    "./testing/request-platform-provider-context": {
+      "types": "./src/server/request-platform-provider-context.ts",
+      "default": "./src/server/request-platform-provider-context.ts"
+    },
+    "./testing/request-router": {
+      "types": "./src/server/request-router.ts",
+      "default": "./src/server/request-router.ts"
+    },
+    "./testing/request-runtime-binding": {
+      "types": "./src/core/request-runtime-binding.ts",
+      "default": "./src/core/request-runtime-binding.ts"
+    },
+    "./testing/response-views": {
+      "types": "./src/server/response-views.ts",
+      "default": "./src/server/response-views.ts"
+    },
+    "./testing/screenshot-runtime": {
+      "types": "./src/execution/screenshot-runtime.ts",
+      "default": "./src/execution/screenshot-runtime.ts"
+    },
+    "./testing/scroll-until": {
+      "types": "./src/execution/scroll-until.ts",
+      "default": "./src/execution/scroll-until.ts"
+    },
+    "./testing/selector-capture-binding": {
+      "types": "./src/execution/selector-capture-binding.ts",
+      "default": "./src/execution/selector-capture-binding.ts"
+    },
+    "./testing/selector-match-errors": {
+      "types": "./src/execution/selector-match-errors.ts",
+      "default": "./src/execution/selector-match-errors.ts"
+    },
+    "./testing/selector-runtime": {
+      "types": "./src/execution/selector-runtime.ts",
+      "default": "./src/execution/selector-runtime.ts"
+    },
+    "./testing/selector-runtime-backend": {
+      "types": "./src/execution/selector-runtime-backend.ts",
+      "default": "./src/execution/selector-runtime-backend.ts"
+    },
+    "./testing/server/http-server": {
+      "types": "./src/server/server/http-server.ts",
+      "default": "./src/server/server/http-server.ts"
+    },
+    "./testing/server/server-lifecycle": {
+      "types": "./src/server/server/server-lifecycle.ts",
+      "default": "./src/server/server/server-lifecycle.ts"
+    },
+    "./testing/server/server-shutdown": {
+      "types": "./src/server/server/server-shutdown.ts",
+      "default": "./src/server/server/server-shutdown.ts"
+    },
+    "./testing/server/transport": {
+      "types": "./src/server/server/transport.ts",
+      "default": "./src/server/server/transport.ts"
+    },
+    "./testing/session-action-recorder": {
+      "types": "./src/core/session-action-recorder.ts",
+      "default": "./src/core/session-action-recorder.ts"
+    },
+    "./testing/session-capture-binding": {
+      "types": "./src/core/session-capture-binding.ts",
+      "default": "./src/core/session-capture-binding.ts"
+    },
+    "./testing/session-lifecycle/index": {
+      "types": "./src/sessions/session-lifecycle/index.ts",
+      "default": "./src/sessions/session-lifecycle/index.ts"
+    },
+    "./testing/session-lifecycle/internal/__tests__/*": {
+      "types": "./src/sessions/session-lifecycle/internal/__tests__/*.ts",
+      "default": "./src/sessions/session-lifecycle/internal/__tests__/*.ts"
+    },
+    "./testing/session-observability/__tests__/*": {
+      "types": "./src/sessions/session-observability/__tests__/*.ts",
+      "default": "./src/sessions/session-observability/__tests__/*.ts"
+    },
+    "./testing/session-recovery-hints": {
+      "types": "./src/core/session-recovery-hints.ts",
+      "default": "./src/core/session-recovery-hints.ts"
+    },
+    "./testing/session-runtime": {
+      "types": "./src/sessions/session-runtime.ts",
+      "default": "./src/sessions/session-runtime.ts"
+    },
+    "./testing/session-script-writer": {
+      "types": "./src/core/session-script-writer.ts",
+      "default": "./src/core/session-script-writer.ts"
+    },
+    "./testing/session-snapshot": {
+      "types": "./src/execution/session-snapshot.ts",
+      "default": "./src/execution/session-snapshot.ts"
+    },
+    "./testing/session-state": {
+      "types": "./src/core/session-state.ts",
+      "default": "./src/core/session-state.ts"
+    },
+    "./testing/session-store": {
+      "types": "./src/core/session-store.ts",
+      "default": "./src/core/session-store.ts"
+    },
+    "./testing/session-teardown-budget": {
+      "types": "./src/sessions/session-teardown-budget.ts",
+      "default": "./src/sessions/session-teardown-budget.ts"
+    },
+    "./testing/snapshot-capture": {
+      "types": "./src/core/snapshot-capture.ts",
+      "default": "./src/core/snapshot-capture.ts"
+    },
+    "./testing/snapshot-diff-runtime": {
+      "types": "./src/sessions/snapshot-diff-runtime.ts",
+      "default": "./src/sessions/snapshot-diff-runtime.ts"
+    },
+    "./testing/snapshot-interactor-capture": {
+      "types": "./src/core/snapshot-interactor-capture.ts",
+      "default": "./src/core/snapshot-interactor-capture.ts"
+    },
+    "./testing/snapshot-quality-latch": {
+      "types": "./src/sessions/snapshot-quality-latch.ts",
+      "default": "./src/sessions/snapshot-quality-latch.ts"
+    },
+    "./testing/snapshot-runtime": {
+      "types": "./src/sessions/snapshot-runtime.ts",
+      "default": "./src/sessions/snapshot-runtime.ts"
+    },
+    "./testing/snapshot-session": {
+      "types": "./src/core/snapshot-session.ts",
+      "default": "./src/core/snapshot-session.ts"
+    },
+    "./testing/wait-runtime": {
+      "types": "./src/execution/wait-runtime.ts",
+      "default": "./src/execution/wait-runtime.ts"
+    },
+    "./testing/web-session-names": {
+      "types": "./src/sessions/web-session-names.ts",
+      "default": "./src/sessions/web-session-names.ts"
+    }
+  }
+}
diff --git a/src/daemon/__tests__/android-observation-fixture.ts b/packages/daemon/src/__tests__/support/android-observation-fixture.ts
similarity index 100%
rename from src/daemon/__tests__/android-observation-fixture.ts
rename to packages/daemon/src/__tests__/support/android-observation-fixture.ts
diff --git a/src/daemon/__tests__/application-lifecycle-runtime-fixture.ts b/packages/daemon/src/__tests__/support/application-lifecycle-runtime-fixture.ts
similarity index 100%
rename from src/daemon/__tests__/application-lifecycle-runtime-fixture.ts
rename to packages/daemon/src/__tests__/support/application-lifecycle-runtime-fixture.ts
diff --git a/src/daemon/__tests__/application-lifecycle-runtime-harness.ts b/packages/daemon/src/__tests__/support/application-lifecycle-runtime-harness.ts
similarity index 98%
rename from src/daemon/__tests__/application-lifecycle-runtime-harness.ts
rename to packages/daemon/src/__tests__/support/application-lifecycle-runtime-harness.ts
index 8013fa6740..dc9f010fc3 100644
--- a/src/daemon/__tests__/application-lifecycle-runtime-harness.ts
+++ b/packages/daemon/src/__tests__/support/application-lifecycle-runtime-harness.ts
@@ -15,7 +15,10 @@ import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform
 import { unavailableDeploymentSnapshotAndShutdownOperationFacts } from '@agent-device/test-kit/runtime-operation-facts';
 import { deviceShape, type DeviceInfo } from '@agent-device/kernel/device';
 import { vi } from 'vitest';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
 import {
   applicationLifecycleFixtureInteractor,
   applicationLifecycleRuntimeFixture,
diff --git a/src/daemon/__tests__/support/command-surface-fake.ts b/packages/daemon/src/__tests__/support/command-surface-fake.ts
similarity index 100%
rename from src/daemon/__tests__/support/command-surface-fake.ts
rename to packages/daemon/src/__tests__/support/command-surface-fake.ts
diff --git a/src/daemon/__tests__/support/device-claim-store.ts b/packages/daemon/src/__tests__/support/device-claim-store.ts
similarity index 93%
rename from src/daemon/__tests__/support/device-claim-store.ts
rename to packages/daemon/src/__tests__/support/device-claim-store.ts
index e4995b95b8..ff8291153e 100644
--- a/src/daemon/__tests__/support/device-claim-store.ts
+++ b/packages/daemon/src/__tests__/support/device-claim-store.ts
@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { afterEach } from 'vitest';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import type { DeviceClaimReconciler } from '../../device/device-claims.ts';
+import type { DeviceClaimReconciler } from '../../resources/device/device-claims.ts';
 
 export type IsolatedDeviceClaimStore = {
   /** Temporary root holding both the claim store and the daemon state dir. */
diff --git a/src/daemon/__tests__/device-selection-stub.ts b/packages/daemon/src/__tests__/support/device-selection-stub.ts
similarity index 100%
rename from src/daemon/__tests__/device-selection-stub.ts
rename to packages/daemon/src/__tests__/support/device-selection-stub.ts
diff --git a/src/daemon/handlers/__tests__/session-command-harness.ts b/packages/daemon/src/__tests__/support/handlers/session-command-harness.ts
similarity index 97%
rename from src/daemon/handlers/__tests__/session-command-harness.ts
rename to packages/daemon/src/__tests__/support/handlers/session-command-harness.ts
index ee2de6d05f..b1b2c1b57a 100644
--- a/src/daemon/handlers/__tests__/session-command-harness.ts
+++ b/packages/daemon/src/__tests__/support/handlers/session-command-harness.ts
@@ -1,5 +1,5 @@
-import { handleSessionCommands as handleProductionSessionCommands } from '../session.ts';
-import type { SessionCommandInput } from '../session-command-input.ts';
+import { handleSessionCommands as handleProductionSessionCommands } from '../../../sessions/handlers/session.ts';
+import type { SessionCommandInput } from '../../../sessions/handlers/session-command-input.ts';
 import type {
   AppDeploymentInput,
   AppDeploymentResult,
@@ -25,10 +25,10 @@ import { beforeEach, vi } from 'vitest';
 import {
   applicationLifecycleRuntimeFixture,
   type LifecycleOperationsLoader,
-} from '../../__tests__/application-lifecycle-runtime-fixture.ts';
+} from '../application-lifecycle-runtime-fixture.ts';
 import { withClientReplayScriptSources } from '@agent-device/replay-port/replay-script-source-fixtures';
 import { createUnavailableRuntimeFactsForTest } from '@agent-device/test-kit/runtime-operation-facts';
-import { platformResourceCleanupFixture } from '../../__tests__/support/platform-resource-cleanup-fixture.ts';
+import { platformResourceCleanupFixture } from '../platform-resource-cleanup-fixture.ts';
 
 const unavailable = Object.freeze({
   available: false,
diff --git a/src/daemon/handlers/__tests__/session-test-harness.ts b/packages/daemon/src/__tests__/support/handlers/session-test-harness.ts
similarity index 92%
rename from src/daemon/handlers/__tests__/session-test-harness.ts
rename to packages/daemon/src/__tests__/support/handlers/session-test-harness.ts
index 108862588a..b9d11d9418 100644
--- a/src/daemon/handlers/__tests__/session-test-harness.ts
+++ b/packages/daemon/src/__tests__/support/handlers/session-test-harness.ts
@@ -1,5 +1,5 @@
 import { isMacOs } from '@agent-device/kernel/device';
-import { legacyDispatchCapture } from '../../__tests__/legacy-snapshot-capture-fixture.ts';
+import { legacyDispatchCapture } from '../legacy-snapshot-capture-fixture.ts';
 import { expect, vi, beforeEach } from 'vitest';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import type { AppLogLiveState } from '@agent-device/contracts/app-log-runtime';
@@ -16,8 +16,7 @@ vi.mock('node:timers/promises', async (importOriginal) => {
 vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal) => {
   const actual =
     await importOriginal<typeof import('@agent-device/device-selection/dispatch-resolve')>();
-  const { selectionFromResolveTargetDevice } =
-    await import('../../__tests__/device-selection-stub.ts');
+  const { selectionFromResolveTargetDevice } = await import('../device-selection-stub.ts');
   const resolveTargetDevice = vi.fn();
   return {
     ...actual,
@@ -25,7 +24,9 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
     resolveTargetDeviceSelection: vi.fn(selectionFromResolveTargetDevice(resolveTargetDevice)),
   };
 });
-vi.mock('../../device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));
+vi.mock('../../../core/device/device-ready.ts', () => ({
+  ensureDeviceReady: vi.fn(async () => {}),
+}));
 vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal) => {
   const actual =
     await importOriginal<typeof import('@agent-device/platform-apple/runner/operations')>();
@@ -72,23 +73,24 @@ vi.mock('@agent-device/host-kit/command', async (importOriginal) => {
   const actual = await importOriginal<typeof import('@agent-device/host-kit/command')>();
   return { ...actual, runCmd: vi.fn(async () => ({ stdout: '', stderr: '', exitCode: 0 })) };
 });
-vi.mock('../../materialized-path-registry.ts', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../../materialized-path-registry.ts')>();
+vi.mock('../../../sessions/materialized-path-registry.ts', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('../../../sessions/materialized-path-registry.ts')>();
   return { ...actual, cleanupRetainedMaterializedPathsForSession: vi.fn(async () => {}) };
 });
 
 import * as path from 'node:path';
-import { cleanupRetainedMaterializedPathsForSession } from '../../materialized-path-registry.ts';
-import { SessionStore } from '../../session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
-import type { SessionState } from '../../session-state.ts';
+import { cleanupRetainedMaterializedPathsForSession } from '../../../sessions/materialized-path-registry.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
+import type { SessionState } from '../../../core/session-state.ts';
 import { resolveTargetDevice } from '@agent-device/device-selection/dispatch-resolve';
-import { ensureDeviceReady } from '../../device/device-ready.ts';
+import { ensureDeviceReady } from '../../../core/device/device-ready.ts';
 import {
   applyRuntimeHintsFixture,
   clearRuntimeHintsFixture,
   dispatchApplicationLifecycleEffect,
-} from '../../__tests__/application-lifecycle-runtime-fixture.ts';
+} from '../application-lifecycle-runtime-fixture.ts';
 import {
   prepareIosRunner,
   prewarmAppleRunnerCache,
diff --git a/src/daemon/handlers/__tests__/snapshot-handler.fixtures.ts b/packages/daemon/src/__tests__/support/handlers/snapshot-handler.fixtures.ts
similarity index 93%
rename from src/daemon/handlers/__tests__/snapshot-handler.fixtures.ts
rename to packages/daemon/src/__tests__/support/handlers/snapshot-handler.fixtures.ts
index a5d350f263..bfda7d8786 100644
--- a/src/daemon/handlers/__tests__/snapshot-handler.fixtures.ts
+++ b/packages/daemon/src/__tests__/support/handlers/snapshot-handler.fixtures.ts
@@ -7,13 +7,13 @@ import { buildSnapshotSignatures } from '@agent-device/capture-kit/snapshot-fres
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../request-runtime-binding.ts';
-import { snapshotRuntimeFixture } from '../../__tests__/snapshot-runtime-fixture.ts';
-import { SessionStore } from '../../session-store.ts';
-import type { DaemonRequest } from '../../daemon-request.ts';
-import type { SessionState } from '../../session-state.ts';
-import { handleSnapshotCommands as handleProductionSnapshotCommands } from '../snapshot.ts';
-import { platformResourceCleanupFixture } from '../../__tests__/support/platform-resource-cleanup-fixture.ts';
+} from '../../../core/request-runtime-binding.ts';
+import { snapshotRuntimeFixture } from '../snapshot-runtime-fixture.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
+import type { SessionState } from '../../../core/session-state.ts';
+import { handleSnapshotCommands as handleProductionSnapshotCommands } from '../../../sessions/handlers/snapshot.ts';
+import { platformResourceCleanupFixture } from '../platform-resource-cleanup-fixture.ts';
 
 export function makeSessionStore(): SessionStore {
   const root = mkdtempForTestSync('agent-device-snapshot-handler-');
diff --git a/src/daemon/__tests__/support/host-diagnostics-fixture.ts b/packages/daemon/src/__tests__/support/host-diagnostics-fixture.ts
similarity index 100%
rename from src/daemon/__tests__/support/host-diagnostics-fixture.ts
rename to packages/daemon/src/__tests__/support/host-diagnostics-fixture.ts
diff --git a/src/daemon/__tests__/human-control-fixtures.ts b/packages/daemon/src/__tests__/support/human-control-fixtures.ts
similarity index 92%
rename from src/daemon/__tests__/human-control-fixtures.ts
rename to packages/daemon/src/__tests__/support/human-control-fixtures.ts
index b5c2a9b5ff..3a117db731 100644
--- a/src/daemon/__tests__/human-control-fixtures.ts
+++ b/packages/daemon/src/__tests__/support/human-control-fixtures.ts
@@ -1,7 +1,7 @@
 import type { HumanControlHold, HumanControlHoldScope } from '@agent-device/contracts/client';
 import type { DeviceLease } from '@agent-device/contracts/device';
-import type { AllocateLeaseRequest } from '../lease-registry-scope.ts';
-import type { DaemonRequest } from '../daemon-request.ts';
+import type { AllocateLeaseRequest } from '../../resources/lease-registry-scope.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
 import { AppError } from '@agent-device/kernel/errors';
 
 export const HUMAN_CONTROL_SCOPE: HumanControlHoldScope = {
diff --git a/src/daemon/__tests__/human-control-router-fixture.ts b/packages/daemon/src/__tests__/support/human-control-router-fixture.ts
similarity index 73%
rename from src/daemon/__tests__/human-control-router-fixture.ts
rename to packages/daemon/src/__tests__/support/human-control-router-fixture.ts
index 095fa4d8fb..54ed1c1295 100644
--- a/src/daemon/__tests__/human-control-router-fixture.ts
+++ b/packages/daemon/src/__tests__/support/human-control-router-fixture.ts
@@ -3,16 +3,16 @@ import {
   daemonPlatformServicesFixture,
   daemonClaimRecoveryGatewayFixture,
 } from './platform-services-fixture.ts';
-import { makeIosAppSession } from './support/session-factories.ts';
-import { makeSessionStore } from './support/store-factory.ts';
-import { buildSessionLeaseFromRequest } from '../lease-context.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { createRequestHandler } from '../request-router.ts';
-import { providerCredentialsFixture } from './support/provider-credentials-fixture.ts';
-import { tenantScopedSessionName } from '../session-tenant-scope.ts';
+import { makeIosAppSession } from './session-factories.ts';
+import { makeSessionStore } from './store-factory.ts';
+import { buildSessionLeaseFromRequest } from '../../core/lease-context.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { createRequestHandler } from '../../server/request-router.ts';
+import { providerCredentialsFixture } from './provider-credentials-fixture.ts';
+import { tenantScopedSessionName } from '../../core/session-tenant-scope.ts';
 import { lifecycleDeviceRuntimeGateway } from './test-device-runtime-gateway.ts';
 import { HUMAN_CONTROL_LEASE_REQUEST, humanControlRequest } from './human-control-fixtures.ts';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from './command-surface-fake.ts';
 
 export function createHumanControlHarness() {
   const registry = new LeaseRegistry();
diff --git a/src/daemon/__tests__/legacy-snapshot-capture-fixture.ts b/packages/daemon/src/__tests__/support/legacy-snapshot-capture-fixture.ts
similarity index 96%
rename from src/daemon/__tests__/legacy-snapshot-capture-fixture.ts
rename to packages/daemon/src/__tests__/support/legacy-snapshot-capture-fixture.ts
index a206866f21..8979396f22 100644
--- a/src/daemon/__tests__/legacy-snapshot-capture-fixture.ts
+++ b/packages/daemon/src/__tests__/support/legacy-snapshot-capture-fixture.ts
@@ -1,7 +1,7 @@
 import { vi } from 'vitest';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import type { SnapshotResult } from '@agent-device/contracts/interactor-types';
-import type { captureSnapshotWithInteractor } from '../snapshot-interactor-capture.ts';
+import type { captureSnapshotWithInteractor } from '../../core/snapshot-interactor-capture.ts';
 
 type CaptureParams = Parameters<typeof captureSnapshotWithInteractor>[0];
 
diff --git a/src/daemon/__tests__/support/platform-resource-cleanup-fixture.ts b/packages/daemon/src/__tests__/support/platform-resource-cleanup-fixture.ts
similarity index 95%
rename from src/daemon/__tests__/support/platform-resource-cleanup-fixture.ts
rename to packages/daemon/src/__tests__/support/platform-resource-cleanup-fixture.ts
index c97551d7f5..1a8b0c7edd 100644
--- a/src/daemon/__tests__/support/platform-resource-cleanup-fixture.ts
+++ b/packages/daemon/src/__tests__/support/platform-resource-cleanup-fixture.ts
@@ -1,5 +1,5 @@
 import { vi, type Mock } from 'vitest';
-import type { PlatformResourceCleanup } from '../../platform-resource-cleanup.ts';
+import type { PlatformResourceCleanup } from '../../core/platform-resource-cleanup.ts';
 
 /** Every member observable as a spy, which is how the daemon suites read the fixture back. */
 export type PlatformResourceCleanupFixture = {
diff --git a/src/daemon/__tests__/platform-services-fixture.ts b/packages/daemon/src/__tests__/support/platform-services-fixture.ts
similarity index 94%
rename from src/daemon/__tests__/platform-services-fixture.ts
rename to packages/daemon/src/__tests__/support/platform-services-fixture.ts
index 62dc9ae641..8a1aad0e95 100644
--- a/src/daemon/__tests__/platform-services-fixture.ts
+++ b/packages/daemon/src/__tests__/support/platform-services-fixture.ts
@@ -2,9 +2,9 @@ import { vi } from 'vitest';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import type { SessionSurface } from '@agent-device/contracts/session';
 import type { DeviceBootObservation } from '@agent-device/contracts/device-boot';
-import type { ClaimRecoveryGatewayFactory } from '../device/claim-recovery-gateway.ts';
-import type { DaemonPlatformServices } from '../platform-services.ts';
-import { unavailableDeviceRuntimeGateway } from './support/unavailable-device-runtime-gateway.ts';
+import type { ClaimRecoveryGatewayFactory } from '../../resources/device/claim-recovery-gateway.ts';
+import type { DaemonPlatformServices } from '../../core/platform-services.ts';
+import { unavailableDeviceRuntimeGateway } from './unavailable-device-runtime-gateway.ts';
 
 /**
  * The `DaemonPlatformServices` port as the daemon suites answer it: every member is a plain
diff --git a/src/daemon/__tests__/support/provider-credentials-fixture.ts b/packages/daemon/src/__tests__/support/provider-credentials-fixture.ts
similarity index 100%
rename from src/daemon/__tests__/support/provider-credentials-fixture.ts
rename to packages/daemon/src/__tests__/support/provider-credentials-fixture.ts
diff --git a/src/daemon/__tests__/support/provider-device-admission-fixture.ts b/packages/daemon/src/__tests__/support/provider-device-admission-fixture.ts
similarity index 92%
rename from src/daemon/__tests__/support/provider-device-admission-fixture.ts
rename to packages/daemon/src/__tests__/support/provider-device-admission-fixture.ts
index 6ddbaa6c54..f48d53eee7 100644
--- a/src/daemon/__tests__/support/provider-device-admission-fixture.ts
+++ b/packages/daemon/src/__tests__/support/provider-device-admission-fixture.ts
@@ -1,6 +1,6 @@
 import type { ProviderDeviceRuntime } from '@agent-device/contracts/device';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import { installProviderDeviceAdmission } from '../../provider-device-admission.ts';
+import { installProviderDeviceAdmission } from '../../core/provider-device-admission.ts';
 
 /**
  * Provider ownership as the daemon consumes it: the `ProviderDeviceAdmission` port over a list
diff --git a/src/daemon/__tests__/request-router-dispatch-mocks.ts b/packages/daemon/src/__tests__/support/request-router-dispatch-mocks.ts
similarity index 66%
rename from src/daemon/__tests__/request-router-dispatch-mocks.ts
rename to packages/daemon/src/__tests__/support/request-router-dispatch-mocks.ts
index aff97cea5c..6f1e95bd18 100644
--- a/src/daemon/__tests__/request-router-dispatch-mocks.ts
+++ b/packages/daemon/src/__tests__/support/request-router-dispatch-mocks.ts
@@ -1,7 +1,10 @@
-import { vi } from 'vitest';
+import { vi, type Mock } from 'vitest';
 
+// The explicit Mock annotation is what lets the daemon package's composite project emit
+// this fixture's declaration; the inferred vi.fn() type names @vitest/spy internals that
+// are not importable from the emitted .d.ts (TS2883) — the capture-kit fixtures' pattern.
 const dispatchMocks = vi.hoisted(() => ({
-  resolveTargetDevice: vi.fn(),
+  resolveTargetDevice: vi.fn() as Mock,
 }));
 
 vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal) => {
diff --git a/src/daemon/__tests__/runtime-binding-conformance.ts b/packages/daemon/src/__tests__/support/runtime-binding-conformance.ts
similarity index 89%
rename from src/daemon/__tests__/runtime-binding-conformance.ts
rename to packages/daemon/src/__tests__/support/runtime-binding-conformance.ts
index f7f5294998..6bbdfe1025 100644
--- a/src/daemon/__tests__/runtime-binding-conformance.ts
+++ b/packages/daemon/src/__tests__/support/runtime-binding-conformance.ts
@@ -13,30 +13,30 @@ import {
   commandRuntimeUseRequirements,
 } from '@agent-device/command-registry/registry';
 import { createUnavailableRuntimeFactsForTest } from '@agent-device/test-kit/runtime-operation-facts';
-import { makeSession } from './support/session-factories.ts';
-import { makeSessionStore } from './support/store-factory.ts';
-import { resolveBoundBackRuntime } from '../back-runtime.ts';
-import { resolveBoundFocusRuntime } from '../focus-runtime.ts';
-import { resolveBoundFoldRuntime } from '../fold-runtime.ts';
-import { resolveBoundGestureRuntime } from '../gesture-runtime.ts';
-import { resolveBoundOrientationRuntime } from '../orientation-runtime.ts';
-import type { ResolvedGenericExecution } from '../generic-leaf-execution.ts';
+import { makeSession } from './session-factories.ts';
+import { makeSessionStore } from './store-factory.ts';
+import { resolveBoundBackRuntime } from '../../execution/back-runtime.ts';
+import { resolveBoundFocusRuntime } from '../../execution/focus-runtime.ts';
+import { resolveBoundFoldRuntime } from '../../execution/fold-runtime.ts';
+import { resolveBoundGestureRuntime } from '../../core/gesture-runtime.ts';
+import { resolveBoundOrientationRuntime } from '../../execution/orientation-runtime.ts';
+import type { ResolvedGenericExecution } from '../../core/generic-leaf-execution.ts';
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
   RuntimeAdmissionBindings,
-} from '../request-runtime-binding.ts';
-import { dispatchSnapshotDiffViaRuntime } from '../snapshot-diff-runtime.ts';
+} from '../../core/request-runtime-binding.ts';
+import { dispatchSnapshotDiffViaRuntime } from '../../sessions/snapshot-diff-runtime.ts';
 import {
   isSystemButtonCommand,
   resolveBoundSystemButtonRuntime,
   type SystemButtonCommand,
-} from '../system-button-runtime.ts';
-import { resolveBoundTvRemoteRuntime } from '../tv-remote-runtime.ts';
-import { resolveBoundTypeTextRuntime } from '../type-text-runtime.ts';
-import { resolveBoundViewportRuntime } from '../viewport-runtime.ts';
+} from '../../execution/system-button-runtime.ts';
+import { resolveBoundTvRemoteRuntime } from '../../execution/tv-remote-runtime.ts';
+import { resolveBoundTypeTextRuntime } from '../../execution/type-text-runtime.ts';
+import { resolveBoundViewportRuntime } from '../../execution/viewport-runtime.ts';
 import type { DaemonFailureResponse } from '@agent-device/kernel/contracts';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from './command-surface-fake.ts';
 
 type RuntimeOperation = RuntimeOperationKey<PlatformRuntimeOperations>;
 
diff --git a/src/daemon/__tests__/support/screen-recording-live-handle.ts b/packages/daemon/src/__tests__/support/screen-recording-live-handle.ts
similarity index 96%
rename from src/daemon/__tests__/support/screen-recording-live-handle.ts
rename to packages/daemon/src/__tests__/support/screen-recording-live-handle.ts
index 7276477b0a..de62056477 100644
--- a/src/daemon/__tests__/support/screen-recording-live-handle.ts
+++ b/packages/daemon/src/__tests__/support/screen-recording-live-handle.ts
@@ -5,7 +5,7 @@ import {
 import { localRuntimeOwner } from '@agent-device/contracts/platform-runtime';
 import type { ScreenRecordingLiveSnapshot } from '@agent-device/contracts/screen-recording-runtime';
 import { deviceIdentity } from '@agent-device/kernel/device';
-import type { SessionState } from '../../session-state.ts';
+import type { SessionState } from '../../core/session-state.ts';
 
 type ScreenRecordingOverrides = Partial<ScreenRecordingLiveSnapshot>;
 
diff --git a/src/daemon/__tests__/screenshot-runtime-fixture.ts b/packages/daemon/src/__tests__/support/screenshot-runtime-fixture.ts
similarity index 96%
rename from src/daemon/__tests__/screenshot-runtime-fixture.ts
rename to packages/daemon/src/__tests__/support/screenshot-runtime-fixture.ts
index 4049fbfb9f..7a26db4796 100644
--- a/src/daemon/__tests__/screenshot-runtime-fixture.ts
+++ b/packages/daemon/src/__tests__/support/screenshot-runtime-fixture.ts
@@ -20,8 +20,11 @@ import { deviceShape, type DeviceInfo } from '@agent-device/kernel/device';
 import fs from 'node:fs';
 import { vi, type Mock } from 'vitest';
 import { PNG } from '@agent-device/capture-kit/png';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import { unavailableDeviceRuntimeGateway } from './support/unavailable-device-runtime-gateway.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import { unavailableDeviceRuntimeGateway } from './unavailable-device-runtime-gateway.ts';
 import {
   type TapPointInput,
   touchRuntimeOperationFacts,
diff --git a/src/daemon/__tests__/selector-capture-fixture.ts b/packages/daemon/src/__tests__/support/selector-capture-fixture.ts
similarity index 92%
rename from src/daemon/__tests__/selector-capture-fixture.ts
rename to packages/daemon/src/__tests__/support/selector-capture-fixture.ts
index 1cd6bf5998..08f8cf8a56 100644
--- a/src/daemon/__tests__/selector-capture-fixture.ts
+++ b/packages/daemon/src/__tests__/support/selector-capture-fixture.ts
@@ -12,9 +12,12 @@ import {
   snapshotRuntimeOperationFacts,
 } from '@agent-device/contracts/snapshot-runtime';
 import { deviceShape, type DeviceInfo } from '@agent-device/kernel/device';
-import { isActiveProviderDevice } from '../provider-device-admission.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import { unavailableDeviceRuntimeGateway } from './support/unavailable-device-runtime-gateway.ts';
+import { isActiveProviderDevice } from '../../core/provider-device-admission.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import { unavailableDeviceRuntimeGateway } from './unavailable-device-runtime-gateway.ts';
 
 const available: RuntimeOperationFact = Object.freeze({ available: true });
 
diff --git a/src/daemon/__tests__/support/session-factories.ts b/packages/daemon/src/__tests__/support/session-factories.ts
similarity index 97%
rename from src/daemon/__tests__/support/session-factories.ts
rename to packages/daemon/src/__tests__/support/session-factories.ts
index ad7dcb43c6..546a6d8f29 100644
--- a/src/daemon/__tests__/support/session-factories.ts
+++ b/packages/daemon/src/__tests__/support/session-factories.ts
@@ -1,8 +1,8 @@
-import type { SessionState } from '../../session-state.ts';
+import type { SessionState } from '../../core/session-state.ts';
 import type {
   SessionScriptPublicationState,
   SessionScriptRepairStatus,
-} from '../../session-script-publication-state.ts';
+} from '../../core/session-script-publication-state.ts';
 import {
   IOS_SIMULATOR,
   ANDROID_EMULATOR,
diff --git a/src/daemon/session-observability/internal/__tests__/network-runtime-harness.ts b/packages/daemon/src/__tests__/support/session-observability/internal/network-runtime-harness.ts
similarity index 97%
rename from src/daemon/session-observability/internal/__tests__/network-runtime-harness.ts
rename to packages/daemon/src/__tests__/support/session-observability/internal/network-runtime-harness.ts
index cd88cad1c0..06ac4a6cfd 100644
--- a/src/daemon/session-observability/internal/__tests__/network-runtime-harness.ts
+++ b/packages/daemon/src/__tests__/support/session-observability/internal/network-runtime-harness.ts
@@ -10,7 +10,7 @@ import {
 import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform-runtime-operations';
 import { unavailableDeploymentSnapshotAndShutdownOperationFacts } from '@agent-device/test-kit/runtime-operation-facts';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import type { BindDeviceRuntime } from '../../../request-runtime-binding.ts';
+import type { BindDeviceRuntime } from '../../../../core/request-runtime-binding.ts';
 
 export function createNetworkRuntime(
   device: DeviceInfo,
diff --git a/src/daemon/__tests__/session-teardown.fixtures.ts b/packages/daemon/src/__tests__/support/session-teardown.fixtures.ts
similarity index 94%
rename from src/daemon/__tests__/session-teardown.fixtures.ts
rename to packages/daemon/src/__tests__/support/session-teardown.fixtures.ts
index 94b56f37af..77c4b499a2 100644
--- a/src/daemon/__tests__/session-teardown.fixtures.ts
+++ b/packages/daemon/src/__tests__/support/session-teardown.fixtures.ts
@@ -4,8 +4,8 @@ import type { ScreenRecordingLiveHandle } from '@agent-device/contracts/screen-r
 import { createDurableResourceEnvelope } from '@agent-device/capture-kit';
 import { WEB_DESKTOP_DEVICE } from '@agent-device/test-kit/device-fixtures';
 import { screenRecordingResourceStore } from '@agent-device/capture-kit/screen-recording-resource-store';
-import type { SessionStore } from '../session-store.ts';
-import type { SessionState } from '../session-state.ts';
+import type { SessionStore } from '../../core/session-store.ts';
+import type { SessionState } from '../../core/session-state.ts';
 
 export function makeRecordingSession(params: {
   name: string;
diff --git a/src/daemon/__tests__/snapshot-runtime-fixture.ts b/packages/daemon/src/__tests__/support/snapshot-runtime-fixture.ts
similarity index 96%
rename from src/daemon/__tests__/snapshot-runtime-fixture.ts
rename to packages/daemon/src/__tests__/support/snapshot-runtime-fixture.ts
index e97687d0fe..ecedbc69cf 100644
--- a/src/daemon/__tests__/snapshot-runtime-fixture.ts
+++ b/packages/daemon/src/__tests__/support/snapshot-runtime-fixture.ts
@@ -6,7 +6,7 @@ import {
 } from '@agent-device/contracts/platform-runtime';
 import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform-runtime-operations';
 import { daemonPlatformServicesFixture } from './platform-services-fixture.ts';
-import type { DaemonPlatformServices } from '../platform-services.ts';
+import type { DaemonPlatformServices } from '../../core/platform-services.ts';
 import { legacyDispatchCapture } from './legacy-snapshot-capture-fixture.ts';
 import {
   type AlertRuntimeInput,
@@ -37,11 +37,14 @@ import {
 } from '@agent-device/kernel/device';
 import { applePlugin } from '@agent-device/platform-apple';
 import { textSizeSettingPayload } from '@agent-device/contracts/settings';
-import { type DispatchContext } from '../dispatch-context.ts';
+import { type DispatchContext } from '../../core/dispatch-context.ts';
 import { getRequestSignal } from '@agent-device/host-kit/request';
-import { isActiveProviderDevice } from '../provider-device-admission.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import { unavailableDeviceRuntimeGateway } from './support/unavailable-device-runtime-gateway.ts';
+import { isActiveProviderDevice } from '../../core/provider-device-admission.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import { unavailableDeviceRuntimeGateway } from './unavailable-device-runtime-gateway.ts';
 import { writeSolidPng } from './screenshot-runtime-fixture.ts';
 
 /**
diff --git a/src/daemon/__tests__/support/store-factory.ts b/packages/daemon/src/__tests__/support/store-factory.ts
similarity index 86%
rename from src/daemon/__tests__/support/store-factory.ts
rename to packages/daemon/src/__tests__/support/store-factory.ts
index 0c5bf00423..4ad650155d 100644
--- a/src/daemon/__tests__/support/store-factory.ts
+++ b/packages/daemon/src/__tests__/support/store-factory.ts
@@ -1,7 +1,7 @@
 import path from 'node:path';
-import { SessionStore } from '../../session-store.ts';
+import { SessionStore } from '../../core/session-store.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import type { SessionRef, SessionState } from '../../session-state.ts';
+import type { SessionRef, SessionState } from '../../core/session-state.ts';
 
 export function makeSessionStore(prefix = 'agent-device-test-'): SessionStore {
   const tempRoot = mkdtempForTestSync(prefix);
diff --git a/src/daemon/__tests__/test-device-runtime-gateway.ts b/packages/daemon/src/__tests__/support/test-device-runtime-gateway.ts
similarity index 95%
rename from src/daemon/__tests__/test-device-runtime-gateway.ts
rename to packages/daemon/src/__tests__/support/test-device-runtime-gateway.ts
index d4b604d099..13ea6b5f15 100644
--- a/src/daemon/__tests__/test-device-runtime-gateway.ts
+++ b/packages/daemon/src/__tests__/support/test-device-runtime-gateway.ts
@@ -17,8 +17,8 @@ import type { ScrollDirectionInput } from '@agent-device/contracts/scroll-runtim
 import {
   createRequestHandler as createProductionRequestHandler,
   type RequestRouterDeps,
-} from '../request-router.ts';
-import type { BindDeviceRuntime } from '../request-runtime-binding.ts';
+} from '../../server/request-router.ts';
+import type { BindDeviceRuntime } from '../../core/request-runtime-binding.ts';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import {
   applicationLifecycleRuntimeFixture,
@@ -26,18 +26,18 @@ import {
 } from './application-lifecycle-runtime-fixture.ts';
 import { createUnavailableRuntimeFactsForTest } from '@agent-device/test-kit/runtime-operation-facts';
 import { withClientReplayScriptSources } from '@agent-device/replay-port/replay-script-source-fixtures';
-import type { DaemonInvokeFn } from '../daemon-request.ts';
+import type { DaemonInvokeFn } from '../../core/daemon-request.ts';
 import { clearAndroidObservationFixture } from './android-observation-fixture.ts';
 import {
   daemonClaimRecoveryGatewayFixture,
   daemonPlatformServicesFixture,
 } from './platform-services-fixture.ts';
-import { platformResourceCleanupFixture } from './support/platform-resource-cleanup-fixture.ts';
-import { providerCredentialsFixture } from './support/provider-credentials-fixture.ts';
+import { platformResourceCleanupFixture } from './platform-resource-cleanup-fixture.ts';
+import { providerCredentialsFixture } from './provider-credentials-fixture.ts';
 import {
   unavailableBinding,
   unavailableDeviceRuntimeGateway,
-} from './support/unavailable-device-runtime-gateway.ts';
+} from './unavailable-device-runtime-gateway.ts';
 
 const unavailable = Object.freeze({
   available: false as const,
diff --git a/src/daemon/__tests__/support/unavailable-device-runtime-gateway.ts b/packages/daemon/src/__tests__/support/unavailable-device-runtime-gateway.ts
similarity index 95%
rename from src/daemon/__tests__/support/unavailable-device-runtime-gateway.ts
rename to packages/daemon/src/__tests__/support/unavailable-device-runtime-gateway.ts
index 84665a6fda..2426053d8f 100644
--- a/src/daemon/__tests__/support/unavailable-device-runtime-gateway.ts
+++ b/packages/daemon/src/__tests__/support/unavailable-device-runtime-gateway.ts
@@ -6,7 +6,10 @@ import {
 import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform-runtime-operations';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import { createUnavailableRuntimeFactsForTest } from '@agent-device/test-kit/runtime-operation-facts';
-import type { BindDeviceRuntime, BindExactDeviceRuntime } from '../../request-runtime-binding.ts';
+import type {
+  BindDeviceRuntime,
+  BindExactDeviceRuntime,
+} from '../../core/request-runtime-binding.ts';
 
 /**
  * The `DeviceRuntimeGateway` port answering that no owner on this host can bind the device:
diff --git a/src/daemon/__tests__/audio-probe-resource-recovery.test.ts b/packages/daemon/src/core/__tests__/audio-probe-resource-recovery.test.ts
similarity index 100%
rename from src/daemon/__tests__/audio-probe-resource-recovery.test.ts
rename to packages/daemon/src/core/__tests__/audio-probe-resource-recovery.test.ts
diff --git a/src/daemon/__tests__/capture-disclosure-target-activation-fact.ts b/packages/daemon/src/core/__tests__/capture-disclosure-target-activation-fact.ts
similarity index 100%
rename from src/daemon/__tests__/capture-disclosure-target-activation-fact.ts
rename to packages/daemon/src/core/__tests__/capture-disclosure-target-activation-fact.ts
diff --git a/src/daemon/__tests__/capture-disclosure-target-activation.test.ts b/packages/daemon/src/core/__tests__/capture-disclosure-target-activation.test.ts
similarity index 100%
rename from src/daemon/__tests__/capture-disclosure-target-activation.test.ts
rename to packages/daemon/src/core/__tests__/capture-disclosure-target-activation.test.ts
diff --git a/src/daemon/__tests__/config.test.ts b/packages/daemon/src/core/__tests__/config.test.ts
similarity index 100%
rename from src/daemon/__tests__/config.test.ts
rename to packages/daemon/src/core/__tests__/config.test.ts
diff --git a/src/daemon/__tests__/context.test.ts b/packages/daemon/src/core/__tests__/context.test.ts
similarity index 100%
rename from src/daemon/__tests__/context.test.ts
rename to packages/daemon/src/core/__tests__/context.test.ts
diff --git a/src/daemon/__tests__/daemon-command-registry.test.ts b/packages/daemon/src/core/__tests__/daemon-command-registry.test.ts
similarity index 100%
rename from src/daemon/__tests__/daemon-command-registry.test.ts
rename to packages/daemon/src/core/__tests__/daemon-command-registry.test.ts
diff --git a/src/daemon/__tests__/daemon-policy.test.ts b/packages/daemon/src/core/__tests__/daemon-policy.test.ts
similarity index 95%
rename from src/daemon/__tests__/daemon-policy.test.ts
rename to packages/daemon/src/core/__tests__/daemon-policy.test.ts
index 5e5746003f..cf1557a2a5 100644
--- a/src/daemon/__tests__/daemon-policy.test.ts
+++ b/packages/daemon/src/core/__tests__/daemon-policy.test.ts
@@ -1,27 +1,27 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { beforeEach, expect, test, vi } from 'vitest';
-import { getResolveTargetDeviceMock } from './request-router-dispatch-mocks.ts';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { getResolveTargetDeviceMock } from '../../__tests__/support/request-router-dispatch-mocks.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 vi.mock('../device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));
 
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import { ANDROID_EMULATOR, IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
-import { makeIosSession } from './support/session-factories.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+import { makeIosSession } from '../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { parseDaemonPolicy } from '@agent-device/daemon-contracts/daemon-policy-file';
 import { assertDaemonPolicyAdmitsRequest } from '../daemon-policy.ts';
 import type { DaemonRequest } from '../daemon-request.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { hostDiagnosticsFixture } from './support/host-diagnostics-fixture.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { hostDiagnosticsFixture } from '../../__tests__/support/host-diagnostics-fixture.ts';
 import {
   createRequestHandler,
   lifecycleDeviceRuntimeGateway,
   systemRuntimeSpies,
-} from './test-device-runtime-gateway.ts';
+} from '../../__tests__/support/test-device-runtime-gateway.ts';
 
 const mockResolveTargetDevice = vi.mocked(getResolveTargetDeviceMock());
 const OTHER_SIMULATOR: DeviceInfo = { ...IOS_SIMULATOR, id: 'sim-2', name: 'iPhone 16' };
diff --git a/src/daemon/__tests__/daemon-request-wire.test.ts b/packages/daemon/src/core/__tests__/daemon-request-wire.test.ts
similarity index 100%
rename from src/daemon/__tests__/daemon-request-wire.test.ts
rename to packages/daemon/src/core/__tests__/daemon-request-wire.test.ts
diff --git a/src/daemon/__tests__/deferred-interaction-outcome.test.ts b/packages/daemon/src/core/__tests__/deferred-interaction-outcome.test.ts
similarity index 100%
rename from src/daemon/__tests__/deferred-interaction-outcome.test.ts
rename to packages/daemon/src/core/__tests__/deferred-interaction-outcome.test.ts
diff --git a/src/daemon/__tests__/direct-ios-selector.test.ts b/packages/daemon/src/core/__tests__/direct-ios-selector.test.ts
similarity index 100%
rename from src/daemon/__tests__/direct-ios-selector.test.ts
rename to packages/daemon/src/core/__tests__/direct-ios-selector.test.ts
diff --git a/src/daemon/__tests__/execution-plan.test.ts b/packages/daemon/src/core/__tests__/execution-plan.test.ts
similarity index 95%
rename from src/daemon/__tests__/execution-plan.test.ts
rename to packages/daemon/src/core/__tests__/execution-plan.test.ts
index 75f41c0544..0a9481930d 100644
--- a/src/daemon/__tests__/execution-plan.test.ts
+++ b/packages/daemon/src/core/__tests__/execution-plan.test.ts
@@ -1,7 +1,7 @@
 import { test } from 'vitest';
 import assert from 'node:assert/strict';
 import { resolvePlannedOperations } from '../execution-plan.ts';
-import { runBatchCommands } from '../handlers/session-batch.ts';
+import { runBatchCommands } from '../../sessions/handlers/session-batch.ts';
 import type { DaemonRequest } from '../daemon-request.ts';
 
 test('an open that ends its batch has an unknown future', () => {
diff --git a/src/daemon/__tests__/interaction-surface-signature.test.ts b/packages/daemon/src/core/__tests__/interaction-surface-signature.test.ts
similarity index 99%
rename from src/daemon/__tests__/interaction-surface-signature.test.ts
rename to packages/daemon/src/core/__tests__/interaction-surface-signature.test.ts
index e2100079c3..5f27716f3a 100644
--- a/src/daemon/__tests__/interaction-surface-signature.test.ts
+++ b/packages/daemon/src/core/__tests__/interaction-surface-signature.test.ts
@@ -226,7 +226,7 @@ test('classifyBaselineSurfaceEvidence excludes keyboard DESCENDANTS and window S
 /**
  * A keyboard-window subtree: a `[Keyboard]` container plus a SIBLING "Next
  * keyboard" assistant button under the same window — matches the shape in
- * `src/daemon/__tests__/post-gesture-stabilization-fixtures.ts`'s
+ * `packages/daemon/src/core/__tests__/post-gesture-stabilization-fixtures.ts`'s
  * `keyboardWindowNodes` (kept local here rather than imported: this file's
  * fixtures are raw node literals consumed directly by
  * `buildInteractionSurfaceSignature`, not `SnapshotState`-wrapped like that
diff --git a/src/daemon/__tests__/interactor-resolution.test.ts b/packages/daemon/src/core/__tests__/interactor-resolution.test.ts
similarity index 100%
rename from src/daemon/__tests__/interactor-resolution.test.ts
rename to packages/daemon/src/core/__tests__/interactor-resolution.test.ts
diff --git a/src/daemon/__tests__/ios-comparison-key-fixture.ts b/packages/daemon/src/core/__tests__/ios-comparison-key-fixture.ts
similarity index 100%
rename from src/daemon/__tests__/ios-comparison-key-fixture.ts
rename to packages/daemon/src/core/__tests__/ios-comparison-key-fixture.ts
diff --git a/src/daemon/__tests__/is-predicates.test.ts b/packages/daemon/src/core/__tests__/is-predicates.test.ts
similarity index 100%
rename from src/daemon/__tests__/is-predicates.test.ts
rename to packages/daemon/src/core/__tests__/is-predicates.test.ts
diff --git a/src/daemon/__tests__/lease-context.test.ts b/packages/daemon/src/core/__tests__/lease-context.test.ts
similarity index 100%
rename from src/daemon/__tests__/lease-context.test.ts
rename to packages/daemon/src/core/__tests__/lease-context.test.ts
diff --git a/src/daemon/__tests__/managed-session-artifact-path.test.ts b/packages/daemon/src/core/__tests__/managed-session-artifact-path.test.ts
similarity index 100%
rename from src/daemon/__tests__/managed-session-artifact-path.test.ts
rename to packages/daemon/src/core/__tests__/managed-session-artifact-path.test.ts
diff --git a/src/daemon/__tests__/moving-target-baseline.test.ts b/packages/daemon/src/core/__tests__/moving-target-baseline.test.ts
similarity index 100%
rename from src/daemon/__tests__/moving-target-baseline.test.ts
rename to packages/daemon/src/core/__tests__/moving-target-baseline.test.ts
diff --git a/src/daemon/__tests__/post-gesture-no-effect-claim.test.ts b/packages/daemon/src/core/__tests__/post-gesture-no-effect-claim.test.ts
similarity index 100%
rename from src/daemon/__tests__/post-gesture-no-effect-claim.test.ts
rename to packages/daemon/src/core/__tests__/post-gesture-no-effect-claim.test.ts
diff --git a/src/daemon/__tests__/post-gesture-stabilization-fixtures.ts b/packages/daemon/src/core/__tests__/post-gesture-stabilization-fixtures.ts
similarity index 100%
rename from src/daemon/__tests__/post-gesture-stabilization-fixtures.ts
rename to packages/daemon/src/core/__tests__/post-gesture-stabilization-fixtures.ts
diff --git a/src/daemon/__tests__/post-gesture-stabilization-verdict.test.ts b/packages/daemon/src/core/__tests__/post-gesture-stabilization-verdict.test.ts
similarity index 100%
rename from src/daemon/__tests__/post-gesture-stabilization-verdict.test.ts
rename to packages/daemon/src/core/__tests__/post-gesture-stabilization-verdict.test.ts
diff --git a/src/daemon/__tests__/post-gesture-stabilization.test.ts b/packages/daemon/src/core/__tests__/post-gesture-stabilization.test.ts
similarity index 100%
rename from src/daemon/__tests__/post-gesture-stabilization.test.ts
rename to packages/daemon/src/core/__tests__/post-gesture-stabilization.test.ts
diff --git a/src/daemon/__tests__/provider-device-admission.test.ts b/packages/daemon/src/core/__tests__/provider-device-admission.test.ts
similarity index 100%
rename from src/daemon/__tests__/provider-device-admission.test.ts
rename to packages/daemon/src/core/__tests__/provider-device-admission.test.ts
diff --git a/src/daemon/__tests__/recording-gestures.test.ts b/packages/daemon/src/core/__tests__/recording-gestures.test.ts
similarity index 98%
rename from src/daemon/__tests__/recording-gestures.test.ts
rename to packages/daemon/src/core/__tests__/recording-gestures.test.ts
index ca6f4521b2..a816fccc58 100644
--- a/src/daemon/__tests__/recording-gestures.test.ts
+++ b/packages/daemon/src/core/__tests__/recording-gestures.test.ts
@@ -4,9 +4,9 @@ import {
   augmentScrollVisualizationResult,
   recordTouchVisualizationEvent,
 } from '../recording-gestures.ts';
-import { makeIosSession, makeMacOsSession } from './support/session-factories.ts';
+import { makeIosSession, makeMacOsSession } from '../../__tests__/support/session-factories.ts';
 import { makeSnapshotState } from '@agent-device/selectors/snapshot-geometry-fixtures';
-import { makeTestScreenRecordingResource } from './support/screen-recording-live-handle.ts';
+import { makeTestScreenRecordingResource } from '../../__tests__/support/screen-recording-live-handle.ts';
 import type { ScreenRecordingLiveSnapshot } from '@agent-device/contracts/screen-recording-runtime';
 import { TVOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
 
diff --git a/src/daemon/__tests__/recording-timing.test.ts b/packages/daemon/src/core/__tests__/recording-timing.test.ts
similarity index 100%
rename from src/daemon/__tests__/recording-timing.test.ts
rename to packages/daemon/src/core/__tests__/recording-timing.test.ts
diff --git a/src/daemon/__tests__/ref-frame.test.ts b/packages/daemon/src/core/__tests__/ref-frame.test.ts
similarity index 100%
rename from src/daemon/__tests__/ref-frame.test.ts
rename to packages/daemon/src/core/__tests__/ref-frame.test.ts
diff --git a/src/daemon/__tests__/request-dispatch-ledger.test.ts b/packages/daemon/src/core/__tests__/request-dispatch-ledger.test.ts
similarity index 100%
rename from src/daemon/__tests__/request-dispatch-ledger.test.ts
rename to packages/daemon/src/core/__tests__/request-dispatch-ledger.test.ts
diff --git a/src/daemon/__tests__/request-runtime-binding-router.test.ts b/packages/daemon/src/core/__tests__/request-runtime-binding-router.test.ts
similarity index 95%
rename from src/daemon/__tests__/request-runtime-binding-router.test.ts
rename to packages/daemon/src/core/__tests__/request-runtime-binding-router.test.ts
index 25d1be7565..f94bcac0ad 100644
--- a/src/daemon/__tests__/request-runtime-binding-router.test.ts
+++ b/packages/daemon/src/core/__tests__/request-runtime-binding-router.test.ts
@@ -11,10 +11,10 @@ import { createAppLogStartResult, createDurableResourceEnvelope } from '@agent-d
 import { createTestAppLogLiveHandle } from '@agent-device/test-kit/app-log-live-handle';
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
 import { unavailableDeploymentSnapshotAndShutdownOperationFacts } from '@agent-device/test-kit/runtime-operation-facts';
-import { makeSessionStore } from './support/store-factory.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { createRequestHandler } from './test-device-runtime-gateway.ts';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { createRequestHandler } from '../../__tests__/support/test-device-runtime-gateway.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 test('request binding disposes once after response while adopted app-log handle survives', async () => {
   const runtime = makeGateway();
diff --git a/src/daemon/__tests__/request-runtime-binding.test.ts b/packages/daemon/src/core/__tests__/request-runtime-binding.test.ts
similarity index 99%
rename from src/daemon/__tests__/request-runtime-binding.test.ts
rename to packages/daemon/src/core/__tests__/request-runtime-binding.test.ts
index aa0cd94e6d..50ed9b7a76 100644
--- a/src/daemon/__tests__/request-runtime-binding.test.ts
+++ b/packages/daemon/src/core/__tests__/request-runtime-binding.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from './platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../__tests__/support/platform-services-fixture.ts';
 import { beforeEach, expect, test, vi } from 'vitest';
 import { applicationLifecycleOperationFacts } from '@agent-device/contracts/application-lifecycle-runtime';
 import {
diff --git a/src/daemon/__tests__/runtime-operation-effects.test.ts b/packages/daemon/src/core/__tests__/runtime-operation-effects.test.ts
similarity index 100%
rename from src/daemon/__tests__/runtime-operation-effects.test.ts
rename to packages/daemon/src/core/__tests__/runtime-operation-effects.test.ts
diff --git a/src/daemon/__tests__/runtime-session.test.ts b/packages/daemon/src/core/__tests__/runtime-session.test.ts
similarity index 95%
rename from src/daemon/__tests__/runtime-session.test.ts
rename to packages/daemon/src/core/__tests__/runtime-session.test.ts
index a9e963e83a..df96d306fe 100644
--- a/src/daemon/__tests__/runtime-session.test.ts
+++ b/packages/daemon/src/core/__tests__/runtime-session.test.ts
@@ -1,7 +1,7 @@
 import { test, expect } from 'vitest';
 import fs from 'node:fs';
-import { makeSessionStore } from './support/store-factory.ts';
-import { makeIosSession } from './support/session-factories.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import { makeIosSession } from '../../__tests__/support/session-factories.ts';
 import {
   flushDiagnosticsToSessionFile,
   withDiagnosticsScope,
diff --git a/src/daemon/__tests__/screen-recording-resource-recovery.test.ts b/packages/daemon/src/core/__tests__/screen-recording-resource-recovery.test.ts
similarity index 97%
rename from src/daemon/__tests__/screen-recording-resource-recovery.test.ts
rename to packages/daemon/src/core/__tests__/screen-recording-resource-recovery.test.ts
index 428e67e2d8..341fe10060 100644
--- a/src/daemon/__tests__/screen-recording-resource-recovery.test.ts
+++ b/packages/daemon/src/core/__tests__/screen-recording-resource-recovery.test.ts
@@ -6,7 +6,7 @@ import {
   localRuntimeOwner,
 } from '@agent-device/contracts/platform-runtime';
 import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform-runtime-operations';
-import { makeTestScreenRecordingResource } from './support/screen-recording-live-handle.ts';
+import { makeTestScreenRecordingResource } from '../../__tests__/support/screen-recording-live-handle.ts';
 import { unavailableDeploymentSnapshotAndShutdownOperationFacts } from '@agent-device/test-kit/runtime-operation-facts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { recoverScreenRecordingResourceAfterDaemonLock } from '@agent-device/capture-kit/screen-recording-recovery';
diff --git a/src/daemon/__tests__/selector-operation-binding.test.ts b/packages/daemon/src/core/__tests__/selector-operation-binding.test.ts
similarity index 100%
rename from src/daemon/__tests__/selector-operation-binding.test.ts
rename to packages/daemon/src/core/__tests__/selector-operation-binding.test.ts
diff --git a/src/daemon/__tests__/selector-recording-find-data.test.ts b/packages/daemon/src/core/__tests__/selector-recording-find-data.test.ts
similarity index 100%
rename from src/daemon/__tests__/selector-recording-find-data.test.ts
rename to packages/daemon/src/core/__tests__/selector-recording-find-data.test.ts
diff --git a/src/daemon/__tests__/selector-recording.test.ts b/packages/daemon/src/core/__tests__/selector-recording.test.ts
similarity index 98%
rename from src/daemon/__tests__/selector-recording.test.ts
rename to packages/daemon/src/core/__tests__/selector-recording.test.ts
index 99c40b3d60..5090a1af02 100644
--- a/src/daemon/__tests__/selector-recording.test.ts
+++ b/packages/daemon/src/core/__tests__/selector-recording.test.ts
@@ -11,7 +11,7 @@ import { test, expect } from 'vitest';
 import path from 'node:path';
 import { recordIfSession } from '../selector-recording.ts';
 import { SessionStore } from '../session-store.ts';
-import { makeIosSession } from './support/session-factories.ts';
+import { makeIosSession } from '../../__tests__/support/session-factories.ts';
 import type { DaemonRequest } from '../daemon-request.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
diff --git a/src/daemon/__tests__/session-action-recorder.test.ts b/packages/daemon/src/core/__tests__/session-action-recorder.test.ts
similarity index 99%
rename from src/daemon/__tests__/session-action-recorder.test.ts
rename to packages/daemon/src/core/__tests__/session-action-recorder.test.ts
index 505189f84a..d690110be7 100644
--- a/src/daemon/__tests__/session-action-recorder.test.ts
+++ b/packages/daemon/src/core/__tests__/session-action-recorder.test.ts
@@ -8,7 +8,7 @@ import { isSessionRecording } from '../session-script-publication-capability.ts'
  */
 import { test, expect } from 'vitest';
 import { recordActionEntry } from '../session-action-recorder.ts';
-import { authoringPublication, makeIosSession } from './support/session-factories.ts';
+import { authoringPublication, makeIosSession } from '../../__tests__/support/session-factories.ts';
 
 test('an observation-only action is excluded while repair-armed and no --record is given', () => {
   const session = makeIosSession('default', {
diff --git a/src/daemon/__tests__/session-artifact-paths.test.ts b/packages/daemon/src/core/__tests__/session-artifact-paths.test.ts
similarity index 100%
rename from src/daemon/__tests__/session-artifact-paths.test.ts
rename to packages/daemon/src/core/__tests__/session-artifact-paths.test.ts
diff --git a/src/daemon/__tests__/session-capture-binding.test.ts b/packages/daemon/src/core/__tests__/session-capture-binding.test.ts
similarity index 98%
rename from src/daemon/__tests__/session-capture-binding.test.ts
rename to packages/daemon/src/core/__tests__/session-capture-binding.test.ts
index d44d732d86..254b0ca5fd 100644
--- a/src/daemon/__tests__/session-capture-binding.test.ts
+++ b/packages/daemon/src/core/__tests__/session-capture-binding.test.ts
@@ -1,6 +1,6 @@
 import { expect, test, vi } from 'vitest';
-import { makeSessionStore } from './support/store-factory.ts';
-import { makeRecordingSession } from './session-teardown.fixtures.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import { makeRecordingSession } from '../../__tests__/support/session-teardown.fixtures.ts';
 import {
   bindSessionScreenRecording,
   bindRecordOnlyScreenRecording,
diff --git a/src/daemon/__tests__/session-runtime-admission.test.ts b/packages/daemon/src/core/__tests__/session-runtime-admission.test.ts
similarity index 96%
rename from src/daemon/__tests__/session-runtime-admission.test.ts
rename to packages/daemon/src/core/__tests__/session-runtime-admission.test.ts
index 69982f0566..e31f3e9b84 100644
--- a/src/daemon/__tests__/session-runtime-admission.test.ts
+++ b/packages/daemon/src/core/__tests__/session-runtime-admission.test.ts
@@ -1,7 +1,7 @@
 import { resolveSnapshotRuntimePlan } from '@agent-device/contracts/platform-runtime-operations';
 import { expect, test } from 'vitest';
 import { ANDROID_EMULATOR, IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
-import { snapshotRuntimeFixture } from './snapshot-runtime-fixture.ts';
+import { snapshotRuntimeFixture } from '../../__tests__/support/snapshot-runtime-fixture.ts';
 import {
   admitRuntimePlan,
   unwrapAdmittedRuntimePlan,
@@ -47,7 +47,7 @@ test('the admission cannot be written down or copied: only admitRuntimePlan mint
   // Planted reds for the seam itself: each directive below becomes unused — and tsc fails — if
   // the token loses its #private member (degrades to a plain shape). A route holds a token only
   // by having called admitRuntimePlan (or by a type assertion, which the cutover gate rejects in
-  // src/daemon/). The class value is not exported, so `new` is not even nameable from here.
+  // packages/daemon/src/). The class value is not exported, so `new` is not even nameable from here.
   // @ts-expect-error a literal is not an admission: it lacks the #private member
   const literal: AdmittedRuntimePlan<typeof plan> = { admitted: true };
   // @ts-expect-error a spread of a real admission is a plain object without the #private member
diff --git a/src/daemon/__tests__/session-script-active-publication.test.ts b/packages/daemon/src/core/__tests__/session-script-active-publication.test.ts
similarity index 100%
rename from src/daemon/__tests__/session-script-active-publication.test.ts
rename to packages/daemon/src/core/__tests__/session-script-active-publication.test.ts
diff --git a/src/daemon/__tests__/session-script-publication-state.test.ts b/packages/daemon/src/core/__tests__/session-script-publication-state.test.ts
similarity index 100%
rename from src/daemon/__tests__/session-script-publication-state.test.ts
rename to packages/daemon/src/core/__tests__/session-script-publication-state.test.ts
diff --git a/src/daemon/__tests__/session-script-writer.test.ts b/packages/daemon/src/core/__tests__/session-script-writer.test.ts
similarity index 99%
rename from src/daemon/__tests__/session-script-writer.test.ts
rename to packages/daemon/src/core/__tests__/session-script-writer.test.ts
index 3146071b53..8d1befb235 100644
--- a/src/daemon/__tests__/session-script-writer.test.ts
+++ b/packages/daemon/src/core/__tests__/session-script-writer.test.ts
@@ -10,7 +10,7 @@ import {
   makeRepairCompleteSession,
   repairPublication,
   authoringPublication,
-} from './support/session-factories.ts';
+} from '../../__tests__/support/session-factories.ts';
 import { markRepairTransactionComplete } from '../session-replay-transaction.ts';
 import { NO_SCRIPT_PUBLICATION, scriptTargetPath } from '../session-script-publication-state.ts';
 import { parseReplayScriptDetailed } from '@agent-device/ad-script';
diff --git a/src/daemon/__tests__/session-selector.test.ts b/packages/daemon/src/core/__tests__/session-selector.test.ts
similarity index 98%
rename from src/daemon/__tests__/session-selector.test.ts
rename to packages/daemon/src/core/__tests__/session-selector.test.ts
index af0efeb371..a51470fe26 100644
--- a/src/daemon/__tests__/session-selector.test.ts
+++ b/packages/daemon/src/core/__tests__/session-selector.test.ts
@@ -1,4 +1,4 @@
-import { makeStoredSessionRef } from './support/store-factory.ts';
+import { makeStoredSessionRef } from '../../__tests__/support/store-factory.ts';
 import { test } from 'vitest';
 import assert from 'node:assert/strict';
 import { assertSessionSelectorMatches } from '../session-selector.ts';
diff --git a/src/daemon/__tests__/session-snapshot-freshness.test.ts b/packages/daemon/src/core/__tests__/session-snapshot-freshness.test.ts
similarity index 100%
rename from src/daemon/__tests__/session-snapshot-freshness.test.ts
rename to packages/daemon/src/core/__tests__/session-snapshot-freshness.test.ts
diff --git a/src/daemon/__tests__/session-store-lifetime.test.ts b/packages/daemon/src/core/__tests__/session-store-lifetime.test.ts
similarity index 98%
rename from src/daemon/__tests__/session-store-lifetime.test.ts
rename to packages/daemon/src/core/__tests__/session-store-lifetime.test.ts
index 1873069483..a528264685 100644
--- a/src/daemon/__tests__/session-store-lifetime.test.ts
+++ b/packages/daemon/src/core/__tests__/session-store-lifetime.test.ts
@@ -7,8 +7,8 @@ import {
   makeRepairCompleteSession,
   makeRepairArmedSession,
   authoringPublication,
-} from './support/session-factories.ts';
-import { makeSessionStore, storeSessionForTest } from './support/store-factory.ts';
+} from '../../__tests__/support/session-factories.ts';
+import { makeSessionStore, storeSessionForTest } from '../../__tests__/support/store-factory.ts';
 import { resolveRepairTombstonePath } from '@agent-device/daemon-contracts/session-repair-tombstone';
 
 const ADDRESS = 'cwd:worktree:default';
diff --git a/src/daemon/__tests__/session-store.test.ts b/packages/daemon/src/core/__tests__/session-store.test.ts
similarity index 99%
rename from src/daemon/__tests__/session-store.test.ts
rename to packages/daemon/src/core/__tests__/session-store.test.ts
index 41cb398a2b..33855f6c95 100644
--- a/src/daemon/__tests__/session-store.test.ts
+++ b/packages/daemon/src/core/__tests__/session-store.test.ts
@@ -1,4 +1,4 @@
-import { storeSessionForTest } from './support/store-factory.ts';
+import { storeSessionForTest } from '../../__tests__/support/store-factory.ts';
 import { test } from 'vitest';
 import assert from 'node:assert/strict';
 import fs from 'node:fs';
@@ -9,7 +9,7 @@ import { buildRequestFinishedEvent } from '@agent-device/session-journal/session
 import { HEAL_COMPLETE_SENTINEL } from '../session-script-writer.ts';
 import { parseReplayScriptDetailed } from '@agent-device/ad-script';
 import type { TargetAnnotationV1 } from '@agent-device/contracts/replay';
-import { makeMacOsSession, repairPublication } from './support/session-factories.ts';
+import { makeMacOsSession, repairPublication } from '../../__tests__/support/session-factories.ts';
 
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
diff --git a/src/daemon/__tests__/settle-observation-capture.test.ts b/packages/daemon/src/core/__tests__/settle-observation-capture.test.ts
similarity index 95%
rename from src/daemon/__tests__/settle-observation-capture.test.ts
rename to packages/daemon/src/core/__tests__/settle-observation-capture.test.ts
index 7f74cc6def..50c7e47084 100644
--- a/src/daemon/__tests__/settle-observation-capture.test.ts
+++ b/packages/daemon/src/core/__tests__/settle-observation-capture.test.ts
@@ -1,8 +1,8 @@
 import { beforeEach, expect, test, vi } from 'vitest';
 import { IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
-import { makeIosSession } from './support/session-factories.ts';
-import { daemonPlatformServicesFixture } from './platform-services-fixture.ts';
-import { selectorCaptureFixture } from './selector-capture-fixture.ts';
+import { makeIosSession } from '../../__tests__/support/session-factories.ts';
+import { daemonPlatformServicesFixture } from '../../__tests__/support/platform-services-fixture.ts';
+import { selectorCaptureFixture } from '../../__tests__/support/selector-capture-fixture.ts';
 import { resolveSettleObservationCapture } from '../settle-observation-capture.ts';
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
 
diff --git a/src/daemon/__tests__/snapshot-capture.test.ts b/packages/daemon/src/core/__tests__/snapshot-capture.test.ts
similarity index 97%
rename from src/daemon/__tests__/snapshot-capture.test.ts
rename to packages/daemon/src/core/__tests__/snapshot-capture.test.ts
index 389e469178..d45e5bb42e 100644
--- a/src/daemon/__tests__/snapshot-capture.test.ts
+++ b/packages/daemon/src/core/__tests__/snapshot-capture.test.ts
@@ -10,14 +10,14 @@ import { buildNodes } from '@agent-device/test-kit/snapshot-builders';
 import {
   legacyDispatchCapture,
   resetLegacySnapshotCapture,
-} from './legacy-snapshot-capture-fixture.ts';
+} from '../../__tests__/support/legacy-snapshot-capture-fixture.ts';
 import {
   androidCapture,
   androidDevice,
   androidTextRows,
   inboxBaselineNodes,
   makeAndroidFreshnessSession,
-} from '../handlers/__tests__/snapshot-handler.fixtures.ts';
+} from '../../__tests__/support/handlers/snapshot-handler.fixtures.ts';
 import { pendingSurfaceStabilization } from '../deferred-interaction-outcome.ts';
 
 const captureSnapshotWithInteractor = vi.hoisted(() => vi.fn());
diff --git a/src/daemon/__tests__/snapshot-interactor-capture.test.ts b/packages/daemon/src/core/__tests__/snapshot-interactor-capture.test.ts
similarity index 100%
rename from src/daemon/__tests__/snapshot-interactor-capture.test.ts
rename to packages/daemon/src/core/__tests__/snapshot-interactor-capture.test.ts
diff --git a/src/daemon/__tests__/snapshot-runtime-binding.test.ts b/packages/daemon/src/core/__tests__/snapshot-runtime-binding.test.ts
similarity index 87%
rename from src/daemon/__tests__/snapshot-runtime-binding.test.ts
rename to packages/daemon/src/core/__tests__/snapshot-runtime-binding.test.ts
index 4c5d6b6ad0..ac1e4abfa4 100644
--- a/src/daemon/__tests__/snapshot-runtime-binding.test.ts
+++ b/packages/daemon/src/core/__tests__/snapshot-runtime-binding.test.ts
@@ -1,19 +1,19 @@
-import { daemonPlatformServicesFixture } from './platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../__tests__/support/platform-services-fixture.ts';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import { expect, test, vi } from 'vitest';
 import { resolveSnapshotRuntimePlan } from '@agent-device/contracts/platform-runtime-operations';
 import { IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
-import { makeIosSession } from './support/session-factories.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+import { makeIosSession } from '../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import type { BindDeviceRuntime } from '../request-runtime-binding.ts';
 import {
   admitAndBindSnapshotCapture,
   resolveBoundSnapshotCaptureRuntime,
 } from '../snapshot-runtime-binding.ts';
 import type { DaemonRequest } from '../daemon-request.ts';
-import { snapshotRuntimeFixture } from './snapshot-runtime-fixture.ts';
+import { snapshotRuntimeFixture } from '../../__tests__/support/snapshot-runtime-fixture.ts';
 import { ensureDeviceReady } from '../device/device-ready.ts';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 vi.mock('../device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));
 
diff --git a/src/daemon/__tests__/tenant-owned-entry.test.ts b/packages/daemon/src/core/__tests__/tenant-owned-entry.test.ts
similarity index 100%
rename from src/daemon/__tests__/tenant-owned-entry.test.ts
rename to packages/daemon/src/core/__tests__/tenant-owned-entry.test.ts
diff --git a/src/daemon/capture-disclosure.ts b/packages/daemon/src/core/capture-disclosure.ts
similarity index 100%
rename from src/daemon/capture-disclosure.ts
rename to packages/daemon/src/core/capture-disclosure.ts
diff --git a/src/daemon/config.ts b/packages/daemon/src/core/config.ts
similarity index 100%
rename from src/daemon/config.ts
rename to packages/daemon/src/core/config.ts
diff --git a/src/daemon/context.ts b/packages/daemon/src/core/context.ts
similarity index 100%
rename from src/daemon/context.ts
rename to packages/daemon/src/core/context.ts
diff --git a/src/daemon/daemon-command-registry.ts b/packages/daemon/src/core/daemon-command-registry.ts
similarity index 100%
rename from src/daemon/daemon-command-registry.ts
rename to packages/daemon/src/core/daemon-command-registry.ts
diff --git a/src/daemon/daemon-policy.ts b/packages/daemon/src/core/daemon-policy.ts
similarity index 100%
rename from src/daemon/daemon-policy.ts
rename to packages/daemon/src/core/daemon-policy.ts
diff --git a/src/daemon/daemon-request.ts b/packages/daemon/src/core/daemon-request.ts
similarity index 100%
rename from src/daemon/daemon-request.ts
rename to packages/daemon/src/core/daemon-request.ts
diff --git a/src/daemon/deferred-interaction-outcome.ts b/packages/daemon/src/core/deferred-interaction-outcome.ts
similarity index 100%
rename from src/daemon/deferred-interaction-outcome.ts
rename to packages/daemon/src/core/deferred-interaction-outcome.ts
diff --git a/src/daemon/device/device-ready.ts b/packages/daemon/src/core/device/device-ready.ts
similarity index 100%
rename from src/daemon/device/device-ready.ts
rename to packages/daemon/src/core/device/device-ready.ts
diff --git a/src/daemon/device/device-selector-intent.ts b/packages/daemon/src/core/device/device-selector-intent.ts
similarity index 100%
rename from src/daemon/device/device-selector-intent.ts
rename to packages/daemon/src/core/device/device-selector-intent.ts
diff --git a/src/daemon/direct-ios-selector.ts b/packages/daemon/src/core/direct-ios-selector.ts
similarity index 100%
rename from src/daemon/direct-ios-selector.ts
rename to packages/daemon/src/core/direct-ios-selector.ts
diff --git a/src/daemon/dispatch-context.ts b/packages/daemon/src/core/dispatch-context.ts
similarity index 100%
rename from src/daemon/dispatch-context.ts
rename to packages/daemon/src/core/dispatch-context.ts
diff --git a/src/daemon/execution-plan.ts b/packages/daemon/src/core/execution-plan.ts
similarity index 100%
rename from src/daemon/execution-plan.ts
rename to packages/daemon/src/core/execution-plan.ts
diff --git a/src/daemon/fill-backend-result.test.ts b/packages/daemon/src/core/fill-backend-result.test.ts
similarity index 100%
rename from src/daemon/fill-backend-result.test.ts
rename to packages/daemon/src/core/fill-backend-result.test.ts
diff --git a/src/daemon/fill-backend-result.ts b/packages/daemon/src/core/fill-backend-result.ts
similarity index 100%
rename from src/daemon/fill-backend-result.ts
rename to packages/daemon/src/core/fill-backend-result.ts
diff --git a/src/daemon/generic-leaf-execution.ts b/packages/daemon/src/core/generic-leaf-execution.ts
similarity index 100%
rename from src/daemon/generic-leaf-execution.ts
rename to packages/daemon/src/core/generic-leaf-execution.ts
diff --git a/src/daemon/gesture-runtime.ts b/packages/daemon/src/core/gesture-runtime.ts
similarity index 100%
rename from src/daemon/gesture-runtime.ts
rename to packages/daemon/src/core/gesture-runtime.ts
diff --git a/src/daemon/interaction-surface-signature.ts b/packages/daemon/src/core/interaction-surface-signature.ts
similarity index 100%
rename from src/daemon/interaction-surface-signature.ts
rename to packages/daemon/src/core/interaction-surface-signature.ts
diff --git a/src/daemon/interaction/internal/interaction-touch-direct-ios-eligibility.ts b/packages/daemon/src/core/interaction/internal/interaction-touch-direct-ios-eligibility.ts
similarity index 100%
rename from src/daemon/interaction/internal/interaction-touch-direct-ios-eligibility.ts
rename to packages/daemon/src/core/interaction/internal/interaction-touch-direct-ios-eligibility.ts
diff --git a/src/daemon/interaction/internal/types.ts b/packages/daemon/src/core/interaction/internal/types.ts
similarity index 100%
rename from src/daemon/interaction/internal/types.ts
rename to packages/daemon/src/core/interaction/internal/types.ts
diff --git a/src/daemon/interactor-resolution.ts b/packages/daemon/src/core/interactor-resolution.ts
similarity index 100%
rename from src/daemon/interactor-resolution.ts
rename to packages/daemon/src/core/interactor-resolution.ts
diff --git a/src/daemon/ios-app-session-hint.test.ts b/packages/daemon/src/core/ios-app-session-hint.test.ts
similarity index 97%
rename from src/daemon/ios-app-session-hint.test.ts
rename to packages/daemon/src/core/ios-app-session-hint.test.ts
index 645d5bdb57..1f99c7e91c 100644
--- a/src/daemon/ios-app-session-hint.test.ts
+++ b/packages/daemon/src/core/ios-app-session-hint.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from './__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../__tests__/support/platform-services-fixture.ts';
 import { beforeEach, expect, test, vi } from 'vitest';
 import { IOS_DEVICE, IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
 import { buildIosOpenCommandHint } from './ios-app-session-hint.ts';
diff --git a/src/daemon/ios-app-session-hint.ts b/packages/daemon/src/core/ios-app-session-hint.ts
similarity index 100%
rename from src/daemon/ios-app-session-hint.ts
rename to packages/daemon/src/core/ios-app-session-hint.ts
diff --git a/src/daemon/lease-context.ts b/packages/daemon/src/core/lease-context.ts
similarity index 100%
rename from src/daemon/lease-context.ts
rename to packages/daemon/src/core/lease-context.ts
diff --git a/src/daemon/managed-session-artifact-path.ts b/packages/daemon/src/core/managed-session-artifact-path.ts
similarity index 100%
rename from src/daemon/managed-session-artifact-path.ts
rename to packages/daemon/src/core/managed-session-artifact-path.ts
diff --git a/src/daemon/platform-owner-lifecycle.ts b/packages/daemon/src/core/platform-owner-lifecycle.ts
similarity index 100%
rename from src/daemon/platform-owner-lifecycle.ts
rename to packages/daemon/src/core/platform-owner-lifecycle.ts
diff --git a/src/daemon/platform-resource-cleanup.ts b/packages/daemon/src/core/platform-resource-cleanup.ts
similarity index 100%
rename from src/daemon/platform-resource-cleanup.ts
rename to packages/daemon/src/core/platform-resource-cleanup.ts
diff --git a/src/daemon/platform-services.ts b/packages/daemon/src/core/platform-services.ts
similarity index 100%
rename from src/daemon/platform-services.ts
rename to packages/daemon/src/core/platform-services.ts
diff --git a/src/daemon/provider-device-admission.ts b/packages/daemon/src/core/provider-device-admission.ts
similarity index 100%
rename from src/daemon/provider-device-admission.ts
rename to packages/daemon/src/core/provider-device-admission.ts
diff --git a/src/daemon/recording-gesture-events.ts b/packages/daemon/src/core/recording-gesture-events.ts
similarity index 100%
rename from src/daemon/recording-gesture-events.ts
rename to packages/daemon/src/core/recording-gesture-events.ts
diff --git a/src/daemon/recording-gestures.ts b/packages/daemon/src/core/recording-gestures.ts
similarity index 100%
rename from src/daemon/recording-gestures.ts
rename to packages/daemon/src/core/recording-gestures.ts
diff --git a/src/daemon/recording-timing.ts b/packages/daemon/src/core/recording-timing.ts
similarity index 100%
rename from src/daemon/recording-timing.ts
rename to packages/daemon/src/core/recording-timing.ts
diff --git a/src/daemon/recording-values.ts b/packages/daemon/src/core/recording-values.ts
similarity index 100%
rename from src/daemon/recording-values.ts
rename to packages/daemon/src/core/recording-values.ts
diff --git a/src/daemon/ref-frame-slot.ts b/packages/daemon/src/core/ref-frame-slot.ts
similarity index 100%
rename from src/daemon/ref-frame-slot.ts
rename to packages/daemon/src/core/ref-frame-slot.ts
diff --git a/src/daemon/ref-frame.ts b/packages/daemon/src/core/ref-frame.ts
similarity index 100%
rename from src/daemon/ref-frame.ts
rename to packages/daemon/src/core/ref-frame.ts
diff --git a/src/daemon/request-dispatch-ledger.ts b/packages/daemon/src/core/request-dispatch-ledger.ts
similarity index 100%
rename from src/daemon/request-dispatch-ledger.ts
rename to packages/daemon/src/core/request-dispatch-ledger.ts
diff --git a/src/daemon/request-runtime-binding.ts b/packages/daemon/src/core/request-runtime-binding.ts
similarity index 100%
rename from src/daemon/request-runtime-binding.ts
rename to packages/daemon/src/core/request-runtime-binding.ts
diff --git a/src/daemon/runtime-admission.ts b/packages/daemon/src/core/runtime-admission.ts
similarity index 100%
rename from src/daemon/runtime-admission.ts
rename to packages/daemon/src/core/runtime-admission.ts
diff --git a/src/daemon/runtime-operation-effects.ts b/packages/daemon/src/core/runtime-operation-effects.ts
similarity index 100%
rename from src/daemon/runtime-operation-effects.ts
rename to packages/daemon/src/core/runtime-operation-effects.ts
diff --git a/src/daemon/runtime-session.ts b/packages/daemon/src/core/runtime-session.ts
similarity index 100%
rename from src/daemon/runtime-session.ts
rename to packages/daemon/src/core/runtime-session.ts
diff --git a/src/daemon/selector-operation-binding.ts b/packages/daemon/src/core/selector-operation-binding.ts
similarity index 100%
rename from src/daemon/selector-operation-binding.ts
rename to packages/daemon/src/core/selector-operation-binding.ts
diff --git a/src/daemon/selector-recording.ts b/packages/daemon/src/core/selector-recording.ts
similarity index 100%
rename from src/daemon/selector-recording.ts
rename to packages/daemon/src/core/selector-recording.ts
diff --git a/src/daemon/session-action-recorder.ts b/packages/daemon/src/core/session-action-recorder.ts
similarity index 100%
rename from src/daemon/session-action-recorder.ts
rename to packages/daemon/src/core/session-action-recorder.ts
diff --git a/src/daemon/session-artifact-paths.ts b/packages/daemon/src/core/session-artifact-paths.ts
similarity index 100%
rename from src/daemon/session-artifact-paths.ts
rename to packages/daemon/src/core/session-artifact-paths.ts
diff --git a/src/daemon/session-capture-binding.ts b/packages/daemon/src/core/session-capture-binding.ts
similarity index 100%
rename from src/daemon/session-capture-binding.ts
rename to packages/daemon/src/core/session-capture-binding.ts
diff --git a/src/daemon/session-idle-tombstone.test.ts b/packages/daemon/src/core/session-idle-tombstone.test.ts
similarity index 100%
rename from src/daemon/session-idle-tombstone.test.ts
rename to packages/daemon/src/core/session-idle-tombstone.test.ts
diff --git a/src/daemon/session-idle-tombstone.ts b/packages/daemon/src/core/session-idle-tombstone.ts
similarity index 100%
rename from src/daemon/session-idle-tombstone.ts
rename to packages/daemon/src/core/session-idle-tombstone.ts
diff --git a/src/daemon/session-recovery-hints.test.ts b/packages/daemon/src/core/session-recovery-hints.test.ts
similarity index 97%
rename from src/daemon/session-recovery-hints.test.ts
rename to packages/daemon/src/core/session-recovery-hints.test.ts
index fe88bf2172..f220564329 100644
--- a/src/daemon/session-recovery-hints.test.ts
+++ b/packages/daemon/src/core/session-recovery-hints.test.ts
@@ -1,4 +1,4 @@
-import { makeStoredSessionRef } from './__tests__/support/store-factory.ts';
+import { makeStoredSessionRef } from '../__tests__/support/store-factory.ts';
 import { test, expect } from 'vitest';
 import { buildSessionRecoveryHint } from './session-recovery-hints.ts';
 import type { SessionRef, SessionState } from './session-state.ts';
diff --git a/src/daemon/session-recovery-hints.ts b/packages/daemon/src/core/session-recovery-hints.ts
similarity index 100%
rename from src/daemon/session-recovery-hints.ts
rename to packages/daemon/src/core/session-recovery-hints.ts
diff --git a/src/daemon/session-replay-transaction.ts b/packages/daemon/src/core/session-replay-transaction.ts
similarity index 100%
rename from src/daemon/session-replay-transaction.ts
rename to packages/daemon/src/core/session-replay-transaction.ts
diff --git a/src/daemon/session-runtime-admission.ts b/packages/daemon/src/core/session-runtime-admission.ts
similarity index 99%
rename from src/daemon/session-runtime-admission.ts
rename to packages/daemon/src/core/session-runtime-admission.ts
index 20e0aa48e1..2d8b84750c 100644
--- a/src/daemon/session-runtime-admission.ts
+++ b/packages/daemon/src/core/session-runtime-admission.ts
@@ -73,7 +73,7 @@ let mintAdmission: <Plan extends RuntimePlan>(
  * WeakMap keyed by the token's identity. A binder gets at the device and plan only through
  * `unwrapAdmittedRuntimePlan`, which refuses any object that was not minted here — including a
  * Proxy around a real token, which types as the token but is a different identity. What remains
- * is a type assertion, which the cutover gate's manufactured-proof column rejects in src/daemon/.
+ * is a type assertion, which the cutover gate's manufactured-proof column rejects in packages/daemon/src/.
  * A facts-first binder that requires the token therefore enforces "admit before bind" — for this
  * device, for this plan — at the seam.
  */
diff --git a/src/daemon/session-script-active-publication.ts b/packages/daemon/src/core/session-script-active-publication.ts
similarity index 100%
rename from src/daemon/session-script-active-publication.ts
rename to packages/daemon/src/core/session-script-active-publication.ts
diff --git a/src/daemon/session-script-publication-capability.ts b/packages/daemon/src/core/session-script-publication-capability.ts
similarity index 100%
rename from src/daemon/session-script-publication-capability.ts
rename to packages/daemon/src/core/session-script-publication-capability.ts
diff --git a/src/daemon/session-script-publication-state.ts b/packages/daemon/src/core/session-script-publication-state.ts
similarity index 100%
rename from src/daemon/session-script-publication-state.ts
rename to packages/daemon/src/core/session-script-publication-state.ts
diff --git a/src/daemon/session-script-writer.ts b/packages/daemon/src/core/session-script-writer.ts
similarity index 100%
rename from src/daemon/session-script-writer.ts
rename to packages/daemon/src/core/session-script-writer.ts
diff --git a/src/daemon/session-selector.ts b/packages/daemon/src/core/session-selector.ts
similarity index 100%
rename from src/daemon/session-selector.ts
rename to packages/daemon/src/core/session-selector.ts
diff --git a/src/daemon/session-snapshot-freshness.ts b/packages/daemon/src/core/session-snapshot-freshness.ts
similarity index 100%
rename from src/daemon/session-snapshot-freshness.ts
rename to packages/daemon/src/core/session-snapshot-freshness.ts
diff --git a/src/daemon/session-state.ts b/packages/daemon/src/core/session-state.ts
similarity index 98%
rename from src/daemon/session-state.ts
rename to packages/daemon/src/core/session-state.ts
index 9444108349..1a1f7c5194 100644
--- a/src/daemon/session-state.ts
+++ b/packages/daemon/src/core/session-state.ts
@@ -200,7 +200,7 @@ export type SessionState = {
    * resolution, settle observation, system-modal probes) can arm the runner-side penalty
    * without any user-facing render — when the latch is not held, the first public
    * deferred verdict re-renders the warning once. Managed only through
-   * `src/daemon/snapshot-quality-latch.ts`: a genuine recovered render sets it, a healthy
+   * `packages/daemon/src/sessions/snapshot-quality-latch.ts`: a genuine recovered render sets it, a healthy
    * public verdict clears it, and an app switch supersedes it.
    */
   recoveredSnapshotWarningLatch?: { appBundleId?: string };
@@ -290,7 +290,7 @@ export type SessionState = {
    * app-rendered echo of an already-authored literal. In-memory only for
    * this session's lifetime: never read by the script writer, the event
    * log, or diagnostics, and dropped with the session. Owned by
-   * `src/daemon/session-action-recorder.ts`.
+   * `packages/daemon/src/core/session-action-recorder.ts`.
    */
   recordedFillLiterals?: Map<string, string>;
   /**
diff --git a/src/daemon/session-store.ts b/packages/daemon/src/core/session-store.ts
similarity index 100%
rename from src/daemon/session-store.ts
rename to packages/daemon/src/core/session-store.ts
diff --git a/src/daemon/session-tenant-scope.ts b/packages/daemon/src/core/session-tenant-scope.ts
similarity index 100%
rename from src/daemon/session-tenant-scope.ts
rename to packages/daemon/src/core/session-tenant-scope.ts
diff --git a/src/daemon/settle-observation-capture.ts b/packages/daemon/src/core/settle-observation-capture.ts
similarity index 100%
rename from src/daemon/settle-observation-capture.ts
rename to packages/daemon/src/core/settle-observation-capture.ts
diff --git a/src/daemon/snapshot-capture.ts b/packages/daemon/src/core/snapshot-capture.ts
similarity index 100%
rename from src/daemon/snapshot-capture.ts
rename to packages/daemon/src/core/snapshot-capture.ts
diff --git a/src/daemon/snapshot-interactor-capture.ts b/packages/daemon/src/core/snapshot-interactor-capture.ts
similarity index 100%
rename from src/daemon/snapshot-interactor-capture.ts
rename to packages/daemon/src/core/snapshot-interactor-capture.ts
diff --git a/src/daemon/snapshot-runtime-binding.ts b/packages/daemon/src/core/snapshot-runtime-binding.ts
similarity index 100%
rename from src/daemon/snapshot-runtime-binding.ts
rename to packages/daemon/src/core/snapshot-runtime-binding.ts
diff --git a/src/daemon/snapshot-runtime-capture-input.ts b/packages/daemon/src/core/snapshot-runtime-capture-input.ts
similarity index 100%
rename from src/daemon/snapshot-runtime-capture-input.ts
rename to packages/daemon/src/core/snapshot-runtime-capture-input.ts
diff --git a/src/daemon/snapshot-session.ts b/packages/daemon/src/core/snapshot-session.ts
similarity index 100%
rename from src/daemon/snapshot-session.ts
rename to packages/daemon/src/core/snapshot-session.ts
diff --git a/src/daemon/tenant-owned-entry.ts b/packages/daemon/src/core/tenant-owned-entry.ts
similarity index 100%
rename from src/daemon/tenant-owned-entry.ts
rename to packages/daemon/src/core/tenant-owned-entry.ts
diff --git a/src/daemon/touch-runtime.ts b/packages/daemon/src/core/touch-runtime.ts
similarity index 100%
rename from src/daemon/touch-runtime.ts
rename to packages/daemon/src/core/touch-runtime.ts
diff --git a/src/daemon/__tests__/android-owner-seam.test.ts b/packages/daemon/src/execution/__tests__/android-owner-seam.test.ts
similarity index 92%
rename from src/daemon/__tests__/android-owner-seam.test.ts
rename to packages/daemon/src/execution/__tests__/android-owner-seam.test.ts
index 81e9bcfb27..4c53806429 100644
--- a/src/daemon/__tests__/android-owner-seam.test.ts
+++ b/packages/daemon/src/execution/__tests__/android-owner-seam.test.ts
@@ -1,14 +1,14 @@
 import { test, expect, vi } from 'vitest';
 import type { AndroidObservationAdapter } from '@agent-device/contracts/android-observation';
-import { makeAndroidSession } from './support/session-factories.ts';
-import { makeTestScreenRecordingResource } from './support/screen-recording-live-handle.ts';
+import { makeAndroidSession } from '../../__tests__/support/session-factories.ts';
+import { makeTestScreenRecordingResource } from '../../__tests__/support/screen-recording-live-handle.ts';
 import {
   ensureAndroidBlockingSystemDialogReady,
   recoverAndroidBlockingSystemDialog,
 } from '../android-system-dialog.ts';
 import { detectAndroidEscapeSurface } from '../android-foreground-surface.ts';
 import { resolveDirectTouchReferenceFrameSafely } from '../interaction/internal/interaction-touch-reference-frame.ts';
-import { SessionStore } from '../session-store.ts';
+import { SessionStore } from '../../core/session-store.ts';
 
 test('provider-owned Android sessions bypass local observation and recovery', async () => {
   const session = makeAndroidSession('provider-owned-android', {
diff --git a/src/daemon/__tests__/android-system-dialog-occlusion.test.ts b/packages/daemon/src/execution/__tests__/android-system-dialog-occlusion.test.ts
similarity index 96%
rename from src/daemon/__tests__/android-system-dialog-occlusion.test.ts
rename to packages/daemon/src/execution/__tests__/android-system-dialog-occlusion.test.ts
index 5cf08ceff7..d6c470ce32 100644
--- a/src/daemon/__tests__/android-system-dialog-occlusion.test.ts
+++ b/packages/daemon/src/execution/__tests__/android-system-dialog-occlusion.test.ts
@@ -11,9 +11,9 @@ vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
 
 import { runAndroidAdb, snapshotAndroid } from '@agent-device/platform-android/mechanics';
 import { recoverAndroidBlockingSystemDialog as recoverOwnedAndroidBlockingSystemDialog } from '../android-system-dialog.ts';
-import { androidObservationPolicyFixture as androidObservation } from './android-observation-fixture.ts';
-import { makeAndroidSession } from './support/session-factories.ts';
-import { makeTestScreenRecordingResource } from './support/screen-recording-live-handle.ts';
+import { androidObservationPolicyFixture as androidObservation } from '../../__tests__/support/android-observation-fixture.ts';
+import { makeAndroidSession } from '../../__tests__/support/session-factories.ts';
+import { makeTestScreenRecordingResource } from '../../__tests__/support/screen-recording-live-handle.ts';
 import { makeAndroidSnapshotCapture } from '@agent-device/platform-android/snapshot-capture-fixtures';
 
 const recoverAndroidBlockingSystemDialog = (
diff --git a/src/daemon/__tests__/android-system-dialog-ref-frame.test.ts b/packages/daemon/src/execution/__tests__/android-system-dialog-ref-frame.test.ts
similarity index 88%
rename from src/daemon/__tests__/android-system-dialog-ref-frame.test.ts
rename to packages/daemon/src/execution/__tests__/android-system-dialog-ref-frame.test.ts
index 3a996c8e2c..67dab9618d 100644
--- a/src/daemon/__tests__/android-system-dialog-ref-frame.test.ts
+++ b/packages/daemon/src/execution/__tests__/android-system-dialog-ref-frame.test.ts
@@ -9,11 +9,11 @@ vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
 
 import { runAndroidAdb, snapshotAndroid } from '@agent-device/platform-android/mechanics';
 import { recoverAndroidBlockingSystemDialog as recoverOwnedAndroidBlockingSystemDialog } from '../android-system-dialog.ts';
-import { androidObservationPolicyFixture as androidObservation } from './android-observation-fixture.ts';
-import { makeAndroidSession } from './support/session-factories.ts';
-import { makeTestScreenRecordingResource } from './support/screen-recording-live-handle.ts';
+import { androidObservationPolicyFixture as androidObservation } from '../../__tests__/support/android-observation-fixture.ts';
+import { makeAndroidSession } from '../../__tests__/support/session-factories.ts';
+import { makeTestScreenRecordingResource } from '../../__tests__/support/screen-recording-live-handle.ts';
 import { makeAndroidSnapshotCapture } from '@agent-device/platform-android/snapshot-capture-fixtures';
-import { refFrameState } from '../ref-frame.ts';
+import { refFrameState } from '../../core/ref-frame.ts';
 
 const recoverAndroidBlockingSystemDialog = (
   params: Omit<Parameters<typeof recoverOwnedAndroidBlockingSystemDialog>[0], 'observation'>,
diff --git a/src/daemon/__tests__/android-system-dialog.test.ts b/packages/daemon/src/execution/__tests__/android-system-dialog.test.ts
similarity index 88%
rename from src/daemon/__tests__/android-system-dialog.test.ts
rename to packages/daemon/src/execution/__tests__/android-system-dialog.test.ts
index 11e9792374..4455fe7e77 100644
--- a/src/daemon/__tests__/android-system-dialog.test.ts
+++ b/packages/daemon/src/execution/__tests__/android-system-dialog.test.ts
@@ -1,7 +1,7 @@
 import { test, expect, vi } from 'vitest';
 import { AppError } from '@agent-device/kernel/errors';
-import { makeAndroidSession } from './support/session-factories.ts';
-import { makeTestScreenRecordingResource } from './support/screen-recording-live-handle.ts';
+import { makeAndroidSession } from '../../__tests__/support/session-factories.ts';
+import { makeTestScreenRecordingResource } from '../../__tests__/support/screen-recording-live-handle.ts';
 
 vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
   const actual = await importOriginal<typeof import('@agent-device/platform-android/mechanics')>();
@@ -10,7 +10,7 @@ vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
 
 import { snapshotAndroid } from '@agent-device/platform-android/mechanics';
 import { recoverAndroidBlockingSystemDialog as recoverOwnedAndroidBlockingSystemDialog } from '../android-system-dialog.ts';
-import { androidObservationPolicyFixture as androidObservation } from './android-observation-fixture.ts';
+import { androidObservationPolicyFixture as androidObservation } from '../../__tests__/support/android-observation-fixture.ts';
 
 const recoverAndroidBlockingSystemDialog = (
   params: Omit<Parameters<typeof recoverOwnedAndroidBlockingSystemDialog>[0], 'observation'>,
diff --git a/src/daemon/__tests__/back-runtime.test.ts b/packages/daemon/src/execution/__tests__/back-runtime.test.ts
similarity index 86%
rename from src/daemon/__tests__/back-runtime.test.ts
rename to packages/daemon/src/execution/__tests__/back-runtime.test.ts
index 5dc2420152..90a1c045f7 100644
--- a/src/daemon/__tests__/back-runtime.test.ts
+++ b/packages/daemon/src/execution/__tests__/back-runtime.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from './platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../__tests__/support/platform-services-fixture.ts';
 import { expect, test, vi } from 'vitest';
 import { backRuntimeOperationFacts } from '@agent-device/contracts/back-runtime';
 import {
@@ -14,17 +14,20 @@ import {
   type PlatformRuntimeOperations,
 } from '@agent-device/contracts/platform-runtime-operations';
 import { deviceShape } from '@agent-device/kernel/device';
-import { makeSession } from './support/session-factories.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+import { makeSession } from '../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { activateCompleteRefFrame, refFrameState } from '../ref-frame.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import type { GenericPlatformExecutionParams } from '../generic-leaf-execution.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { activateCompleteRefFrame, refFrameState } from '../../core/ref-frame.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import type { GenericPlatformExecutionParams } from '../../core/generic-leaf-execution.ts';
 import { resolveBoundBackRuntime } from '../back-runtime.ts';
-import { expectRefusesUnavailableExactOwnerFact } from './runtime-binding-conformance.ts';
-import { createRequestHandler } from './test-device-runtime-gateway.ts';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { expectRefusesUnavailableExactOwnerFact } from '../../__tests__/support/runtime-binding-conformance.ts';
+import { createRequestHandler } from '../../__tests__/support/test-device-runtime-gateway.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 // File-scoped id, not the widely shared 'ios-simulator' literal: this owner binding's
 // `local-family` kind reaches the real on-disk device-claim admission (`require-owner`
diff --git a/src/daemon/__tests__/focus-runtime.test.ts b/packages/daemon/src/execution/__tests__/focus-runtime.test.ts
similarity index 89%
rename from src/daemon/__tests__/focus-runtime.test.ts
rename to packages/daemon/src/execution/__tests__/focus-runtime.test.ts
index 8a97b29908..a05f5cc25c 100644
--- a/src/daemon/__tests__/focus-runtime.test.ts
+++ b/packages/daemon/src/execution/__tests__/focus-runtime.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from './platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../__tests__/support/platform-services-fixture.ts';
 import { expect, test, vi } from 'vitest';
 import { focusRuntimeOperationFacts } from '@agent-device/contracts/focus-runtime';
 import {
@@ -14,17 +14,20 @@ import {
   focusRuntimeUse,
 } from '@agent-device/contracts/platform-runtime-operations';
 import { deviceShape } from '@agent-device/kernel/device';
-import { makeSession } from './support/session-factories.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+import { makeSession } from '../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { activateCompleteRefFrame, refFrameState } from '../ref-frame.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import type { GenericPlatformExecutionParams } from '../generic-leaf-execution.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { activateCompleteRefFrame, refFrameState } from '../../core/ref-frame.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import type { GenericPlatformExecutionParams } from '../../core/generic-leaf-execution.ts';
 import { readFocusPoint, resolveBoundFocusRuntime } from '../focus-runtime.ts';
-import { expectRefusesUnavailableExactOwnerFact } from './runtime-binding-conformance.ts';
-import { createRequestHandler } from './test-device-runtime-gateway.ts';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { expectRefusesUnavailableExactOwnerFact } from '../../__tests__/support/runtime-binding-conformance.ts';
+import { createRequestHandler } from '../../__tests__/support/test-device-runtime-gateway.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 const appleDevice = {
   id: 'ios-simulator',
diff --git a/src/daemon/__tests__/fold-runtime.test.ts b/packages/daemon/src/execution/__tests__/fold-runtime.test.ts
similarity index 93%
rename from src/daemon/__tests__/fold-runtime.test.ts
rename to packages/daemon/src/execution/__tests__/fold-runtime.test.ts
index 7382d0ba1c..eae9f118ea 100644
--- a/src/daemon/__tests__/fold-runtime.test.ts
+++ b/packages/daemon/src/execution/__tests__/fold-runtime.test.ts
@@ -1,5 +1,5 @@
-import { daemonPlatformServicesFixture } from './platform-services-fixture.ts';
-import { recordActionEntry } from '../session-action-recorder.ts';
+import { daemonPlatformServicesFixture } from '../../__tests__/support/platform-services-fixture.ts';
+import { recordActionEntry } from '../../core/session-action-recorder.ts';
 import { expect, test, vi } from 'vitest';
 
 import {
@@ -18,11 +18,14 @@ import {
   type PlatformRuntimeOperations,
 } from '@agent-device/contracts/platform-runtime-operations';
 import { deviceShape, type DeviceInfo } from '@agent-device/kernel/device';
-import { makeSession } from './support/session-factories.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import type { GenericPlatformExecutionParams } from '../generic-leaf-execution.ts';
+import { makeSession } from '../../__tests__/support/session-factories.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import type { GenericPlatformExecutionParams } from '../../core/generic-leaf-execution.ts';
 import { readRequestedFoldPose, resolveBoundFoldRuntime } from '../fold-runtime.ts';
-import { expectRefusesUnavailableExactOwnerFact } from './runtime-binding-conformance.ts';
+import { expectRefusesUnavailableExactOwnerFact } from '../../__tests__/support/runtime-binding-conformance.ts';
 
 // File-scoped id: this owner binding's `local-family` kind reaches the real on-disk device-claim
 // admission, so a shared id risks a cross-file claim collision under parallel execution.
diff --git a/src/daemon/__tests__/generic-route-runtime-completeness.test.ts b/packages/daemon/src/execution/__tests__/generic-route-runtime-completeness.test.ts
similarity index 100%
rename from src/daemon/__tests__/generic-route-runtime-completeness.test.ts
rename to packages/daemon/src/execution/__tests__/generic-route-runtime-completeness.test.ts
diff --git a/src/daemon/__tests__/interaction-get-runtime-fixture.ts b/packages/daemon/src/execution/__tests__/interaction-get-runtime-fixture.ts
similarity index 95%
rename from src/daemon/__tests__/interaction-get-runtime-fixture.ts
rename to packages/daemon/src/execution/__tests__/interaction-get-runtime-fixture.ts
index 563b4ddc09..e889bd06fb 100644
--- a/src/daemon/__tests__/interaction-get-runtime-fixture.ts
+++ b/packages/daemon/src/execution/__tests__/interaction-get-runtime-fixture.ts
@@ -30,11 +30,14 @@ import type {
   QuerySelectorResult,
 } from '@agent-device/contracts/selector-observation-runtime';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import type { DaemonPlatformServices } from '../platform-services.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import { captureSnapshotWithInteractor } from '../snapshot-interactor-capture.ts';
-import { daemonPlatformServicesFixture } from './platform-services-fixture.ts';
-import { androidObservationFixture } from './android-observation-fixture.ts';
+import type { DaemonPlatformServices } from '../../core/platform-services.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import { captureSnapshotWithInteractor } from '../../core/snapshot-interactor-capture.ts';
+import { daemonPlatformServicesFixture } from '../../__tests__/support/platform-services-fixture.ts';
+import { androidObservationFixture } from '../../__tests__/support/android-observation-fixture.ts';
 import { createUnavailableRuntimeFactsForTest } from '@agent-device/test-kit/runtime-operation-facts';
 
 /**
diff --git a/src/daemon/__tests__/interaction-surface-baseline-evidence.test.ts b/packages/daemon/src/execution/__tests__/interaction-surface-baseline-evidence.test.ts
similarity index 99%
rename from src/daemon/__tests__/interaction-surface-baseline-evidence.test.ts
rename to packages/daemon/src/execution/__tests__/interaction-surface-baseline-evidence.test.ts
index 27cb6a1f3f..6b876eb980 100644
--- a/src/daemon/__tests__/interaction-surface-baseline-evidence.test.ts
+++ b/packages/daemon/src/execution/__tests__/interaction-surface-baseline-evidence.test.ts
@@ -4,7 +4,7 @@ import type { SnapshotNode } from '@agent-device/kernel/snapshot';
 import {
   buildInteractionSurfaceSignature,
   classifyBaselineSurfaceEvidence,
-} from '../interaction-surface-signature.ts';
+} from '../../core/interaction-surface-signature.ts';
 
 // #1569: node shapes below are transcribed from a live iPhone 17 Pro capture of
 // examples/test-app's checkout form, before and after `scroll down 0.6`. Two
diff --git a/src/daemon/__tests__/internal-observation.test.ts b/packages/daemon/src/execution/__tests__/internal-observation.test.ts
similarity index 98%
rename from src/daemon/__tests__/internal-observation.test.ts
rename to packages/daemon/src/execution/__tests__/internal-observation.test.ts
index 271ad4ed47..e0f865439f 100644
--- a/src/daemon/__tests__/internal-observation.test.ts
+++ b/packages/daemon/src/execution/__tests__/internal-observation.test.ts
@@ -1,6 +1,6 @@
 import path from 'node:path';
 import { expect, test } from 'vitest';
-import { makeIosSession } from './support/session-factories.ts';
+import { makeIosSession } from '../../__tests__/support/session-factories.ts';
 import type { SnapshotState } from '@agent-device/kernel/snapshot';
 import { bindInternalObservationAuthority } from '../internal-observation.ts';
 import {
@@ -9,9 +9,9 @@ import {
   refFrameScope,
   refFrameState,
   refFrameTree,
-} from '../ref-frame.ts';
+} from '../../core/ref-frame.ts';
 import { markSessionPartialRefsIssued, setSessionSnapshot } from '../session-snapshot.ts';
-import { SessionStore } from '../session-store.ts';
+import { SessionStore } from '../../core/session-store.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
 function snapshot(ref: string, label = ref): SnapshotState {
diff --git a/src/daemon/__tests__/keyboard-runtime.test.ts b/packages/daemon/src/execution/__tests__/keyboard-runtime.test.ts
similarity index 98%
rename from src/daemon/__tests__/keyboard-runtime.test.ts
rename to packages/daemon/src/execution/__tests__/keyboard-runtime.test.ts
index a9caf533e9..0342812f20 100644
--- a/src/daemon/__tests__/keyboard-runtime.test.ts
+++ b/packages/daemon/src/execution/__tests__/keyboard-runtime.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from './platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../__tests__/support/platform-services-fixture.ts';
 import { expect, test, vi } from 'vitest';
 import {
   keyboardRuntimeOperationFacts,
@@ -20,7 +20,10 @@ import {
   type PlatformRuntimeOperations,
 } from '@agent-device/contracts/platform-runtime-operations';
 import { deviceShape, type DeviceInfo } from '@agent-device/kernel/device';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
 import { resolveBoundKeyboardRuntime } from '../keyboard-runtime.ts';
 
 // File-scoped ids, not the widely shared 'emulator-5554'/'ios-simulator' literals: these owner
diff --git a/src/daemon/__tests__/offscreen-target-probe.test.ts b/packages/daemon/src/execution/__tests__/offscreen-target-probe.test.ts
similarity index 98%
rename from src/daemon/__tests__/offscreen-target-probe.test.ts
rename to packages/daemon/src/execution/__tests__/offscreen-target-probe.test.ts
index b08dd4b5be..0ddbdb2a1d 100644
--- a/src/daemon/__tests__/offscreen-target-probe.test.ts
+++ b/packages/daemon/src/execution/__tests__/offscreen-target-probe.test.ts
@@ -6,7 +6,7 @@ import type {
   QuerySelectorInput,
   QuerySelectorResult,
 } from '@agent-device/contracts/selector-observation-runtime';
-import type { SessionState } from '../session-state.ts';
+import type { SessionState } from '../../core/session-state.ts';
 
 import { confirmIosOffscreenTargetVisible } from '../offscreen-target-probe.ts';
 
diff --git a/src/daemon/__tests__/orientation-runtime.test.ts b/packages/daemon/src/execution/__tests__/orientation-runtime.test.ts
similarity index 89%
rename from src/daemon/__tests__/orientation-runtime.test.ts
rename to packages/daemon/src/execution/__tests__/orientation-runtime.test.ts
index d0a4032a73..78d0998079 100644
--- a/src/daemon/__tests__/orientation-runtime.test.ts
+++ b/packages/daemon/src/execution/__tests__/orientation-runtime.test.ts
@@ -1,6 +1,6 @@
-import { daemonPlatformServicesFixture } from './platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../__tests__/support/platform-services-fixture.ts';
 import { expect, test, vi } from 'vitest';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 // `orientation` carries `androidBlockingDialogGuard: true` (like every other generic-route leaf
 // in this migration), so this file's Android device reaching the real request router below hits
@@ -37,20 +37,23 @@ import {
   type PlatformRuntimeOperations,
 } from '@agent-device/contracts/platform-runtime-operations';
 import { deviceShape } from '@agent-device/kernel/device';
-import { makeSession } from './support/session-factories.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+import { makeSession } from '../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { activateCompleteRefFrame, refFrameState } from '../ref-frame.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import type { GenericPlatformExecutionParams } from '../generic-leaf-execution.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { activateCompleteRefFrame, refFrameState } from '../../core/ref-frame.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import type { GenericPlatformExecutionParams } from '../../core/generic-leaf-execution.ts';
 import {
   readRequestedOrientation,
   resolveBoundOrientationRuntime,
 } from '../orientation-runtime.ts';
-import { expectRefusesUnavailableExactOwnerFact } from './runtime-binding-conformance.ts';
-import { createRequestHandler } from './test-device-runtime-gateway.ts';
-import { androidObservationFixture } from './android-observation-fixture.ts';
+import { expectRefusesUnavailableExactOwnerFact } from '../../__tests__/support/runtime-binding-conformance.ts';
+import { createRequestHandler } from '../../__tests__/support/test-device-runtime-gateway.ts';
+import { androidObservationFixture } from '../../__tests__/support/android-observation-fixture.ts';
 
 // File-scoped id, not a shared literal: this owner binding's `local-family` kind reaches the
 // real on-disk device-claim admission (`require-owner` policy), so a shared id risks a
diff --git a/src/daemon/__tests__/ref-snapshot-flag-policy.test.ts b/packages/daemon/src/execution/__tests__/ref-snapshot-flag-policy.test.ts
similarity index 100%
rename from src/daemon/__tests__/ref-snapshot-flag-policy.test.ts
rename to packages/daemon/src/execution/__tests__/ref-snapshot-flag-policy.test.ts
diff --git a/src/daemon/__tests__/runtime-policy.test.ts b/packages/daemon/src/execution/__tests__/runtime-policy.test.ts
similarity index 100%
rename from src/daemon/__tests__/runtime-policy.test.ts
rename to packages/daemon/src/execution/__tests__/runtime-policy.test.ts
diff --git a/src/daemon/__tests__/screenshot-crop-target.test.ts b/packages/daemon/src/execution/__tests__/screenshot-crop-target.test.ts
similarity index 100%
rename from src/daemon/__tests__/screenshot-crop-target.test.ts
rename to packages/daemon/src/execution/__tests__/screenshot-crop-target.test.ts
diff --git a/src/daemon/__tests__/screenshot-crop.test.ts b/packages/daemon/src/execution/__tests__/screenshot-crop.test.ts
similarity index 97%
rename from src/daemon/__tests__/screenshot-crop.test.ts
rename to packages/daemon/src/execution/__tests__/screenshot-crop.test.ts
index 2ebe1736bf..ca060f702b 100644
--- a/src/daemon/__tests__/screenshot-crop.test.ts
+++ b/packages/daemon/src/execution/__tests__/screenshot-crop.test.ts
@@ -1,5 +1,5 @@
 import { ANDROID_EMULATOR, IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
-import { makeSession } from './support/session-factories.ts';
+import { makeSession } from '../../__tests__/support/session-factories.ts';
 import { readPngSize } from '@agent-device/capture-kit/png-size';
 import { SCREENSHOT_CROP_REASONS } from '@agent-device/contracts/capture';
 import type { SessionSurface } from '@agent-device/contracts/session';
@@ -14,9 +14,9 @@ import type {
 import fs from 'node:fs';
 import path from 'node:path';
 import { expect, test, vi } from 'vitest';
-import type { SessionState } from '../session-state.ts';
+import type { SessionState } from '../../core/session-state.ts';
 import { buildScreenshotCropWarnings, cropScreenshotToSelector } from '../screenshot-crop.ts';
-import { writeSolidPng } from './screenshot-runtime-fixture.ts';
+import { writeSolidPng } from '../../__tests__/support/screenshot-runtime-fixture.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
 test('the warning composition is the single owner: partial intersection and only', () => {
diff --git a/src/daemon/__tests__/scroll-movement.test.ts b/packages/daemon/src/execution/__tests__/scroll-movement.test.ts
similarity index 99%
rename from src/daemon/__tests__/scroll-movement.test.ts
rename to packages/daemon/src/execution/__tests__/scroll-movement.test.ts
index 1e2a400be3..8496b50c9e 100644
--- a/src/daemon/__tests__/scroll-movement.test.ts
+++ b/packages/daemon/src/execution/__tests__/scroll-movement.test.ts
@@ -14,8 +14,8 @@ import type { Rect, SnapshotNode } from '@agent-device/kernel/snapshot';
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
 import { readScrollEdgeState } from '@agent-device/capture-kit/scroll-edge-state';
 import { IOS_SIMULATOR, MACOS_DEVICE } from '@agent-device/test-kit/device-fixtures';
-import { makeSession } from './support/session-factories.ts';
-import { expireRefFrame } from '../ref-frame.ts';
+import { makeSession } from '../../__tests__/support/session-factories.ts';
+import { expireRefFrame } from '../../core/ref-frame.ts';
 import {
   observeScrollMovement,
   planScrollMovement,
diff --git a/src/daemon/__tests__/scroll-runtime.test.ts b/packages/daemon/src/execution/__tests__/scroll-runtime.test.ts
similarity index 97%
rename from src/daemon/__tests__/scroll-runtime.test.ts
rename to packages/daemon/src/execution/__tests__/scroll-runtime.test.ts
index 1104f840ce..e34a6a3f4c 100644
--- a/src/daemon/__tests__/scroll-runtime.test.ts
+++ b/packages/daemon/src/execution/__tests__/scroll-runtime.test.ts
@@ -1,12 +1,12 @@
-import { daemonPlatformServicesFixture } from './platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../__tests__/support/platform-services-fixture.ts';
 import { expect, expectTypeOf, test } from 'vitest';
 import assert from 'node:assert/strict';
 import { buildSnapshotState } from '@agent-device/capture-kit/snapshot-state';
 import { AppError } from '@agent-device/kernel/errors';
 import type { CommandFlags } from '@agent-device/contracts/command';
-import type { DaemonRequest } from '../daemon-request.ts';
-import type { SessionState } from '../session-state.ts';
-import type { GenericPlatformExecutionParams } from '../generic-leaf-execution.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
+import type { SessionState } from '../../core/session-state.ts';
+import type { GenericPlatformExecutionParams } from '../../core/generic-leaf-execution.ts';
 import type { SnapshotNode } from '@agent-device/kernel/snapshot';
 import type { BoundDeviceRuntime, RuntimeFacts } from '@agent-device/contracts/platform-runtime';
 import {
@@ -14,13 +14,16 @@ import {
   resolveScrollRuntimePlan,
   type ScrollRuntimePlan,
 } from '@agent-device/contracts/platform-runtime-operations';
-import type { DaemonCommandContext } from '../context.ts';
+import type { DaemonCommandContext } from '../../core/context.ts';
 import { resolveBoundScrollRuntime } from '../scroll-runtime.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
 import { unavailableDeploymentSnapshotAndShutdownOperationFacts } from '@agent-device/test-kit/runtime-operation-facts';
 import { IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
-import { makeIosSession, makeMacOsSession } from './support/session-factories.ts';
-import { activateCompleteRefFrame, expireRefFrame } from '../ref-frame.ts';
+import { makeIosSession, makeMacOsSession } from '../../__tests__/support/session-factories.ts';
+import { activateCompleteRefFrame, expireRefFrame } from '../../core/ref-frame.ts';
 
 /**
  * The retired `handleScrollCommand` suite, re-pointed at the bound runtime (R43). Every
diff --git a/src/daemon/__tests__/selector-capture-binding.test.ts b/packages/daemon/src/execution/__tests__/selector-capture-binding.test.ts
similarity index 93%
rename from src/daemon/__tests__/selector-capture-binding.test.ts
rename to packages/daemon/src/execution/__tests__/selector-capture-binding.test.ts
index f38b1a7101..4d2d76e3e2 100644
--- a/src/daemon/__tests__/selector-capture-binding.test.ts
+++ b/packages/daemon/src/execution/__tests__/selector-capture-binding.test.ts
@@ -1,13 +1,13 @@
-import { daemonPlatformServicesFixture } from './platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../__tests__/support/platform-services-fixture.ts';
 import { expect, test } from 'vitest';
 import { ANDROID_EMULATOR, IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
-import { makeAndroidSession, makeIosSession } from './support/session-factories.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+import { makeAndroidSession, makeIosSession } from '../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import { withTestDeviceInventory } from '@agent-device/device-selection/inventory-gateways-fixtures';
 import { resolveBoundSelectorCapture } from '../selector-capture-binding.ts';
 import { createBoundSelectorRuntime } from '../selector-runtime-backend.ts';
-import { selectorCaptureFixture } from './selector-capture-fixture.ts';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { selectorCaptureFixture } from '../../__tests__/support/selector-capture-fixture.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 // The seam every selector unit consumes. `find` landed it; `get`, `is`, and `wait` migrate by
 // naming their command, so these are the guarantees they inherit rather than re-derive.
diff --git a/src/daemon/__tests__/selector-capture-runtime.test.ts b/packages/daemon/src/execution/__tests__/selector-capture-runtime.test.ts
similarity index 98%
rename from src/daemon/__tests__/selector-capture-runtime.test.ts
rename to packages/daemon/src/execution/__tests__/selector-capture-runtime.test.ts
index 6eae38f60b..e2bb9e9e1c 100644
--- a/src/daemon/__tests__/selector-capture-runtime.test.ts
+++ b/packages/daemon/src/execution/__tests__/selector-capture-runtime.test.ts
@@ -8,10 +8,10 @@ import {
   type IosTargetActivation,
   type SnapshotState,
 } from '@agent-device/kernel/snapshot';
-import type { DaemonResponse } from '../daemon-request.ts';
-import { type RequestCaptureProof, withCaptureDisclosures } from '../capture-disclosure.ts';
-import { makeIosSession } from './support/session-factories.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+import type { DaemonResponse } from '../../core/daemon-request.ts';
+import { type RequestCaptureProof, withCaptureDisclosures } from '../../core/capture-disclosure.ts';
+import { makeIosSession } from '../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import { createSelectorCaptureRuntime } from '../selector-capture-runtime.ts';
 
 // R35: the capture runtime executes only through its request-bound capture — there is no
diff --git a/src/daemon/__tests__/selector-text-runtime.test.ts b/packages/daemon/src/execution/__tests__/selector-text-runtime.test.ts
similarity index 100%
rename from src/daemon/__tests__/selector-text-runtime.test.ts
rename to packages/daemon/src/execution/__tests__/selector-text-runtime.test.ts
diff --git a/src/daemon/__tests__/session-snapshot.test.ts b/packages/daemon/src/execution/__tests__/session-snapshot.test.ts
similarity index 98%
rename from src/daemon/__tests__/session-snapshot.test.ts
rename to packages/daemon/src/execution/__tests__/session-snapshot.test.ts
index c638122617..8920a289e9 100644
--- a/src/daemon/__tests__/session-snapshot.test.ts
+++ b/packages/daemon/src/execution/__tests__/session-snapshot.test.ts
@@ -1,9 +1,9 @@
 import { expect, test } from 'vitest';
-import { makeSessionStore } from './support/store-factory.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import type { SettleObservation } from '@agent-device/contracts/interaction';
 import { AppError } from '@agent-device/kernel/errors';
 import type { SnapshotState } from '@agent-device/kernel/snapshot';
-import type { SessionState } from '../session-state.ts';
+import type { SessionState } from '../../core/session-state.ts';
 import {
   markSessionPartialRefsIssued,
   issueSettleRefs,
@@ -21,7 +21,7 @@ import {
   refFrameEpoch,
   refFrameScope,
   refFrameState,
-} from '../ref-frame.ts';
+} from '../../core/ref-frame.ts';
 
 function makeSession(): SessionState {
   return {
diff --git a/src/daemon/__tests__/system-button-runtime.test.ts b/packages/daemon/src/execution/__tests__/system-button-runtime.test.ts
similarity index 88%
rename from src/daemon/__tests__/system-button-runtime.test.ts
rename to packages/daemon/src/execution/__tests__/system-button-runtime.test.ts
index 7ea81ecb8d..5d0e6133a7 100644
--- a/src/daemon/__tests__/system-button-runtime.test.ts
+++ b/packages/daemon/src/execution/__tests__/system-button-runtime.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from './platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../__tests__/support/platform-services-fixture.ts';
 import { expect, test, vi } from 'vitest';
 import { systemButtonRuntimeOperationFacts } from '@agent-device/contracts/system-button-runtime';
 import {
@@ -17,13 +17,16 @@ import {
 } from '@agent-device/contracts/platform-runtime-operations';
 import type { SystemButton } from '@agent-device/contracts/system-button-runtime';
 import { deviceShape, type DeviceInfo } from '@agent-device/kernel/device';
-import { makeSession } from './support/session-factories.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+import { makeSession } from '../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { activateCompleteRefFrame, refFrameState } from '../ref-frame.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import type { GenericPlatformExecutionParams } from '../generic-leaf-execution.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { activateCompleteRefFrame, refFrameState } from '../../core/ref-frame.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import type { GenericPlatformExecutionParams } from '../../core/generic-leaf-execution.ts';
 import {
   resolveBoundSystemButtonRuntime,
   type SystemButtonCommand,
@@ -31,9 +34,9 @@ import {
 import {
   expectRefusesUnavailableExactOwnerFact,
   systemButtonCommands,
-} from './runtime-binding-conformance.ts';
-import { createRequestHandler } from './test-device-runtime-gateway.ts';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+} from '../../__tests__/support/runtime-binding-conformance.ts';
+import { createRequestHandler } from '../../__tests__/support/test-device-runtime-gateway.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 const macOsDevice = {
   id: 'macos-host',
diff --git a/src/daemon/__tests__/tv-remote-runtime.test.ts b/packages/daemon/src/execution/__tests__/tv-remote-runtime.test.ts
similarity index 90%
rename from src/daemon/__tests__/tv-remote-runtime.test.ts
rename to packages/daemon/src/execution/__tests__/tv-remote-runtime.test.ts
index 2fd82435cc..63a6956136 100644
--- a/src/daemon/__tests__/tv-remote-runtime.test.ts
+++ b/packages/daemon/src/execution/__tests__/tv-remote-runtime.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from './platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../__tests__/support/platform-services-fixture.ts';
 import { expect, test, vi } from 'vitest';
 import {
   localRuntimeOwner,
@@ -14,17 +14,20 @@ import {
 } from '@agent-device/contracts/platform-runtime-operations';
 import { tvRemoteRuntimeOperationFacts } from '@agent-device/contracts/tv-remote-runtime';
 import { deviceShape } from '@agent-device/kernel/device';
-import { makeSession } from './support/session-factories.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+import { makeSession } from '../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { activateCompleteRefFrame, refFrameState } from '../ref-frame.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import type { GenericPlatformExecutionParams } from '../generic-leaf-execution.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { activateCompleteRefFrame, refFrameState } from '../../core/ref-frame.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import type { GenericPlatformExecutionParams } from '../../core/generic-leaf-execution.ts';
 import { resolveBoundTvRemoteRuntime } from '../tv-remote-runtime.ts';
-import { expectRefusesUnavailableExactOwnerFact } from './runtime-binding-conformance.ts';
-import { createRequestHandler } from './test-device-runtime-gateway.ts';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { expectRefusesUnavailableExactOwnerFact } from '../../__tests__/support/runtime-binding-conformance.ts';
+import { createRequestHandler } from '../../__tests__/support/test-device-runtime-gateway.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 const vegaVvd = {
   id: 'vega-vvd',
diff --git a/src/daemon/__tests__/type-text-runtime.test.ts b/packages/daemon/src/execution/__tests__/type-text-runtime.test.ts
similarity index 94%
rename from src/daemon/__tests__/type-text-runtime.test.ts
rename to packages/daemon/src/execution/__tests__/type-text-runtime.test.ts
index 0a842678b3..2f37a978e7 100644
--- a/src/daemon/__tests__/type-text-runtime.test.ts
+++ b/packages/daemon/src/execution/__tests__/type-text-runtime.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from './platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../__tests__/support/platform-services-fixture.ts';
 import { expect, test, vi } from 'vitest';
 import {
   type DeviceBinding,
@@ -16,9 +16,12 @@ import {
   typeTextRuntimeOperationFacts,
 } from '@agent-device/contracts/type-text-runtime';
 import { deviceShape } from '@agent-device/kernel/device';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
 import { resolveBoundTypeTextRuntime } from '../type-text-runtime.ts';
-import { expectRefusesUnavailableExactOwnerFact } from './runtime-binding-conformance.ts';
+import { expectRefusesUnavailableExactOwnerFact } from '../../__tests__/support/runtime-binding-conformance.ts';
 
 const appleDevice = {
   id: 'ios-simulator',
diff --git a/src/daemon/__tests__/viewport-runtime.test.ts b/packages/daemon/src/execution/__tests__/viewport-runtime.test.ts
similarity index 87%
rename from src/daemon/__tests__/viewport-runtime.test.ts
rename to packages/daemon/src/execution/__tests__/viewport-runtime.test.ts
index 4e74cd6a2f..18c5610c64 100644
--- a/src/daemon/__tests__/viewport-runtime.test.ts
+++ b/packages/daemon/src/execution/__tests__/viewport-runtime.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from './platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../__tests__/support/platform-services-fixture.ts';
 import { expect, test, vi } from 'vitest';
 import {
   type DeviceBinding,
@@ -14,17 +14,20 @@ import {
 } from '@agent-device/contracts/platform-runtime-operations';
 import { viewportRuntimeOperationFacts } from '@agent-device/contracts/viewport-runtime';
 import { deviceShape } from '@agent-device/kernel/device';
-import { makeSession } from './support/session-factories.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+import { makeSession } from '../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { activateCompleteRefFrame, refFrameState } from '../ref-frame.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import type { GenericPlatformExecutionParams } from '../generic-leaf-execution.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { activateCompleteRefFrame, refFrameState } from '../../core/ref-frame.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import type { GenericPlatformExecutionParams } from '../../core/generic-leaf-execution.ts';
 import { resolveBoundViewportRuntime } from '../viewport-runtime.ts';
-import { expectRefusesUnavailableExactOwnerFact } from './runtime-binding-conformance.ts';
-import { createRequestHandler } from './test-device-runtime-gateway.ts';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { expectRefusesUnavailableExactOwnerFact } from '../../__tests__/support/runtime-binding-conformance.ts';
+import { createRequestHandler } from '../../__tests__/support/test-device-runtime-gateway.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 const webDevice = {
   id: 'web',
diff --git a/src/daemon/android-foreground-surface.ts b/packages/daemon/src/execution/android-foreground-surface.ts
similarity index 94%
rename from src/daemon/android-foreground-surface.ts
rename to packages/daemon/src/execution/android-foreground-surface.ts
index c1f6af601a..c9d52e5f73 100644
--- a/src/daemon/android-foreground-surface.ts
+++ b/packages/daemon/src/execution/android-foreground-surface.ts
@@ -1,7 +1,7 @@
 import type { AndroidObservationAdapter } from '@agent-device/contracts/android-observation';
 import { AppError } from '@agent-device/kernel/errors';
-import { isActiveProviderDevice } from './provider-device-admission.ts';
-import type { SessionState } from './session-state.ts';
+import { isActiveProviderDevice } from '../core/provider-device-admission.ts';
+import type { SessionState } from '../core/session-state.ts';
 
 export type AndroidEscapeSurface = {
   expectedPackage: string;
diff --git a/src/daemon/android-snapshot-timeout-evidence.ts b/packages/daemon/src/execution/android-snapshot-timeout-evidence.ts
similarity index 94%
rename from src/daemon/android-snapshot-timeout-evidence.ts
rename to packages/daemon/src/execution/android-snapshot-timeout-evidence.ts
index 11b8b68197..0d7ab1da01 100644
--- a/src/daemon/android-snapshot-timeout-evidence.ts
+++ b/packages/daemon/src/execution/android-snapshot-timeout-evidence.ts
@@ -1,8 +1,8 @@
 import { promises as fs } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
-import type { DaemonResponse } from './daemon-request.ts';
-import type { SessionState } from './session-state.ts';
+import type { DaemonResponse } from '../core/daemon-request.ts';
+import type { SessionState } from '../core/session-state.ts';
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
 import { AppError, normalizeError } from '@agent-device/kernel/errors';
 import {
@@ -14,7 +14,7 @@ import {
   type SnapshotTimeoutEvidence,
 } from './snapshot-timeout-evidence.ts';
 import { isAndroidSnapshotTimeoutError } from '@agent-device/capture-kit/snapshot-timeout-policy';
-import { contextFromFlags } from './context.ts';
+import { contextFromFlags } from '../core/context.ts';
 import { annotateScreenshotWithRefs } from '@agent-device/capture-kit/screenshot-overlay';
 import { screenshotExecutionFromContext } from './screenshot-runtime.ts';
 import {
@@ -28,7 +28,7 @@ import {
  * The two things that are not daemon assembly moved out: whether a failure is the
  * accessibility-timeout shape is a policy
  * (`packages/capture-kit/src/snapshot/snapshot-timeout-policy.ts`), and the published evidence shape is
- * vocabulary (`src/daemon/snapshot-timeout-evidence.ts`, whose only consumer is this
+ * vocabulary (`packages/daemon/src/execution/snapshot-timeout-evidence.ts`, whose only consumer is this
  * module). What remains here is the ordering that
  * genuinely needs the daemon: resolving a bound screenshot runtime, writing the artifact,
  * annotating it from the stored observation, and emitting the diagnostics.
diff --git a/src/daemon/android-system-dialog.ts b/packages/daemon/src/execution/android-system-dialog.ts
similarity index 98%
rename from src/daemon/android-system-dialog.ts
rename to packages/daemon/src/execution/android-system-dialog.ts
index 8816bfe79a..3c13514d94 100644
--- a/src/daemon/android-system-dialog.ts
+++ b/packages/daemon/src/execution/android-system-dialog.ts
@@ -8,9 +8,9 @@ import { AppError, normalizeError, type NormalizedError } from '@agent-device/ke
 import { centerOfRect, type SnapshotNode } from '@agent-device/kernel/snapshot';
 
 import { isSnapshotNodeInteractionBlocked } from '@agent-device/capture-kit/snapshot-occlusion';
-import { expireRefFrame } from './ref-frame.ts';
-import type { SessionState } from './session-state.ts';
-import { isActiveProviderDevice } from './provider-device-admission.ts';
+import { expireRefFrame } from '../core/ref-frame.ts';
+import type { SessionState } from '../core/session-state.ts';
+import { isActiveProviderDevice } from '../core/provider-device-admission.ts';
 
 const ANDROID_BLOCKING_MODAL_PATTERN = /\bis(?:n(?:'|&apos;|&#39;)?t| not)\s+responding\b/i;
 const ANDROID_CLOSE_APP_PATTERN = /^close app$/i;
diff --git a/src/daemon/app-event-runtime.ts b/packages/daemon/src/execution/app-event-runtime.ts
similarity index 94%
rename from src/daemon/app-event-runtime.ts
rename to packages/daemon/src/execution/app-event-runtime.ts
index e74790bb32..e4d270e41b 100644
--- a/src/daemon/app-event-runtime.ts
+++ b/packages/daemon/src/execution/app-event-runtime.ts
@@ -4,9 +4,9 @@ import type { BoundDeviceRuntime } from '@agent-device/contracts/platform-runtim
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import { parseTriggerAppEventArgs, resolveAppEventUrl } from './app-events.ts';
 import { successText } from '@agent-device/kernel/success-text';
-import type { DaemonCommandContext } from './context.ts';
-import { admitRuntimeUse, type RuntimeAdmissionBindings } from './runtime-admission.ts';
-import { runtimeExecutionFromContext } from './snapshot-runtime-capture-input.ts';
+import type { DaemonCommandContext } from '../core/context.ts';
+import { admitRuntimeUse, type RuntimeAdmissionBindings } from '../core/runtime-admission.ts';
+import { runtimeExecutionFromContext } from '../core/snapshot-runtime-capture-input.ts';
 import type { DaemonFailureResponse } from '@agent-device/kernel/contracts';
 
 /**
diff --git a/src/daemon/app-events.test.ts b/packages/daemon/src/execution/app-events.test.ts
similarity index 100%
rename from src/daemon/app-events.test.ts
rename to packages/daemon/src/execution/app-events.test.ts
diff --git a/src/daemon/app-events.ts b/packages/daemon/src/execution/app-events.ts
similarity index 100%
rename from src/daemon/app-events.ts
rename to packages/daemon/src/execution/app-events.ts
diff --git a/src/daemon/apps-runtime.ts b/packages/daemon/src/execution/apps-runtime.ts
similarity index 100%
rename from src/daemon/apps-runtime.ts
rename to packages/daemon/src/execution/apps-runtime.ts
diff --git a/src/daemon/back-runtime.ts b/packages/daemon/src/execution/back-runtime.ts
similarity index 85%
rename from src/daemon/back-runtime.ts
rename to packages/daemon/src/execution/back-runtime.ts
index e63c7ba663..c7df3e8a35 100644
--- a/src/daemon/back-runtime.ts
+++ b/packages/daemon/src/execution/back-runtime.ts
@@ -4,10 +4,13 @@ import { backRuntimeUse } from '@agent-device/contracts/platform-runtime-operati
 import type { BoundDeviceRuntime } from '@agent-device/contracts/platform-runtime';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import { successText } from '@agent-device/kernel/success-text';
-import type { DaemonCommandContext } from './context.ts';
-import type { ResolvedGenericExecution } from './generic-leaf-execution.ts';
-import { resolveBoundGenericRuntime, type RuntimeAdmissionBindings } from './runtime-admission.ts';
-import { runtimeExecutionFromContext } from './snapshot-runtime-capture-input.ts';
+import type { DaemonCommandContext } from '../core/context.ts';
+import type { ResolvedGenericExecution } from '../core/generic-leaf-execution.ts';
+import {
+  resolveBoundGenericRuntime,
+  type RuntimeAdmissionBindings,
+} from '../core/runtime-admission.ts';
+import { runtimeExecutionFromContext } from '../core/snapshot-runtime-capture-input.ts';
 
 /** The neutral intent one `back` carries, projected from a resolved command context. */
 function backInput(mode: BackMode | undefined, context: DaemonCommandContext): BackInput {
diff --git a/src/daemon/focus-runtime.ts b/packages/daemon/src/execution/focus-runtime.ts
similarity index 87%
rename from src/daemon/focus-runtime.ts
rename to packages/daemon/src/execution/focus-runtime.ts
index c16e628e66..7f04b83729 100644
--- a/src/daemon/focus-runtime.ts
+++ b/packages/daemon/src/execution/focus-runtime.ts
@@ -4,10 +4,13 @@ import type { DeviceInfo } from '@agent-device/kernel/device';
 import type { Point } from '@agent-device/kernel/snapshot';
 import { successText } from '@agent-device/kernel/success-text';
 import { readPointPositionals } from '@agent-device/kernel/validation';
-import type { DaemonCommandContext } from './context.ts';
-import type { ResolvedGenericExecution } from './generic-leaf-execution.ts';
-import { resolveBoundGenericRuntime, type RuntimeAdmissionBindings } from './runtime-admission.ts';
-import { runtimeExecutionFromContext } from './snapshot-runtime-capture-input.ts';
+import type { DaemonCommandContext } from '../core/context.ts';
+import type { ResolvedGenericExecution } from '../core/generic-leaf-execution.ts';
+import {
+  resolveBoundGenericRuntime,
+  type RuntimeAdmissionBindings,
+} from '../core/runtime-admission.ts';
+import { runtimeExecutionFromContext } from '../core/snapshot-runtime-capture-input.ts';
 
 /** `focus x y`, on the same positional parse its still-legacy touch siblings take. */
 export function readFocusPoint(positionals: readonly string[]): Point {
diff --git a/src/daemon/fold-runtime.ts b/packages/daemon/src/execution/fold-runtime.ts
similarity index 93%
rename from src/daemon/fold-runtime.ts
rename to packages/daemon/src/execution/fold-runtime.ts
index d94abe7f4e..2d6c9ff447 100644
--- a/src/daemon/fold-runtime.ts
+++ b/packages/daemon/src/execution/fold-runtime.ts
@@ -9,8 +9,11 @@ import { foldRuntimeUse } from '@agent-device/contracts/platform-runtime-operati
 import type { BoundDeviceRuntime } from '@agent-device/contracts/platform-runtime';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import { successText } from '@agent-device/kernel/success-text';
-import type { ResolvedGenericExecution } from './generic-leaf-execution.ts';
-import { resolveBoundGenericRuntime, type RuntimeAdmissionBindings } from './runtime-admission.ts';
+import type { ResolvedGenericExecution } from '../core/generic-leaf-execution.ts';
+import {
+  resolveBoundGenericRuntime,
+  type RuntimeAdmissionBindings,
+} from '../core/runtime-admission.ts';
 
 /** `fold <pose>`, parsed with the same aliases the CLI reader accepts. */
 export function readRequestedFoldPose(positionals: readonly string[]): FoldPose {
diff --git a/src/daemon/generic-runtime-execution.ts b/packages/daemon/src/execution/generic-runtime-execution.ts
similarity index 95%
rename from src/daemon/generic-runtime-execution.ts
rename to packages/daemon/src/execution/generic-runtime-execution.ts
index 8539e9b2ae..8aa38b4749 100644
--- a/src/daemon/generic-runtime-execution.ts
+++ b/packages/daemon/src/execution/generic-runtime-execution.ts
@@ -1,11 +1,11 @@
-import type { ResolvedGenericExecution } from './generic-leaf-execution.ts';
+import type { ResolvedGenericExecution } from '../core/generic-leaf-execution.ts';
 import { resolveBoundFocusRuntime } from './focus-runtime.ts';
 import { resolveBoundScrollRuntime } from './scroll-runtime.ts';
 import type { ScreenshotRuntimeBindings } from './screenshot-runtime-binding.ts';
 import type { CreateDaemonCommandSurface } from '@agent-device/contracts/daemon-command-surface';
-import type { DaemonCommandContext } from './context.ts';
-import type { DaemonRequest } from './daemon-request.ts';
-import type { SessionState } from './session-state.ts';
+import type { DaemonCommandContext } from '../core/context.ts';
+import type { DaemonRequest } from '../core/daemon-request.ts';
+import type { SessionState } from '../core/session-state.ts';
 import { resolveBoundViewportRuntime } from './viewport-runtime.ts';
 import { resolveBoundBackRuntime } from './back-runtime.ts';
 import { isSystemButtonCommand, resolveBoundSystemButtonRuntime } from './system-button-runtime.ts';
diff --git a/src/daemon/generic-settle.ts b/packages/daemon/src/execution/generic-settle.ts
similarity index 92%
rename from src/daemon/generic-settle.ts
rename to packages/daemon/src/execution/generic-settle.ts
index 01559d9598..ba812847c6 100644
--- a/src/daemon/generic-settle.ts
+++ b/packages/daemon/src/execution/generic-settle.ts
@@ -12,14 +12,14 @@ import {
   readSettleRequest,
   settleFlagGuardResponse,
 } from './interaction/index.ts';
-import type { BoundContextFromFlags } from './context.ts';
-import type { RuntimeAdmissionBindings } from './request-runtime-binding.ts';
-import type { DaemonPlatformServices } from './platform-services.ts';
-import { resolveSettleObservationCapture } from './settle-observation-capture.ts';
+import type { BoundContextFromFlags } from '../core/context.ts';
+import type { RuntimeAdmissionBindings } from '../core/request-runtime-binding.ts';
+import type { DaemonPlatformServices } from '../core/platform-services.ts';
+import { resolveSettleObservationCapture } from '../core/settle-observation-capture.ts';
 import { issueSettleRefs } from './session-snapshot.ts';
-import type { SessionStore } from './session-store.ts';
-import type { DaemonRequest, DaemonResponse } from './daemon-request.ts';
-import type { SessionRef, SessionState } from './session-state.ts';
+import type { SessionStore } from '../core/session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../core/session-state.ts';
 
 /**
  * `--settle` on the generic daemon route (#1638): `scroll` and `back` change
diff --git a/src/daemon/handlers/__tests__/react-native.test.ts b/packages/daemon/src/execution/handlers/__tests__/react-native.test.ts
similarity index 98%
rename from src/daemon/handlers/__tests__/react-native.test.ts
rename to packages/daemon/src/execution/handlers/__tests__/react-native.test.ts
index c2bf743cbd..1dd2f1ada6 100644
--- a/src/daemon/handlers/__tests__/react-native.test.ts
+++ b/packages/daemon/src/execution/handlers/__tests__/react-native.test.ts
@@ -1,19 +1,19 @@
 import { beforeEach, expect, test, vi } from 'vitest';
 import path from 'node:path';
 import { handleReactNativeCommands } from '../react-native.ts';
-import { captureSnapshot } from '../../snapshot-capture.ts';
-import { SessionStore } from '../../session-store.ts';
-import type { SessionState } from '../../session-state.ts';
+import { captureSnapshot } from '../../../core/snapshot-capture.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import type { SessionState } from '../../../core/session-state.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import {
   getRuntimeBindings,
   mockTapPoint,
   resetGetRuntimeFixture,
 } from '../../__tests__/interaction-get-runtime-fixture.ts';
-import { refFrameState } from '../../ref-frame.ts';
-import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
+import { refFrameState } from '../../../core/ref-frame.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
-vi.mock('../../snapshot-capture.ts', () => ({
+vi.mock('../../../core/snapshot-capture.ts', () => ({
   captureSnapshot: vi.fn(),
 }));
 
diff --git a/src/daemon/handlers/__tests__/session-clipboard.test.ts b/packages/daemon/src/execution/handlers/__tests__/session-clipboard.test.ts
similarity index 98%
rename from src/daemon/handlers/__tests__/session-clipboard.test.ts
rename to packages/daemon/src/execution/handlers/__tests__/session-clipboard.test.ts
index 0111a11351..90ce3d0dd9 100644
--- a/src/daemon/handlers/__tests__/session-clipboard.test.ts
+++ b/packages/daemon/src/execution/handlers/__tests__/session-clipboard.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import { expect, test, vi } from 'vitest';
 import { clipboardRuntimeOperationFacts } from '@agent-device/contracts/clipboard-runtime';
 import {
@@ -17,13 +17,13 @@ import { deviceShape, type DeviceInfo } from '@agent-device/kernel/device';
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../request-runtime-binding.ts';
+} from '../../../core/request-runtime-binding.ts';
 import {
   makeSession,
   makeSessionStore,
   mockEnsureDeviceReady,
   mockResolveTargetDevice,
-} from './session-test-harness.ts';
+} from '../../../__tests__/support/handlers/session-test-harness.ts';
 import { handleSessionClipboardCommand } from '../session-clipboard.ts';
 
 // File-scoped id, not a shared literal: this owner binding's `local-family` kind reaches the real
diff --git a/src/daemon/handlers/__tests__/session-selector-dispatch.test.ts b/packages/daemon/src/execution/handlers/__tests__/session-selector-dispatch.test.ts
similarity index 95%
rename from src/daemon/handlers/__tests__/session-selector-dispatch.test.ts
rename to packages/daemon/src/execution/handlers/__tests__/session-selector-dispatch.test.ts
index cc008dd3ba..62c05ce336 100644
--- a/src/daemon/handlers/__tests__/session-selector-dispatch.test.ts
+++ b/packages/daemon/src/execution/handlers/__tests__/session-selector-dispatch.test.ts
@@ -1,7 +1,7 @@
 import {
   daemonPlatformServicesFixture,
   resolveSessionAppBundleIdForTargetFixture,
-} from '../../__tests__/platform-services-fixture.ts';
+} from '../../../__tests__/support/platform-services-fixture.ts';
 import { test, expect, vi } from 'vitest';
 import * as path from 'node:path';
 import { AppError } from '@agent-device/kernel/errors';
@@ -20,21 +20,21 @@ import { deviceShape, type DeviceInfo } from '@agent-device/kernel/device';
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../request-runtime-binding.ts';
+} from '../../../core/request-runtime-binding.ts';
 import {
   mockDispatch,
   mockResolveTargetDevice,
   makeSessionStore,
   makeSession,
   noopInvoke,
-} from './session-test-harness.ts';
-import type { SessionState } from '../../session-state.ts';
-import { handleSessionCommands } from './session-command-harness.ts';
-import { refFrameState } from '../../ref-frame.ts';
+} from '../../../__tests__/support/handlers/session-test-harness.ts';
+import type { SessionState } from '../../../core/session-state.ts';
+import { handleSessionCommands } from '../../../__tests__/support/handlers/session-command-harness.ts';
+import { refFrameState } from '../../../core/ref-frame.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { makeIosSession } from '../../__tests__/support/session-factories.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
 import { createUnavailableRuntimeFactsForTest } from '@agent-device/test-kit/runtime-operation-facts';
-import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 const available = Object.freeze({ available: true } as const);
 const keyboardFamilyDenial = Object.freeze({
diff --git a/src/daemon/handlers/__tests__/snapshot-alert.test.ts b/packages/daemon/src/execution/handlers/__tests__/snapshot-alert.test.ts
similarity index 92%
rename from src/daemon/handlers/__tests__/snapshot-alert.test.ts
rename to packages/daemon/src/execution/handlers/__tests__/snapshot-alert.test.ts
index 94e66d07ba..0c7e849f49 100644
--- a/src/daemon/handlers/__tests__/snapshot-alert.test.ts
+++ b/packages/daemon/src/execution/handlers/__tests__/snapshot-alert.test.ts
@@ -1,14 +1,14 @@
 import { test, expect, vi, beforeEach } from 'vitest';
 import { AppError } from '@agent-device/kernel/errors';
-import type { SessionState } from '../../session-state.ts';
-import { SessionStore } from '../../session-store.ts';
-import { handleSnapshotCommands as handleProductionSnapshotCommands } from '../snapshot.ts';
-import { snapshotRuntimeFixture } from '../../__tests__/snapshot-runtime-fixture.ts';
+import type { SessionState } from '../../../core/session-state.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import { handleSnapshotCommands as handleProductionSnapshotCommands } from '../../../sessions/handlers/snapshot.ts';
+import { snapshotRuntimeFixture } from '../../../__tests__/support/snapshot-runtime-fixture.ts';
 import { withAppleRunnerProvider } from '@agent-device/platform-apple/runner';
 import { runAppleRunnerCommand } from '@agent-device/platform-apple/runner/operations';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import path from 'node:path';
-import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal) => {
   const actual =
diff --git a/src/daemon/handlers/__tests__/snapshot-settings-handler.test.ts b/packages/daemon/src/execution/handlers/__tests__/snapshot-settings-handler.test.ts
similarity index 95%
rename from src/daemon/handlers/__tests__/snapshot-settings-handler.test.ts
rename to packages/daemon/src/execution/handlers/__tests__/snapshot-settings-handler.test.ts
index e9fb476c19..747af24a4f 100644
--- a/src/daemon/handlers/__tests__/snapshot-settings-handler.test.ts
+++ b/packages/daemon/src/execution/handlers/__tests__/snapshot-settings-handler.test.ts
@@ -1,20 +1,20 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import { test, expect, vi, afterEach, beforeEach } from 'vitest';
-import { legacyDispatchCapture } from '../../__tests__/legacy-snapshot-capture-fixture.ts';
-import { handleSnapshotCommands as handleProductionSnapshotCommands } from '../snapshot.ts';
-import { providerDeviceAdmissionFixture } from '../../__tests__/support/provider-device-admission-fixture.ts';
-import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
+import { legacyDispatchCapture } from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
+import { handleSnapshotCommands as handleProductionSnapshotCommands } from '../../../sessions/handlers/snapshot.ts';
+import { providerDeviceAdmissionFixture } from '../../../__tests__/support/provider-device-admission-fixture.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 // The daemon reads provider ownership through its own typed admission seam; these suites
 // install the seam over runtime fakes, the way root composition installs the real one.
 const providerAdmission = providerDeviceAdmissionFixture();
-import { platformResourceCleanupFixture } from '../../__tests__/support/platform-resource-cleanup-fixture.ts';
+import { platformResourceCleanupFixture } from '../../../__tests__/support/platform-resource-cleanup-fixture.ts';
 import {
   fixtureSettingsMutations,
   fixtureSettingsReads,
   resetSnapshotRuntimeFixture,
   snapshotRuntimeFixture,
-} from '../../__tests__/snapshot-runtime-fixture.ts';
+} from '../../../__tests__/support/snapshot-runtime-fixture.ts';
 import {
   androidDevice,
   iosSimulatorDevice,
@@ -23,12 +23,12 @@ import {
   makeSessionStore,
   snapshotRequest,
   tvOsSimulatorDevice,
-} from './snapshot-handler.fixtures.ts';
-import { activateCompleteRefFrame, refFrameState } from '../../ref-frame.ts';
+} from '../../../__tests__/support/handlers/snapshot-handler.fixtures.ts';
+import { activateCompleteRefFrame, refFrameState } from '../../../core/ref-frame.ts';
 import { PRE_DISPATCH_REFUSAL_REASONS } from '@agent-device/kernel/errors';
 
-vi.mock('../../snapshot-interactor-capture.ts', async () => {
-  const fixture = await import('../../__tests__/legacy-snapshot-capture-fixture.ts');
+vi.mock('../../../core/snapshot-interactor-capture.ts', async () => {
+  const fixture = await import('../../../__tests__/support/legacy-snapshot-capture-fixture.ts');
   return { captureSnapshotWithInteractor: fixture.captureSnapshotThroughLegacyDispatchFixture };
 });
 vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal) => {
@@ -41,12 +41,12 @@ vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal)
 // unambiguous environment; that live-probe logic is covered by
 // ios-app-session-hint.test.ts. Stubbed here so this suite stays hermetic and
 // fast — defaults to "no enrichment", matching the current-behavior fallback.
-vi.mock('../../ios-app-session-hint.ts', () => ({
+vi.mock('../../../core/ios-app-session-hint.ts', () => ({
   buildIosOpenCommandHint: vi.fn(async () => undefined),
 }));
 
 import { runAppleRunnerCommand } from '@agent-device/platform-apple/runner/operations';
-import { buildIosOpenCommandHint } from '../../ios-app-session-hint.ts';
+import { buildIosOpenCommandHint } from '../../../core/ios-app-session-hint.ts';
 
 const mockRunnerCommand = vi.mocked(runAppleRunnerCommand);
 const mockBuildIosOpenCommandHint = vi.mocked(buildIosOpenCommandHint);
diff --git a/src/daemon/handlers/react-native.ts b/packages/daemon/src/execution/handlers/react-native.ts
similarity index 97%
rename from src/daemon/handlers/react-native.ts
rename to packages/daemon/src/execution/handlers/react-native.ts
index 5c9a4bbc8e..1eb4e5a2e2 100644
--- a/src/daemon/handlers/react-native.ts
+++ b/packages/daemon/src/execution/handlers/react-native.ts
@@ -2,7 +2,7 @@ import {
   createBoundTouchExecutor,
   resolveBoundTouchRuntime,
   type BoundTouchRuntime,
-} from '../touch-runtime.ts';
+} from '../../core/touch-runtime.ts';
 import { PUBLIC_COMMANDS } from '@agent-device/command-registry/catalog';
 import {
   analyzeReactNativeOverlay,
@@ -14,15 +14,15 @@ import { successText } from '@agent-device/kernel/success-text';
 
 import type { SnapshotQualityVerdict, SnapshotState } from '@agent-device/kernel/snapshot';
 import { isSparseSnapshotQualityVerdict } from '@agent-device/capture-kit/snapshot-quality-verdict';
-import type { DaemonResponse } from '../daemon-request.ts';
-import type { SessionState } from '../session-state.ts';
+import type { DaemonResponse } from '../../core/daemon-request.ts';
+import type { SessionState } from '../../core/session-state.ts';
 import {
   bindInteractionSession,
   captureSnapshotForSession,
   finalizeTouchInteraction,
   type InteractionRouteInput,
 } from '../interaction/index.ts';
-import { expireRefFrame } from '../ref-frame.ts';
+import { expireRefFrame } from '../../core/ref-frame.ts';
 import { readSnapshotNodesReferenceFrame } from '@agent-device/capture-kit/touch-reference-frame';
 import { errorResponse, noActiveSessionError } from '@agent-device/kernel/contracts';
 
diff --git a/src/daemon/handlers/session-clipboard.ts b/packages/daemon/src/execution/handlers/session-clipboard.ts
similarity index 91%
rename from src/daemon/handlers/session-clipboard.ts
rename to packages/daemon/src/execution/handlers/session-clipboard.ts
index 61badf6386..85b18755a5 100644
--- a/src/daemon/handlers/session-clipboard.ts
+++ b/packages/daemon/src/execution/handlers/session-clipboard.ts
@@ -1,4 +1,4 @@
-import type { DaemonPlatformServices } from '../platform-services.ts';
+import type { DaemonPlatformServices } from '../../core/platform-services.ts';
 import type {
   ClipboardReadInput,
   ClipboardWriteInput,
@@ -11,18 +11,21 @@ import type { BoundDeviceRuntime } from '@agent-device/contracts/platform-runtim
 import { publicPlatformString, type DeviceInfo } from '@agent-device/kernel/device';
 import { AppError } from '@agent-device/kernel/errors';
 import { PUBLIC_COMMANDS } from '@agent-device/command-registry/catalog';
-import { contextFromFlags, type DaemonCommandContext } from '../context.ts';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
-import type { SessionStore } from '../session-store.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import { admitRuntimeUse, type RuntimeAdmissionBindings } from '../runtime-admission.ts';
-import { runtimeExecutionFromContext } from '../snapshot-runtime-capture-input.ts';
+import { contextFromFlags, type DaemonCommandContext } from '../../core/context.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
+import type { SessionStore } from '../../core/session-store.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import { admitRuntimeUse, type RuntimeAdmissionBindings } from '../../core/runtime-admission.ts';
+import { runtimeExecutionFromContext } from '../../core/snapshot-runtime-capture-input.ts';
 import { successText } from '@agent-device/kernel/success-text';
-import { recordSessionAction } from '../session-action-recorder.ts';
+import { recordSessionAction } from '../../core/session-action-recorder.ts';
 import {
   requireSessionOrExplicitSelector,
   resolveCommandDevice,
-} from '../session-device-resolution.ts';
+} from '../../resources/session-device-resolution.ts';
 import { type DaemonFailureResponse, errorResponse } from '@agent-device/kernel/contracts';
 
 type ClipboardAction = 'read' | 'write';
diff --git a/src/daemon/handlers/session-selector-dispatch.ts b/packages/daemon/src/execution/handlers/session-selector-dispatch.ts
similarity index 91%
rename from src/daemon/handlers/session-selector-dispatch.ts
rename to packages/daemon/src/execution/handlers/session-selector-dispatch.ts
index edf0b3b228..4b4605185d 100644
--- a/src/daemon/handlers/session-selector-dispatch.ts
+++ b/packages/daemon/src/execution/handlers/session-selector-dispatch.ts
@@ -1,21 +1,24 @@
-import type { DaemonPlatformServices } from '../platform-services.ts';
+import type { DaemonPlatformServices } from '../../core/platform-services.ts';
 import { PUBLIC_COMMANDS } from '@agent-device/command-registry/catalog';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
-import type { SessionRef, SessionState } from '../session-state.ts';
-import type { SessionStore } from '../session-store.ts';
-import { contextFromFlags } from '../context.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../../core/session-state.ts';
+import type { SessionStore } from '../../core/session-store.ts';
+import { contextFromFlags } from '../../core/context.ts';
 import {
   requireSessionOrExplicitSelector,
   resolveCommandDevice,
-} from '../session-device-resolution.ts';
-import { recordSessionAction } from '../session-action-recorder.ts';
+} from '../../resources/session-device-resolution.ts';
+import { recordSessionAction } from '../../core/session-action-recorder.ts';
 import { resolveBoundAppEventRuntime } from '../app-event-runtime.ts';
 import { resolveBoundKeyboardRuntime } from '../keyboard-runtime.ts';
-import { resolveRefFrameEffect } from '../daemon-command-registry.ts';
-import { expireRefFrame } from '../ref-frame.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import type { DaemonCommandContext } from '../context.ts';
+import { resolveRefFrameEffect } from '../../core/daemon-command-registry.ts';
+import { expireRefFrame } from '../../core/ref-frame.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import type { DaemonCommandContext } from '../../core/context.ts';
 import { errorResponse } from '@agent-device/kernel/contracts';
 
 /**
diff --git a/src/daemon/handlers/snapshot-alert.ts b/packages/daemon/src/execution/handlers/snapshot-alert.ts
similarity index 89%
rename from src/daemon/handlers/snapshot-alert.ts
rename to packages/daemon/src/execution/handlers/snapshot-alert.ts
index 295529ebd2..bb914de475 100644
--- a/src/daemon/handlers/snapshot-alert.ts
+++ b/packages/daemon/src/execution/handlers/snapshot-alert.ts
@@ -1,4 +1,4 @@
-import type { DaemonPlatformServices } from '../platform-services.ts';
+import type { DaemonPlatformServices } from '../../core/platform-services.ts';
 import type { AlertRuntimeInput } from '@agent-device/contracts/alert-runtime';
 import {
   type AlertAction,
@@ -12,17 +12,20 @@ import {
   alertWaitUse,
 } from '@agent-device/contracts/platform-runtime-operations';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import { contextFromFlags } from '../context.ts';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
-import type { SessionRef, SessionState } from '../session-state.ts';
-import { SessionStore } from '../session-store.ts';
-import { recordSessionAction } from '../session-action-recorder.ts';
+import { contextFromFlags } from '../../core/context.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../../core/session-state.ts';
+import { SessionStore } from '../../core/session-store.ts';
+import { recordSessionAction } from '../../core/session-action-recorder.ts';
 import { parseTimeout } from '@agent-device/command-registry/parse-timeout';
-import { resolveRefFrameEffect } from '../daemon-command-registry.ts';
-import { expireRefFrame } from '../ref-frame.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import { admitRuntimeUse, type RuntimeAdmissionBindings } from '../runtime-admission.ts';
-import { runtimeExecutionFromContext } from '../snapshot-runtime-capture-input.ts';
+import { resolveRefFrameEffect } from '../../core/daemon-command-registry.ts';
+import { expireRefFrame } from '../../core/ref-frame.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import { admitRuntimeUse, type RuntimeAdmissionBindings } from '../../core/runtime-admission.ts';
+import { runtimeExecutionFromContext } from '../../core/snapshot-runtime-capture-input.ts';
 import type { DaemonFailureResponse } from '@agent-device/kernel/contracts';
 
 type HandleAlertCommandParams = {
diff --git a/src/daemon/handlers/snapshot-settings.ts b/packages/daemon/src/execution/handlers/snapshot-settings.ts
similarity index 95%
rename from src/daemon/handlers/snapshot-settings.ts
rename to packages/daemon/src/execution/handlers/snapshot-settings.ts
index ae27c9338c..375d056d73 100644
--- a/src/daemon/handlers/snapshot-settings.ts
+++ b/packages/daemon/src/execution/handlers/snapshot-settings.ts
@@ -1,4 +1,4 @@
-import type { DaemonPlatformServices } from '../platform-services.ts';
+import type { DaemonPlatformServices } from '../../core/platform-services.ts';
 import {
   isApplePlatform,
   isHandheldAppleSimulator,
@@ -27,20 +27,23 @@ import {
   settingsRuntimeUse,
 } from '@agent-device/contracts/platform-runtime-operations';
 import type { BoundDeviceRuntime } from '@agent-device/contracts/platform-runtime';
-import { contextFromFlags } from '../context.ts';
-import { SessionStore } from '../session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
-import type { SessionRef, SessionState } from '../session-state.ts';
-import { recordSessionAction } from '../session-action-recorder.ts';
-import { expireRefFrame } from '../ref-frame.ts';
+import { contextFromFlags } from '../../core/context.ts';
+import { SessionStore } from '../../core/session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../../core/session-state.ts';
+import { recordSessionAction } from '../../core/session-action-recorder.ts';
+import { expireRefFrame } from '../../core/ref-frame.ts';
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
 import { readLocationCoordinate } from '@agent-device/kernel/location-coordinates';
 import { sessionAppRequiredDetails } from '@agent-device/kernel/errors';
 import { successText, withSuccessText } from '@agent-device/kernel/success-text';
 
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import { admitRuntimeUse } from '../runtime-admission.ts';
-import { runtimeExecutionFromContext } from '../snapshot-runtime-capture-input.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import { admitRuntimeUse } from '../../core/runtime-admission.ts';
+import { runtimeExecutionFromContext } from '../../core/snapshot-runtime-capture-input.ts';
 import { type DaemonFailureResponse, errorResponse } from '@agent-device/kernel/contracts';
 
 type ParsedSettingsArgs = {
diff --git a/src/daemon/interaction/index.ts b/packages/daemon/src/execution/interaction/index.ts
similarity index 86%
rename from src/daemon/interaction/index.ts
rename to packages/daemon/src/execution/interaction/index.ts
index 612abde8c5..81b5f1511b 100644
--- a/src/daemon/interaction/index.ts
+++ b/packages/daemon/src/execution/interaction/index.ts
@@ -1,8 +1,8 @@
 import { bindInteractionSession } from './internal/interaction-session.ts';
 import type { Rect } from '@agent-device/kernel/snapshot';
-import { buildRuntimeCaptureInput } from '../snapshot-runtime-capture-input.ts';
+import { buildRuntimeCaptureInput } from '../../core/snapshot-runtime-capture-input.ts';
 import { setSessionSnapshot } from '../session-snapshot.ts';
-import { captureSnapshot } from '../snapshot-capture.ts';
+import { captureSnapshot } from '../../core/snapshot-capture.ts';
 import { captureInteractionSnapshot } from './internal/interaction-snapshot.ts';
 import { createInteractionRuntimeForRoute } from './internal/interaction-runtime.ts';
 import { readSettleRequest, settleFlagGuardResponse } from './internal/interaction-flags.ts';
@@ -11,9 +11,12 @@ import type {
   FindRouteInput,
   InteractionRouteInput,
   SettleObservationCaptureInput,
-} from './internal/types.ts';
+} from '../../core/interaction/internal/types.ts';
 
-export type { FindRouteInput, InteractionRouteInput } from './internal/types.ts';
+export type {
+  FindRouteInput,
+  InteractionRouteInput,
+} from '../../core/interaction/internal/types.ts';
 
 export { refMutationAdmissionResponse } from './internal/interaction-ref-policy.ts';
 export { finalizeTouchInteraction } from './internal/interaction-runtime.ts';
@@ -71,8 +74,8 @@ export async function createInteractionRuntime(
   params: SettleObservationCaptureInput &
     InteractionRouteInput & {
       pairedGestureViewport?: Rect;
-      touchExecutor?: import('../touch-runtime.ts').BoundTouchExecutor;
-      gestures?: import('../gesture-runtime.ts').BoundGestureExecutor;
+      touchExecutor?: import('../../core/touch-runtime.ts').BoundTouchExecutor;
+      gestures?: import('../../core/gesture-runtime.ts').BoundGestureExecutor;
     },
 ) {
   return await createInteractionRuntimeForRoute({
diff --git a/src/daemon/interaction/internal/__tests__/find-handler-fixture.ts b/packages/daemon/src/execution/interaction/internal/__tests__/find-handler-fixture.ts
similarity index 83%
rename from src/daemon/interaction/internal/__tests__/find-handler-fixture.ts
rename to packages/daemon/src/execution/interaction/internal/__tests__/find-handler-fixture.ts
index 5b26c59892..9bb69ef83e 100644
--- a/src/daemon/interaction/internal/__tests__/find-handler-fixture.ts
+++ b/packages/daemon/src/execution/interaction/internal/__tests__/find-handler-fixture.ts
@@ -1,9 +1,9 @@
-import type { SessionStore } from '../../../session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../../../daemon-request.ts';
+import type { SessionStore } from '../../../../core/session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../../core/daemon-request.ts';
 import { handleFindCommands } from '../find.ts';
 import { getRuntimeBindings } from '../../../__tests__/interaction-get-runtime-fixture.ts';
 import type { CreateDaemonCommandSurface } from '@agent-device/contracts/daemon-command-surface';
-import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../../__tests__/support/command-surface-fake.ts';
 
 /**
  * One `handleFindCommands` invocation shape.
diff --git a/src/daemon/interaction/internal/__tests__/find-match-ranking.test.ts b/packages/daemon/src/execution/interaction/internal/__tests__/find-match-ranking.test.ts
similarity index 100%
rename from src/daemon/interaction/internal/__tests__/find-match-ranking.test.ts
rename to packages/daemon/src/execution/interaction/internal/__tests__/find-match-ranking.test.ts
diff --git a/src/daemon/interaction/internal/__tests__/find-single-bind.test.ts b/packages/daemon/src/execution/interaction/internal/__tests__/find-single-bind.test.ts
similarity index 81%
rename from src/daemon/interaction/internal/__tests__/find-single-bind.test.ts
rename to packages/daemon/src/execution/interaction/internal/__tests__/find-single-bind.test.ts
index 9a64128de6..0190dfcfa1 100644
--- a/src/daemon/interaction/internal/__tests__/find-single-bind.test.ts
+++ b/packages/daemon/src/execution/interaction/internal/__tests__/find-single-bind.test.ts
@@ -1,7 +1,7 @@
 import { test, expect, vi, beforeEach } from 'vitest';
-import type { DaemonResponse } from '../../../daemon-request.ts';
-import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
-import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
+import type { DaemonResponse } from '../../../../core/daemon-request.ts';
+import { makeSessionStore } from '../../../../__tests__/support/store-factory.ts';
+import { makeIosSession } from '../../../../__tests__/support/session-factories.ts';
 import {
   mockFocusPoint,
   mockTypeText,
@@ -9,10 +9,10 @@ import {
   runtimeBindingSpies,
 } from '../../../__tests__/interaction-get-runtime-fixture.ts';
 import { invokeFindHandler } from './find-handler-fixture.ts';
-import { legacyDispatchCapture } from '../../../__tests__/legacy-snapshot-capture-fixture.ts';
+import { legacyDispatchCapture } from '../../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
 
-vi.mock('../../../snapshot-interactor-capture.ts', async () => {
-  const fixture = await import('../../../__tests__/legacy-snapshot-capture-fixture.ts');
+vi.mock('../../../../core/snapshot-interactor-capture.ts', async () => {
+  const fixture = await import('../../../../__tests__/support/legacy-snapshot-capture-fixture.ts');
   return { captureSnapshotWithInteractor: fixture.captureSnapshotThroughLegacyDispatchFixture };
 });
 
diff --git a/src/daemon/interaction/internal/__tests__/find-target-activation-disclosure.test.ts b/packages/daemon/src/execution/interaction/internal/__tests__/find-target-activation-disclosure.test.ts
similarity index 89%
rename from src/daemon/interaction/internal/__tests__/find-target-activation-disclosure.test.ts
rename to packages/daemon/src/execution/interaction/internal/__tests__/find-target-activation-disclosure.test.ts
index d686d53bef..662ddf25b8 100644
--- a/src/daemon/interaction/internal/__tests__/find-target-activation-disclosure.test.ts
+++ b/packages/daemon/src/execution/interaction/internal/__tests__/find-target-activation-disclosure.test.ts
@@ -1,18 +1,18 @@
 import { beforeEach, expect, test, vi } from 'vitest';
 import type { IosTargetActivation, PostGestureOutcome } from '@agent-device/kernel/snapshot';
 import { iosTargetActivationDisclosure } from '@agent-device/contracts/ios-target-activation';
-import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
-import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
-import type { DaemonResponse } from '../../../daemon-request.ts';
-import { legacyDispatchCapture } from '../../../__tests__/legacy-snapshot-capture-fixture.ts';
+import { makeSessionStore } from '../../../../__tests__/support/store-factory.ts';
+import { makeIosSession } from '../../../../__tests__/support/session-factories.ts';
+import type { DaemonResponse } from '../../../../core/daemon-request.ts';
+import { legacyDispatchCapture } from '../../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
 import { getRuntimeBindings } from '../../../__tests__/interaction-get-runtime-fixture.ts';
 import { handleFindCommands } from '../../index.ts';
-import { markDeferredInteractionOutcome } from '../../../deferred-interaction-outcome.ts';
+import { markDeferredInteractionOutcome } from '../../../../core/deferred-interaction-outcome.ts';
 import { formatPostGestureOutcomeWarning } from '@agent-device/capture-kit/post-gesture-stability';
-import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../../__tests__/support/command-surface-fake.ts';
 
-vi.mock('../../../snapshot-interactor-capture.ts', async () => {
-  const fixture = await import('../../../__tests__/legacy-snapshot-capture-fixture.ts');
+vi.mock('../../../../core/snapshot-interactor-capture.ts', async () => {
+  const fixture = await import('../../../../__tests__/support/legacy-snapshot-capture-fixture.ts');
   return { captureSnapshotWithInteractor: fixture.captureSnapshotThroughLegacyDispatchFixture };
 });
 
diff --git a/src/daemon/interaction/internal/__tests__/find-touch-runtime-fixture.ts b/packages/daemon/src/execution/interaction/internal/__tests__/find-touch-runtime-fixture.ts
similarity index 88%
rename from src/daemon/interaction/internal/__tests__/find-touch-runtime-fixture.ts
rename to packages/daemon/src/execution/interaction/internal/__tests__/find-touch-runtime-fixture.ts
index 4c2ee94934..46f439138d 100644
--- a/src/daemon/interaction/internal/__tests__/find-touch-runtime-fixture.ts
+++ b/packages/daemon/src/execution/interaction/internal/__tests__/find-touch-runtime-fixture.ts
@@ -1,5 +1,5 @@
 import { expect } from 'vitest';
-import { legacyDispatchCapture } from '../../../__tests__/legacy-snapshot-capture-fixture.ts';
+import { legacyDispatchCapture } from '../../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
 import { IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
 import {
   getRuntimeBindings,
@@ -8,10 +8,10 @@ import {
   mockTapPoint,
   resetGetRuntimeFixture,
 } from '../../../__tests__/interaction-get-runtime-fixture.ts';
-import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
-import { makeIosSession as makeSession } from '../../../__tests__/support/session-factories.ts';
-import type { DaemonRequest, DaemonResponse } from '../../../daemon-request.ts';
-import type { SessionState } from '../../../session-state.ts';
+import { makeSessionStore } from '../../../../__tests__/support/store-factory.ts';
+import { makeIosSession as makeSession } from '../../../../__tests__/support/session-factories.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../../core/daemon-request.ts';
+import type { SessionState } from '../../../../core/session-state.ts';
 import type { CreateDaemonCommandSurface } from '@agent-device/contracts/daemon-command-surface';
 import type { handleFindCommands } from '../find.ts';
 import { invokeFindHandler } from './find-handler-fixture.ts';
diff --git a/src/daemon/interaction/internal/__tests__/find.test.ts b/packages/daemon/src/execution/interaction/internal/__tests__/find.test.ts
similarity index 98%
rename from src/daemon/interaction/internal/__tests__/find.test.ts
rename to packages/daemon/src/execution/interaction/internal/__tests__/find.test.ts
index 7f24f1cef0..27b4050d7c 100644
--- a/src/daemon/interaction/internal/__tests__/find.test.ts
+++ b/packages/daemon/src/execution/interaction/internal/__tests__/find.test.ts
@@ -1,5 +1,5 @@
 import { test, expect, vi, beforeEach } from 'vitest';
-import { makeIosSession as makeSession } from '../../../__tests__/support/session-factories.ts';
+import { makeIosSession as makeSession } from '../../../../__tests__/support/session-factories.ts';
 
 vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal) => {
   const actual = (await importOriginal()) as Record<string, unknown>;
@@ -8,8 +8,8 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
     resolveTargetDevice: actual.resolveTargetDevice,
   };
 });
-vi.mock('../../../snapshot-interactor-capture.ts', async () => {
-  const fixture = await import('../../../__tests__/legacy-snapshot-capture-fixture.ts');
+vi.mock('../../../../core/snapshot-interactor-capture.ts', async () => {
+  const fixture = await import('../../../../__tests__/support/legacy-snapshot-capture-fixture.ts');
   return { captureSnapshotWithInteractor: fixture.captureSnapshotThroughLegacyDispatchFixture };
 });
 
@@ -19,7 +19,7 @@ import {
   resetFindTouchRuntimeFixture,
   runFindClickScenario,
 } from './find-touch-runtime-fixture.ts';
-import { refFrameState } from '../../../ref-frame.ts';
+import { refFrameState } from '../../../../core/ref-frame.ts';
 
 beforeEach(() => {
   resetFindTouchRuntimeFixture();
diff --git a/src/daemon/interaction/internal/__tests__/gesture-runtime-bindings.fixtures.ts b/packages/daemon/src/execution/interaction/internal/__tests__/gesture-runtime-bindings.fixtures.ts
similarity index 63%
rename from src/daemon/interaction/internal/__tests__/gesture-runtime-bindings.fixtures.ts
rename to packages/daemon/src/execution/interaction/internal/__tests__/gesture-runtime-bindings.fixtures.ts
index ebc033b318..ba8a00ca92 100644
--- a/src/daemon/interaction/internal/__tests__/gesture-runtime-bindings.fixtures.ts
+++ b/packages/daemon/src/execution/interaction/internal/__tests__/gesture-runtime-bindings.fixtures.ts
@@ -1,11 +1,19 @@
-import { vi } from 'vitest';
+import { vi, type Mock } from 'vitest';
 import type { BoundDeviceRuntime, RuntimeFacts } from '@agent-device/contracts/platform-runtime';
 import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform-runtime-operations';
 import type { Rect } from '@agent-device/kernel/snapshot';
+import type {
+  GesturePlanInput,
+  GestureViewportInput,
+} from '@agent-device/contracts/gesture-runtime';
+import type {
+  CaptureSnapshotInput,
+  SnapshotResult,
+} from '@agent-device/contracts/snapshot-runtime';
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../../request-runtime-binding.ts';
+} from '../../../../core/request-runtime-binding.ts';
 import { unavailableDeploymentSnapshotAndShutdownOperationFacts } from '@agent-device/test-kit/runtime-operation-facts';
 
 const available = Object.freeze({ available: true } as const);
@@ -26,14 +34,25 @@ export function gestureRuntimeBindingsFixture(
       ? ({ available: false, reason: 'unsupported-platform-leaf' } as const)
       : available;
   const operationSpies = {
-    captureSnapshot: vi.fn(async () => ({ backend: 'xctest' as const, nodes: [] })),
-    performGesturePlan: vi.fn(async () => ({})),
-    performDirectionalFlingPlan: vi.fn(async () => ({})),
-    performMultiTouchGesturePlan: vi.fn(async () => ({})),
-    performTargetAuthoredDrag: vi.fn(async () => ({})),
+    captureSnapshot: vi.fn(async () => ({
+      backend: 'xctest' as const,
+      nodes: [],
+    })) as unknown as Mock<(input: CaptureSnapshotInput) => Promise<SnapshotResult>>,
+    performGesturePlan: vi.fn(async () => ({})) as Mock<
+      (input: GesturePlanInput) => Promise<Record<string, never>>
+    >,
+    performDirectionalFlingPlan: vi.fn(async () => ({})) as Mock<
+      (input: GesturePlanInput) => Promise<Record<string, never>>
+    >,
+    performMultiTouchGesturePlan: vi.fn(async () => ({})) as Mock<
+      (input: GesturePlanInput) => Promise<Record<string, never>>
+    >,
+    performTargetAuthoredDrag: vi.fn(async () => ({})) as Mock<
+      (input: GesturePlanInput) => Promise<Record<string, never>>
+    >,
     gestureViewport: vi.fn(
-      async () => options.viewport ?? ({ x: 0, y: 0, width: 400, height: 800 } as Rect),
-    ),
+      async () => options.viewport ?? { x: 0, y: 0, width: 400, height: 800 },
+    ) as Mock<(input: GestureViewportInput) => Promise<Rect>>,
   };
   const facts = {
     device: { family: 'apple', kind: 'simulator', providerMode: 'local' },
@@ -48,7 +67,7 @@ export function gestureRuntimeBindingsFixture(
     },
   } as unknown as RuntimeFacts<PlatformRuntimeOperations>;
   const inspectFacts = vi.fn(async () => facts) as unknown as InspectDeviceRuntimeFacts &
-    ReturnType<typeof vi.fn>;
+    Mock<() => Promise<RuntimeFacts<PlatformRuntimeOperations>>>;
   const bindDevice = vi.fn(
     async () =>
       ({
@@ -57,6 +76,6 @@ export function gestureRuntimeBindingsFixture(
           Object.entries(operationSpies).filter(([name]) => !unavailable.has(name)),
         ),
       }) as unknown as BoundDeviceRuntime<never>,
-  ) as unknown as BindDeviceRuntime & ReturnType<typeof vi.fn>;
+  ) as unknown as BindDeviceRuntime & Mock<() => Promise<BoundDeviceRuntime<never>>>;
   return { ...operationSpies, facts, inspectFacts, bindDevice };
 }
diff --git a/src/daemon/interaction/internal/__tests__/interaction-gesture-response.test.ts b/packages/daemon/src/execution/interaction/internal/__tests__/interaction-gesture-response.test.ts
similarity index 100%
rename from src/daemon/interaction/internal/__tests__/interaction-gesture-response.test.ts
rename to packages/daemon/src/execution/interaction/internal/__tests__/interaction-gesture-response.test.ts
diff --git a/src/daemon/interaction/internal/__tests__/interaction-ios-tap-outcome-fixtures.ts b/packages/daemon/src/execution/interaction/internal/__tests__/interaction-ios-tap-outcome-fixtures.ts
similarity index 100%
rename from src/daemon/interaction/internal/__tests__/interaction-ios-tap-outcome-fixtures.ts
rename to packages/daemon/src/execution/interaction/internal/__tests__/interaction-ios-tap-outcome-fixtures.ts
diff --git a/src/daemon/interaction/internal/__tests__/interaction-recorded-input.test.ts b/packages/daemon/src/execution/interaction/internal/__tests__/interaction-recorded-input.test.ts
similarity index 100%
rename from src/daemon/interaction/internal/__tests__/interaction-recorded-input.test.ts
rename to packages/daemon/src/execution/interaction/internal/__tests__/interaction-recorded-input.test.ts
diff --git a/src/daemon/interaction/internal/__tests__/interaction-ref-policy.test.ts b/packages/daemon/src/execution/interaction/internal/__tests__/interaction-ref-policy.test.ts
similarity index 98%
rename from src/daemon/interaction/internal/__tests__/interaction-ref-policy.test.ts
rename to packages/daemon/src/execution/interaction/internal/__tests__/interaction-ref-policy.test.ts
index c65902c850..11dabba40a 100644
--- a/src/daemon/interaction/internal/__tests__/interaction-ref-policy.test.ts
+++ b/packages/daemon/src/execution/interaction/internal/__tests__/interaction-ref-policy.test.ts
@@ -1,5 +1,5 @@
 import { expect, test } from 'vitest';
-import { activatePartialRefFrame, readRefMutationFrame } from '../../../ref-frame.ts';
+import { activatePartialRefFrame, readRefMutationFrame } from '../../../../core/ref-frame.ts';
 import { refMutationAdmissionResponse } from '../interaction-ref-policy.ts';
 import { makeStaleRefSession } from './interaction-touch-fixtures.ts';
 
diff --git a/src/daemon/interaction/internal/__tests__/interaction-response-construction-guard.test.ts b/packages/daemon/src/execution/interaction/internal/__tests__/interaction-response-construction-guard.test.ts
similarity index 100%
rename from src/daemon/interaction/internal/__tests__/interaction-response-construction-guard.test.ts
rename to packages/daemon/src/execution/interaction/internal/__tests__/interaction-response-construction-guard.test.ts
diff --git a/src/daemon/interaction/internal/__tests__/interaction-response-data-transform.test.ts b/packages/daemon/src/execution/interaction/internal/__tests__/interaction-response-data-transform.test.ts
similarity index 100%
rename from src/daemon/interaction/internal/__tests__/interaction-response-data-transform.test.ts
rename to packages/daemon/src/execution/interaction/internal/__tests__/interaction-response-data-transform.test.ts
diff --git a/src/daemon/interaction/internal/__tests__/interaction-runtime.test.ts b/packages/daemon/src/execution/interaction/internal/__tests__/interaction-runtime.test.ts
similarity index 85%
rename from src/daemon/interaction/internal/__tests__/interaction-runtime.test.ts
rename to packages/daemon/src/execution/interaction/internal/__tests__/interaction-runtime.test.ts
index 8994028ee3..d23491de0a 100644
--- a/src/daemon/interaction/internal/__tests__/interaction-runtime.test.ts
+++ b/packages/daemon/src/execution/interaction/internal/__tests__/interaction-runtime.test.ts
@@ -1,6 +1,6 @@
 import { expectTypeOf, test } from 'vitest';
 import type { CommandFlags } from '@agent-device/contracts/command';
-import type { InteractionRuntimeInput } from '../types.ts';
+import type { InteractionRuntimeInput } from '../../../../core/interaction/internal/types.ts';
 
 test('interaction runtime accepts only explicit request capabilities', () => {
   expectTypeOf<InteractionRuntimeInput>()
diff --git a/src/daemon/interaction/internal/__tests__/interaction-snapshot-scope.test.ts b/packages/daemon/src/execution/interaction/internal/__tests__/interaction-snapshot-scope.test.ts
similarity index 93%
rename from src/daemon/interaction/internal/__tests__/interaction-snapshot-scope.test.ts
rename to packages/daemon/src/execution/interaction/internal/__tests__/interaction-snapshot-scope.test.ts
index 7c4904cbbd..c62c5218d0 100644
--- a/src/daemon/interaction/internal/__tests__/interaction-snapshot-scope.test.ts
+++ b/packages/daemon/src/execution/interaction/internal/__tests__/interaction-snapshot-scope.test.ts
@@ -2,9 +2,9 @@ import { afterEach, expect, test, vi } from 'vitest';
 import type { SnapshotOptions } from '@agent-device/contracts/interactor-types';
 import type { CommandFlags } from '@agent-device/contracts/command';
 import type { SnapshotNode } from '@agent-device/kernel/snapshot';
-import { makeAndroidSession } from '../../../__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
-import { contextFromFlags } from '../../../context.ts';
+import { makeAndroidSession } from '../../../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../../../__tests__/support/store-factory.ts';
+import { contextFromFlags } from '../../../../core/context.ts';
 import { captureSnapshotForSession } from '../../index.ts';
 
 // The interaction runtime's capture (press/click/fill/longpress/hover <selector> --scope X,
@@ -18,7 +18,7 @@ const captured = vi.hoisted(() => ({
   held: undefined as Promise<void> | undefined,
 }));
 
-vi.mock('../../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(async ({ options }: { options: SnapshotOptions }) => {
     captured.options.push(options);
     await captured.held;
diff --git a/src/daemon/interaction/internal/__tests__/interaction-touch-fixtures.ts b/packages/daemon/src/execution/interaction/internal/__tests__/interaction-touch-fixtures.ts
similarity index 93%
rename from src/daemon/interaction/internal/__tests__/interaction-touch-fixtures.ts
rename to packages/daemon/src/execution/interaction/internal/__tests__/interaction-touch-fixtures.ts
index c9fbad50d5..1b51da7f56 100644
--- a/src/daemon/interaction/internal/__tests__/interaction-touch-fixtures.ts
+++ b/packages/daemon/src/execution/interaction/internal/__tests__/interaction-touch-fixtures.ts
@@ -4,10 +4,10 @@ import {
   makeAndroidSession as makeBaseAndroidSession,
   makeIosAppSession,
   makeMacOsSession as makeBaseMacOsSession,
-} from '../../../__tests__/support/session-factories.ts';
-import { makeTestScreenRecordingResource } from '../../../__tests__/support/screen-recording-live-handle.ts';
-import { activateCompleteRefFrame } from '../../../ref-frame.ts';
-import type { SessionState } from '../../../session-state.ts';
+} from '../../../../__tests__/support/session-factories.ts';
+import { makeTestScreenRecordingResource } from '../../../../__tests__/support/screen-recording-live-handle.ts';
+import { activateCompleteRefFrame } from '../../../../core/ref-frame.ts';
+import type { SessionState } from '../../../../core/session-state.ts';
 import { buildSnapshotState } from '@agent-device/capture-kit/snapshot-state';
 
 /**
diff --git a/src/daemon/interaction/internal/__tests__/interaction-touch-reference-frame.test.ts b/packages/daemon/src/execution/interaction/internal/__tests__/interaction-touch-reference-frame.test.ts
similarity index 89%
rename from src/daemon/interaction/internal/__tests__/interaction-touch-reference-frame.test.ts
rename to packages/daemon/src/execution/interaction/internal/__tests__/interaction-touch-reference-frame.test.ts
index 5eab8cd09c..df7e217a5a 100644
--- a/src/daemon/interaction/internal/__tests__/interaction-touch-reference-frame.test.ts
+++ b/packages/daemon/src/execution/interaction/internal/__tests__/interaction-touch-reference-frame.test.ts
@@ -3,10 +3,10 @@ import { makeSnapshotState } from '@agent-device/capture-kit/snapshot-state-fixt
 import {
   makeAndroidSession,
   makeIosAppSession,
-} from '../../../__tests__/support/session-factories.ts';
-import { makeTestScreenRecordingResource } from '../../../__tests__/support/screen-recording-live-handle.ts';
-import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
-import { clearAndroidObservationFixture } from '../../../__tests__/android-observation-fixture.ts';
+} from '../../../../__tests__/support/session-factories.ts';
+import { makeTestScreenRecordingResource } from '../../../../__tests__/support/screen-recording-live-handle.ts';
+import { makeSessionStore } from '../../../../__tests__/support/store-factory.ts';
+import { clearAndroidObservationFixture } from '../../../../__tests__/support/android-observation-fixture.ts';
 import { contextFromFlags } from './interaction-touch-fixtures.ts';
 import { resolveDirectTouchReferenceFrameSafely } from '../interaction-touch-reference-frame.ts';
 
diff --git a/packages/daemon/src/execution/interaction/internal/__tests__/interaction-touch-response.test.ts b/packages/daemon/src/execution/interaction/internal/__tests__/interaction-touch-response.test.ts
new file mode 100644
index 0000000000..13ea9cd835
--- /dev/null
+++ b/packages/daemon/src/execution/interaction/internal/__tests__/interaction-touch-response.test.ts
@@ -0,0 +1,308 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import {
+  withDiagnosticsScope,
+  flushDiagnosticsToSessionFile,
+} from '@agent-device/host-kit/diagnostics';
+import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
+import { test, expect, vi, beforeEach } from 'vitest';
+import { attachRefs } from '@agent-device/kernel/snapshot';
+import { makeSessionStore } from '../../../../__tests__/support/store-factory.ts';
+import {
+  buildInteractionResponseData,
+  buildTargetedTouchResponsePayloads,
+  transformTouchResponseData,
+} from '../interaction-touch-response.ts';
+import type { PressCommandResult } from '@agent-device/contracts/interaction';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
+import { fakeCreateCommandSurface as testCreateCommandSurface } from '../../../../__tests__/support/command-surface-fake.ts';
+import {
+  contextFromFlags,
+  installTestScreenRecording,
+  makeSession,
+} from './interaction-touch-fixtures.ts';
+
+// Pure response-builder suites: every case calls the daemon builders directly. The
+// suites that drive `handleInteractionCommands` through the real root command surface
+// (the --verify evidence branches) stayed root-side under
+// `src/__tests__/daemon-composition/interaction/`, where the surface they exercise lives.
+
+const { mockRunAppleRunnerCommand } = vi.hoisted(() => ({
+  mockRunAppleRunnerCommand: vi.fn(),
+}));
+
+vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@agent-device/platform-android/mechanics')>();
+  return {
+    ...actual,
+    getAndroidScreenSize: vi.fn(async () => ({ width: 1344, height: 2992 })),
+    getAndroidAppState: vi.fn(async () => ({})),
+    getAndroidBlockingDialogObservation: vi.fn(async () => ({ status: 'clear' }) as const),
+  };
+});
+
+vi.mock('../../../../core/snapshot-interactor-capture.ts', () => ({
+  captureSnapshotWithInteractor: vi.fn(),
+}));
+
+vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('@agent-device/platform-apple/runner/operations')>();
+  return { ...actual, runAppleRunnerCommand: mockRunAppleRunnerCommand };
+});
+
+import {
+  getAndroidAppState,
+  getAndroidBlockingDialogObservation,
+  getAndroidScreenSize,
+} from '@agent-device/platform-android/mechanics';
+import { captureSnapshotWithInteractor } from '../../../../core/snapshot-interactor-capture.ts';
+
+beforeEach(() => {
+  vi.mocked(getAndroidAppState).mockReset();
+  vi.mocked(getAndroidAppState).mockResolvedValue({});
+  vi.mocked(getAndroidBlockingDialogObservation).mockReset();
+  vi.mocked(getAndroidBlockingDialogObservation).mockResolvedValue({ status: 'clear' });
+  vi.mocked(getAndroidScreenSize).mockReset();
+  vi.mocked(getAndroidScreenSize).mockResolvedValue({ width: 1344, height: 2992 });
+  vi.mocked(captureSnapshotWithInteractor).mockReset();
+  mockRunAppleRunnerCommand.mockReset();
+  mockRunAppleRunnerCommand.mockResolvedValue({});
+});
+
+test('commandless longpress response omits internal interaction diagnostics', () => {
+  expect(
+    transformTouchResponseData({
+      flags: {},
+      data: {
+        currentUptimeMs: 900,
+        gestureStartUptimeMs: 100,
+        gestureEndUptimeMs: 800,
+        sequenceResults: [{ index: 0, success: true }],
+        completedSteps: 1,
+      },
+    }),
+  ).toEqual({ completedSteps: 1 });
+});
+
+function selectorResult(readiness?: { polls: number; waitedMs: number }): PressCommandResult {
+  return {
+    kind: 'selector',
+    point: { x: 10, y: 20 },
+    target: { kind: 'selector', selector: 'label=Continue' },
+    node: { ref: 'e1', index: 0, type: 'Button', label: 'Continue' },
+    selectorChain: ['label=Continue'],
+    warning: 'earlier warning',
+    ...(readiness ? { readiness } : {}),
+  };
+}
+
+const WAITED_SELECTOR_RESULT = selectorResult({ polls: 3, waitedMs: 400 });
+
+test.each([false, true])('selector-touch observation after retirement=%s', async (retired) => {
+  const sessionStore = makeSessionStore();
+  const address = 'cwd:selector-touch-response:default';
+  const session = makeSession('default');
+  session.snapshot = {
+    nodes: attachRefs([{ index: 0, type: 'Button', label: 'Continue' }]),
+    createdAt: Date.now(),
+    backend: 'xctest',
+  };
+  session.snapshotGeneration = 3;
+  const ref = sessionStore.publish(address, session);
+  const result: PressCommandResult = {
+    ...selectorResult(),
+    settle: {
+      settled: true,
+      waitedMs: 25,
+      captures: 2,
+      quietMs: 25,
+      timeoutMs: 2000,
+      diff: {
+        summary: { additions: 1, removals: 0, unchanged: 0 },
+        lines: [{ kind: 'added', text: 'Continue', ref: 'e1' }],
+      },
+    },
+  };
+  let successor;
+  if (retired) {
+    sessionStore.retire(ref);
+    successor = sessionStore.publish(address, makeSession('default'));
+  }
+  const payloads = await buildTargetedTouchResponsePayloads({
+    params: {
+      createCommandSurface: testCreateCommandSurface,
+      req: { token: 't', command: 'press', positionals: ['@e1'], session: 'default' },
+      sessionName: address,
+      sessionRef: ref,
+      sessionStore,
+      contextFromFlags,
+      platformServices: daemonPlatformServicesFixture(),
+      captureSnapshotForSession: vi.fn(),
+    },
+    result,
+    staleRefsWarning: undefined,
+    extra: {},
+  });
+  if (retired) {
+    expect(payloads.responseData.settle).toBeUndefined();
+    expect(payloads.result.settle).toBeUndefined();
+    expect(sessionStore.lookup(address)).toEqual(successor);
+    expect(successor?.session.snapshot).toBeUndefined();
+  } else {
+    expect(payloads.responseData.settle).toMatchObject({ refsGeneration: 3, settled: true });
+  }
+});
+
+test.each([
+  [false, false],
+  [false, true],
+  [true, false],
+  [true, true],
+])(
+  'point-touch publication after a held frame probe, retired=%s, fails=%s',
+  async (retired, fails) => {
+    const sessionStore = makeSessionStore();
+    const address = 'cwd:held-touch-response:default';
+    const session = makeSession('default');
+    session.snapshot = {
+      nodes: attachRefs([{ index: 0, type: 'Button', label: 'Continue' }]),
+      createdAt: Date.now(),
+      backend: 'xctest',
+    };
+    session.snapshotGeneration = 3;
+    installTestScreenRecording(session);
+    const ref = sessionStore.publish(address, session);
+    let startProbe!: () => void;
+    let releaseProbe!: () => void;
+    const probing = new Promise<void>((resolve) => {
+      startProbe = resolve;
+    });
+    const released = new Promise<void>((resolve) => {
+      releaseProbe = resolve;
+    });
+    const result: PressCommandResult = {
+      kind: 'point',
+      point: { x: 10, y: 20 },
+      settle: {
+        settled: true,
+        waitedMs: 25,
+        captures: 2,
+        quietMs: 25,
+        timeoutMs: 2000,
+        diff: {
+          summary: { additions: 1, removals: 0, unchanged: 0 },
+          lines: [{ kind: 'added', text: 'Continue', ref: 'e1' }],
+        },
+      },
+    };
+    const logPath = path.join(mkdtempForTestSync('held-point-'), 'request.log');
+    const running = withDiagnosticsScope(
+      { command: 'press', session: address, logPath, debug: true },
+      async () => {
+        const payloads = await buildTargetedTouchResponsePayloads({
+          params: {
+            createCommandSurface: testCreateCommandSurface,
+            req: {
+              token: 't',
+              command: 'press',
+              positionals: ['10', '20'],
+              session: 'default',
+              flags: {},
+            },
+            sessionName: address,
+            sessionRef: ref,
+            sessionStore,
+            contextFromFlags,
+            platformServices: daemonPlatformServicesFixture(),
+            captureSnapshotForSession: async () => {
+              startProbe();
+              await released;
+              if (fails) throw new Error('frame capture failed');
+              return sessionStore.requireCurrent(ref).snapshot!;
+            },
+          },
+          result,
+          staleRefsWarning: undefined,
+          extra: {},
+        });
+        flushDiagnosticsToSessionFile({ force: true });
+        return payloads;
+      },
+    );
+    await probing;
+    let successor;
+    if (retired) {
+      sessionStore.retire(ref);
+      successor = sessionStore.publish(address, makeSession('default'));
+    }
+    releaseProbe();
+    const payloads = await running;
+    const diagnostics = fs.existsSync(logPath) ? fs.readFileSync(logPath, 'utf8') : '';
+    expect(diagnostics.includes('touch_reference_frame_resolve_failed')).toBe(!retired && fails);
+    expect(payloads.responseData.x).toBe(10);
+    if (retired) {
+      expect(payloads.responseData.settle).toBeUndefined();
+      expect(payloads.result.settle).toBeUndefined();
+      expect(sessionStore.lookup(address)).toEqual(successor);
+      expect(successor?.session.snapshot).toBeUndefined();
+    } else {
+      expect(payloads.responseData.settle).toMatchObject({ refsGeneration: 3, settled: true });
+    }
+  },
+);
+
+test('the response builder reports the resolved wait and keeps the prior warning', () => {
+  const { responseData, result } = buildInteractionResponseData({
+    source: { kind: 'runtime', result: WAITED_SELECTOR_RESULT },
+    referenceFrame: undefined,
+    staleRefsWarning: 'stale refs',
+  });
+
+  expect(responseData.readiness).toEqual({ polls: 3, waitedMs: 400 });
+  expect(responseData.warning).toBe('earlier warning stale refs');
+  expect(result.readiness).toBeUndefined();
+});
+
+test('the response builder omits readiness when nothing waited', () => {
+  const { responseData } = buildInteractionResponseData({
+    source: { kind: 'runtime', result: selectorResult() },
+    referenceFrame: undefined,
+  });
+
+  expect('readiness' in responseData).toBe(false);
+});
+
+test('an already retired coordinate touch skips its frame probe without a warning', async () => {
+  const sessionStore = makeSessionStore();
+  const ref = sessionStore.publish('retired-point', makeSession('retired-point'));
+  sessionStore.retire(ref);
+  const capture = vi.fn();
+  const logPath = path.join(mkdtempForTestSync('retired-point-'), 'request.log');
+  await withDiagnosticsScope(
+    { command: 'click', session: ref.address, logPath, debug: true },
+    async () => {
+      const payloads = await buildTargetedTouchResponsePayloads({
+        params: {
+          createCommandSurface: testCreateCommandSurface,
+          req: { token: 't', command: 'click', positionals: ['1', '2'], session: ref.address },
+          sessionName: ref.address,
+          sessionRef: ref,
+          sessionStore,
+          contextFromFlags,
+          platformServices: daemonPlatformServicesFixture(),
+          captureSnapshotForSession: capture,
+        },
+        result: { kind: 'point', point: { x: 1, y: 2 } },
+        staleRefsWarning: undefined,
+        extra: {},
+      });
+      expect(payloads.responseData).toMatchObject({ x: 1, y: 2 });
+      flushDiagnosticsToSessionFile({ force: true });
+    },
+  );
+  expect(capture).not.toHaveBeenCalled();
+  expect(fs.existsSync(logPath) ? fs.readFileSync(logPath, 'utf8') : '').not.toContain(
+    'touch_reference_frame_resolve_failed',
+  );
+});
diff --git a/src/daemon/interaction/internal/__tests__/interaction-touch-targets.test.ts b/packages/daemon/src/execution/interaction/internal/__tests__/interaction-touch-targets.test.ts
similarity index 100%
rename from src/daemon/interaction/internal/__tests__/interaction-touch-targets.test.ts
rename to packages/daemon/src/execution/interaction/internal/__tests__/interaction-touch-targets.test.ts
diff --git a/src/daemon/interaction/internal/__tests__/interaction-type-android-readiness.test.ts b/packages/daemon/src/execution/interaction/internal/__tests__/interaction-type-android-readiness.test.ts
similarity index 86%
rename from src/daemon/interaction/internal/__tests__/interaction-type-android-readiness.test.ts
rename to packages/daemon/src/execution/interaction/internal/__tests__/interaction-type-android-readiness.test.ts
index fe3edf0530..cf077efe6e 100644
--- a/src/daemon/interaction/internal/__tests__/interaction-type-android-readiness.test.ts
+++ b/packages/daemon/src/execution/interaction/internal/__tests__/interaction-type-android-readiness.test.ts
@@ -1,8 +1,8 @@
 import { test, expect, vi, beforeEach } from 'vitest';
 import { AppError } from '@agent-device/kernel/errors';
-import { makeAndroidSession } from '../../../__tests__/support/session-factories.ts';
-import { makeTestScreenRecordingResource } from '../../../__tests__/support/screen-recording-live-handle.ts';
-import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
+import { makeAndroidSession } from '../../../../__tests__/support/session-factories.ts';
+import { makeTestScreenRecordingResource } from '../../../../__tests__/support/screen-recording-live-handle.ts';
+import { makeSessionStore } from '../../../../__tests__/support/store-factory.ts';
 import { handleInteractionCommands } from '../../index.ts';
 import { contextFromFlags } from './interaction-touch-fixtures.ts';
 import {
@@ -10,7 +10,7 @@ import {
   mockTypeText,
   resetGetRuntimeFixture,
 } from '../../../__tests__/interaction-get-runtime-fixture.ts';
-import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../../__tests__/support/command-surface-fake.ts';
 
 vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
   const actual = await importOriginal<typeof import('@agent-device/platform-android/mechanics')>();
diff --git a/src/daemon/interaction/internal/find-match-ranking.ts b/packages/daemon/src/execution/interaction/internal/find-match-ranking.ts
similarity index 100%
rename from src/daemon/interaction/internal/find-match-ranking.ts
rename to packages/daemon/src/execution/interaction/internal/find-match-ranking.ts
diff --git a/src/daemon/interaction/internal/find-match-resolution.ts b/packages/daemon/src/execution/interaction/internal/find-match-resolution.ts
similarity index 95%
rename from src/daemon/interaction/internal/find-match-resolution.ts
rename to packages/daemon/src/execution/interaction/internal/find-match-resolution.ts
index 6c4b16152e..3184388f78 100644
--- a/src/daemon/interaction/internal/find-match-resolution.ts
+++ b/packages/daemon/src/execution/interaction/internal/find-match-resolution.ts
@@ -8,8 +8,8 @@ import { SELECTOR_PIPELINE_POLICIES } from '@agent-device/selectors/selector-pip
 import type { SnapshotState } from '@agent-device/kernel/snapshot';
 import { isRootInteractionContainer } from '@agent-device/selectors/interaction-targeting';
 import { preferOnscreenMatches } from './find-match-ranking.ts';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
-import type { SessionState } from '../../session-state.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
+import type { SessionState } from '../../../core/session-state.ts';
 import { buildAmbiguousMatchError } from '../../selector-match-errors.ts';
 import { errorResponse } from '@agent-device/kernel/contracts';
 
diff --git a/src/daemon/interaction/internal/find-target-capture.ts b/packages/daemon/src/execution/interaction/internal/find-target-capture.ts
similarity index 91%
rename from src/daemon/interaction/internal/find-target-capture.ts
rename to packages/daemon/src/execution/interaction/internal/find-target-capture.ts
index 3109598692..d1ed52ee94 100644
--- a/src/daemon/interaction/internal/find-target-capture.ts
+++ b/packages/daemon/src/execution/interaction/internal/find-target-capture.ts
@@ -1,11 +1,11 @@
 import type { FindLocator } from '@agent-device/selectors';
 import type { BoundSelectorCapture } from '../../selector-capture-binding.ts';
 import type { SnapshotQualityVerdict, SnapshotState } from '@agent-device/kernel/snapshot';
-import type { CaptureProvenance, RequestCaptureProof } from '../../capture-disclosure.ts';
+import type { CaptureProvenance, RequestCaptureProof } from '../../../core/capture-disclosure.ts';
 import { createSelectorCaptureRuntime } from '../../selector-capture-runtime.ts';
-import { SessionStore } from '../../session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
-import type { SessionRef, SessionState } from '../../session-state.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../../../core/session-state.ts';
 import { errorResponse } from '@agent-device/kernel/contracts';
 
 /** The tree a mutating find resolves its target against, plus what the capture disclosed. */
diff --git a/src/daemon/interaction/internal/find.ts b/packages/daemon/src/execution/interaction/internal/find.ts
similarity index 94%
rename from src/daemon/interaction/internal/find.ts
rename to packages/daemon/src/execution/interaction/internal/find.ts
index 66c635830e..62be98f335 100644
--- a/src/daemon/interaction/internal/find.ts
+++ b/packages/daemon/src/execution/interaction/internal/find.ts
@@ -13,28 +13,32 @@ import {
   type SnapshotKeyboardBandFact,
   type SnapshotState,
 } from '@agent-device/kernel/snapshot';
-import { expireRefFrame } from '../../ref-frame.ts';
-import type { DaemonInvokeFn, DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
-import type { SessionRef, SessionState } from '../../session-state.ts';
-import { SessionStore } from '../../session-store.ts';
-import { contextFromFlags } from '../../context.ts';
+import { expireRefFrame } from '../../../core/ref-frame.ts';
+import type {
+  DaemonInvokeFn,
+  DaemonRequest,
+  DaemonResponse,
+} from '../../../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../../../core/session-state.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import { contextFromFlags } from '../../../core/context.ts';
 import { readCommandMessage, successText } from '@agent-device/kernel/success-text';
-import type { RequestCaptureProof } from '../../capture-disclosure.ts';
-import { withCaptureDisclosures } from '../../capture-disclosure.ts';
-import { recordSessionAction } from '../../session-action-recorder.ts';
-import { stripInternalInteractionFlags } from '../../deferred-interaction-outcome.ts';
+import type { RequestCaptureProof } from '../../../core/capture-disclosure.ts';
+import { withCaptureDisclosures } from '../../../core/capture-disclosure.ts';
+import { recordSessionAction } from '../../../core/session-action-recorder.ts';
+import { stripInternalInteractionFlags } from '../../../core/deferred-interaction-outcome.ts';
 import { resolveFindMatch } from './find-match-resolution.ts';
 import { executeFocusPoint } from '../../focus-runtime.ts';
 import { executeBoundTypeText } from '../../type-text-runtime.ts';
 import { dispatchFindReadOnlyViaRuntime } from '../../selector-runtime.ts';
-import { admitAndBindSnapshotCapture } from '../../snapshot-runtime-binding.ts';
+import { admitAndBindSnapshotCapture } from '../../../core/snapshot-runtime-binding.ts';
 import type { FocusPointInput } from '@agent-device/contracts/focus-runtime';
 import {
   findRuntimeIntent,
   resolveSelectorCaptureRuntimePlan,
 } from '@agent-device/contracts/platform-runtime-operations';
 import type { TypeTextRuntimeOperations } from '@agent-device/contracts/type-text-runtime';
-import type { FindRouteInput } from './types.ts';
+import type { FindRouteInput } from '../../../core/interaction/internal/types.ts';
 import { createFindTargetCapture, sparseFindSnapshotResponse } from './find-target-capture.ts';
 import { isSparseSnapshotQualityVerdict } from '@agent-device/capture-kit/snapshot-quality-verdict';
 import { errorResponse, noActiveSessionError } from '@agent-device/kernel/contracts';
diff --git a/src/daemon/interaction/internal/interaction-android-escape.ts b/packages/daemon/src/execution/interaction/internal/interaction-android-escape.ts
similarity index 95%
rename from src/daemon/interaction/internal/interaction-android-escape.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-android-escape.ts
index 4f923396be..355acaf1b8 100644
--- a/src/daemon/interaction/internal/interaction-android-escape.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction-android-escape.ts
@@ -1,7 +1,7 @@
 import type { AndroidObservationAdapter } from '@agent-device/contracts/android-observation';
 import { AppError } from '@agent-device/kernel/errors';
 import { detectAndroidEscapeSurface } from '../../android-foreground-surface.ts';
-import type { SessionState } from '../../session-state.ts';
+import type { SessionState } from '../../../core/session-state.ts';
 
 /**
  * Post-press escape guard. Throws when the tap left the app for a genuine
diff --git a/src/daemon/interaction/internal/interaction-common.ts b/packages/daemon/src/execution/interaction/internal/interaction-common.ts
similarity index 94%
rename from src/daemon/interaction/internal/interaction-common.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-common.ts
index 05d1ecccab..fcbb012248 100644
--- a/src/daemon/interaction/internal/interaction-common.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction-common.ts
@@ -1,8 +1,8 @@
 import type { CommandFlags } from '@agent-device/contracts/command';
 import type { SettleObservation, SurfaceScopedNodes } from '@agent-device/contracts/interaction';
 import type { SnapshotState } from '@agent-device/kernel/snapshot';
-import type { DaemonResponse } from '../../daemon-request.ts';
-import { stripInternalInteractionFlags } from '../../deferred-interaction-outcome.ts';
+import type { DaemonResponse } from '../../../core/daemon-request.ts';
+import { stripInternalInteractionFlags } from '../../../core/deferred-interaction-outcome.ts';
 import {
   computeTargetEvidence,
   type RecordedTargetCapture,
@@ -14,7 +14,7 @@ import {
   sensitiveFillPlaceholder,
 } from '@agent-device/ad-script';
 import { parameterizeRecordedFillPayload } from '@agent-device/selectors/parameterized-recorded-fill';
-import type { InteractionFinalizationOperations } from './types.ts';
+import type { InteractionFinalizationOperations } from '../../../core/interaction/internal/types.ts';
 
 export function finalizeTouchInteraction(params: {
   operations: InteractionFinalizationOperations;
diff --git a/src/daemon/interaction/internal/interaction-flags.ts b/packages/daemon/src/execution/interaction/internal/interaction-flags.ts
similarity index 93%
rename from src/daemon/interaction/internal/interaction-flags.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-flags.ts
index 4e72352012..075bc4352b 100644
--- a/src/daemon/interaction/internal/interaction-flags.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction-flags.ts
@@ -1,6 +1,6 @@
 import type { CommandFlags } from '@agent-device/contracts/command';
 import type { SettleParams } from '@agent-device/contracts/interaction';
-import type { DaemonResponse } from '../../daemon-request.ts';
+import type { DaemonResponse } from '../../../core/daemon-request.ts';
 import { interactionErrorResponse } from './interaction-response.ts';
 
 export function settleFlagGuardResponse(
diff --git a/src/daemon/interaction/internal/interaction-gesture-response.ts b/packages/daemon/src/execution/interaction/internal/interaction-gesture-response.ts
similarity index 100%
rename from src/daemon/interaction/internal/interaction-gesture-response.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-gesture-response.ts
diff --git a/src/daemon/interaction/internal/interaction-gesture.ts b/packages/daemon/src/execution/interaction/internal/interaction-gesture.ts
similarity index 96%
rename from src/daemon/interaction/internal/interaction-gesture.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-gesture.ts
index 7e253533ab..a7e990ed3f 100644
--- a/src/daemon/interaction/internal/interaction-gesture.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction-gesture.ts
@@ -24,23 +24,29 @@ import {
   splitRefGenerationSuffix,
   type Point,
 } from '@agent-device/kernel/snapshot';
-import { resolveBoundGestureRuntime, type BoundGestureExecutor } from '../../gesture-runtime.ts';
-import { isActiveProviderDevice } from '../../provider-device-admission.ts';
+import {
+  resolveBoundGestureRuntime,
+  type BoundGestureExecutor,
+} from '../../../core/gesture-runtime.ts';
+import { isActiveProviderDevice } from '../../../core/provider-device-admission.ts';
 import { sleep } from '@agent-device/host-kit/retry';
 import {
   ensureAndroidBlockingSystemDialogReady,
   type AndroidBlockingDialogReadinessResult,
 } from '../../android-system-dialog.ts';
-import { readRefMutationFrame } from '../../ref-frame.ts';
-import type { DaemonResponse } from '../../daemon-request.ts';
+import { readRefMutationFrame } from '../../../core/ref-frame.ts';
+import type { DaemonResponse } from '../../../core/daemon-request.ts';
 import { thrownBeforeDispatch } from '../../request-dispatch-disclosure.ts';
-import type { SessionState } from '../../session-state.ts';
+import type { SessionState } from '../../../core/session-state.ts';
 import { assertRefMutationAdmitted } from './interaction-ref-policy.ts';
 import {
   createInteractionRuntimeForRoute,
   finalizeTouchInteraction,
 } from './interaction-runtime.ts';
-import type { CaptureSnapshotForSession, InteractionRouteInput } from './types.ts';
+import type {
+  CaptureSnapshotForSession,
+  InteractionRouteInput,
+} from '../../../core/interaction/internal/types.ts';
 import type { RecordedTargetCapture } from '@agent-device/selectors/target-evidence';
 import { gestureResponseData } from './interaction-gesture-response.ts';
 import { noActiveSessionError } from '@agent-device/kernel/contracts';
diff --git a/src/daemon/interaction/internal/interaction-ios-tap-outcome.ts b/packages/daemon/src/execution/interaction/internal/interaction-ios-tap-outcome.ts
similarity index 96%
rename from src/daemon/interaction/internal/interaction-ios-tap-outcome.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-ios-tap-outcome.ts
index daa210dd46..88d5c24703 100644
--- a/src/daemon/interaction/internal/interaction-ios-tap-outcome.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction-ios-tap-outcome.ts
@@ -8,12 +8,15 @@ import {
 } from '@agent-device/capture-kit/snapshot-quality-verdict';
 import { summarizeAxEvidence } from '@agent-device/capture-kit/snapshot-evidence';
 import { getRequestSignal } from '@agent-device/host-kit/request';
-import { isLocalIosRunnerSession } from '../../direct-ios-selector.ts';
+import { isLocalIosRunnerSession } from '../../../core/direct-ios-selector.ts';
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
-import type { SessionStore } from '../../session-store.ts';
-import type { SessionRef, SessionState } from '../../session-state.ts';
-import type { BoundSnapshotCapture } from '../../snapshot-runtime-binding.ts';
-import type { BoundContextFromFlags, CaptureSnapshotForSession } from './types.ts';
+import type { SessionStore } from '../../../core/session-store.ts';
+import type { SessionRef, SessionState } from '../../../core/session-state.ts';
+import type { BoundSnapshotCapture } from '../../../core/snapshot-runtime-binding.ts';
+import type {
+  BoundContextFromFlags,
+  CaptureSnapshotForSession,
+} from '../../../core/interaction/internal/types.ts';
 
 const XCTEST_RECORDED_FAILURE = 'XCTEST_RECORDED_FAILURE';
 // A model commonly needs 5-10s to choose a target after receiving a snapshot.
diff --git a/src/daemon/interaction/internal/interaction-recorded-input.ts b/packages/daemon/src/execution/interaction/internal/interaction-recorded-input.ts
similarity index 100%
rename from src/daemon/interaction/internal/interaction-recorded-input.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-recorded-input.ts
diff --git a/src/daemon/interaction/internal/interaction-ref-policy.ts b/packages/daemon/src/execution/interaction/internal/interaction-ref-policy.ts
similarity index 96%
rename from src/daemon/interaction/internal/interaction-ref-policy.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-ref-policy.ts
index b0a4723ce5..2e100ffd8b 100644
--- a/src/daemon/interaction/internal/interaction-ref-policy.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction-ref-policy.ts
@@ -1,6 +1,6 @@
 import { AppError } from '@agent-device/kernel/errors';
-import type { DaemonResponse } from '../../daemon-request.ts';
-import type { RefFrameRejectReason, RefMutationFrame } from '../../ref-frame.ts';
+import type { DaemonResponse } from '../../../core/daemon-request.ts';
+import type { RefFrameRejectReason, RefMutationFrame } from '../../../core/ref-frame.ts';
 import { interactionErrorResponse } from './interaction-response.ts';
 
 export function refMutationAdmissionResponse(params: {
diff --git a/src/daemon/interaction/internal/interaction-response-data-transform.ts b/packages/daemon/src/execution/interaction/internal/interaction-response-data-transform.ts
similarity index 100%
rename from src/daemon/interaction/internal/interaction-response-data-transform.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-response-data-transform.ts
diff --git a/src/daemon/interaction/internal/interaction-response.ts b/packages/daemon/src/execution/interaction/internal/interaction-response.ts
similarity index 78%
rename from src/daemon/interaction/internal/interaction-response.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-response.ts
index 345b6315f7..71658fa8e2 100644
--- a/src/daemon/interaction/internal/interaction-response.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction-response.ts
@@ -1,4 +1,4 @@
-import type { DaemonResponse } from '../../daemon-request.ts';
+import type { DaemonResponse } from '../../../core/daemon-request.ts';
 
 export function interactionErrorResponse(
   code: string,
diff --git a/src/daemon/interaction/internal/interaction-runtime.ts b/packages/daemon/src/execution/interaction/internal/interaction-runtime.ts
similarity index 90%
rename from src/daemon/interaction/internal/interaction-runtime.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-runtime.ts
index bee3cd7c63..d62c4a488c 100644
--- a/src/daemon/interaction/internal/interaction-runtime.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction-runtime.ts
@@ -8,30 +8,30 @@ import type {
 } from '@agent-device/contracts/backend';
 import { getRequestSignal } from '@agent-device/host-kit/request';
 import type { Rect, SnapshotState } from '@agent-device/kernel/snapshot';
-import type { DaemonCommandContext } from '../../context.ts';
+import type { DaemonCommandContext } from '../../../core/context.ts';
 import { createDaemonRuntimePolicy } from '../../runtime-policy.ts';
-import { recordCaptureProof } from '../../capture-disclosure.ts';
+import { recordCaptureProof } from '../../../core/capture-disclosure.ts';
 import { confirmIosOffscreenTargetVisible } from '../../offscreen-target-probe.ts';
-import { runtimeExecutionFromContext } from '../../snapshot-runtime-capture-input.ts';
-import { createDaemonRuntimeSessionStore } from '../../runtime-session.ts';
-import { expireRefFrame } from '../../ref-frame.ts';
+import { runtimeExecutionFromContext } from '../../../core/snapshot-runtime-capture-input.ts';
+import { createDaemonRuntimeSessionStore } from '../../../core/runtime-session.ts';
+import { expireRefFrame } from '../../../core/ref-frame.ts';
 import { setSessionSnapshot } from '../../session-snapshot.ts';
 import type {
   CaptureSnapshotForSession,
   InteractionRouteInput,
   InteractionRuntimeInput,
   SettleObservationCaptureInput,
-} from './types.ts';
+} from '../../../core/interaction/internal/types.ts';
 import { finalizeTouchInteraction as finalizeInteraction } from './interaction-common.ts';
-import { markDeferredInteractionOutcome } from '../../deferred-interaction-outcome.ts';
-import { isSessionRecording } from '../../session-script-publication-capability.ts';
-import { recordTouchVisualizationEvent } from '../../recording-gestures.ts';
-import type { SessionStore } from '../../session-store.ts';
-import type { DaemonResponse } from '../../daemon-request.ts';
-import type { SessionRef } from '../../session-state.ts';
-import type { BoundTouchExecutor } from '../../touch-runtime.ts';
-import type { BoundGestureExecutor } from '../../gesture-runtime.ts';
-import type { BoundSnapshotCapture } from '../../snapshot-runtime-binding.ts';
+import { markDeferredInteractionOutcome } from '../../../core/deferred-interaction-outcome.ts';
+import { isSessionRecording } from '../../../core/session-script-publication-capability.ts';
+import { recordTouchVisualizationEvent } from '../../../core/recording-gestures.ts';
+import type { SessionStore } from '../../../core/session-store.ts';
+import type { DaemonResponse } from '../../../core/daemon-request.ts';
+import type { SessionRef } from '../../../core/session-state.ts';
+import type { BoundTouchExecutor } from '../../../core/touch-runtime.ts';
+import type { BoundGestureExecutor } from '../../../core/gesture-runtime.ts';
+import type { BoundSnapshotCapture } from '../../../core/snapshot-runtime-binding.ts';
 import { NO_ACTIVE_SESSION_MESSAGE } from '@agent-device/kernel/contracts';
 
 export async function createInteractionRuntimeForRoute(
diff --git a/src/daemon/interaction/internal/interaction-session.ts b/packages/daemon/src/execution/interaction/internal/interaction-session.ts
similarity index 65%
rename from src/daemon/interaction/internal/interaction-session.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-session.ts
index fa079cd281..8f80c14e17 100644
--- a/src/daemon/interaction/internal/interaction-session.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction-session.ts
@@ -1,5 +1,5 @@
-import type { InteractionRouteInput } from './types.ts';
-import type { SessionRef } from '../../session-state.ts';
+import type { InteractionRouteInput } from '../../../core/interaction/internal/types.ts';
+import type { SessionRef } from '../../../core/session-state.ts';
 
 export function bindInteractionSession<Params extends InteractionRouteInput>(
   params: Params,
diff --git a/src/daemon/interaction/internal/interaction-snapshot.ts b/packages/daemon/src/execution/interaction/internal/interaction-snapshot.ts
similarity index 92%
rename from src/daemon/interaction/internal/interaction-snapshot.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-snapshot.ts
index 32af84964c..cefb420438 100644
--- a/src/daemon/interaction/internal/interaction-snapshot.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction-snapshot.ts
@@ -1,13 +1,13 @@
 import type { CommandFlags } from '@agent-device/contracts/command';
 import type { SnapshotState } from '@agent-device/kernel/snapshot';
-import type { DaemonCommandContext } from '../../context.ts';
+import type { DaemonCommandContext } from '../../../core/context.ts';
 import { isSparseSnapshotQualityVerdict } from '@agent-device/capture-kit/snapshot-quality-verdict';
 import { snapshotOptionsToFlags } from '@agent-device/contracts/backend-snapshot-options';
 import type {
   BoundContextFromFlags,
   InteractionSessionView,
   InteractionSnapshotOptions,
-} from './types.ts';
+} from '../../../core/interaction/internal/types.ts';
 
 export type InteractionSnapshotCapture = (params: {
   flags: CommandFlags;
diff --git a/src/daemon/interaction/internal/interaction-targeting.ts b/packages/daemon/src/execution/interaction/internal/interaction-targeting.ts
similarity index 100%
rename from src/daemon/interaction/internal/interaction-targeting.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-targeting.ts
diff --git a/src/daemon/interaction/internal/interaction-touch-android-freshness.ts b/packages/daemon/src/execution/interaction/internal/interaction-touch-android-freshness.ts
similarity index 80%
rename from src/daemon/interaction/internal/interaction-touch-android-freshness.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-touch-android-freshness.ts
index 2704184b40..2f615f9e7e 100644
--- a/src/daemon/interaction/internal/interaction-touch-android-freshness.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction-touch-android-freshness.ts
@@ -1,7 +1,10 @@
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
-import { getActiveAndroidSnapshotFreshness } from '../../session-snapshot-freshness.ts';
-import type { SessionState } from '../../session-state.ts';
-import type { CaptureSnapshotForSession, InteractionRouteInput } from './types.ts';
+import { getActiveAndroidSnapshotFreshness } from '../../../core/session-snapshot-freshness.ts';
+import type { SessionState } from '../../../core/session-state.ts';
+import type {
+  CaptureSnapshotForSession,
+  InteractionRouteInput,
+} from '../../../core/interaction/internal/types.ts';
 
 /**
  * The Android ref-refresh capture a `@ref` mutation takes before dispatch, and
diff --git a/src/daemon/interaction/internal/interaction-touch-android-readiness.ts b/packages/daemon/src/execution/interaction/internal/interaction-touch-android-readiness.ts
similarity index 92%
rename from src/daemon/interaction/internal/interaction-touch-android-readiness.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-touch-android-readiness.ts
index 77da08deca..30d684558e 100644
--- a/src/daemon/interaction/internal/interaction-touch-android-readiness.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction-touch-android-readiness.ts
@@ -2,9 +2,9 @@ import {
   ensureAndroidBlockingSystemDialogReady,
   type AndroidBlockingDialogReadinessResult,
 } from '../../android-system-dialog.ts';
-import type { DaemonResponse } from '../../daemon-request.ts';
-import type { SessionState } from '../../session-state.ts';
-import { readRefMutationFrame } from '../../ref-frame.ts';
+import type { DaemonResponse } from '../../../core/daemon-request.ts';
+import type { SessionState } from '../../../core/session-state.ts';
+import { readRefMutationFrame } from '../../../core/ref-frame.ts';
 import { refMutationAdmissionResponse } from './interaction-ref-policy.ts';
 import type { AndroidObservationAdapter } from '@agent-device/contracts/android-observation';
 
diff --git a/src/daemon/interaction/internal/interaction-touch-direct-ios.ts b/packages/daemon/src/execution/interaction/internal/interaction-touch-direct-ios.ts
similarity index 93%
rename from src/daemon/interaction/internal/interaction-touch-direct-ios.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-touch-direct-ios.ts
index 96564df057..9ad8f23ae6 100644
--- a/src/daemon/interaction/internal/interaction-touch-direct-ios.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction-touch-direct-ios.ts
@@ -4,14 +4,17 @@ import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
 import {
   isDirectIosSelectorFallbackError,
   type DirectIosSelectorTarget,
-} from '../../direct-ios-selector.ts';
-import { expireRefFrame } from '../../ref-frame.ts';
-import type { DaemonResponse } from '../../daemon-request.ts';
-import type { SessionState } from '../../session-state.ts';
+} from '../../../core/direct-ios-selector.ts';
+import { expireRefFrame } from '../../../core/ref-frame.ts';
+import type { DaemonResponse } from '../../../core/daemon-request.ts';
+import type { SessionState } from '../../../core/session-state.ts';
 import { finalizeTouchInteraction } from './interaction-runtime.ts';
-import type { CaptureSnapshotForSession, InteractionRouteInput } from './types.ts';
+import type {
+  CaptureSnapshotForSession,
+  InteractionRouteInput,
+} from '../../../core/interaction/internal/types.ts';
 import { corroborateIosTapFailure } from './interaction-ios-tap-outcome.ts';
-import type { BoundTouchExecutor } from '../../touch-runtime.ts';
+import type { BoundTouchExecutor } from '../../../core/touch-runtime.ts';
 import {
   buildCorroboratedTapResponseData,
   buildInteractionResponseData,
diff --git a/src/daemon/interaction/internal/interaction-touch-fill.ts b/packages/daemon/src/execution/interaction/internal/interaction-touch-fill.ts
similarity index 94%
rename from src/daemon/interaction/internal/interaction-touch-fill.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-touch-fill.ts
index 0142edac5d..e2ef365ce5 100644
--- a/src/daemon/interaction/internal/interaction-touch-fill.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction-touch-fill.ts
@@ -2,11 +2,11 @@ import { bindInteractionSession } from './interaction-session.ts';
 import type { CommandFlags } from '@agent-device/contracts/command';
 import type { FillCommandResult, InteractionTarget } from '@agent-device/contracts/interaction';
 import { issueSettleRefs, resolveRefStalenessWarning } from '../../session-snapshot.ts';
-import { readRefMutationFrame } from '../../ref-frame.ts';
-import type { DaemonResponse } from '../../daemon-request.ts';
-import type { SessionRef, SessionState } from '../../session-state.ts';
-import type { SessionStore } from '../../session-store.ts';
-import { isSessionRecording } from '../../session-script-publication-capability.ts';
+import { readRefMutationFrame } from '../../../core/ref-frame.ts';
+import type { DaemonResponse } from '../../../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../../../core/session-state.ts';
+import type { SessionStore } from '../../../core/session-store.ts';
+import { isSessionRecording } from '../../../core/session-script-publication-capability.ts';
 import { assertRecordedFillParameterization } from './interaction-recorded-input.ts';
 import { readSettleRequest, settleFlagGuardResponse } from './interaction-flags.ts';
 import { refMutationAdmissionResponse } from './interaction-ref-policy.ts';
@@ -15,7 +15,7 @@ import type {
   InteractionRouteInput,
   RefSnapshotFlagGuardResponse,
   SettleObservationCaptureInput,
-} from './types.ts';
+} from '../../../core/interaction/internal/types.ts';
 import { refreshAndroidRefSnapshotIfFreshnessActive } from './interaction-touch-android-freshness.ts';
 import { unsupportedMacOsDesktopSurfaceInteraction } from './interaction-touch-policy.ts';
 import { readSnapshotNodesReferenceFrame } from '@agent-device/capture-kit/touch-reference-frame';
@@ -29,7 +29,7 @@ import { dispatchRuntimeInteraction } from './interaction-touch-runtime.ts';
 import { parseFillTarget } from './interaction-touch-targets.ts';
 import { prepareTouchDispatch } from './interaction-touch-prepare.ts';
 import { refusedBeforeDispatch, thrownBeforeDispatch } from '../../request-dispatch-disclosure.ts';
-import type { BoundTouchExecutor } from '../../touch-runtime.ts';
+import type { BoundTouchExecutor } from '../../../core/touch-runtime.ts';
 import { noActiveSessionError } from '@agent-device/kernel/contracts';
 
 /**
diff --git a/src/daemon/interaction/internal/interaction-touch-payload.ts b/packages/daemon/src/execution/interaction/internal/interaction-touch-payload.ts
similarity index 100%
rename from src/daemon/interaction/internal/interaction-touch-payload.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-touch-payload.ts
diff --git a/src/daemon/interaction/internal/interaction-touch-policy.ts b/packages/daemon/src/execution/interaction/internal/interaction-touch-policy.ts
similarity index 84%
rename from src/daemon/interaction/internal/interaction-touch-policy.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-touch-policy.ts
index c557478326..ff7d7049a0 100644
--- a/src/daemon/interaction/internal/interaction-touch-policy.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction-touch-policy.ts
@@ -1,6 +1,6 @@
 import { isMacOs } from '@agent-device/kernel/device';
-import type { DaemonResponse } from '../../daemon-request.ts';
-import type { SessionState } from '../../session-state.ts';
+import type { DaemonResponse } from '../../../core/daemon-request.ts';
+import type { SessionState } from '../../../core/session-state.ts';
 import { errorResponse } from '@agent-device/kernel/contracts';
 
 export function unsupportedMacOsDesktopSurfaceInteraction(
diff --git a/src/daemon/interaction/internal/interaction-touch-prepare.ts b/packages/daemon/src/execution/interaction/internal/interaction-touch-prepare.ts
similarity index 85%
rename from src/daemon/interaction/internal/interaction-touch-prepare.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-touch-prepare.ts
index 6cc9ab7ba5..f38fa831f3 100644
--- a/src/daemon/interaction/internal/interaction-touch-prepare.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction-touch-prepare.ts
@@ -1,14 +1,14 @@
-import type { SessionState } from '../../session-state.ts';
+import type { SessionState } from '../../../core/session-state.ts';
 import {
   createBoundTouchExecutor,
   resolveBoundTouchRuntime,
   type BoundTouchExecutor,
   type TouchRuntimeCommand,
-} from '../../touch-runtime.ts';
+} from '../../../core/touch-runtime.ts';
 import { readSettleRequest } from './interaction-flags.ts';
-import type { BoundSnapshotCapture } from '../../snapshot-runtime-binding.ts';
-import { resolveSettleObservationCapture } from '../../settle-observation-capture.ts';
-import type { InteractionRouteInput } from './types.ts';
+import type { BoundSnapshotCapture } from '../../../core/snapshot-runtime-binding.ts';
+import { resolveSettleObservationCapture } from '../../../core/settle-observation-capture.ts';
+import type { InteractionRouteInput } from '../../../core/interaction/internal/types.ts';
 import type { DaemonFailureResponse } from '@agent-device/kernel/contracts';
 import { refusedBeforeDispatch } from '../../request-dispatch-disclosure.ts';
 
diff --git a/src/daemon/interaction/internal/interaction-touch-press-admission.ts b/packages/daemon/src/execution/interaction/internal/interaction-touch-press-admission.ts
similarity index 96%
rename from src/daemon/interaction/internal/interaction-touch-press-admission.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-touch-press-admission.ts
index b57006e5aa..63232dfa26 100644
--- a/src/daemon/interaction/internal/interaction-touch-press-admission.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction-touch-press-admission.ts
@@ -7,9 +7,9 @@ import {
 } from '@agent-device/contracts/click-button';
 import { publicPlatformString } from '@agent-device/kernel/device';
 import { resolveRefStalenessWarning } from '../../session-snapshot.ts';
-import { readRefMutationFrame } from '../../ref-frame.ts';
-import type { DaemonResponse } from '../../daemon-request.ts';
-import type { SessionState } from '../../session-state.ts';
+import { readRefMutationFrame } from '../../../core/ref-frame.ts';
+import type { DaemonResponse } from '../../../core/daemon-request.ts';
+import type { SessionState } from '../../../core/session-state.ts';
 import { refMutationAdmissionResponse } from './interaction-ref-policy.ts';
 import { refusedBeforeDispatch } from '../../request-dispatch-disclosure.ts';
 import { settleFlagGuardResponse } from './interaction-flags.ts';
@@ -17,7 +17,7 @@ import type {
   CaptureSnapshotForSession,
   InteractionRouteInput,
   RefSnapshotFlagGuardResponse,
-} from './types.ts';
+} from '../../../core/interaction/internal/types.ts';
 import type { RefAdmissionContext } from './interaction-touch-android-readiness.ts';
 import { unsupportedMacOsDesktopSurfaceInteraction } from './interaction-touch-policy.ts';
 import {
diff --git a/src/daemon/interaction/internal/interaction-touch-press.ts b/packages/daemon/src/execution/interaction/internal/interaction-touch-press.ts
similarity index 97%
rename from src/daemon/interaction/internal/interaction-touch-press.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-touch-press.ts
index 1bd6944889..e19a4384f1 100644
--- a/src/daemon/interaction/internal/interaction-touch-press.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction-touch-press.ts
@@ -6,12 +6,12 @@ import type {
 } from '@agent-device/contracts/interaction';
 import type { resolveClickButton } from '@agent-device/contracts/click-button';
 import type { ReplayTargetGuardDenotation } from '@agent-device/contracts/replay';
-import type { DaemonResponse } from '../../daemon-request.ts';
+import type { DaemonResponse } from '../../../core/daemon-request.ts';
 import { assertAndroidPressStayedInApp } from './interaction-android-escape.ts';
 import { createInteractionRuntimeForRoute } from './interaction-runtime.ts';
 import { readSettleRequest } from './interaction-flags.ts';
 import { dispatchDirectIosSelectorTap } from './interaction-touch-direct-ios.ts';
-import { readDirectIosSelectorTapTarget } from './interaction-touch-direct-ios-eligibility.ts';
+import { readDirectIosSelectorTapTarget } from '../../../core/interaction/internal/interaction-touch-direct-ios-eligibility.ts';
 import {
   admitTargetedTouch,
   type AdmittedTargetedTouch,
diff --git a/src/daemon/interaction/internal/interaction-touch-reference-frame.ts b/packages/daemon/src/execution/interaction/internal/interaction-touch-reference-frame.ts
similarity index 89%
rename from src/daemon/interaction/internal/interaction-touch-reference-frame.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-touch-reference-frame.ts
index e8c4c39389..807a54619f 100644
--- a/src/daemon/interaction/internal/interaction-touch-reference-frame.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction-touch-reference-frame.ts
@@ -2,11 +2,14 @@ import type { CommandFlags } from '@agent-device/contracts/command';
 import type { AndroidObservationAdapter } from '@agent-device/contracts/android-observation';
 import type { GestureReferenceFrame } from '@agent-device/contracts/scroll-gesture';
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
-import type { SessionStore } from '../../session-store.ts';
+import type { SessionStore } from '../../../core/session-store.ts';
 import { getSnapshotReferenceFrame } from '@agent-device/capture-kit/touch-reference-frame';
-import type { SessionRef } from '../../session-state.ts';
-import type { BoundContextFromFlags, CaptureSnapshotForSession } from './types.ts';
-import { isActiveProviderDevice } from '../../provider-device-admission.ts';
+import type { SessionRef } from '../../../core/session-state.ts';
+import type {
+  BoundContextFromFlags,
+  CaptureSnapshotForSession,
+} from '../../../core/interaction/internal/types.ts';
+import { isActiveProviderDevice } from '../../../core/provider-device-admission.ts';
 
 async function resolveDirectTouchReferenceFrame(params: {
   ref: SessionRef;
diff --git a/src/daemon/interaction/internal/interaction-touch-response.ts b/packages/daemon/src/execution/interaction/internal/interaction-touch-response.ts
similarity index 98%
rename from src/daemon/interaction/internal/interaction-touch-response.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-touch-response.ts
index 741da1b325..36ab7bcdee 100644
--- a/src/daemon/interaction/internal/interaction-touch-response.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction-touch-response.ts
@@ -17,7 +17,10 @@ import {
 } from './interaction-response-data-transform.ts';
 import { issueSettleRefs } from '../../session-snapshot.ts';
 import type { RecordedTargetCapture } from '@agent-device/selectors/target-evidence';
-import type { CaptureSnapshotForSession, InteractionRouteInput } from './types.ts';
+import type {
+  CaptureSnapshotForSession,
+  InteractionRouteInput,
+} from '../../../core/interaction/internal/types.ts';
 import { resolveDirectTouchReferenceFrameSafely } from './interaction-touch-reference-frame.ts';
 import { readSnapshotNodesReferenceFrame } from '@agent-device/capture-kit/touch-reference-frame';
 import { buildTouchPayload } from './interaction-touch-payload.ts';
@@ -155,7 +158,7 @@ export function buildInteractionResponseData(params: {
   extra?: Record<string, unknown>;
   /**
    * Staleness warning for the consumed `@ref` argument (ADR 0014), resolved by
-   * `resolveRefStalenessWarning` (src/daemon/session-snapshot.ts): the
+   * `resolveRefStalenessWarning` (packages/daemon/src/execution/session-snapshot.ts): the
    * STALE_SNAPSHOT_REFS_WARNING for a plain ref once the frame has expired, or
    * the precise pinned-generation warning for a `@e12~s3` ref whose epoch no
    * longer matches the frame. Stale mutations are rejected before reaching this
diff --git a/src/daemon/interaction/internal/interaction-touch-runtime.ts b/packages/daemon/src/execution/interaction/internal/interaction-touch-runtime.ts
similarity index 95%
rename from src/daemon/interaction/internal/interaction-touch-runtime.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-touch-runtime.ts
index b7b7480468..fd17b3d4eb 100644
--- a/src/daemon/interaction/internal/interaction-touch-runtime.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction-touch-runtime.ts
@@ -11,14 +11,17 @@ import type { SnapshotState } from '@agent-device/kernel/snapshot';
 import { asAppError, normalizeError } from '@agent-device/kernel/errors';
 import { readResolvedInteractionTarget } from '@agent-device/host-kit/interaction-outcome';
 import { publishAmbiguousMatchCandidateRefs } from '../../session-snapshot.ts';
-import { isSessionRecording } from '../../session-script-publication-capability.ts';
-import type { DaemonResponse } from '../../daemon-request.ts';
-import type { SessionState } from '../../session-state.ts';
+import { isSessionRecording } from '../../../core/session-script-publication-capability.ts';
+import type { DaemonResponse } from '../../../core/daemon-request.ts';
+import type { SessionState } from '../../../core/session-state.ts';
 import {
   createInteractionRuntimeForRoute,
   finalizeTouchInteraction,
 } from './interaction-runtime.ts';
-import type { CaptureSnapshotForSession, InteractionRouteInput } from './types.ts';
+import type {
+  CaptureSnapshotForSession,
+  InteractionRouteInput,
+} from '../../../core/interaction/internal/types.ts';
 import { isAndroidEscapeError } from './interaction-android-escape.ts';
 import { corroborateIosTapFailure, interactionTargetExtra } from './interaction-ios-tap-outcome.ts';
 import {
@@ -31,8 +34,8 @@ import {
   buildInteractionResponseData,
   type InteractionResponsePayloads,
 } from './interaction-touch-response.ts';
-import type { BoundTouchExecutor } from '../../touch-runtime.ts';
-import type { BoundSnapshotCapture } from '../../snapshot-runtime-binding.ts';
+import type { BoundTouchExecutor } from '../../../core/touch-runtime.ts';
+import type { BoundSnapshotCapture } from '../../../core/snapshot-runtime-binding.ts';
 import { noActiveSessionError } from '@agent-device/kernel/contracts';
 
 /**
diff --git a/src/daemon/interaction/internal/interaction-touch-targets.ts b/packages/daemon/src/execution/interaction/internal/interaction-touch-targets.ts
similarity index 99%
rename from src/daemon/interaction/internal/interaction-touch-targets.ts
rename to packages/daemon/src/execution/interaction/internal/interaction-touch-targets.ts
index 922da79a98..100dee27a2 100644
--- a/src/daemon/interaction/internal/interaction-touch-targets.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction-touch-targets.ts
@@ -9,7 +9,7 @@ import {
   stripAtPrefix,
   type DecodedFillTarget,
 } from '@agent-device/selectors/interaction-positionals';
-import type { DaemonResponse } from '../../daemon-request.ts';
+import type { DaemonResponse } from '../../../core/daemon-request.ts';
 import { parseCoordinateTarget } from './interaction-targeting.ts';
 import { parseVersionedRefPositional } from '../../ref-positionals.ts';
 import { errorResponse } from '@agent-device/kernel/contracts';
diff --git a/src/daemon/interaction/internal/interaction.ts b/packages/daemon/src/execution/interaction/internal/interaction.ts
similarity index 94%
rename from src/daemon/interaction/internal/interaction.ts
rename to packages/daemon/src/execution/interaction/internal/interaction.ts
index 34bdb679c7..35593f4039 100644
--- a/src/daemon/interaction/internal/interaction.ts
+++ b/packages/daemon/src/execution/interaction/internal/interaction.ts
@@ -1,13 +1,19 @@
-import type { DaemonResponse } from '../../daemon-request.ts';
-import type { SessionRef, SessionState } from '../../session-state.ts';
-import { type RequestCaptureProof, withCaptureDisclosures } from '../../capture-disclosure.ts';
-import type { CaptureSnapshotForSession, InteractionRouteInput } from './types.ts';
+import type { DaemonResponse } from '../../../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../../../core/session-state.ts';
+import {
+  type RequestCaptureProof,
+  withCaptureDisclosures,
+} from '../../../core/capture-disclosure.ts';
+import type {
+  CaptureSnapshotForSession,
+  InteractionRouteInput,
+} from '../../../core/interaction/internal/types.ts';
 import { dispatchFillViaRuntime } from './interaction-touch-fill.ts';
 import { dispatchTargetedTouchViaRuntime } from './interaction-touch-press.ts';
 import { finalizeTouchInteraction } from './interaction-runtime.ts';
 import { refSnapshotFlagGuardResponse } from '../../ref-snapshot-flag-policy.ts';
 import { dispatchGetViaRuntime, dispatchIsViaRuntime } from '../../selector-runtime.ts';
-import { expireRefFrame } from '../../ref-frame.ts';
+import { expireRefFrame } from '../../../core/ref-frame.ts';
 import { PUBLIC_COMMANDS } from '@agent-device/command-registry/catalog';
 import { normalizeError } from '@agent-device/kernel/errors';
 import {
diff --git a/src/daemon/internal-observation.ts b/packages/daemon/src/execution/internal-observation.ts
similarity index 95%
rename from src/daemon/internal-observation.ts
rename to packages/daemon/src/execution/internal-observation.ts
index ad1e4bff5b..7b9659c4dd 100644
--- a/src/daemon/internal-observation.ts
+++ b/packages/daemon/src/execution/internal-observation.ts
@@ -6,11 +6,11 @@ import type {
   ReplayRefPublicationProjection,
   ReplayRefPublicationResult,
 } from '@agent-device/contracts/replay';
-import { readSessionRuntimeRevision, refFrame } from './ref-frame.ts';
-import type { RefFrame } from './ref-frame-slot.ts';
+import { readSessionRuntimeRevision, refFrame } from '../core/ref-frame.ts';
+import type { RefFrame } from '../core/ref-frame-slot.ts';
 import { markSessionPartialRefsIssued, setSessionSnapshot } from './session-snapshot.ts';
-import type { SessionRef, SessionState } from './session-state.ts';
-import type { SessionStore } from './session-store.ts';
+import type { SessionRef, SessionState } from '../core/session-state.ts';
+import type { SessionStore } from '../core/session-store.ts';
 
 type InternalObservationLineage = Readonly<{
   ref: SessionRef;
diff --git a/src/daemon/keyboard-runtime.ts b/packages/daemon/src/execution/keyboard-runtime.ts
similarity index 98%
rename from src/daemon/keyboard-runtime.ts
rename to packages/daemon/src/execution/keyboard-runtime.ts
index 5330e5c184..71e394afc5 100644
--- a/src/daemon/keyboard-runtime.ts
+++ b/packages/daemon/src/execution/keyboard-runtime.ts
@@ -22,13 +22,13 @@ import {
   type KeyboardAction,
 } from '@agent-device/session-journal/keyboard-actions';
 import { successText } from '@agent-device/kernel/success-text';
-import type { DaemonCommandContext } from './context.ts';
+import type { DaemonCommandContext } from '../core/context.ts';
 import {
   admitRuntimeUse,
   type RuntimeAdmissionBindings,
   type RuntimeAdmissionRequest,
-} from './runtime-admission.ts';
-import { runtimeExecutionFromContext } from './snapshot-runtime-capture-input.ts';
+} from '../core/runtime-admission.ts';
+import { runtimeExecutionFromContext } from '../core/snapshot-runtime-capture-input.ts';
 import type { DaemonFailureResponse } from '@agent-device/kernel/contracts';
 
 type KeyboardRuntimeAction = 'status' | 'dismiss' | 'enter';
diff --git a/src/daemon/offscreen-target-probe.ts b/packages/daemon/src/execution/offscreen-target-probe.ts
similarity index 93%
rename from src/daemon/offscreen-target-probe.ts
rename to packages/daemon/src/execution/offscreen-target-probe.ts
index ff253d7e98..b28e560b51 100644
--- a/src/daemon/offscreen-target-probe.ts
+++ b/packages/daemon/src/execution/offscreen-target-probe.ts
@@ -2,8 +2,8 @@ import type { Rect, SnapshotNode } from '@agent-device/kernel/snapshot';
 import { isConfirmedOnScreenProbe } from '@agent-device/capture-kit/mobile-snapshot-semantics';
 import type { QuerySelectorRuntimeOperations } from '@agent-device/contracts/selector-observation-runtime';
 import type { SnapshotRuntimeExecution } from '@agent-device/contracts/snapshot-runtime';
-import { deriveDirectIosNodeSelector } from './direct-ios-selector.ts';
-import type { SessionState } from './session-state.ts';
+import { deriveDirectIosNodeSelector } from '../core/direct-ios-selector.ts';
+import type { SessionState } from '../core/session-state.ts';
 
 /**
  * The #1542 rescue read: one live `querySelector` on the caller's request-bound operation,
diff --git a/src/daemon/orientation-runtime.ts b/packages/daemon/src/execution/orientation-runtime.ts
similarity index 90%
rename from src/daemon/orientation-runtime.ts
rename to packages/daemon/src/execution/orientation-runtime.ts
index 170d1fb87b..a57bb06ffd 100644
--- a/src/daemon/orientation-runtime.ts
+++ b/packages/daemon/src/execution/orientation-runtime.ts
@@ -4,10 +4,13 @@ import { orientationRuntimeUse } from '@agent-device/contracts/platform-runtime-
 import type { BoundDeviceRuntime } from '@agent-device/contracts/platform-runtime';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import { successText } from '@agent-device/kernel/success-text';
-import type { DaemonCommandContext } from './context.ts';
-import type { ResolvedGenericExecution } from './generic-leaf-execution.ts';
-import { resolveBoundGenericRuntime, type RuntimeAdmissionBindings } from './runtime-admission.ts';
-import { runtimeExecutionFromContext } from './snapshot-runtime-capture-input.ts';
+import type { DaemonCommandContext } from '../core/context.ts';
+import type { ResolvedGenericExecution } from '../core/generic-leaf-execution.ts';
+import {
+  resolveBoundGenericRuntime,
+  type RuntimeAdmissionBindings,
+} from '../core/runtime-admission.ts';
+import { runtimeExecutionFromContext } from '../core/snapshot-runtime-capture-input.ts';
 
 /** `orientation <rotation>`, on the same parse the retired leaf used. */
 export function readRequestedOrientation(positionals: readonly string[]): DeviceRotation {
diff --git a/src/daemon/ref-positionals.ts b/packages/daemon/src/execution/ref-positionals.ts
similarity index 94%
rename from src/daemon/ref-positionals.ts
rename to packages/daemon/src/execution/ref-positionals.ts
index 1e0e629661..1a8689edc1 100644
--- a/src/daemon/ref-positionals.ts
+++ b/packages/daemon/src/execution/ref-positionals.ts
@@ -1,5 +1,5 @@
 import { REF_GRAMMAR_HINT, splitRefGenerationSuffix } from '@agent-device/kernel/snapshot';
-import type { DaemonResponse } from './daemon-request.ts';
+import type { DaemonResponse } from '../core/daemon-request.ts';
 import { errorResponse } from '@agent-device/kernel/contracts';
 
 /**
diff --git a/src/daemon/ref-snapshot-flag-policy.ts b/packages/daemon/src/execution/ref-snapshot-flag-policy.ts
similarity index 92%
rename from src/daemon/ref-snapshot-flag-policy.ts
rename to packages/daemon/src/execution/ref-snapshot-flag-policy.ts
index 2ae4232ba7..e112ded6c8 100644
--- a/src/daemon/ref-snapshot-flag-policy.ts
+++ b/packages/daemon/src/execution/ref-snapshot-flag-policy.ts
@@ -1,5 +1,5 @@
 import type { CommandFlags } from '@agent-device/contracts/command';
-import type { DaemonResponse } from './daemon-request.ts';
+import type { DaemonResponse } from '../core/daemon-request.ts';
 import { errorResponse } from '@agent-device/kernel/contracts';
 
 const REF_UNSUPPORTED_FLAG_MAP: ReadonlyArray<[keyof CommandFlags, string]> = [
diff --git a/src/daemon/request-dispatch-disclosure.ts b/packages/daemon/src/execution/request-dispatch-disclosure.ts
similarity index 94%
rename from src/daemon/request-dispatch-disclosure.ts
rename to packages/daemon/src/execution/request-dispatch-disclosure.ts
index 8fef8ecaeb..35e331d587 100644
--- a/src/daemon/request-dispatch-disclosure.ts
+++ b/packages/daemon/src/execution/request-dispatch-disclosure.ts
@@ -6,8 +6,8 @@ import {
   type ErrorWireDetails,
 } from '@agent-device/kernel/errors';
 import { resolveCommandRecordingEffect } from '@agent-device/command-registry/registry';
-import type { DaemonRequest, DaemonResponse } from './daemon-request.ts';
-import type { RequestDispatchLedger } from './request-dispatch-ledger.ts';
+import type { DaemonRequest, DaemonResponse } from '../core/daemon-request.ts';
+import type { RequestDispatchLedger } from '../core/request-dispatch-ledger.ts';
 
 type RecordingEffect = ReturnType<typeof resolveCommandRecordingEffect>;
 
diff --git a/src/daemon/request-generic-dispatch.ts b/packages/daemon/src/execution/request-generic-dispatch.ts
similarity index 93%
rename from src/daemon/request-generic-dispatch.ts
rename to packages/daemon/src/execution/request-generic-dispatch.ts
index 4c76de00e2..ebb1d5bbcf 100644
--- a/src/daemon/request-generic-dispatch.ts
+++ b/packages/daemon/src/execution/request-generic-dispatch.ts
@@ -1,32 +1,38 @@
 import type { CommandFlags } from '@agent-device/contracts/command';
 import type { SettleObservation } from '@agent-device/contracts/interaction';
 import { commandSupportsSettleObservation } from '@agent-device/command-registry/registry';
-import type { SessionStore } from './session-store.ts';
-import type { DaemonCommandContext } from './context.ts';
-import type { DaemonRequest, DaemonResponse } from './daemon-request.ts';
-import type { SessionRef, SessionState } from './session-state.ts';
-import type { DaemonPlatformServices } from './platform-services.ts';
+import type { SessionStore } from '../core/session-store.ts';
+import type { DaemonCommandContext } from '../core/context.ts';
+import type { DaemonRequest, DaemonResponse } from '../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../core/session-state.ts';
+import type { DaemonPlatformServices } from '../core/platform-services.ts';
 import {
   ensureAndroidBlockingSystemDialogReady,
   recoverAndroidBlockingSystemDialog,
 } from './android-system-dialog.ts';
-import { markDeferredInteractionOutcome } from './deferred-interaction-outcome.ts';
+import { markDeferredInteractionOutcome } from '../core/deferred-interaction-outcome.ts';
 import {
   augmentScrollVisualizationResult,
   recordTouchVisualizationEvent,
-} from './recording-gestures.ts';
+} from '../core/recording-gestures.ts';
 import { normalizeError } from '@agent-device/kernel/errors';
-import { expireRefFrame } from './ref-frame.ts';
+import { expireRefFrame } from '../core/ref-frame.ts';
 import {
   resolveRefFrameEffect,
   shouldGuardAndroidBlockingDialog,
-} from './daemon-command-registry.ts';
-import { isActiveProviderDevice } from './provider-device-admission.ts';
+} from '../core/daemon-command-registry.ts';
+import { isActiveProviderDevice } from '../core/provider-device-admission.ts';
 import { buildActionEventResult } from '@agent-device/session-journal/session-event-action-presentation';
 import type { AndroidObservationAdapter } from '@agent-device/contracts/android-observation';
 import type { CreateDaemonCommandSurface } from '@agent-device/contracts/daemon-command-surface';
-import type { GenericPlatformExecution, RecordedGenericRequest } from './generic-leaf-execution.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from './request-runtime-binding.ts';
+import type {
+  GenericPlatformExecution,
+  RecordedGenericRequest,
+} from '../core/generic-leaf-execution.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../core/request-runtime-binding.ts';
 
 export async function dispatchGenericCommand(params: {
   req: DaemonRequest;
diff --git a/src/daemon/runtime-artifacts.ts b/packages/daemon/src/execution/runtime-artifacts.ts
similarity index 100%
rename from src/daemon/runtime-artifacts.ts
rename to packages/daemon/src/execution/runtime-artifacts.ts
diff --git a/src/daemon/runtime-policy.ts b/packages/daemon/src/execution/runtime-policy.ts
similarity index 100%
rename from src/daemon/runtime-policy.ts
rename to packages/daemon/src/execution/runtime-policy.ts
diff --git a/src/daemon/screenshot-crop-target.ts b/packages/daemon/src/execution/screenshot-crop-target.ts
similarity index 100%
rename from src/daemon/screenshot-crop-target.ts
rename to packages/daemon/src/execution/screenshot-crop-target.ts
diff --git a/src/daemon/screenshot-crop.ts b/packages/daemon/src/execution/screenshot-crop.ts
similarity index 94%
rename from src/daemon/screenshot-crop.ts
rename to packages/daemon/src/execution/screenshot-crop.ts
index 60f1faf87a..964cfd0ec1 100644
--- a/src/daemon/screenshot-crop.ts
+++ b/packages/daemon/src/execution/screenshot-crop.ts
@@ -15,11 +15,11 @@ import {
 import { buildSnapshotState } from '@agent-device/capture-kit/snapshot-state';
 import { SELECTOR_PIPELINE_POLICIES } from '@agent-device/selectors/selector-pipeline-policy';
 import { resolveSelectorPipeline } from '@agent-device/selectors/selector-pipeline';
-import type { DaemonCommandContext } from './context.ts';
-import { captureSnapshotData } from './snapshot-capture.ts';
-import { runtimeExecutionFromContext } from './snapshot-runtime-capture-input.ts';
+import type { DaemonCommandContext } from '../core/context.ts';
+import { captureSnapshotData } from '../core/snapshot-capture.ts';
+import { runtimeExecutionFromContext } from '../core/snapshot-runtime-capture-input.ts';
 import type { BoundScreenshotRuntime } from './screenshot-runtime-binding.ts';
-import type { SessionState } from './session-state.ts';
+import type { SessionState } from '../core/session-state.ts';
 
 export type ScreenshotCropOutcome = Readonly<{ partialIntersection: boolean }>;
 
diff --git a/src/daemon/screenshot-runtime-binding.ts b/packages/daemon/src/execution/screenshot-runtime-binding.ts
similarity index 94%
rename from src/daemon/screenshot-runtime-binding.ts
rename to packages/daemon/src/execution/screenshot-runtime-binding.ts
index a0c75f0969..c015562910 100644
--- a/src/daemon/screenshot-runtime-binding.ts
+++ b/packages/daemon/src/execution/screenshot-runtime-binding.ts
@@ -1,4 +1,4 @@
-import type { DaemonPlatformServices } from './platform-services.ts';
+import type { DaemonPlatformServices } from '../core/platform-services.ts';
 import type { RuntimeOperationFact } from '@agent-device/contracts/platform-runtime';
 import {
   type ScreenshotRuntimePlan,
@@ -21,9 +21,12 @@ import {
   unavailableRuntimeOperationResponse,
   unwrapAdmittedRuntimePlan,
   type AdmittedRuntimePlan,
-} from './session-runtime-admission.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from './request-runtime-binding.ts';
-import type { DaemonResponse } from './daemon-request.ts';
+} from '../core/session-runtime-admission.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../core/request-runtime-binding.ts';
+import type { DaemonResponse } from '../core/daemon-request.ts';
 import { errorResponse } from '@agent-device/kernel/contracts';
 
 export type ScreenshotRuntimeBindings = Readonly<{
diff --git a/src/daemon/screenshot-runtime.ts b/packages/daemon/src/execution/screenshot-runtime.ts
similarity index 96%
rename from src/daemon/screenshot-runtime.ts
rename to packages/daemon/src/execution/screenshot-runtime.ts
index 500630360f..e28edb852f 100644
--- a/src/daemon/screenshot-runtime.ts
+++ b/packages/daemon/src/execution/screenshot-runtime.ts
@@ -21,12 +21,15 @@ import {
   assertSupportedScreenshotPixelDensity,
   readScreenshotResultMetadata,
 } from '@agent-device/capture-kit/screenshot-density';
-import { runtimeExecutionFromContext } from './snapshot-runtime-capture-input.ts';
-import type { DaemonCommandContext } from './context.ts';
-import { captureSnapshotData } from './snapshot-capture.ts';
+import { runtimeExecutionFromContext } from '../core/snapshot-runtime-capture-input.ts';
+import type { DaemonCommandContext } from '../core/context.ts';
+import { captureSnapshotData } from '../core/snapshot-capture.ts';
 import { buildSnapshotState } from '@agent-device/capture-kit/snapshot-state';
-import type { RecordedGenericRequest, ResolvedGenericExecution } from './generic-leaf-execution.ts';
-import { createReadonlyRuntimeSessionStore } from './runtime-session.ts';
+import type {
+  RecordedGenericRequest,
+  ResolvedGenericExecution,
+} from '../core/generic-leaf-execution.ts';
+import { createReadonlyRuntimeSessionStore } from '../core/runtime-session.ts';
 import { assertScreenshotCropPolicy } from './screenshot-crop-target.ts';
 import { buildScreenshotCropWarnings, cropScreenshotToSelector } from './screenshot-crop.ts';
 import { annotateScreenshotWithRefs } from '@agent-device/capture-kit/screenshot-overlay';
@@ -36,8 +39,8 @@ import {
   type ScreenshotRuntimeBindings,
 } from './screenshot-runtime-binding.ts';
 import { setSessionSnapshot } from './session-snapshot.ts';
-import type { DaemonRequest } from './daemon-request.ts';
-import type { SessionState } from './session-state.ts';
+import type { DaemonRequest } from '../core/daemon-request.ts';
+import type { SessionState } from '../core/session-state.ts';
 
 /**
  * The `screenshot` leaf of the generic route. Argument policy is answered before any device work,
diff --git a/src/daemon/scroll-movement.ts b/packages/daemon/src/execution/scroll-movement.ts
similarity index 99%
rename from src/daemon/scroll-movement.ts
rename to packages/daemon/src/execution/scroll-movement.ts
index a05c112964..f66ae5b209 100644
--- a/src/daemon/scroll-movement.ts
+++ b/packages/daemon/src/execution/scroll-movement.ts
@@ -29,10 +29,10 @@ import {
   summarizeDiscriminatingSurfaceDivergence,
   type InteractionSurfaceChange,
   type InteractionSurfaceSignature,
-} from './interaction-surface-signature.ts';
-import { refFrameState } from './ref-frame.ts';
-import { isPostGestureStabilizationPending } from './deferred-interaction-outcome.ts';
-import type { SessionState } from './session-state.ts';
+} from '../core/interaction-surface-signature.ts';
+import { refFrameState } from '../core/ref-frame.ts';
+import { isPostGestureStabilizationPending } from '../core/deferred-interaction-outcome.ts';
+import type { SessionState } from '../core/session-state.ts';
 
 /**
  * What one directional scroll saw after its gesture, and the only thing that can back the distance
diff --git a/src/daemon/scroll-runtime.ts b/packages/daemon/src/execution/scroll-runtime.ts
similarity index 97%
rename from src/daemon/scroll-runtime.ts
rename to packages/daemon/src/execution/scroll-runtime.ts
index 40ea1212e7..2f7fd959ac 100644
--- a/src/daemon/scroll-runtime.ts
+++ b/packages/daemon/src/execution/scroll-runtime.ts
@@ -32,10 +32,13 @@ import { formatScrollUntilMessage, runScrollUntilVisible } from './scroll-until.
 import { publicPlatformString } from '@agent-device/kernel/device';
 import type { CommandFlags } from '@agent-device/contracts/command';
 import { withSuccessText } from '@agent-device/kernel/success-text';
-import type { DaemonCommandContext } from './context.ts';
-import type { SessionState } from './session-state.ts';
-import type { ResolvedGenericExecution } from './generic-leaf-execution.ts';
-import { resolveBoundGenericRuntime, type RuntimeAdmissionBindings } from './runtime-admission.ts';
+import type { DaemonCommandContext } from '../core/context.ts';
+import type { SessionState } from '../core/session-state.ts';
+import type { ResolvedGenericExecution } from '../core/generic-leaf-execution.ts';
+import {
+  resolveBoundGenericRuntime,
+  type RuntimeAdmissionBindings,
+} from '../core/runtime-admission.ts';
 import {
   observeScrollMovement,
   planScrollMovement,
@@ -44,7 +47,7 @@ import {
   type ScrollMovementPlan,
   type ScrollSwipeEvidence,
 } from './scroll-movement.ts';
-import { runtimeExecutionFromContext } from './snapshot-runtime-capture-input.ts';
+import { runtimeExecutionFromContext } from '../core/snapshot-runtime-capture-input.ts';
 import type { CaptureSnapshotInput } from '@agent-device/contracts/snapshot-runtime';
 import { errorResponse } from '@agent-device/kernel/contracts';
 
diff --git a/src/daemon/scroll-until.test.ts b/packages/daemon/src/execution/scroll-until.test.ts
similarity index 100%
rename from src/daemon/scroll-until.test.ts
rename to packages/daemon/src/execution/scroll-until.test.ts
diff --git a/src/daemon/scroll-until.ts b/packages/daemon/src/execution/scroll-until.ts
similarity index 100%
rename from src/daemon/scroll-until.ts
rename to packages/daemon/src/execution/scroll-until.ts
diff --git a/src/daemon/selector-capture-binding.ts b/packages/daemon/src/execution/selector-capture-binding.ts
similarity index 89%
rename from src/daemon/selector-capture-binding.ts
rename to packages/daemon/src/execution/selector-capture-binding.ts
index aa721933d4..6b206eef25 100644
--- a/src/daemon/selector-capture-binding.ts
+++ b/packages/daemon/src/execution/selector-capture-binding.ts
@@ -1,4 +1,4 @@
-import type { DaemonPlatformServices } from './platform-services.ts';
+import type { DaemonPlatformServices } from '../core/platform-services.ts';
 import type { ElementTextRuntimeOperations } from '@agent-device/contracts/element-text-runtime';
 import { resolveSelectorCaptureRuntimePlan } from '@agent-device/contracts/platform-runtime-operations';
 import type { FindTextRuntimeOperations } from '@agent-device/contracts/selector-observation-runtime';
@@ -6,10 +6,13 @@ import type {
   CaptureSnapshotInput,
   SnapshotResult,
 } from '@agent-device/contracts/snapshot-runtime';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from './request-runtime-binding.ts';
-import { admitAndBindSnapshotCapture } from './snapshot-runtime-binding.ts';
-import type { DaemonResponse } from './daemon-request.ts';
-import type { SessionState } from './session-state.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../core/request-runtime-binding.ts';
+import { admitAndBindSnapshotCapture } from '../core/snapshot-runtime-binding.ts';
+import type { DaemonResponse } from '../core/daemon-request.ts';
+import type { SessionState } from '../core/session-state.ts';
 
 /** The selector commands that resolve their targets from the shared request-bound capture seam. */
 export type SelectorCaptureCommand = 'find' | 'get' | 'is' | 'wait';
diff --git a/src/daemon/selector-capture-runtime.ts b/packages/daemon/src/execution/selector-capture-runtime.ts
similarity index 93%
rename from src/daemon/selector-capture-runtime.ts
rename to packages/daemon/src/execution/selector-capture-runtime.ts
index 26b95f3555..6baefa4782 100644
--- a/src/daemon/selector-capture-runtime.ts
+++ b/packages/daemon/src/execution/selector-capture-runtime.ts
@@ -7,18 +7,18 @@ import {
   type SnapshotState,
 } from '@agent-device/kernel/snapshot';
 import { isSparseSnapshotQualityVerdict } from '@agent-device/capture-kit/snapshot-quality-verdict';
-import type { DaemonRequest } from './daemon-request.ts';
-import type { SessionRef, SessionState } from './session-state.ts';
-import { SessionStore } from './session-store.ts';
-import { recordCaptureProof } from './capture-disclosure.ts';
-import type { RequestCaptureProof } from './capture-disclosure.ts';
-import { captureSnapshot } from './snapshot-capture.ts';
+import type { DaemonRequest } from '../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../core/session-state.ts';
+import { SessionStore } from '../core/session-store.ts';
+import { recordCaptureProof } from '../core/capture-disclosure.ts';
+import type { RequestCaptureProof } from '../core/capture-disclosure.ts';
+import { captureSnapshot } from '../core/snapshot-capture.ts';
 import { setSessionSnapshot } from './session-snapshot.ts';
-import { getActiveAndroidSnapshotFreshness } from './session-snapshot-freshness.ts';
-import { isPostGestureStabilizationPending } from './deferred-interaction-outcome.ts';
-import { isOutdatedObservation } from './ref-frame.ts';
+import { getActiveAndroidSnapshotFreshness } from '../core/session-snapshot-freshness.ts';
+import { isPostGestureStabilizationPending } from '../core/deferred-interaction-outcome.ts';
+import { isOutdatedObservation } from '../core/ref-frame.ts';
 import type { BoundSelectorCapture } from './selector-capture-binding.ts';
-import { buildRuntimeCaptureInput } from './snapshot-runtime-capture-input.ts';
+import { buildRuntimeCaptureInput } from '../core/snapshot-runtime-capture-input.ts';
 import { isLegacySparseIosInteractiveSnapshot } from '@agent-device/selectors/absence-observation';
 
 const SELECTOR_CAPTURE_CACHE_TTL_MS = 750;
diff --git a/src/daemon/selector-match-errors.ts b/packages/daemon/src/execution/selector-match-errors.ts
similarity index 95%
rename from src/daemon/selector-match-errors.ts
rename to packages/daemon/src/execution/selector-match-errors.ts
index 1cd32ca536..cbfa9b7c8a 100644
--- a/src/daemon/selector-match-errors.ts
+++ b/packages/daemon/src/execution/selector-match-errors.ts
@@ -1,7 +1,7 @@
 import type { FindLocator } from '@agent-device/selectors';
 import type { SnapshotState } from '@agent-device/kernel/snapshot';
 import { elementMatchCandidateDetails } from '@agent-device/capture-kit/snapshot-lines';
-import type { DaemonResponse } from './daemon-request.ts';
+import type { DaemonResponse } from '../core/daemon-request.ts';
 import { errorResponse } from '@agent-device/kernel/contracts';
 
 // #1597: an agent reading an ambiguous-match error must be able to act on the
diff --git a/src/daemon/selector-runtime-backend.ts b/packages/daemon/src/execution/selector-runtime-backend.ts
similarity index 92%
rename from src/daemon/selector-runtime-backend.ts
rename to packages/daemon/src/execution/selector-runtime-backend.ts
index 482d1bedf7..9679e98ff6 100644
--- a/src/daemon/selector-runtime-backend.ts
+++ b/packages/daemon/src/execution/selector-runtime-backend.ts
@@ -1,4 +1,4 @@
-import type { DaemonPlatformServices } from './platform-services.ts';
+import type { DaemonPlatformServices } from '../core/platform-services.ts';
 import type {
   AgentDeviceBackend,
   BackendCommandContext,
@@ -9,27 +9,30 @@ import type { CreateDaemonCommandSurface } from '@agent-device/contracts/daemon-
 import { publicPlatformString } from '@agent-device/kernel/device';
 import type { SnapshotState, SnapshotNode } from '@agent-device/kernel/snapshot';
 import { createDaemonRuntimePolicy } from './runtime-policy.ts';
-import { createDaemonRuntimeSessionStore } from './runtime-session.ts';
-import { contextFromFlags, type BoundContextFromFlags } from './context.ts';
+import { createDaemonRuntimeSessionStore } from '../core/runtime-session.ts';
+import { contextFromFlags, type BoundContextFromFlags } from '../core/context.ts';
 import { readTextForNode } from './selector-text-runtime.ts';
 import { setSessionSnapshot } from './session-snapshot.ts';
-import { markSessionSnapshotOutdated } from './ref-frame.ts';
-import { SessionStore } from './session-store.ts';
-import type { DaemonRequest, DaemonResponse } from './daemon-request.ts';
-import type { SessionRef, SessionState } from './session-state.ts';
+import { markSessionSnapshotOutdated } from '../core/ref-frame.ts';
+import { SessionStore } from '../core/session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../core/session-state.ts';
 import { createSelectorCaptureRuntime } from './selector-capture-runtime.ts';
-import { buildRuntimeCaptureInput } from './snapshot-runtime-capture-input.ts';
+import { buildRuntimeCaptureInput } from '../core/snapshot-runtime-capture-input.ts';
 import {
   resolveBoundSelectorCapture,
   type BoundSelectorOperations,
   type SelectorCaptureCommand,
 } from './selector-capture-binding.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from './request-runtime-binding.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../core/request-runtime-binding.ts';
 import type { AndroidObservationAdapter } from '@agent-device/contracts/android-observation';
-import type { PlatformResourceCleanup } from './platform-resource-cleanup.ts';
+import type { PlatformResourceCleanup } from '../core/platform-resource-cleanup.ts';
 import { getRequestSignal } from '@agent-device/host-kit/request';
 import { snapshotOptionsToFlags } from '@agent-device/contracts/backend-snapshot-options';
-import type { RequestCaptureProof } from './capture-disclosure.ts';
+import type { RequestCaptureProof } from '../core/capture-disclosure.ts';
 import { checkIsArgs } from '@agent-device/selectors';
 import { noActiveSessionError } from '@agent-device/kernel/contracts';
 
diff --git a/src/daemon/selector-runtime.ts b/packages/daemon/src/execution/selector-runtime.ts
similarity index 97%
rename from src/daemon/selector-runtime.ts
rename to packages/daemon/src/execution/selector-runtime.ts
index 8f54705113..b011a40871 100644
--- a/src/daemon/selector-runtime.ts
+++ b/packages/daemon/src/execution/selector-runtime.ts
@@ -2,9 +2,9 @@ import { asAppError } from '@agent-device/kernel/errors';
 import type { SnapshotNode, SnapshotState } from '@agent-device/kernel/snapshot';
 import { absenceCaptureOptionError } from '@agent-device/selectors/absence-observation-errors';
 import { absenceCaptureOptionRefusal } from '@agent-device/selectors/absence-observation';
-import type { DaemonRequest, DaemonResponse } from './daemon-request.ts';
-import type { SessionRef } from './session-state.ts';
-import type { SessionStore } from './session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../core/daemon-request.ts';
+import type { SessionRef } from '../core/session-state.ts';
+import type { SessionStore } from '../core/session-store.ts';
 import {
   markSessionPartialRefsIssued,
   publishAmbiguousMatchCandidateRefs,
@@ -31,9 +31,9 @@ import {
   stripSelectorChain,
   toDaemonFindData,
   toDaemonGetData,
-} from './selector-recording.ts';
+} from '../core/selector-recording.ts';
 import type { RecordedTargetCapture } from '@agent-device/selectors/target-evidence';
-import { withCaptureDisclosures } from './capture-disclosure.ts';
+import { withCaptureDisclosures } from '../core/capture-disclosure.ts';
 import {
   createBoundSelectorRuntime,
   type SelectorRuntimeParams,
diff --git a/src/daemon/selector-text-runtime.ts b/packages/daemon/src/execution/selector-text-runtime.ts
similarity index 93%
rename from src/daemon/selector-text-runtime.ts
rename to packages/daemon/src/execution/selector-text-runtime.ts
index 2881b3414e..db6ece8456 100644
--- a/src/daemon/selector-text-runtime.ts
+++ b/packages/daemon/src/execution/selector-text-runtime.ts
@@ -4,7 +4,7 @@ import type {
   ElementTextUnreadableReason,
 } from '@agent-device/contracts/element-text-runtime';
 import { isIosFamily } from '@agent-device/kernel/device';
-import { runtimeExecutionFromContext } from './snapshot-runtime-capture-input.ts';
+import { runtimeExecutionFromContext } from '../core/snapshot-runtime-capture-input.ts';
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
 import type { SnapshotNode } from '@agent-device/kernel/snapshot';
 import type { DeviceInfo } from '@agent-device/kernel/device';
@@ -13,7 +13,7 @@ import {
   extractReadableText,
   prefersValueForReadableText,
 } from '@agent-device/capture-kit/text-surface';
-import type { BoundContextFromFlags } from './context.ts';
+import type { BoundContextFromFlags } from '../core/context.ts';
 import { resolveRectCenter } from '@agent-device/kernel/rect-center';
 
 export type ReadElementTextAtPoint = ElementTextRuntimeOperations['readTextAtPoint'];
diff --git a/src/daemon/session-snapshot.ts b/packages/daemon/src/execution/session-snapshot.ts
similarity index 98%
rename from src/daemon/session-snapshot.ts
rename to packages/daemon/src/execution/session-snapshot.ts
index 503d35c840..daf24c941d 100644
--- a/src/daemon/session-snapshot.ts
+++ b/packages/daemon/src/execution/session-snapshot.ts
@@ -2,9 +2,9 @@ import { randomInt } from 'node:crypto';
 import type { SettleObservation } from '@agent-device/contracts/interaction';
 import { readElementMatchCandidateRefs, AppError } from '@agent-device/kernel/errors';
 import type { SnapshotState } from '@agent-device/kernel/snapshot';
-import { activatePartialRefFrame, refFrameEpoch, refFrameState } from './ref-frame.ts';
-import type { SessionRef, SessionState } from './session-state.ts';
-import type { SessionStore } from './session-store.ts';
+import { activatePartialRefFrame, refFrameEpoch, refFrameState } from '../core/ref-frame.ts';
+import type { SessionRef, SessionState } from '../core/session-state.ts';
+import type { SessionStore } from '../core/session-store.ts';
 
 /**
  * Warning attached to a read of an `@ref` argument once the ref frame has
@@ -22,7 +22,7 @@ export const STALE_SNAPSHOT_REFS_WARNING =
  * does NOT touch the ref frame: replacing the latest observation is an
  * operational read, so it never expires, reactivates, or reindexes the
  * authorized frame (ADR 0014). Frame lifetime is owned solely by
- * `src/daemon/ref-frame.ts`; the partial-issuance writer below decides WHETHER to issue
+ * `packages/daemon/src/core/ref-frame.ts`; the partial-issuance writer below decides WHETHER to issue
  * and hands the transition there.
  */
 export function setSessionSnapshot(session: SessionState, snapshot: SnapshotState): void {
diff --git a/src/daemon/snapshot-timeout-evidence.test.ts b/packages/daemon/src/execution/snapshot-timeout-evidence.test.ts
similarity index 100%
rename from src/daemon/snapshot-timeout-evidence.test.ts
rename to packages/daemon/src/execution/snapshot-timeout-evidence.test.ts
diff --git a/src/daemon/snapshot-timeout-evidence.ts b/packages/daemon/src/execution/snapshot-timeout-evidence.ts
similarity index 100%
rename from src/daemon/snapshot-timeout-evidence.ts
rename to packages/daemon/src/execution/snapshot-timeout-evidence.ts
diff --git a/src/daemon/sparse-fallback-screenshot.ts b/packages/daemon/src/execution/sparse-fallback-screenshot.ts
similarity index 95%
rename from src/daemon/sparse-fallback-screenshot.ts
rename to packages/daemon/src/execution/sparse-fallback-screenshot.ts
index a57f53a6a5..5574857df2 100644
--- a/src/daemon/sparse-fallback-screenshot.ts
+++ b/packages/daemon/src/execution/sparse-fallback-screenshot.ts
@@ -2,14 +2,14 @@ import type { DeviceRotation } from '@agent-device/contracts/device';
 import type { CreateDaemonCommandSurface } from '@agent-device/contracts/daemon-command-surface';
 import type { SnapshotQualityVerdict } from '@agent-device/kernel/snapshot';
 import { isSparseSnapshotQualityVerdict } from '@agent-device/capture-kit/snapshot-quality-verdict';
-import { contextFromFlags } from './context.ts';
+import { contextFromFlags } from '../core/context.ts';
 import { captureScreenshotArtifact } from './screenshot-runtime.ts';
 import {
   resolveBoundScreenshotRuntime,
   type ScreenshotRuntimeBindings,
 } from './screenshot-runtime-binding.ts';
-import type { DaemonRequest } from './daemon-request.ts';
-import type { SessionState } from './session-state.ts';
+import type { DaemonRequest } from '../core/daemon-request.ts';
+import type { SessionState } from '../core/session-state.ts';
 
 export type SparseFallbackScreenshot = {
   path: string;
diff --git a/src/daemon/system-button-runtime.ts b/packages/daemon/src/execution/system-button-runtime.ts
similarity index 90%
rename from src/daemon/system-button-runtime.ts
rename to packages/daemon/src/execution/system-button-runtime.ts
index aa01452482..c5be8300c0 100644
--- a/src/daemon/system-button-runtime.ts
+++ b/packages/daemon/src/execution/system-button-runtime.ts
@@ -11,10 +11,13 @@ import type {
 } from '@agent-device/contracts/system-button-runtime';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import { successText } from '@agent-device/kernel/success-text';
-import type { DaemonCommandContext } from './context.ts';
-import type { ResolvedGenericExecution } from './generic-leaf-execution.ts';
-import { resolveBoundGenericRuntime, type RuntimeAdmissionBindings } from './runtime-admission.ts';
-import { runtimeExecutionFromContext } from './snapshot-runtime-capture-input.ts';
+import type { DaemonCommandContext } from '../core/context.ts';
+import type { ResolvedGenericExecution } from '../core/generic-leaf-execution.ts';
+import {
+  resolveBoundGenericRuntime,
+  type RuntimeAdmissionBindings,
+} from '../core/runtime-admission.ts';
+import { runtimeExecutionFromContext } from '../core/snapshot-runtime-capture-input.ts';
 
 type SystemButtonUse = RuntimeUse<
   PlatformRuntimeOperations,
diff --git a/src/daemon/tv-remote-runtime.ts b/packages/daemon/src/execution/tv-remote-runtime.ts
similarity index 89%
rename from src/daemon/tv-remote-runtime.ts
rename to packages/daemon/src/execution/tv-remote-runtime.ts
index b2263a5d2f..552370b6fc 100644
--- a/src/daemon/tv-remote-runtime.ts
+++ b/packages/daemon/src/execution/tv-remote-runtime.ts
@@ -6,10 +6,13 @@ import type { DeviceInfo } from '@agent-device/kernel/device';
 import { AppError } from '@agent-device/kernel/errors';
 import { successText } from '@agent-device/kernel/success-text';
 import { requireIntInRange } from '@agent-device/kernel/validation';
-import type { DaemonCommandContext } from './context.ts';
-import type { ResolvedGenericExecution } from './generic-leaf-execution.ts';
-import { resolveBoundGenericRuntime, type RuntimeAdmissionBindings } from './runtime-admission.ts';
-import { runtimeExecutionFromContext } from './snapshot-runtime-capture-input.ts';
+import type { DaemonCommandContext } from '../core/context.ts';
+import type { ResolvedGenericExecution } from '../core/generic-leaf-execution.ts';
+import {
+  resolveBoundGenericRuntime,
+  type RuntimeAdmissionBindings,
+} from '../core/runtime-admission.ts';
+import { runtimeExecutionFromContext } from '../core/snapshot-runtime-capture-input.ts';
 
 /** `tv-remote <button>`, on the same parse the retired leaf used. */
 function readTvRemoteButton(positionals: readonly string[]): TvRemoteButton {
diff --git a/src/daemon/type-target-warning.ts b/packages/daemon/src/execution/type-target-warning.ts
similarity index 100%
rename from src/daemon/type-target-warning.ts
rename to packages/daemon/src/execution/type-target-warning.ts
diff --git a/src/daemon/type-text-runtime.ts b/packages/daemon/src/execution/type-text-runtime.ts
similarity index 95%
rename from src/daemon/type-text-runtime.ts
rename to packages/daemon/src/execution/type-text-runtime.ts
index 9771599ca7..e92afd6762 100644
--- a/src/daemon/type-text-runtime.ts
+++ b/packages/daemon/src/execution/type-text-runtime.ts
@@ -8,9 +8,9 @@ import { AppError } from '@agent-device/kernel/errors';
 import { successText } from '@agent-device/kernel/success-text';
 import { findMistargetedTypeRefToken } from './type-target-warning.ts';
 import { requireIntInRange } from '@agent-device/kernel/validation';
-import type { DaemonCommandContext } from './context.ts';
-import { admitRuntimeUse, type RuntimeAdmissionBindings } from './runtime-admission.ts';
-import { runtimeExecutionFromContext } from './snapshot-runtime-capture-input.ts';
+import type { DaemonCommandContext } from '../core/context.ts';
+import { admitRuntimeUse, type RuntimeAdmissionBindings } from '../core/runtime-admission.ts';
+import { runtimeExecutionFromContext } from '../core/snapshot-runtime-capture-input.ts';
 import type { DaemonFailureResponse } from '@agent-device/kernel/contracts';
 
 /** What the executor needs: only the bound operation, however broad the bind that carried it. */
diff --git a/src/daemon/viewport-runtime.ts b/packages/daemon/src/execution/viewport-runtime.ts
similarity index 90%
rename from src/daemon/viewport-runtime.ts
rename to packages/daemon/src/execution/viewport-runtime.ts
index 2b824e3a12..97bfd50e4e 100644
--- a/src/daemon/viewport-runtime.ts
+++ b/packages/daemon/src/execution/viewport-runtime.ts
@@ -1,8 +1,8 @@
 import { readViewportDimensions } from '@agent-device/contracts/capture';
 import { viewportRuntimeUse } from '@agent-device/contracts/platform-runtime-operations';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import type { ResolvedGenericExecution } from './generic-leaf-execution.ts';
-import { admitRuntimeUse, type RuntimeAdmissionBindings } from './runtime-admission.ts';
+import type { ResolvedGenericExecution } from '../core/generic-leaf-execution.ts';
+import { admitRuntimeUse, type RuntimeAdmissionBindings } from '../core/runtime-admission.ts';
 
 export async function resolveBoundViewportRuntime(
   params: {
diff --git a/src/daemon/wait-current-surface.test.ts b/packages/daemon/src/execution/wait-current-surface.test.ts
similarity index 98%
rename from src/daemon/wait-current-surface.test.ts
rename to packages/daemon/src/execution/wait-current-surface.test.ts
index f4b0b301cb..a92c8604cd 100644
--- a/src/daemon/wait-current-surface.test.ts
+++ b/packages/daemon/src/execution/wait-current-surface.test.ts
@@ -1,7 +1,7 @@
 import { expect, test, vi } from 'vitest';
 
 import { ANDROID_EMULATOR } from '@agent-device/test-kit/device-fixtures';
-import type { RequestCaptureProof } from './capture-disclosure.ts';
+import type { RequestCaptureProof } from '../core/capture-disclosure.ts';
 import { maybeWaitTimeoutSurfaceResponse } from './wait-current-surface.ts';
 import type { BoundSelectorCapture } from './selector-capture-binding.ts';
 
diff --git a/src/daemon/wait-current-surface.ts b/packages/daemon/src/execution/wait-current-surface.ts
similarity index 93%
rename from src/daemon/wait-current-surface.ts
rename to packages/daemon/src/execution/wait-current-surface.ts
index db7de91bcd..d5f23e715c 100644
--- a/src/daemon/wait-current-surface.ts
+++ b/packages/daemon/src/execution/wait-current-surface.ts
@@ -1,12 +1,12 @@
 import { WAIT_REASONS } from '@agent-device/contracts/wait';
 import type { SnapshotNode } from '@agent-device/kernel/snapshot';
-import { recordCaptureProof } from './capture-disclosure.ts';
-import type { RequestCaptureProof } from './capture-disclosure.ts';
-import type { DaemonRequest, DaemonResponse } from './daemon-request.ts';
-import type { SessionState } from './session-state.ts';
-import { captureSnapshot } from './snapshot-capture.ts';
+import { recordCaptureProof } from '../core/capture-disclosure.ts';
+import type { RequestCaptureProof } from '../core/capture-disclosure.ts';
+import type { DaemonRequest, DaemonResponse } from '../core/daemon-request.ts';
+import type { SessionState } from '../core/session-state.ts';
+import { captureSnapshot } from '../core/snapshot-capture.ts';
 import { normalizeType } from '@agent-device/contracts/snapshot';
-import { buildRuntimeCaptureInput } from './snapshot-runtime-capture-input.ts';
+import { buildRuntimeCaptureInput } from '../core/snapshot-runtime-capture-input.ts';
 import type { BoundSelectorCapture } from './selector-capture-binding.ts';
 import { errorResponse } from '@agent-device/kernel/contracts';
 
diff --git a/src/daemon/wait-runtime.ts b/packages/daemon/src/execution/wait-runtime.ts
similarity index 95%
rename from src/daemon/wait-runtime.ts
rename to packages/daemon/src/execution/wait-runtime.ts
index 70c18665d4..c2e3e285cb 100644
--- a/src/daemon/wait-runtime.ts
+++ b/packages/daemon/src/execution/wait-runtime.ts
@@ -8,8 +8,12 @@ import { absenceCaptureOptionError } from '@agent-device/selectors/absence-obser
 import { absenceCaptureOptionRefusal } from '@agent-device/selectors/absence-observation';
 import { parseVersionedRefPositional } from './ref-positionals.ts';
 import { resolveRefStalenessWarning } from './session-snapshot.ts';
-import { resolveSessionDevice, withSessionlessRunnerCleanup } from './snapshot-session.ts';
-import { recordIfSession, stripResolutionPayload, toDaemonWaitData } from './selector-recording.ts';
+import { resolveSessionDevice, withSessionlessRunnerCleanup } from '../core/snapshot-session.ts';
+import {
+  recordIfSession,
+  stripResolutionPayload,
+  toDaemonWaitData,
+} from '../core/selector-recording.ts';
 import {
   resolveBoundSelectorCapture,
   type BoundSelectorOperations,
@@ -20,11 +24,14 @@ import {
   readRecordedResolutionTarget,
   toDaemonResponse,
 } from './selector-runtime.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from './request-runtime-binding.ts';
-import type { DaemonRequest, DaemonResponse } from './daemon-request.ts';
-import type { SessionRef, SessionState } from './session-state.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../core/request-runtime-binding.ts';
+import type { DaemonRequest, DaemonResponse } from '../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../core/session-state.ts';
 import { maybeWaitTimeoutSurfaceResponse } from './wait-current-surface.ts';
-import { withCaptureDisclosures } from './capture-disclosure.ts';
+import { withCaptureDisclosures } from '../core/capture-disclosure.ts';
 import {
   createSelectorRuntimeForDevice,
   type SelectorRuntimeParams,
diff --git a/src/daemon/__tests__/app-log-admission-ledger.test.ts b/packages/daemon/src/resources/__tests__/app-log-admission-ledger.test.ts
similarity index 98%
rename from src/daemon/__tests__/app-log-admission-ledger.test.ts
rename to packages/daemon/src/resources/__tests__/app-log-admission-ledger.test.ts
index 383aaaf243..4ee855cb82 100644
--- a/src/daemon/__tests__/app-log-admission-ledger.test.ts
+++ b/packages/daemon/src/resources/__tests__/app-log-admission-ledger.test.ts
@@ -3,7 +3,7 @@ import { deviceIdentity, type DeviceInfo } from '@agent-device/kernel/device';
 import { createAppLogAdmissionLedger } from '../app-log-admission-ledger.ts';
 import { createNextAppLogFence } from '../app-log-start-preflight.ts';
 import { appLogResourceStore } from '../app-log-resource-store.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 
 const DEVICE: DeviceInfo = {
   platform: 'android',
diff --git a/src/daemon/__tests__/app-log-files.test.ts b/packages/daemon/src/resources/__tests__/app-log-files.test.ts
similarity index 100%
rename from src/daemon/__tests__/app-log-files.test.ts
rename to packages/daemon/src/resources/__tests__/app-log-files.test.ts
diff --git a/src/daemon/__tests__/app-log-resource-recovery.test.ts b/packages/daemon/src/resources/__tests__/app-log-resource-recovery.test.ts
similarity index 100%
rename from src/daemon/__tests__/app-log-resource-recovery.test.ts
rename to packages/daemon/src/resources/__tests__/app-log-resource-recovery.test.ts
diff --git a/src/daemon/__tests__/app-log-resource-store.test.ts b/packages/daemon/src/resources/__tests__/app-log-resource-store.test.ts
similarity index 100%
rename from src/daemon/__tests__/app-log-resource-store.test.ts
rename to packages/daemon/src/resources/__tests__/app-log-resource-store.test.ts
diff --git a/src/daemon/__tests__/app-log-session-resource.test.ts b/packages/daemon/src/resources/__tests__/app-log-session-resource.test.ts
similarity index 98%
rename from src/daemon/__tests__/app-log-session-resource.test.ts
rename to packages/daemon/src/resources/__tests__/app-log-session-resource.test.ts
index ebc0d0a6e7..895a6510f0 100644
--- a/src/daemon/__tests__/app-log-session-resource.test.ts
+++ b/packages/daemon/src/resources/__tests__/app-log-session-resource.test.ts
@@ -13,13 +13,13 @@ import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { createTestAppLogLiveHandle } from '@agent-device/test-kit/app-log-live-handle';
 import { AppError } from '@agent-device/kernel/errors';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import { makeSessionStore } from './support/store-factory.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import { createAppLogAdmissionLedger } from '../app-log-admission-ledger.ts';
 import { adoptStartedSessionAppLog, finishSessionAppLog } from '../app-log-session-resource.ts';
 import { createNextAppLogFence } from '../app-log-start-preflight.ts';
 import { appLogResourceStore } from '../app-log-resource-store.ts';
-import type { SessionState } from '../session-state.ts';
-import { stopSessionAppLog } from '../session-teardown.ts';
+import type { SessionState } from '../../core/session-state.ts';
+import { stopSessionAppLog } from '../../sessions/session-teardown.ts';
 
 test('teardown captures an adopted app log before its lazy import can cross retirement', async () => {
   const context = makeContext();
diff --git a/src/daemon/__tests__/app-log-start-preflight.test.ts b/packages/daemon/src/resources/__tests__/app-log-start-preflight.test.ts
similarity index 98%
rename from src/daemon/__tests__/app-log-start-preflight.test.ts
rename to packages/daemon/src/resources/__tests__/app-log-start-preflight.test.ts
index 564a487bbb..0dcb81df42 100644
--- a/src/daemon/__tests__/app-log-start-preflight.test.ts
+++ b/packages/daemon/src/resources/__tests__/app-log-start-preflight.test.ts
@@ -4,7 +4,7 @@ import { expect, test } from 'vitest';
 import { localRuntimeOwner } from '@agent-device/contracts/platform-runtime';
 import { createDurableResourceEnvelope } from '@agent-device/capture-kit';
 import { deviceIdentity, type DeviceInfo } from '@agent-device/kernel/device';
-import { makeSessionStore } from './support/store-factory.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import { createAppLogAdmissionLedger } from '../app-log-admission-ledger.ts';
 import { createNextAppLogFence } from '../app-log-start-preflight.ts';
 import { appLogResourceStore } from '../app-log-resource-store.ts';
diff --git a/src/daemon/__tests__/app-log.test.ts b/packages/daemon/src/resources/__tests__/app-log.test.ts
similarity index 100%
rename from src/daemon/__tests__/app-log.test.ts
rename to packages/daemon/src/resources/__tests__/app-log.test.ts
diff --git a/src/daemon/__tests__/filesystem-boundary-faults.test.ts b/packages/daemon/src/resources/__tests__/filesystem-boundary-faults.test.ts
similarity index 94%
rename from src/daemon/__tests__/filesystem-boundary-faults.test.ts
rename to packages/daemon/src/resources/__tests__/filesystem-boundary-faults.test.ts
index 1f74fe5786..658463e17c 100644
--- a/src/daemon/__tests__/filesystem-boundary-faults.test.ts
+++ b/packages/daemon/src/resources/__tests__/filesystem-boundary-faults.test.ts
@@ -1,4 +1,4 @@
-import { storeSessionForTest } from './support/store-factory.ts';
+import { storeSessionForTest } from '../../__tests__/support/store-factory.ts';
 import assert from 'node:assert/strict';
 import crypto from 'node:crypto';
 import path from 'node:path';
@@ -11,9 +11,15 @@ import { canonicalLocalDeviceKey } from '../device/device-claim-paths.ts';
 import { createDurableCaptureResourceStore } from '@agent-device/capture-kit/durable-capture';
 import { tryAcquireDaemonRegistration } from '@agent-device/daemon-contracts/daemon-registration-owner';
 import { resolveDaemonPaths } from '@agent-device/daemon-contracts/daemon-resolution';
-import { SessionScriptWriter, type SessionScriptWriteResult } from '../session-script-writer.ts';
-import { SessionStore } from '../session-store.ts';
-import { repairPublication, makeRepairCompleteSession } from './support/session-factories.ts';
+import {
+  SessionScriptWriter,
+  type SessionScriptWriteResult,
+} from '../../core/session-script-writer.ts';
+import { SessionStore } from '../../core/session-store.ts';
+import {
+  repairPublication,
+  makeRepairCompleteSession,
+} from '../../__tests__/support/session-factories.ts';
 import {
   registerFilesystemBoundaryMatrix,
   type FilesystemBoundaryOwner,
diff --git a/src/daemon/__tests__/lease-in-flight-work.test.ts b/packages/daemon/src/resources/__tests__/lease-in-flight-work.test.ts
similarity index 100%
rename from src/daemon/__tests__/lease-in-flight-work.test.ts
rename to packages/daemon/src/resources/__tests__/lease-in-flight-work.test.ts
diff --git a/src/daemon/__tests__/lease-registry-scope.test.ts b/packages/daemon/src/resources/__tests__/lease-registry-scope.test.ts
similarity index 93%
rename from src/daemon/__tests__/lease-registry-scope.test.ts
rename to packages/daemon/src/resources/__tests__/lease-registry-scope.test.ts
index e89f0fc417..a9d046adce 100644
--- a/src/daemon/__tests__/lease-registry-scope.test.ts
+++ b/packages/daemon/src/resources/__tests__/lease-registry-scope.test.ts
@@ -6,7 +6,10 @@ import {
   normalizeAllocateLeaseRequest,
   normalizeLeaseBackend,
 } from '../lease-registry-scope.ts';
-import { HUMAN_CONTROL_LEASE_REQUEST, HUMAN_CONTROL_SCOPE } from './human-control-fixtures.ts';
+import {
+  HUMAN_CONTROL_LEASE_REQUEST,
+  HUMAN_CONTROL_SCOPE,
+} from '../../__tests__/support/human-control-fixtures.ts';
 
 test('normalizeLeaseBackend accepts HarmonyOS instance backend', () => {
   assert.equal(normalizeLeaseBackend('harmonyos-instance'), 'harmonyos-instance');
diff --git a/src/daemon/__tests__/lease-registry.test.ts b/packages/daemon/src/resources/__tests__/lease-registry.test.ts
similarity index 99%
rename from src/daemon/__tests__/lease-registry.test.ts
rename to packages/daemon/src/resources/__tests__/lease-registry.test.ts
index 47e27814f1..b4533607b5 100644
--- a/src/daemon/__tests__/lease-registry.test.ts
+++ b/packages/daemon/src/resources/__tests__/lease-registry.test.ts
@@ -7,7 +7,7 @@ import {
   HUMAN_CONTROL_SCOPE,
   isHumanControlError,
   createControlLatch,
-} from './human-control-fixtures.ts';
+} from '../../__tests__/support/human-control-fixtures.ts';
 
 test('allocateLease creates lease and enforces tenant/run validation', () => {
   const registry = new LeaseRegistry();
diff --git a/src/daemon/__tests__/macos-app-lease.test.ts b/packages/daemon/src/resources/__tests__/macos-app-lease.test.ts
similarity index 98%
rename from src/daemon/__tests__/macos-app-lease.test.ts
rename to packages/daemon/src/resources/__tests__/macos-app-lease.test.ts
index 976c0adc70..44d1421f8c 100644
--- a/src/daemon/__tests__/macos-app-lease.test.ts
+++ b/packages/daemon/src/resources/__tests__/macos-app-lease.test.ts
@@ -1,15 +1,15 @@
 import assert from 'node:assert/strict';
 import { afterEach, beforeEach, test, vi } from 'vitest';
 import type { DeviceLease } from '@agent-device/contracts/device';
-import { makeIosSession, makeMacOsSession } from './support/session-factories.ts';
+import { makeIosSession, makeMacOsSession } from '../../__tests__/support/session-factories.ts';
 import {
   assertMacOsAppLeaseAdmitsRequest,
   assertMacOsAppLeaseProcess,
   parseMacOsAppLeaseKey,
   redactMacOsAppLeaseResponse,
 } from '../macos-app-lease.ts';
-import { buildOpenResult } from '../session-lifecycle/internal/session-open-surface.ts';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
+import { buildOpenResult } from '../../sessions/session-lifecycle/internal/session-open-surface.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
 
 const lease: Pick<DeviceLease, 'backend' | 'deviceKey'> = {
   backend: 'macos-app',
diff --git a/src/daemon/__tests__/session-device-resolution.test.ts b/packages/daemon/src/resources/__tests__/session-device-resolution.test.ts
similarity index 93%
rename from src/daemon/__tests__/session-device-resolution.test.ts
rename to packages/daemon/src/resources/__tests__/session-device-resolution.test.ts
index 42a989aa1a..8a9cd97b65 100644
--- a/src/daemon/__tests__/session-device-resolution.test.ts
+++ b/packages/daemon/src/resources/__tests__/session-device-resolution.test.ts
@@ -1,6 +1,6 @@
-import { daemonPlatformServicesFixture } from './platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../__tests__/support/platform-services-fixture.ts';
 import { test, expect, vi, beforeEach } from 'vitest';
-import type { SessionState } from '../session-state.ts';
+import type { SessionState } from '../../core/session-state.ts';
 
 import {
   requireSessionOrExplicitSelector,
@@ -9,17 +9,17 @@ import {
   selectorTargetsSessionDevice,
 } from '../session-device-resolution.ts';
 import { resolveTargetDevice } from '@agent-device/device-selection/dispatch-resolve';
-import { isActiveProviderDevice } from '../provider-device-admission.ts';
-import { ensureDeviceReady } from '../device/device-ready.ts';
+import { isActiveProviderDevice } from '../../core/provider-device-admission.ts';
+import { ensureDeviceReady } from '../../core/device/device-ready.ts';
 import { PRE_DISPATCH_REFUSAL_REASONS } from '@agent-device/kernel/errors';
 
 vi.mock('@agent-device/device-selection/dispatch-resolve', () => ({
   resolveTargetDevice: vi.fn(),
 }));
-vi.mock('../provider-device-admission.ts', () => ({
+vi.mock('../../core/provider-device-admission.ts', () => ({
   isActiveProviderDevice: vi.fn(() => false),
 }));
-vi.mock('../device/device-ready.ts', () => ({
+vi.mock('../../core/device/device-ready.ts', () => ({
   ensureDeviceReady: vi.fn(async () => {}),
 }));
 
diff --git a/src/daemon/app-log-admission-ledger.ts b/packages/daemon/src/resources/app-log-admission-ledger.ts
similarity index 100%
rename from src/daemon/app-log-admission-ledger.ts
rename to packages/daemon/src/resources/app-log-admission-ledger.ts
diff --git a/src/daemon/app-log-files.ts b/packages/daemon/src/resources/app-log-files.ts
similarity index 100%
rename from src/daemon/app-log-files.ts
rename to packages/daemon/src/resources/app-log-files.ts
diff --git a/src/daemon/app-log-resource-recovery.ts b/packages/daemon/src/resources/app-log-resource-recovery.ts
similarity index 100%
rename from src/daemon/app-log-resource-recovery.ts
rename to packages/daemon/src/resources/app-log-resource-recovery.ts
diff --git a/src/daemon/app-log-resource-store.ts b/packages/daemon/src/resources/app-log-resource-store.ts
similarity index 100%
rename from src/daemon/app-log-resource-store.ts
rename to packages/daemon/src/resources/app-log-resource-store.ts
diff --git a/src/daemon/app-log-session-resource.ts b/packages/daemon/src/resources/app-log-session-resource.ts
similarity index 95%
rename from src/daemon/app-log-session-resource.ts
rename to packages/daemon/src/resources/app-log-session-resource.ts
index d6ac0ea055..c0d44354f5 100644
--- a/src/daemon/app-log-session-resource.ts
+++ b/packages/daemon/src/resources/app-log-session-resource.ts
@@ -14,10 +14,10 @@ import {
   type DurableCaptureFinishIntent,
 } from '@agent-device/capture-kit/durable-capture-resource';
 import { appLogResourceStore } from './app-log-resource-store.ts';
-import type { SessionStore } from './session-store.ts';
-import type { SessionRef, SessionState } from './session-state.ts';
+import type { SessionStore } from '../core/session-store.ts';
+import type { SessionRef, SessionState } from '../core/session-state.ts';
 import { clearAppLogFiles } from './app-log.ts';
-import { bindSessionCapture } from './session-capture-binding.ts';
+import { bindSessionCapture } from '../core/session-capture-binding.ts';
 
 export type AppLogSessionSnapshot = Readonly<{
   active: boolean;
diff --git a/src/daemon/app-log-start-preflight.ts b/packages/daemon/src/resources/app-log-start-preflight.ts
similarity index 100%
rename from src/daemon/app-log-start-preflight.ts
rename to packages/daemon/src/resources/app-log-start-preflight.ts
diff --git a/src/daemon/app-log.ts b/packages/daemon/src/resources/app-log.ts
similarity index 100%
rename from src/daemon/app-log.ts
rename to packages/daemon/src/resources/app-log.ts
diff --git a/src/daemon/artifact-tracking.ts b/packages/daemon/src/resources/artifact-tracking.ts
similarity index 99%
rename from src/daemon/artifact-tracking.ts
rename to packages/daemon/src/resources/artifact-tracking.ts
index cba0009e24..efccad7590 100644
--- a/src/daemon/artifact-tracking.ts
+++ b/packages/daemon/src/resources/artifact-tracking.ts
@@ -11,7 +11,7 @@ import {
   expiredTenantOwnedEntryError,
   requireTenantOwnedEntry,
   type TenantOwnedResourceKind,
-} from './tenant-owned-entry.ts';
+} from '../core/tenant-owned-entry.ts';
 
 // --- Downloadable artifact tracking ---
 
diff --git a/src/daemon/device/__tests__/device-claim-admission.test.ts b/packages/daemon/src/resources/device/__tests__/device-claim-admission.test.ts
similarity index 96%
rename from src/daemon/device/__tests__/device-claim-admission.test.ts
rename to packages/daemon/src/resources/device/__tests__/device-claim-admission.test.ts
index 762cec9a79..400e2e5180 100644
--- a/src/daemon/device/__tests__/device-claim-admission.test.ts
+++ b/packages/daemon/src/resources/device/__tests__/device-claim-admission.test.ts
@@ -2,7 +2,7 @@ import { expect, test } from 'vitest';
 import {
   daemonPlatformServicesFixture,
   daemonClaimRecoveryGatewayFixture,
-} from '../../__tests__/platform-services-fixture.ts';
+} from '../../../__tests__/support/platform-services-fixture.ts';
 import fs from 'node:fs';
 import path from 'node:path';
 import { localRuntimeOwner, providerRuntimeOwner } from '@agent-device/contracts/platform-runtime';
@@ -11,15 +11,15 @@ import { ANDROID_EMULATOR } from '@agent-device/test-kit/device-fixtures';
 import {
   isolatedDeviceClaimStores,
   retainOrphanedDeviceClaims,
-} from '../../__tests__/support/device-claim-store.ts';
+} from '../../../__tests__/support/device-claim-store.ts';
 import { createDeviceClaimAdmission } from '../device-claim-admission.ts';
 import { abandonDeviceClaim, acquireDeviceClaim } from '../device-claims.ts';
 import { inspectDeviceClaims } from '../device-claim-inspection.ts';
 import { canonicalLocalDeviceKey, resolveDeviceClaimPath } from '../device-claim-paths.ts';
-import { createRequestExecutionScope } from '../../request-execution-scope.ts';
+import { createRequestExecutionScope } from '../../../server/request-execution-scope.ts';
 import { LeaseRegistry } from '../../lease-registry.ts';
-import { SessionStore } from '../../session-store.ts';
-import { unavailableDeviceRuntimeGateway } from '../../__tests__/support/unavailable-device-runtime-gateway.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import { unavailableDeviceRuntimeGateway } from '../../../__tests__/support/unavailable-device-runtime-gateway.ts';
 import type { DeviceClaimPolicy } from '@agent-device/command-registry/types';
 
 const setup = isolatedDeviceClaimStores('agent-device-claim-admission-');
diff --git a/src/daemon/device/__tests__/device-claim-conflict.test.ts b/packages/daemon/src/resources/device/__tests__/device-claim-conflict.test.ts
similarity index 100%
rename from src/daemon/device/__tests__/device-claim-conflict.test.ts
rename to packages/daemon/src/resources/device/__tests__/device-claim-conflict.test.ts
diff --git a/src/daemon/device/__tests__/device-claim-prune.test.ts b/packages/daemon/src/resources/device/__tests__/device-claim-prune.test.ts
similarity index 100%
rename from src/daemon/device/__tests__/device-claim-prune.test.ts
rename to packages/daemon/src/resources/device/__tests__/device-claim-prune.test.ts
diff --git a/src/daemon/device/__tests__/device-claim-reboot.test.ts b/packages/daemon/src/resources/device/__tests__/device-claim-reboot.test.ts
similarity index 100%
rename from src/daemon/device/__tests__/device-claim-reboot.test.ts
rename to packages/daemon/src/resources/device/__tests__/device-claim-reboot.test.ts
diff --git a/src/daemon/device/__tests__/device-claim-record.test.ts b/packages/daemon/src/resources/device/__tests__/device-claim-record.test.ts
similarity index 100%
rename from src/daemon/device/__tests__/device-claim-record.test.ts
rename to packages/daemon/src/resources/device/__tests__/device-claim-record.test.ts
diff --git a/src/daemon/device/__tests__/device-claim-rule.test.ts b/packages/daemon/src/resources/device/__tests__/device-claim-rule.test.ts
similarity index 100%
rename from src/daemon/device/__tests__/device-claim-rule.test.ts
rename to packages/daemon/src/resources/device/__tests__/device-claim-rule.test.ts
diff --git a/src/daemon/device/__tests__/device-claim-settlement.test.ts b/packages/daemon/src/resources/device/__tests__/device-claim-settlement.test.ts
similarity index 100%
rename from src/daemon/device/__tests__/device-claim-settlement.test.ts
rename to packages/daemon/src/resources/device/__tests__/device-claim-settlement.test.ts
diff --git a/src/daemon/device/__tests__/device-claims.test.ts b/packages/daemon/src/resources/device/__tests__/device-claims.test.ts
similarity index 100%
rename from src/daemon/device/__tests__/device-claims.test.ts
rename to packages/daemon/src/resources/device/__tests__/device-claims.test.ts
diff --git a/src/daemon/device/__tests__/device-mutation-drain.test.ts b/packages/daemon/src/resources/device/__tests__/device-mutation-drain.test.ts
similarity index 95%
rename from src/daemon/device/__tests__/device-mutation-drain.test.ts
rename to packages/daemon/src/resources/device/__tests__/device-mutation-drain.test.ts
index 48ccb69020..4bdc60b3fe 100644
--- a/src/daemon/device/__tests__/device-mutation-drain.test.ts
+++ b/packages/daemon/src/resources/device/__tests__/device-mutation-drain.test.ts
@@ -1,4 +1,4 @@
-import { createControlLatch } from '../../__tests__/human-control-fixtures.ts';
+import { createControlLatch } from '../../../__tests__/support/human-control-fixtures.ts';
 import assert from 'node:assert/strict';
 import { test } from 'vitest';
 import { DeviceMutationDrain } from '../device-mutation-drain.ts';
diff --git a/src/daemon/device/claim-recovery-gateway.ts b/packages/daemon/src/resources/device/claim-recovery-gateway.ts
similarity index 100%
rename from src/daemon/device/claim-recovery-gateway.ts
rename to packages/daemon/src/resources/device/claim-recovery-gateway.ts
diff --git a/src/daemon/device/device-claim-admission.ts b/packages/daemon/src/resources/device/device-claim-admission.ts
similarity index 100%
rename from src/daemon/device/device-claim-admission.ts
rename to packages/daemon/src/resources/device/device-claim-admission.ts
diff --git a/src/daemon/device/device-claim-conflict.ts b/packages/daemon/src/resources/device/device-claim-conflict.ts
similarity index 98%
rename from src/daemon/device/device-claim-conflict.ts
rename to packages/daemon/src/resources/device/device-claim-conflict.ts
index b0a88f2b88..98411aa30a 100644
--- a/src/daemon/device/device-claim-conflict.ts
+++ b/packages/daemon/src/resources/device/device-claim-conflict.ts
@@ -11,7 +11,7 @@ import {
   type DeviceClaimClassification,
   type InspectedDeviceClaim,
 } from './device-claim-inspection.ts';
-import type { DaemonResponse } from '../daemon-request.ts';
+import type { DaemonResponse } from '../../core/daemon-request.ts';
 import { errorResponse } from '@agent-device/kernel/contracts';
 import type { DeviceClaimConflictReason } from '@agent-device/contracts/device';
 
diff --git a/src/daemon/device/device-claim-inspection.ts b/packages/daemon/src/resources/device/device-claim-inspection.ts
similarity index 100%
rename from src/daemon/device/device-claim-inspection.ts
rename to packages/daemon/src/resources/device/device-claim-inspection.ts
diff --git a/src/daemon/device/device-claim-paths.ts b/packages/daemon/src/resources/device/device-claim-paths.ts
similarity index 100%
rename from src/daemon/device/device-claim-paths.ts
rename to packages/daemon/src/resources/device/device-claim-paths.ts
diff --git a/src/daemon/device/device-claim-reboot.ts b/packages/daemon/src/resources/device/device-claim-reboot.ts
similarity index 100%
rename from src/daemon/device/device-claim-reboot.ts
rename to packages/daemon/src/resources/device/device-claim-reboot.ts
diff --git a/src/daemon/device/device-claim-record.ts b/packages/daemon/src/resources/device/device-claim-record.ts
similarity index 100%
rename from src/daemon/device/device-claim-record.ts
rename to packages/daemon/src/resources/device/device-claim-record.ts
diff --git a/src/daemon/device/device-claim-rule.ts b/packages/daemon/src/resources/device/device-claim-rule.ts
similarity index 100%
rename from src/daemon/device/device-claim-rule.ts
rename to packages/daemon/src/resources/device/device-claim-rule.ts
diff --git a/src/daemon/device/device-claim-settlement.ts b/packages/daemon/src/resources/device/device-claim-settlement.ts
similarity index 100%
rename from src/daemon/device/device-claim-settlement.ts
rename to packages/daemon/src/resources/device/device-claim-settlement.ts
diff --git a/src/daemon/device/device-claim-store.ts b/packages/daemon/src/resources/device/device-claim-store.ts
similarity index 100%
rename from src/daemon/device/device-claim-store.ts
rename to packages/daemon/src/resources/device/device-claim-store.ts
diff --git a/src/daemon/device/device-claims.ts b/packages/daemon/src/resources/device/device-claims.ts
similarity index 100%
rename from src/daemon/device/device-claims.ts
rename to packages/daemon/src/resources/device/device-claims.ts
diff --git a/src/daemon/device/device-mutation-drain.ts b/packages/daemon/src/resources/device/device-mutation-drain.ts
similarity index 100%
rename from src/daemon/device/device-mutation-drain.ts
rename to packages/daemon/src/resources/device/device-mutation-drain.ts
diff --git a/src/daemon/human-control-contract.ts b/packages/daemon/src/resources/human-control-contract.ts
similarity index 100%
rename from src/daemon/human-control-contract.ts
rename to packages/daemon/src/resources/human-control-contract.ts
diff --git a/src/daemon/lease-in-flight-work.ts b/packages/daemon/src/resources/lease-in-flight-work.ts
similarity index 100%
rename from src/daemon/lease-in-flight-work.ts
rename to packages/daemon/src/resources/lease-in-flight-work.ts
diff --git a/src/daemon/lease-registry-scope.ts b/packages/daemon/src/resources/lease-registry-scope.ts
similarity index 99%
rename from src/daemon/lease-registry-scope.ts
rename to packages/daemon/src/resources/lease-registry-scope.ts
index 63cc188073..434443523f 100644
--- a/src/daemon/lease-registry-scope.ts
+++ b/packages/daemon/src/resources/lease-registry-scope.ts
@@ -6,7 +6,7 @@ import {
 } from '@agent-device/contracts/lease-scope';
 import { LEASE_BACKENDS, type LeaseBackend } from '@agent-device/kernel/contracts';
 import { AppError } from '@agent-device/kernel/errors';
-import { normalizeTenantId } from './config.ts';
+import { normalizeTenantId } from '../core/config.ts';
 
 export type LeaseRegistryOptions = {
   maxActiveSimulatorLeases?: number;
diff --git a/src/daemon/lease-registry.ts b/packages/daemon/src/resources/lease-registry.ts
similarity index 100%
rename from src/daemon/lease-registry.ts
rename to packages/daemon/src/resources/lease-registry.ts
diff --git a/src/daemon/macos-app-lease.ts b/packages/daemon/src/resources/macos-app-lease.ts
similarity index 98%
rename from src/daemon/macos-app-lease.ts
rename to packages/daemon/src/resources/macos-app-lease.ts
index e973240b2a..b21d082895 100644
--- a/src/daemon/macos-app-lease.ts
+++ b/packages/daemon/src/resources/macos-app-lease.ts
@@ -7,10 +7,10 @@ import { runCmd } from '@agent-device/host-kit/command';
 import { isProcessAlive, readHostEnvironmentVariable } from '@agent-device/host-kit/process';
 import { isMacOs } from '@agent-device/kernel/device';
 import { AppError, type DaemonError } from '@agent-device/kernel/errors';
-import { isAppLeaseAllowed } from './daemon-command-registry.ts';
-import type { DaemonRequest, DaemonResponse, DaemonResponseData } from './daemon-request.ts';
+import { isAppLeaseAllowed } from '../core/daemon-command-registry.ts';
+import type { DaemonRequest, DaemonResponse, DaemonResponseData } from '../core/daemon-request.ts';
 import type { LeaseRegistry } from './lease-registry.ts';
-import type { SessionState } from './session-state.ts';
+import type { SessionState } from '../core/session-state.ts';
 
 /**
  * A `macos-app` lease rents one app on the host Mac, never the desktop. Its device key is the app's
diff --git a/src/daemon/provider-session-ownership.ts b/packages/daemon/src/resources/provider-session-ownership.ts
similarity index 100%
rename from src/daemon/provider-session-ownership.ts
rename to packages/daemon/src/resources/provider-session-ownership.ts
diff --git a/src/daemon/session-device-resolution.ts b/packages/daemon/src/resources/session-device-resolution.ts
similarity index 88%
rename from src/daemon/session-device-resolution.ts
rename to packages/daemon/src/resources/session-device-resolution.ts
index d2153f0f3e..c2bdbcf842 100644
--- a/src/daemon/session-device-resolution.ts
+++ b/packages/daemon/src/resources/session-device-resolution.ts
@@ -1,15 +1,15 @@
 import { isIosFamily, type DeviceInfo } from '@agent-device/kernel/device';
 import { AppError, sessionOrDeviceSelectorRequiredDetails } from '@agent-device/kernel/errors';
-import { isActiveProviderDevice } from './provider-device-admission.ts';
-import type { DaemonPlatformServices } from './platform-services.ts';
+import { isActiveProviderDevice } from '../core/provider-device-admission.ts';
+import type { DaemonPlatformServices } from '../core/platform-services.ts';
 import { resolveTargetDevice } from '@agent-device/device-selection/dispatch-resolve';
-import type { DaemonRequest, DaemonResponse } from './daemon-request.ts';
-import type { SessionState } from './session-state.ts';
+import type { DaemonRequest, DaemonResponse } from '../core/daemon-request.ts';
+import type { SessionState } from '../core/session-state.ts';
 import {
   hasDeviceSelectionInput,
   hasExplicitDeviceSelector,
-} from './device/device-selector-intent.ts';
-import { listSessionSelectorConflicts } from './session-selector.ts';
+} from '../core/device/device-selector-intent.ts';
+import { listSessionSelectorConflicts } from '../core/session-selector.ts';
 import { errorResponse } from '@agent-device/kernel/contracts';
 
 export function requireSessionOrExplicitSelector(
diff --git a/src/daemon/__tests__/application-lifecycle-recovery.test.ts b/packages/daemon/src/server/__tests__/application-lifecycle-recovery.test.ts
similarity index 99%
rename from src/daemon/__tests__/application-lifecycle-recovery.test.ts
rename to packages/daemon/src/server/__tests__/application-lifecycle-recovery.test.ts
index 91da21a7b7..0f42223b76 100644
--- a/src/daemon/__tests__/application-lifecycle-recovery.test.ts
+++ b/packages/daemon/src/server/__tests__/application-lifecycle-recovery.test.ts
@@ -12,7 +12,7 @@ import type { PlatformRequestScope } from '@agent-device/contracts/platform-runt
 import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform-runtime-operations';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import { unavailableDeploymentSnapshotAndShutdownOperationFacts } from '@agent-device/test-kit/runtime-operation-facts';
-import type { SessionState } from '../session-state.ts';
+import type { SessionState } from '../../core/session-state.ts';
 import { finalizeDaemonSessionApplicationLifecycle } from '../application-lifecycle-recovery.ts';
 
 const localMechanics = vi.hoisted(() => ({
diff --git a/src/daemon/__tests__/artifact-archive.test.ts b/packages/daemon/src/server/__tests__/artifact-archive.test.ts
similarity index 100%
rename from src/daemon/__tests__/artifact-archive.test.ts
rename to packages/daemon/src/server/__tests__/artifact-archive.test.ts
diff --git a/src/daemon/__tests__/atomic-publish-ownership.test.ts b/packages/daemon/src/server/__tests__/atomic-publish-ownership.test.ts
similarity index 77%
rename from src/daemon/__tests__/atomic-publish-ownership.test.ts
rename to packages/daemon/src/server/__tests__/atomic-publish-ownership.test.ts
index cc98d69066..e186c4fc19 100644
--- a/src/daemon/__tests__/atomic-publish-ownership.test.ts
+++ b/packages/daemon/src/server/__tests__/atomic-publish-ownership.test.ts
@@ -4,16 +4,19 @@ import { test } from 'vitest';
 
 const SIMPLE_PUBLISHERS = [
   // device-claims.ts delegates every write to device-claim-store.ts's writeDeviceClaim.
-  new URL('../device/device-claim-store.ts', import.meta.url),
-  new URL('../../../packages/daemon-contracts/src/daemon-registration-owner.ts', import.meta.url),
+  new URL('../../resources/device/device-claim-store.ts', import.meta.url),
+  new URL(
+    '../../../../../packages/daemon-contracts/src/daemon-registration-owner.ts',
+    import.meta.url,
+  ),
   new URL('../provider-lease-expiry.ts', import.meta.url),
-  new URL('../session-script-writer.ts', import.meta.url),
-  new URL('../../../packages/platform-apple/src/runner/runner-lease.ts', import.meta.url),
-  new URL('../../remote/remote-connection-state.ts', import.meta.url),
+  new URL('../../core/session-script-writer.ts', import.meta.url),
+  new URL('../../../../../packages/platform-apple/src/runner/runner-lease.ts', import.meta.url),
+  new URL('../../../../../src/remote/remote-connection-state.ts', import.meta.url),
 ] as const;
 
 const PROCESS_LOCK_SOURCE = new URL(
-  '../../../packages/host-kit/src/internal/process-lock.ts',
+  '../../../../../packages/host-kit/src/internal/process-lock.ts',
   import.meta.url,
 );
 
@@ -44,7 +47,7 @@ test('the process lock reclaims in place instead of renaming the lock path', ()
 
 test('durable publishers share the host-kit durable publication owner', () => {
   const sourcePaths = [
-    new URL('../../../packages/capture-kit/src/durable-capture/store.ts', import.meta.url),
+    new URL('../../../../../packages/capture-kit/src/durable-capture/store.ts', import.meta.url),
   ];
   for (const sourcePath of sourcePaths) {
     const source = fs.readFileSync(sourcePath, 'utf8');
diff --git a/src/daemon/__tests__/daemon-runtime-app-log.test.ts b/packages/daemon/src/server/__tests__/daemon-runtime-app-log.test.ts
similarity index 91%
rename from src/daemon/__tests__/daemon-runtime-app-log.test.ts
rename to packages/daemon/src/server/__tests__/daemon-runtime-app-log.test.ts
index b1e87a04bf..06e3169199 100644
--- a/src/daemon/__tests__/daemon-runtime-app-log.test.ts
+++ b/packages/daemon/src/server/__tests__/daemon-runtime-app-log.test.ts
@@ -1,4 +1,4 @@
-import { platformResourceCleanupFixture } from './support/platform-resource-cleanup-fixture.ts';
+import { platformResourceCleanupFixture } from '../../__tests__/support/platform-resource-cleanup-fixture.ts';
 import fs from 'node:fs';
 import path from 'node:path';
 import { expect, test, vi } from 'vitest';
@@ -6,16 +6,16 @@ import { localRuntimeOwner } from '@agent-device/contracts/platform-runtime';
 import type { ResourceDiagnostic } from '@agent-device/host-kit/diagnostics';
 import { createDurableResourceEnvelope } from '@agent-device/capture-kit';
 import { createTestAppLogLiveHandle } from '@agent-device/test-kit/app-log-live-handle';
-import { makeSessionStore } from './support/store-factory.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { recoverAppLogResourcesAfterDaemonLock } from '../app-log-resource-recovery.ts';
-import { appLogResourceStore } from '../app-log-resource-store.ts';
+import { recoverAppLogResourcesAfterDaemonLock } from '../../resources/app-log-resource-recovery.ts';
+import { appLogResourceStore } from '../../resources/app-log-resource-store.ts';
 import {
   flushDaemonStartupDiagnostics,
   teardownDaemonSessionForShutdown,
 } from '../server/daemon-runtime.ts';
-import type { SessionState } from '../session-state.ts';
-import { unavailableDeviceRuntimeGateway } from './support/unavailable-device-runtime-gateway.ts';
+import type { SessionState } from '../../core/session-state.ts';
+import { unavailableDeviceRuntimeGateway } from '../../__tests__/support/unavailable-device-runtime-gateway.ts';
 
 test('daemon startup awaits app-log recovery after acquiring the lock and before opening servers', () => {
   const source = fs.readFileSync(new URL('../server/daemon-runtime.ts', import.meta.url), 'utf8');
diff --git a/src/daemon/__tests__/daemon-stop.test.ts b/packages/daemon/src/server/__tests__/daemon-stop.test.ts
similarity index 100%
rename from src/daemon/__tests__/daemon-stop.test.ts
rename to packages/daemon/src/server/__tests__/daemon-stop.test.ts
diff --git a/src/daemon/__tests__/host-lease-http.test.ts b/packages/daemon/src/server/__tests__/host-lease-http.test.ts
similarity index 98%
rename from src/daemon/__tests__/host-lease-http.test.ts
rename to packages/daemon/src/server/__tests__/host-lease-http.test.ts
index 0065fe60cb..70b5b20918 100644
--- a/src/daemon/__tests__/host-lease-http.test.ts
+++ b/packages/daemon/src/server/__tests__/host-lease-http.test.ts
@@ -6,7 +6,7 @@ import {
   skipWhenLoopbackUnavailable,
 } from '@agent-device/test-kit/loopback';
 import { HOST_LEASE_HTTP_PREFIX } from '../host-lease-http.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
 import { createDaemonHttpServer } from '../server/http-server.ts';
 
 const LEASE_ID = 'a1b2c3d4e5f60718293a4b5c6d7e8f90';
diff --git a/src/daemon/__tests__/http-server-artifacts.coverage.ts b/packages/daemon/src/server/__tests__/http-server-artifacts.coverage.ts
similarity index 100%
rename from src/daemon/__tests__/http-server-artifacts.coverage.ts
rename to packages/daemon/src/server/__tests__/http-server-artifacts.coverage.ts
diff --git a/src/daemon/__tests__/http-server-artifacts.test.ts b/packages/daemon/src/server/__tests__/http-server-artifacts.test.ts
similarity index 99%
rename from src/daemon/__tests__/http-server-artifacts.test.ts
rename to packages/daemon/src/server/__tests__/http-server-artifacts.test.ts
index 7ab187becb..36290a2b36 100644
--- a/src/daemon/__tests__/http-server-artifacts.test.ts
+++ b/packages/daemon/src/server/__tests__/http-server-artifacts.test.ts
@@ -7,8 +7,8 @@ import {
   cleanupDownloadableArtifact,
   listDownloadableArtifacts,
   trackDownloadableArtifact,
-} from '../artifact-tracking.ts';
-import type { DaemonResponse } from '../daemon-request.ts';
+} from '../../resources/artifact-tracking.ts';
+import type { DaemonResponse } from '../../core/daemon-request.ts';
 import { runCmdSync, withCommandExecutorOverride } from '@agent-device/host-kit/command';
 import {
   closeLoopbackServer,
diff --git a/src/daemon/__tests__/http-server-rpc-admission.test.ts b/packages/daemon/src/server/__tests__/http-server-rpc-admission.test.ts
similarity index 98%
rename from src/daemon/__tests__/http-server-rpc-admission.test.ts
rename to packages/daemon/src/server/__tests__/http-server-rpc-admission.test.ts
index aaaa06ebfb..4b42af92f8 100644
--- a/src/daemon/__tests__/http-server-rpc-admission.test.ts
+++ b/packages/daemon/src/server/__tests__/http-server-rpc-admission.test.ts
@@ -2,7 +2,7 @@ import { test } from 'vitest';
 import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import path from 'node:path';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
 import { closeLoopbackServer, skipWhenLoopbackUnavailable } from '@agent-device/test-kit/loopback';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { restoreEnv } from '@agent-device/test-kit/env';
diff --git a/src/daemon/__tests__/http-server-rpc-handler-failure.test.ts b/packages/daemon/src/server/__tests__/http-server-rpc-handler-failure.test.ts
similarity index 100%
rename from src/daemon/__tests__/http-server-rpc-handler-failure.test.ts
rename to packages/daemon/src/server/__tests__/http-server-rpc-handler-failure.test.ts
diff --git a/src/daemon/__tests__/http-server-rpc-invalid-body.test.ts b/packages/daemon/src/server/__tests__/http-server-rpc-invalid-body.test.ts
similarity index 98%
rename from src/daemon/__tests__/http-server-rpc-invalid-body.test.ts
rename to packages/daemon/src/server/__tests__/http-server-rpc-invalid-body.test.ts
index cdaba6b8fd..67c132e20a 100644
--- a/src/daemon/__tests__/http-server-rpc-invalid-body.test.ts
+++ b/packages/daemon/src/server/__tests__/http-server-rpc-invalid-body.test.ts
@@ -2,7 +2,7 @@ import { test } from 'vitest';
 import assert from 'node:assert/strict';
 import { closeLoopbackServer, skipWhenLoopbackUnavailable } from '@agent-device/test-kit/loopback';
 import { postRpcCommand, postRpcRaw, startRpcServer } from './http-server-rpc.fixtures.ts';
-import type { DaemonResponse } from '../daemon-request.ts';
+import type { DaemonResponse } from '../../core/daemon-request.ts';
 
 const TOKEN = 'invalid-body-token';
 
diff --git a/src/daemon/__tests__/http-server-rpc-lifetime.test.ts b/packages/daemon/src/server/__tests__/http-server-rpc-lifetime.test.ts
similarity index 96%
rename from src/daemon/__tests__/http-server-rpc-lifetime.test.ts
rename to packages/daemon/src/server/__tests__/http-server-rpc-lifetime.test.ts
index e0953cb4da..cbd8e00276 100644
--- a/src/daemon/__tests__/http-server-rpc-lifetime.test.ts
+++ b/packages/daemon/src/server/__tests__/http-server-rpc-lifetime.test.ts
@@ -1,6 +1,6 @@
 import { test } from 'vitest';
 import assert from 'node:assert/strict';
-import type { DaemonResponse } from '../daemon-request.ts';
+import type { DaemonResponse } from '../../core/daemon-request.ts';
 import { getRequestSignal } from '@agent-device/host-kit/request';
 import { closeLoopbackServer, skipWhenLoopbackUnavailable } from '@agent-device/test-kit/loopback';
 import { postRpcCommand, startRpcServer } from './http-server-rpc.fixtures.ts';
diff --git a/src/daemon/__tests__/http-server-rpc-unowned-failure.test.ts b/packages/daemon/src/server/__tests__/http-server-rpc-unowned-failure.test.ts
similarity index 98%
rename from src/daemon/__tests__/http-server-rpc-unowned-failure.test.ts
rename to packages/daemon/src/server/__tests__/http-server-rpc-unowned-failure.test.ts
index 0a7e3ad208..bf92849592 100644
--- a/src/daemon/__tests__/http-server-rpc-unowned-failure.test.ts
+++ b/packages/daemon/src/server/__tests__/http-server-rpc-unowned-failure.test.ts
@@ -3,7 +3,7 @@ import assert from 'node:assert/strict';
 import type { NormalizedError } from '@agent-device/kernel/errors';
 import { closeLoopbackServer, skipWhenLoopbackUnavailable } from '@agent-device/test-kit/loopback';
 import { postRpcCommand, startRpcServer } from './http-server-rpc.fixtures.ts';
-import type { DaemonResponse } from '../daemon-request.ts';
+import type { DaemonResponse } from '../../core/daemon-request.ts';
 
 const TOKEN = 'unowned-failure-token';
 
diff --git a/src/daemon/__tests__/http-server-rpc-validation.test.ts b/packages/daemon/src/server/__tests__/http-server-rpc-validation.test.ts
similarity index 98%
rename from src/daemon/__tests__/http-server-rpc-validation.test.ts
rename to packages/daemon/src/server/__tests__/http-server-rpc-validation.test.ts
index d6f5acc02c..ecf29b6ab7 100644
--- a/src/daemon/__tests__/http-server-rpc-validation.test.ts
+++ b/packages/daemon/src/server/__tests__/http-server-rpc-validation.test.ts
@@ -3,9 +3,12 @@ import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import path from 'node:path';
 import { createDaemonHttpServer } from '../server/http-server.ts';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
-import { cleanupUploadedArtifact, trackUploadedArtifact } from '../artifact-tracking.ts';
-import { resolveInstallSource } from '../install-source-resolution.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
+import {
+  cleanupUploadedArtifact,
+  trackUploadedArtifact,
+} from '../../resources/artifact-tracking.ts';
+import { resolveInstallSource } from '../../sessions/install-source-resolution.ts';
 import {
   closeLoopbackServer,
   listenOnLoopback,
diff --git a/src/daemon/__tests__/http-server-rpc.fixtures.ts b/packages/daemon/src/server/__tests__/http-server-rpc.fixtures.ts
similarity index 96%
rename from src/daemon/__tests__/http-server-rpc.fixtures.ts
rename to packages/daemon/src/server/__tests__/http-server-rpc.fixtures.ts
index a4226c956b..f6d4860928 100644
--- a/src/daemon/__tests__/http-server-rpc.fixtures.ts
+++ b/packages/daemon/src/server/__tests__/http-server-rpc.fixtures.ts
@@ -1,7 +1,7 @@
 import type { Server } from 'node:http';
 import http from 'node:http';
 import { createDaemonHttpServer } from '../server/http-server.ts';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
 import { listenOnLoopback } from '@agent-device/test-kit/loopback';
 
 const RPC_ANSWER_DEADLINE_MS = 1_000;
diff --git a/src/daemon/__tests__/http-server-tenant-trust.test.ts b/packages/daemon/src/server/__tests__/http-server-tenant-trust.test.ts
similarity index 99%
rename from src/daemon/__tests__/http-server-tenant-trust.test.ts
rename to packages/daemon/src/server/__tests__/http-server-tenant-trust.test.ts
index 7c4c98b40f..95b8b0e76e 100644
--- a/src/daemon/__tests__/http-server-tenant-trust.test.ts
+++ b/packages/daemon/src/server/__tests__/http-server-tenant-trust.test.ts
@@ -3,10 +3,10 @@ import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import path from 'node:path';
 import { createDaemonHttpServer } from '../server/http-server.ts';
-import { resolveSessionRequestLogPath } from '../session-artifact-paths.ts';
+import { resolveSessionRequestLogPath } from '../../core/session-artifact-paths.ts';
 import { safeSessionName } from '@agent-device/host-kit/session-paths';
 import { DAEMON_HTTP_TENANT_HEADER } from '@agent-device/contracts/daemon-http';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
 import {
   closeLoopbackServer,
   listenOnLoopback,
diff --git a/src/daemon/__tests__/human-control-http.test.ts b/packages/daemon/src/server/__tests__/human-control-http.test.ts
similarity index 95%
rename from src/daemon/__tests__/human-control-http.test.ts
rename to packages/daemon/src/server/__tests__/human-control-http.test.ts
index 9ab28e0e1a..03d0c91bd6 100644
--- a/src/daemon/__tests__/human-control-http.test.ts
+++ b/packages/daemon/src/server/__tests__/human-control-http.test.ts
@@ -6,14 +6,14 @@ import {
   listenOnLoopback,
   skipWhenLoopbackUnavailable,
 } from '@agent-device/test-kit/loopback';
-import { HUMAN_CONTROL_HTTP_PREFIX } from '../human-control-contract.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
+import { HUMAN_CONTROL_HTTP_PREFIX } from '../../resources/human-control-contract.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
 import {
   HUMAN_CONTROL_SCOPE,
   humanControlRequest,
   createControlLatch,
-} from './human-control-fixtures.ts';
-import { createHumanControlHarness } from './human-control-router-fixture.ts';
+} from '../../__tests__/support/human-control-fixtures.ts';
+import { createHumanControlHarness } from '../../__tests__/support/human-control-router-fixture.ts';
 import { tryHandleHumanControlHttpRoute } from '../human-control-http.ts';
 import { createDaemonHttpServer } from '../server/http-server.ts';
 
diff --git a/src/daemon/__tests__/provider-lease-expiry.test.ts b/packages/daemon/src/server/__tests__/provider-lease-expiry.test.ts
similarity index 98%
rename from src/daemon/__tests__/provider-lease-expiry.test.ts
rename to packages/daemon/src/server/__tests__/provider-lease-expiry.test.ts
index b704eee90b..96ddab3991 100644
--- a/src/daemon/__tests__/provider-lease-expiry.test.ts
+++ b/packages/daemon/src/server/__tests__/provider-lease-expiry.test.ts
@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import { expect, test, vi } from 'vitest';
 import { createExpiredProviderLeaseReleaser } from '../provider-lease-expiry.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
 import type { DeviceLease } from '@agent-device/contracts/device';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
diff --git a/src/daemon/__tests__/replay-device-selection.test.ts b/packages/daemon/src/server/__tests__/replay-device-selection.test.ts
similarity index 100%
rename from src/daemon/__tests__/replay-device-selection.test.ts
rename to packages/daemon/src/server/__tests__/replay-device-selection.test.ts
diff --git a/src/daemon/__tests__/request-diagnostics-http.test.ts b/packages/daemon/src/server/__tests__/request-diagnostics-http.test.ts
similarity index 97%
rename from src/daemon/__tests__/request-diagnostics-http.test.ts
rename to packages/daemon/src/server/__tests__/request-diagnostics-http.test.ts
index f126dfd95e..47c9bdd9dd 100644
--- a/src/daemon/__tests__/request-diagnostics-http.test.ts
+++ b/packages/daemon/src/server/__tests__/request-diagnostics-http.test.ts
@@ -4,10 +4,10 @@ import fs from 'node:fs';
 import http from 'node:http';
 import path from 'node:path';
 import { createDaemonHttpServer } from '../server/http-server.ts';
-import { resolveSessionRequestLogPath } from '../session-artifact-paths.ts';
+import { resolveSessionRequestLogPath } from '../../core/session-artifact-paths.ts';
 import { safeSessionName } from '@agent-device/host-kit/session-paths';
-import type { DaemonResponse } from '../daemon-request.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
+import type { DaemonResponse } from '../../core/daemon-request.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
 import {
   closeLoopbackServer,
   listenOnLoopback,
diff --git a/src/daemon/__tests__/request-execution-locks.test.ts b/packages/daemon/src/server/__tests__/request-execution-locks.test.ts
similarity index 100%
rename from src/daemon/__tests__/request-execution-locks.test.ts
rename to packages/daemon/src/server/__tests__/request-execution-locks.test.ts
diff --git a/src/daemon/__tests__/request-execution-scope-lease-expiry.test.ts b/packages/daemon/src/server/__tests__/request-execution-scope-lease-expiry.test.ts
similarity index 92%
rename from src/daemon/__tests__/request-execution-scope-lease-expiry.test.ts
rename to packages/daemon/src/server/__tests__/request-execution-scope-lease-expiry.test.ts
index ba94d341b4..ceb68fd6c8 100644
--- a/src/daemon/__tests__/request-execution-scope-lease-expiry.test.ts
+++ b/packages/daemon/src/server/__tests__/request-execution-scope-lease-expiry.test.ts
@@ -2,13 +2,13 @@ import { expect, test, vi } from 'vitest';
 import {
   daemonPlatformServicesFixture,
   daemonClaimRecoveryGatewayFixture,
-} from './platform-services-fixture.ts';
-import { makeSession } from './support/session-factories.ts';
+} from '../../__tests__/support/platform-services-fixture.ts';
+import { makeSession } from '../../__tests__/support/session-factories.ts';
 import { LINUX_DEVICE } from '@agent-device/test-kit/device-fixtures';
-import { makeSessionStore } from './support/store-factory.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
 import { createRequestExecutionScope } from '../request-execution-scope.ts';
-import type { DaemonRequest } from '../daemon-request.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
 
 function makeRequest(overrides: Partial<DaemonRequest>): DaemonRequest {
   return {
diff --git a/src/daemon/__tests__/request-execution-scope-macos-app-lease.test.ts b/packages/daemon/src/server/__tests__/request-execution-scope-macos-app-lease.test.ts
similarity index 92%
rename from src/daemon/__tests__/request-execution-scope-macos-app-lease.test.ts
rename to packages/daemon/src/server/__tests__/request-execution-scope-macos-app-lease.test.ts
index 76919ce1e6..dd5b338f78 100644
--- a/src/daemon/__tests__/request-execution-scope-macos-app-lease.test.ts
+++ b/packages/daemon/src/server/__tests__/request-execution-scope-macos-app-lease.test.ts
@@ -2,12 +2,12 @@ import { expect, test } from 'vitest';
 import {
   daemonPlatformServicesFixture,
   daemonClaimRecoveryGatewayFixture,
-} from './platform-services-fixture.ts';
-import { makeMacOsSession } from './support/session-factories.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+} from '../../__tests__/support/platform-services-fixture.ts';
+import { makeMacOsSession } from '../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import { parseDaemonPolicy } from '@agent-device/daemon-contracts/daemon-policy-file';
-import type { DaemonRequest } from '../daemon-request.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
 import { createRequestExecutionScope } from '../request-execution-scope.ts';
 
 const LEASE_ID = 'a1b2c3d4e5f60718293a4b5c6d7e8f90';
diff --git a/src/daemon/__tests__/request-execution-scope-open-device-wait.test.ts b/packages/daemon/src/server/__tests__/request-execution-scope-open-device-wait.test.ts
similarity index 95%
rename from src/daemon/__tests__/request-execution-scope-open-device-wait.test.ts
rename to packages/daemon/src/server/__tests__/request-execution-scope-open-device-wait.test.ts
index 618d68b6e7..379d7ae03c 100644
--- a/src/daemon/__tests__/request-execution-scope-open-device-wait.test.ts
+++ b/packages/daemon/src/server/__tests__/request-execution-scope-open-device-wait.test.ts
@@ -2,18 +2,18 @@ import { afterAll, test, expect, vi } from 'vitest';
 import {
   daemonPlatformServicesFixture,
   daemonClaimRecoveryGatewayFixture,
-} from './platform-services-fixture.ts';
+} from '../../__tests__/support/platform-services-fixture.ts';
 import fs from 'node:fs';
 import { getFlagDefinitionsForKey } from '@agent-device/command-registry/flag-registry';
 import type { CommandFlags } from '@agent-device/contracts/command';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import { resolveTargetDevice } from '@agent-device/device-selection/dispatch-resolve';
-import { makeSession } from './support/session-factories.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+import { makeSession } from '../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import type { DaemonRequest } from '../daemon-request.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { readOpenWaitAttempt } from '../open-device-contention-wait.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { readOpenWaitAttempt } from '../../sessions/open-device-contention-wait.ts';
 import { createRequestExecutionScope } from '../request-execution-scope.ts';
 
 // Everything `open --wait <ms>` is for sits between two facts. A waiting open must not hold the
diff --git a/src/daemon/__tests__/request-execution-scope.test.ts b/packages/daemon/src/server/__tests__/request-execution-scope.test.ts
similarity index 97%
rename from src/daemon/__tests__/request-execution-scope.test.ts
rename to packages/daemon/src/server/__tests__/request-execution-scope.test.ts
index 3bbf27f953..4938824813 100644
--- a/src/daemon/__tests__/request-execution-scope.test.ts
+++ b/packages/daemon/src/server/__tests__/request-execution-scope.test.ts
@@ -1,7 +1,7 @@
 import {
   daemonPlatformServicesFixture,
   daemonClaimRecoveryGatewayFixture,
-} from './platform-services-fixture.ts';
+} from '../../__tests__/support/platform-services-fixture.ts';
 import { afterAll, test, expect, vi } from 'vitest';
 import fs from 'node:fs';
 import path from 'node:path';
@@ -10,20 +10,20 @@ import {
   flushDiagnosticsToSessionFile,
   withDiagnosticsScope,
 } from '@agent-device/host-kit/diagnostics';
-import { makeAndroidSession, makeIosSession } from './support/session-factories.ts';
-import { makeSessionStore } from './support/store-factory.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
+import { makeAndroidSession, makeIosSession } from '../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
 import { clearRequestCanceled, markRequestCanceled } from '@agent-device/host-kit/request';
 import {
   createRequestExecutionScope,
   prepareLockedRequestScope,
 } from '../request-execution-scope.ts';
-import { resolveSessionRequestLogPath } from '../session-artifact-paths.ts';
-import { resolveSessionScope } from '../session-routing.ts';
-import type { DaemonRequest } from '../daemon-request.ts';
+import { resolveSessionRequestLogPath } from '../../core/session-artifact-paths.ts';
+import { resolveSessionScope } from '../../sessions/session-routing.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { makeTestScreenRecordingResource } from './support/screen-recording-live-handle.ts';
-import { handleSessionCloseCommands } from '../session-lifecycle/index.ts';
+import { makeTestScreenRecordingResource } from '../../__tests__/support/screen-recording-live-handle.ts';
+import { handleSessionCloseCommands } from '../../sessions/session-lifecycle/index.ts';
 
 const TEST_ROOT = mkdtempForTestSync('agent-device-request-execution-scope-');
 const LOG_PATH = path.join(TEST_ROOT, 'diagnostics.log');
diff --git a/src/daemon/__tests__/request-finalization.test.ts b/packages/daemon/src/server/__tests__/request-finalization.test.ts
similarity index 98%
rename from src/daemon/__tests__/request-finalization.test.ts
rename to packages/daemon/src/server/__tests__/request-finalization.test.ts
index 49a374b2b5..b0580debd7 100644
--- a/src/daemon/__tests__/request-finalization.test.ts
+++ b/packages/daemon/src/server/__tests__/request-finalization.test.ts
@@ -1,9 +1,9 @@
 import { test, expect } from 'vitest';
 import { AppError, normalizeError } from '@agent-device/kernel/errors';
 import { finalizeDaemonResponse } from '../request-finalization.ts';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
 import type { DaemonArtifactType } from '@agent-device/kernel/contracts';
-import type { DownloadableArtifactRegistration } from '../artifact-tracking.ts';
+import type { DownloadableArtifactRegistration } from '../../resources/artifact-tracking.ts';
 
 test('finalizeDaemonResponse preserves handler error hints from details', () => {
   const req: DaemonRequest = {
diff --git a/src/daemon/__tests__/request-lease-work.test.ts b/packages/daemon/src/server/__tests__/request-lease-work.test.ts
similarity index 92%
rename from src/daemon/__tests__/request-lease-work.test.ts
rename to packages/daemon/src/server/__tests__/request-lease-work.test.ts
index 16dc991578..1d1e997c54 100644
--- a/src/daemon/__tests__/request-lease-work.test.ts
+++ b/packages/daemon/src/server/__tests__/request-lease-work.test.ts
@@ -4,10 +4,10 @@ import {
   markRequestCanceled,
   registerRequestAbort,
 } from '@agent-device/host-kit/request';
-import type { DaemonRequest } from '../daemon-request.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
 import { runAdmittedLeaseWork } from '../request-lease-work.ts';
-import { HUMAN_CONTROL_LEASE_REQUEST } from './human-control-fixtures.ts';
+import { HUMAN_CONTROL_LEASE_REQUEST } from '../../__tests__/support/human-control-fixtures.ts';
 
 function admittedRequest(
   leaseRegistry: LeaseRegistry,
diff --git a/src/daemon/__tests__/request-lock-identity-policy.test.ts b/packages/daemon/src/server/__tests__/request-lock-identity-policy.test.ts
similarity index 97%
rename from src/daemon/__tests__/request-lock-identity-policy.test.ts
rename to packages/daemon/src/server/__tests__/request-lock-identity-policy.test.ts
index af37834a26..0786d30523 100644
--- a/src/daemon/__tests__/request-lock-identity-policy.test.ts
+++ b/packages/daemon/src/server/__tests__/request-lock-identity-policy.test.ts
@@ -1,10 +1,10 @@
-import { makeStoredSessionRef } from './support/store-factory.ts';
+import { makeStoredSessionRef } from '../../__tests__/support/store-factory.ts';
 import { test } from 'vitest';
 import assert from 'node:assert/strict';
 import { AppError } from '@agent-device/kernel/errors';
 import { applyRequestLockPolicy } from '../request-lock-policy.ts';
-import type { DaemonRequest } from '../daemon-request.ts';
-import type { SessionRef, SessionState } from '../session-state.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../../core/session-state.ts';
 
 /**
  * One table for the device-identity half of the session lock. A device identity selector
diff --git a/src/daemon/__tests__/request-lock-policy.test.ts b/packages/daemon/src/server/__tests__/request-lock-policy.test.ts
similarity index 98%
rename from src/daemon/__tests__/request-lock-policy.test.ts
rename to packages/daemon/src/server/__tests__/request-lock-policy.test.ts
index 641aeea0c3..7d84fdb1d0 100644
--- a/src/daemon/__tests__/request-lock-policy.test.ts
+++ b/packages/daemon/src/server/__tests__/request-lock-policy.test.ts
@@ -1,8 +1,8 @@
-import { makeStoredSessionRef } from './support/store-factory.ts';
+import { makeStoredSessionRef } from '../../__tests__/support/store-factory.ts';
 import { test } from 'vitest';
 import assert from 'node:assert/strict';
 import { applyRequestLockPolicy } from '../request-lock-policy.ts';
-import type { SessionRef, SessionState } from '../session-state.ts';
+import type { SessionRef, SessionState } from '../../core/session-state.ts';
 
 const IOS_SESSION: SessionState = {
   name: 'qa-ios',
diff --git a/src/daemon/__tests__/request-router-apps-admission.test.ts b/packages/daemon/src/server/__tests__/request-router-apps-admission.test.ts
similarity index 89%
rename from src/daemon/__tests__/request-router-apps-admission.test.ts
rename to packages/daemon/src/server/__tests__/request-router-apps-admission.test.ts
index f80c094e72..73fdc3ffe8 100644
--- a/src/daemon/__tests__/request-router-apps-admission.test.ts
+++ b/packages/daemon/src/server/__tests__/request-router-apps-admission.test.ts
@@ -4,12 +4,12 @@ import path from 'node:path';
 import type { DeviceRuntimeGateway } from '@agent-device/contracts/platform-runtime';
 import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform-runtime-operations';
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
-import { makeSessionStore } from './support/store-factory.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
-import type { DaemonRequest } from '../daemon-request.ts';
-import { createRequestHandler } from './test-device-runtime-gateway.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
+import { createRequestHandler } from '../../__tests__/support/test-device-runtime-gateway.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 function createAppsAdmissionHarness(apps: readonly string[] = []) {
   const listProviderApps = vi.fn(async () => apps);
diff --git a/src/daemon/__tests__/request-router-artifacts-web.test.ts b/packages/daemon/src/server/__tests__/request-router-artifacts-web.test.ts
similarity index 82%
rename from src/daemon/__tests__/request-router-artifacts-web.test.ts
rename to packages/daemon/src/server/__tests__/request-router-artifacts-web.test.ts
index 332d4e24e9..c57afb13a2 100644
--- a/src/daemon/__tests__/request-router-artifacts-web.test.ts
+++ b/packages/daemon/src/server/__tests__/request-router-artifacts-web.test.ts
@@ -3,16 +3,19 @@ import { test, expect } from 'vitest';
 import fs from 'node:fs';
 
 import path from 'node:path';
-import { createRequestHandler } from './test-device-runtime-gateway.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
+import { createRequestHandler } from '../../__tests__/support/test-device-runtime-gateway.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
 import type { DaemonArtifactInventoryEntry } from '@agent-device/contracts/observability';
-import { makeSessionStore } from './support/store-factory.ts';
-import { makeSession } from './support/session-factories.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import { makeSession } from '../../__tests__/support/session-factories.ts';
 import { WEB_DESKTOP_DEVICE } from '@agent-device/test-kit/device-fixtures';
 
-import { cleanupDownloadableArtifact, trackDownloadableArtifact } from '../artifact-tracking.ts';
+import {
+  cleanupDownloadableArtifact,
+  trackDownloadableArtifact,
+} from '../../resources/artifact-tracking.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 // #1900: `artifacts` (`handlers/lease.ts`) lists daemon-tracked artifacts by tenant scope with no
 // device or platform involvement at all — `listArtifactsForRequest` never reads `device.platform`.
diff --git a/src/daemon/__tests__/request-router-cost.test.ts b/packages/daemon/src/server/__tests__/request-router-cost.test.ts
similarity index 94%
rename from src/daemon/__tests__/request-router-cost.test.ts
rename to packages/daemon/src/server/__tests__/request-router-cost.test.ts
index e6acc3a174..1789bc60b4 100644
--- a/src/daemon/__tests__/request-router-cost.test.ts
+++ b/packages/daemon/src/server/__tests__/request-router-cost.test.ts
@@ -2,7 +2,7 @@ import { createTestDeviceInventoryGateways } from '@agent-device/device-selectio
 import { test, expect, vi, beforeEach } from 'vitest';
 
 import path from 'node:path';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal) => {
   const actual =
@@ -10,18 +10,18 @@ vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal)
   return { ...actual, stopIosRunnerSession: vi.fn(async () => {}) };
 });
 
-vi.mock('../device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));
+vi.mock('../../core/device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));
 
 import {
   createRequestHandler,
   gestureDeviceRuntimeGateway,
   gestureRuntimeSpies,
-} from './test-device-runtime-gateway.ts';
+} from '../../__tests__/support/test-device-runtime-gateway.ts';
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
-import type { DaemonRequest } from '../daemon-request.ts';
-import type { SessionState } from '../session-state.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
+import type { SessionState } from '../../core/session-state.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import { commandRpcParamsSchema } from '@agent-device/kernel/contracts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
diff --git a/src/daemon/__tests__/request-router-custom-action-flags.test.ts b/packages/daemon/src/server/__tests__/request-router-custom-action-flags.test.ts
similarity index 88%
rename from src/daemon/__tests__/request-router-custom-action-flags.test.ts
rename to packages/daemon/src/server/__tests__/request-router-custom-action-flags.test.ts
index ecf17314ac..57ee641066 100644
--- a/src/daemon/__tests__/request-router-custom-action-flags.test.ts
+++ b/packages/daemon/src/server/__tests__/request-router-custom-action-flags.test.ts
@@ -9,11 +9,11 @@ import { createTestDeviceInventoryGateways } from '@agent-device/device-selectio
 import { test, expect } from 'vitest';
 import path from 'node:path';
 
-import { createRequestHandler } from './test-device-runtime-gateway.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+import { createRequestHandler } from '../../__tests__/support/test-device-runtime-gateway.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 function createHandler() {
   return createRequestHandler({
diff --git a/src/daemon/__tests__/request-router-developer-dir.test.ts b/packages/daemon/src/server/__tests__/request-router-developer-dir.test.ts
similarity index 85%
rename from src/daemon/__tests__/request-router-developer-dir.test.ts
rename to packages/daemon/src/server/__tests__/request-router-developer-dir.test.ts
index 4fd02d8867..b226988c73 100644
--- a/src/daemon/__tests__/request-router-developer-dir.test.ts
+++ b/packages/daemon/src/server/__tests__/request-router-developer-dir.test.ts
@@ -2,11 +2,11 @@ import { createTestDeviceInventoryGateways } from '@agent-device/device-selectio
 import path from 'node:path';
 import { expect, test } from 'vitest';
 import { runCmd } from '@agent-device/host-kit/command';
-import { makeSessionStore } from './support/store-factory.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { createRequestHandler } from './test-device-runtime-gateway.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { createRequestHandler } from '../../__tests__/support/test-device-runtime-gateway.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 test(
   'a request spawns its commands with its own DEVELOPER_DIR, else the daemon one',
diff --git a/src/daemon/__tests__/request-router-error-redaction.test.ts b/packages/daemon/src/server/__tests__/request-router-error-redaction.test.ts
similarity index 87%
rename from src/daemon/__tests__/request-router-error-redaction.test.ts
rename to packages/daemon/src/server/__tests__/request-router-error-redaction.test.ts
index e75cdcd043..670a9a2a7c 100644
--- a/src/daemon/__tests__/request-router-error-redaction.test.ts
+++ b/packages/daemon/src/server/__tests__/request-router-error-redaction.test.ts
@@ -13,21 +13,21 @@ vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal)
   return { ...actual, stopIosRunnerSession: vi.fn(async () => {}) };
 });
 
-vi.mock('../device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));
+vi.mock('../../core/device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));
 
 import { AppError } from '@agent-device/kernel/errors';
 import type { DeviceRuntimeGateway, RuntimeFacts } from '@agent-device/contracts/platform-runtime';
 import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform-runtime-operations';
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
-import { makeIosAppSession } from './support/session-factories.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+import { makeIosAppSession } from '../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
 import {
   createRequestHandler,
   lifecycleDeviceRuntimeGateway,
-} from './test-device-runtime-gateway.ts';
+} from '../../__tests__/support/test-device-runtime-gateway.ts';
 
 const SESSION = 'maestro-input';
 
diff --git a/src/daemon/__tests__/request-router-events.test.ts b/packages/daemon/src/server/__tests__/request-router-events.test.ts
similarity index 95%
rename from src/daemon/__tests__/request-router-events.test.ts
rename to packages/daemon/src/server/__tests__/request-router-events.test.ts
index 82af3eab62..a61146cf03 100644
--- a/src/daemon/__tests__/request-router-events.test.ts
+++ b/packages/daemon/src/server/__tests__/request-router-events.test.ts
@@ -3,13 +3,13 @@ import { test, expect } from 'vitest';
 import fs from 'node:fs';
 
 import path from 'node:path';
-import { createRequestHandler } from './test-device-runtime-gateway.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { makeSessionStore } from './support/store-factory.ts';
-import { makeIosSession, makeSession } from './support/session-factories.ts';
+import { createRequestHandler } from '../../__tests__/support/test-device-runtime-gateway.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import { makeIosSession, makeSession } from '../../__tests__/support/session-factories.ts';
 import { WEB_DESKTOP_DEVICE } from '@agent-device/test-kit/device-fixtures';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 test('events reads the daemon-owned session timeline without appending poll noise', async () => {
   const sessionStore = makeSessionStore('agent-device-router-events-');
diff --git a/src/daemon/__tests__/request-router-idle-expired.test.ts b/packages/daemon/src/server/__tests__/request-router-idle-expired.test.ts
similarity index 93%
rename from src/daemon/__tests__/request-router-idle-expired.test.ts
rename to packages/daemon/src/server/__tests__/request-router-idle-expired.test.ts
index 394336d6af..245047d0bf 100644
--- a/src/daemon/__tests__/request-router-idle-expired.test.ts
+++ b/packages/daemon/src/server/__tests__/request-router-idle-expired.test.ts
@@ -9,13 +9,13 @@ import { test, expect } from 'vitest';
 import path from 'node:path';
 import fs from 'node:fs';
 
-import { createRequestHandler } from './test-device-runtime-gateway.ts';
+import { createRequestHandler } from '../../__tests__/support/test-device-runtime-gateway.ts';
 import { buildIdleExpiryTombstone } from '../session-idle-expiry.ts';
-import type { DaemonRequest } from '../daemon-request.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 function makeHandler(prefix: string) {
   const sessionStore = makeSessionStore(prefix);
diff --git a/src/daemon/__tests__/request-router-open-claim.test.ts b/packages/daemon/src/server/__tests__/request-router-open-claim.test.ts
similarity index 92%
rename from src/daemon/__tests__/request-router-open-claim.test.ts
rename to packages/daemon/src/server/__tests__/request-router-open-claim.test.ts
index 86e9a1a6d5..aa5b1fafed 100644
--- a/src/daemon/__tests__/request-router-open-claim.test.ts
+++ b/packages/daemon/src/server/__tests__/request-router-open-claim.test.ts
@@ -4,10 +4,10 @@ import fs from 'node:fs';
 
 import path from 'node:path';
 import crypto from 'node:crypto';
-import { getResolveTargetDeviceMock } from './request-router-dispatch-mocks.ts';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { getResolveTargetDeviceMock } from '../../__tests__/support/request-router-dispatch-mocks.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
-vi.mock('../device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));
+vi.mock('../../core/device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));
 vi.mock('@agent-device/host-kit/process', async (importOriginal) => {
   const actual = await importOriginal<typeof import('@agent-device/host-kit/process')>();
   return { ...actual, readProcessStartTime: vi.fn(() => 'test-process-start') };
@@ -46,18 +46,18 @@ vi.mock('@agent-device/platform-apple/app-resolution', async (importOriginal) =>
 });
 // Claim settlement asks the device when its current boot began; the daemon port fixture answers at
 // `observeBootTimeMsFixture`, so these tests answer through that spy rather than mocking a leaf.
-import { observeBootTimeMsFixture } from './platform-services-fixture.ts';
+import { observeBootTimeMsFixture } from '../../__tests__/support/platform-services-fixture.ts';
 
 import {
   createRequestHandler,
   lifecycleDeviceRuntimeGateway,
-} from './test-device-runtime-gateway.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { awaitFixtureReadiness } from './application-lifecycle-runtime-fixture.ts';
-import { ensureDeviceReady } from '../device/device-ready.ts';
+} from '../../__tests__/support/test-device-runtime-gateway.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { awaitFixtureReadiness } from '../../__tests__/support/application-lifecycle-runtime-fixture.ts';
+import { ensureDeviceReady } from '../../core/device/device-ready.ts';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import { makeSessionStore } from './support/store-factory.ts';
-import { inspectDeviceClaims } from '../device/device-claim-inspection.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import { inspectDeviceClaims } from '../../resources/device/device-claim-inspection.ts';
 import { makeIosDevice, openRequest, storedClaimUpdatedAt } from './request-router-open-harness.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
diff --git a/src/daemon/__tests__/request-router-open-harness.ts b/packages/daemon/src/server/__tests__/request-router-open-harness.ts
similarity index 93%
rename from src/daemon/__tests__/request-router-open-harness.ts
rename to packages/daemon/src/server/__tests__/request-router-open-harness.ts
index 950ee12ce3..d92ecfb654 100644
--- a/src/daemon/__tests__/request-router-open-harness.ts
+++ b/packages/daemon/src/server/__tests__/request-router-open-harness.ts
@@ -1,4 +1,4 @@
-import { inspectDeviceClaims } from '../device/device-claim-inspection.ts';
+import { inspectDeviceClaims } from '../../resources/device/device-claim-inspection.ts';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 
 /**
diff --git a/src/daemon/__tests__/request-router-open.test.ts b/packages/daemon/src/server/__tests__/request-router-open.test.ts
similarity index 96%
rename from src/daemon/__tests__/request-router-open.test.ts
rename to packages/daemon/src/server/__tests__/request-router-open.test.ts
index 73880f3db2..325a7cf5b8 100644
--- a/src/daemon/__tests__/request-router-open.test.ts
+++ b/packages/daemon/src/server/__tests__/request-router-open.test.ts
@@ -3,18 +3,18 @@ import {
   daemonPlatformServicesFixture,
   daemonClaimRecoveryGatewayFixture,
   observeBootTimeMsFixture,
-} from './platform-services-fixture.ts';
-import { legacyDispatchCapture } from './legacy-snapshot-capture-fixture.ts';
+} from '../../__tests__/support/platform-services-fixture.ts';
+import { legacyDispatchCapture } from '../../__tests__/support/legacy-snapshot-capture-fixture.ts';
 import { test, expect, vi, beforeEach } from 'vitest';
 import fs from 'node:fs';
 
 import path from 'node:path';
-import { getResolveTargetDeviceMock } from './request-router-dispatch-mocks.ts';
+import { getResolveTargetDeviceMock } from '../../__tests__/support/request-router-dispatch-mocks.ts';
 
 import { replayScriptSourceBundleFor } from '@agent-device/replay-port/replay-script-source-fixtures';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
-vi.mock('../device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));
+vi.mock('../../core/device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));
 vi.mock('@agent-device/host-kit/process', async (importOriginal) => {
   const actual = await importOriginal<typeof import('@agent-device/host-kit/process')>();
   const startTime = 'test-process-start';
@@ -66,17 +66,17 @@ vi.mock('@agent-device/platform-apple/app-resolution', async (importOriginal) =>
 import {
   createRequestHandler,
   lifecycleDeviceRuntimeGateway,
-} from './test-device-runtime-gateway.ts';
+} from '../../__tests__/support/test-device-runtime-gateway.ts';
 import { createRequestHandler as createProductionRequestHandler } from '../request-router.ts';
-import { providerCredentialsFixture } from './support/provider-credentials-fixture.ts';
+import { providerCredentialsFixture } from '../../__tests__/support/provider-credentials-fixture.ts';
 import { resolveRequestExecutionLockPlan } from '../request-binding.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { ensureDeviceReady } from '../device/device-ready.ts';
-import { awaitFixtureReadiness } from './application-lifecycle-runtime-fixture.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { ensureDeviceReady } from '../../core/device/device-ready.ts';
+import { awaitFixtureReadiness } from '../../__tests__/support/application-lifecycle-runtime-fixture.ts';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import { AppError } from '@agent-device/kernel/errors';
-import { makeSessionStore } from './support/store-factory.ts';
-import { inspectDeviceClaims } from '../device/device-claim-inspection.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import { inspectDeviceClaims } from '../../resources/device/device-claim-inspection.ts';
 import {
   makeAndroidDevice,
   makeIosDevice,
diff --git a/src/daemon/__tests__/request-router-record-flags.test.ts b/packages/daemon/src/server/__tests__/request-router-record-flags.test.ts
similarity index 89%
rename from src/daemon/__tests__/request-router-record-flags.test.ts
rename to packages/daemon/src/server/__tests__/request-router-record-flags.test.ts
index b7502bae68..9da1e56d3f 100644
--- a/src/daemon/__tests__/request-router-record-flags.test.ts
+++ b/packages/daemon/src/server/__tests__/request-router-record-flags.test.ts
@@ -9,11 +9,11 @@ import { createTestDeviceInventoryGateways } from '@agent-device/device-selectio
 import { test, expect } from 'vitest';
 import path from 'node:path';
 
-import { createRequestHandler } from './test-device-runtime-gateway.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+import { createRequestHandler } from '../../__tests__/support/test-device-runtime-gateway.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 function createHandler() {
   return createRequestHandler({
diff --git a/src/daemon/__tests__/request-router-repair-expired.test.ts b/packages/daemon/src/server/__tests__/request-router-repair-expired.test.ts
similarity index 91%
rename from src/daemon/__tests__/request-router-repair-expired.test.ts
rename to packages/daemon/src/server/__tests__/request-router-repair-expired.test.ts
index 98b6d7f943..9e1810236b 100644
--- a/src/daemon/__tests__/request-router-repair-expired.test.ts
+++ b/packages/daemon/src/server/__tests__/request-router-repair-expired.test.ts
@@ -10,19 +10,19 @@ import { test, expect, vi } from 'vitest';
 import fs from 'node:fs';
 
 import path from 'node:path';
-import { getResolveTargetDeviceMock } from './request-router-dispatch-mocks.ts';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { getResolveTargetDeviceMock } from '../../__tests__/support/request-router-dispatch-mocks.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
-vi.mock('../device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));
+vi.mock('../../core/device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));
 
-import { createRequestHandler } from './test-device-runtime-gateway.ts';
-import type { DaemonRequest } from '../daemon-request.ts';
-import type { SessionState } from '../session-state.ts';
+import { createRequestHandler } from '../../__tests__/support/test-device-runtime-gateway.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
+import type { SessionState } from '../../core/session-state.ts';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import { resolveEffectiveSessionName } from '../session-routing.ts';
-import { scopeRequestSession } from '../request-admission.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+import { resolveEffectiveSessionName } from '../../sessions/session-routing.ts';
+import { scopeRequestSession } from '../../sessions/request-admission.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import { inspectAdReplay } from '@agent-device/ad-replay';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
diff --git a/src/daemon/__tests__/request-router-replay-env.test.ts b/packages/daemon/src/server/__tests__/request-router-replay-env.test.ts
similarity index 89%
rename from src/daemon/__tests__/request-router-replay-env.test.ts
rename to packages/daemon/src/server/__tests__/request-router-replay-env.test.ts
index 7d9e59e65c..d0bde73f7f 100644
--- a/src/daemon/__tests__/request-router-replay-env.test.ts
+++ b/packages/daemon/src/server/__tests__/request-router-replay-env.test.ts
@@ -2,12 +2,12 @@ import { createTestDeviceInventoryGateways } from '@agent-device/device-selectio
 import fs from 'node:fs';
 import path from 'node:path';
 import { expect, test } from 'vitest';
-import { makeSessionStore } from './support/store-factory.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { createRequestHandler } from './test-device-runtime-gateway.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { createRequestHandler } from '../../__tests__/support/test-device-runtime-gateway.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { replayScriptSourceBundleFor } from '@agent-device/replay-port/replay-script-source-fixtures';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 function createHarness() {
   const root = mkdtempForTestSync('agent-device-router-replay-env-');
diff --git a/src/daemon/__tests__/request-router-response-level.test.ts b/packages/daemon/src/server/__tests__/request-router-response-level.test.ts
similarity index 92%
rename from src/daemon/__tests__/request-router-response-level.test.ts
rename to packages/daemon/src/server/__tests__/request-router-response-level.test.ts
index 344bad3d7b..2578607641 100644
--- a/src/daemon/__tests__/request-router-response-level.test.ts
+++ b/packages/daemon/src/server/__tests__/request-router-response-level.test.ts
@@ -2,7 +2,7 @@ import { createTestDeviceInventoryGateways } from '@agent-device/device-selectio
 import { test, expect, vi, beforeEach } from 'vitest';
 
 import path from 'node:path';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal) => {
   const actual =
@@ -10,7 +10,7 @@ vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal)
   return { ...actual, stopIosRunnerSession: vi.fn(async () => {}) };
 });
 
-vi.mock('../device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));
+vi.mock('../../core/device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));
 
 // Register a test view on a command whose payload this file controls end to end, so the router
 // graft mechanics can be exercised without the real snapshot handler (the actual snapshot view is
@@ -34,11 +34,11 @@ import {
   createRequestHandler,
   gestureRuntimeSpies,
   lifecycleDeviceRuntimeGateway,
-} from './test-device-runtime-gateway.ts';
-import type { DaemonRequest } from '../daemon-request.ts';
-import type { SessionState } from '../session-state.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+} from '../../__tests__/support/test-device-runtime-gateway.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
+import type { SessionState } from '../../core/session-state.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import { commandRpcParamsSchema } from '@agent-device/kernel/contracts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
diff --git a/src/daemon/__tests__/request-router-session-address.test.ts b/packages/daemon/src/server/__tests__/request-router-session-address.test.ts
similarity index 90%
rename from src/daemon/__tests__/request-router-session-address.test.ts
rename to packages/daemon/src/server/__tests__/request-router-session-address.test.ts
index 3e0dd2d3d7..daa9018de8 100644
--- a/src/daemon/__tests__/request-router-session-address.test.ts
+++ b/packages/daemon/src/server/__tests__/request-router-session-address.test.ts
@@ -1,12 +1,12 @@
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
-import { legacyDispatchCapture } from './legacy-snapshot-capture-fixture.ts';
+import { legacyDispatchCapture } from '../../__tests__/support/legacy-snapshot-capture-fixture.ts';
 import { test, expect, vi, beforeEach } from 'vitest';
 
 import path from 'node:path';
-import { getResolveTargetDeviceMock } from './request-router-dispatch-mocks.ts';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { getResolveTargetDeviceMock } from '../../__tests__/support/request-router-dispatch-mocks.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
-vi.mock('../device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));
+vi.mock('../../core/device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));
 vi.mock('@agent-device/host-kit/process', async (importOriginal) => {
   const actual = await importOriginal<typeof import('@agent-device/host-kit/process')>();
   return { ...actual, readProcessStartTime: vi.fn(() => 'test-process-start') };
@@ -25,13 +25,13 @@ vi.mock('@agent-device/platform-apple/tool-provider', async (importOriginal) =>
 import {
   createRequestHandler,
   lifecycleDeviceRuntimeGateway,
-} from './test-device-runtime-gateway.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { ensureDeviceReady } from '../device/device-ready.ts';
-import { awaitFixtureReadiness } from './application-lifecycle-runtime-fixture.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+} from '../../__tests__/support/test-device-runtime-gateway.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { ensureDeviceReady } from '../../core/device/device-ready.ts';
+import { awaitFixtureReadiness } from '../../__tests__/support/application-lifecycle-runtime-fixture.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
 /**
diff --git a/src/daemon/__tests__/request-router-typed-error.test.ts b/packages/daemon/src/server/__tests__/request-router-typed-error.test.ts
similarity index 93%
rename from src/daemon/__tests__/request-router-typed-error.test.ts
rename to packages/daemon/src/server/__tests__/request-router-typed-error.test.ts
index 3f364c27a0..19ee0d0089 100644
--- a/src/daemon/__tests__/request-router-typed-error.test.ts
+++ b/packages/daemon/src/server/__tests__/request-router-typed-error.test.ts
@@ -1,10 +1,10 @@
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
-import { legacyDispatchCapture } from './legacy-snapshot-capture-fixture.ts';
+import { legacyDispatchCapture } from '../../__tests__/support/legacy-snapshot-capture-fixture.ts';
 import { test, expect, vi, beforeEach } from 'vitest';
 import fs from 'node:fs';
 
 import path from 'node:path';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal) => {
   const actual =
@@ -12,23 +12,23 @@ vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal)
   return { ...actual, stopIosRunnerSession: vi.fn(async () => {}) };
 });
 
-vi.mock('../device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));
+vi.mock('../../core/device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));
 
-import { dispatchApplicationLifecycleEffect } from './application-lifecycle-runtime-fixture.ts';
+import { dispatchApplicationLifecycleEffect } from '../../__tests__/support/application-lifecycle-runtime-fixture.ts';
 import {
   createRequestHandler,
   lifecycleDeviceRuntimeGateway,
   systemRuntimeSpies,
-} from './test-device-runtime-gateway.ts';
-import type { DaemonRequest } from '../daemon-request.ts';
-import type { SessionState } from '../session-state.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+} from '../../__tests__/support/test-device-runtime-gateway.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
+import type { SessionState } from '../../core/session-state.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import {
   makeAuthoringSession,
   makeRepairCompleteSession,
   makeSession,
-} from './support/session-factories.ts';
+} from '../../__tests__/support/session-factories.ts';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import {
   AppError,
diff --git a/src/daemon/__tests__/request-save-script-policy.test.ts b/packages/daemon/src/server/__tests__/request-save-script-policy.test.ts
similarity index 94%
rename from src/daemon/__tests__/request-save-script-policy.test.ts
rename to packages/daemon/src/server/__tests__/request-save-script-policy.test.ts
index af4a6f978e..adfcd7a9ed 100644
--- a/src/daemon/__tests__/request-save-script-policy.test.ts
+++ b/packages/daemon/src/server/__tests__/request-save-script-policy.test.ts
@@ -4,12 +4,15 @@
  * request seam before any admission, session, or device work.
  */
 import { expect, test } from 'vitest';
-import { listSaveScriptFlagOwnerCommands, ownsSaveScriptFlag } from '../daemon-command-registry.ts';
+import {
+  listSaveScriptFlagOwnerCommands,
+  ownsSaveScriptFlag,
+} from '../../core/daemon-command-registry.ts';
 import {
   SAVE_SCRIPT_FLAG_OWNER_COMMANDS,
   unsupportedSaveScriptFlagResponse,
 } from '../request-save-script-policy.ts';
-import type { DaemonRequest } from '../daemon-request.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
 
 function request(command: string, flags: DaemonRequest['flags']): DaemonRequest {
   return { token: 'token', session: 'default', command, positionals: [], flags };
diff --git a/src/daemon/__tests__/request-save-script-transports.test.ts b/packages/daemon/src/server/__tests__/request-save-script-transports.test.ts
similarity index 93%
rename from src/daemon/__tests__/request-save-script-transports.test.ts
rename to packages/daemon/src/server/__tests__/request-save-script-transports.test.ts
index c157f0c050..8ad82b52ae 100644
--- a/src/daemon/__tests__/request-save-script-transports.test.ts
+++ b/packages/daemon/src/server/__tests__/request-save-script-transports.test.ts
@@ -1,5 +1,5 @@
-import { storeSessionForTest } from './support/store-factory.ts';
-import { isSessionRecording } from '../session-script-publication-capability.ts';
+import { storeSessionForTest } from '../../__tests__/support/store-factory.ts';
+import { isSessionRecording } from '../../core/session-script-publication-capability.ts';
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
 /**
  * #1478 (P4-pre): raw-wire counterfactuals for the `flags.saveScript` seam.
@@ -14,19 +14,22 @@ import { createTestDeviceInventoryGateways } from '@agent-device/device-selectio
  * `.ad` artifact behind.
  */
 import fs from 'node:fs';
-import { NO_SCRIPT_PUBLICATION, scriptTargetPath } from '../session-script-publication-state.ts';
+import {
+  NO_SCRIPT_PUBLICATION,
+  scriptTargetPath,
+} from '../../core/session-script-publication-state.ts';
 import net from 'node:net';
 import path from 'node:path';
 import { afterEach, expect, test } from 'vitest';
-import { LeaseRegistry } from '../lease-registry.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
 import { REPLAY_SCRIPT_SOURCE_REQUIRED_MESSAGE } from '@agent-device/replay-port/script-source';
-import { createRequestHandler } from './test-device-runtime-gateway.ts';
-import { SessionStore } from '../session-store.ts';
+import { createRequestHandler } from '../../__tests__/support/test-device-runtime-gateway.ts';
+import { SessionStore } from '../../core/session-store.ts';
 import { createDaemonHttpServer } from '../server/http-server.ts';
 import { createSocketServer, listenNetServer } from '../server/transport.ts';
-import type { DaemonInvokeFn, DaemonResponse } from '../daemon-request.ts';
-import type { SessionState } from '../session-state.ts';
-import { makeIosSession } from './support/session-factories.ts';
+import type { DaemonInvokeFn, DaemonResponse } from '../../core/daemon-request.ts';
+import type { SessionState } from '../../core/session-state.ts';
+import { makeIosSession } from '../../__tests__/support/session-factories.ts';
 import {
   closeLoopbackServer,
   listenOnLoopback,
@@ -34,7 +37,7 @@ import {
 } from '@agent-device/test-kit/loopback';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { flushSessionEventLogWrites } from '@agent-device/session-journal/session-event-log';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 const TOKEN = 'save-script-transport-token';
 const SESSION = 'save-script-transport';
diff --git a/src/daemon/__tests__/response-views.test.ts b/packages/daemon/src/server/__tests__/response-views.test.ts
similarity index 99%
rename from src/daemon/__tests__/response-views.test.ts
rename to packages/daemon/src/server/__tests__/response-views.test.ts
index fc10d942ca..4a1505fd5e 100644
--- a/src/daemon/__tests__/response-views.test.ts
+++ b/packages/daemon/src/server/__tests__/response-views.test.ts
@@ -1,6 +1,6 @@
 import { test, expect } from 'vitest';
 import { RESPONSE_VIEWS } from '../response-views.ts';
-import type { DaemonResponseData } from '../daemon-request.ts';
+import type { DaemonResponseData } from '../../core/daemon-request.ts';
 
 const snapshotView = RESPONSE_VIEWS.snapshot;
 const screenshotView = RESPONSE_VIEWS.screenshot;
diff --git a/src/daemon/__tests__/resumable-upload-range.test.ts b/packages/daemon/src/server/__tests__/resumable-upload-range.test.ts
similarity index 100%
rename from src/daemon/__tests__/resumable-upload-range.test.ts
rename to packages/daemon/src/server/__tests__/resumable-upload-range.test.ts
diff --git a/src/daemon/__tests__/resumable-upload.test.ts b/packages/daemon/src/server/__tests__/resumable-upload.test.ts
similarity index 100%
rename from src/daemon/__tests__/resumable-upload.test.ts
rename to packages/daemon/src/server/__tests__/resumable-upload.test.ts
diff --git a/src/daemon/__tests__/server-shutdown.test.ts b/packages/daemon/src/server/__tests__/server-shutdown.test.ts
similarity index 100%
rename from src/daemon/__tests__/server-shutdown.test.ts
rename to packages/daemon/src/server/__tests__/server-shutdown.test.ts
diff --git a/src/daemon/__tests__/session-idle-expiry-harness.ts b/packages/daemon/src/server/__tests__/session-idle-expiry-harness.ts
similarity index 93%
rename from src/daemon/__tests__/session-idle-expiry-harness.ts
rename to packages/daemon/src/server/__tests__/session-idle-expiry-harness.ts
index a4c0733772..f08953243e 100644
--- a/src/daemon/__tests__/session-idle-expiry-harness.ts
+++ b/packages/daemon/src/server/__tests__/session-idle-expiry-harness.ts
@@ -1,17 +1,20 @@
 import { assert } from 'vitest';
 import fs from 'node:fs';
 import path from 'node:path';
-import { SessionStore } from '../session-store.ts';
-import type { SessionState } from '../session-state.ts';
+import { SessionStore } from '../../core/session-store.ts';
+import type { SessionState } from '../../core/session-state.ts';
 import type { createSessionIdleExpiry } from '../server/daemon-session-idle-expiry.ts';
-import { makeIosSession } from './support/session-factories.ts';
+import { makeIosSession } from '../../__tests__/support/session-factories.ts';
 import {
   isolatedDeviceClaimStores,
   retainOrphanedDeviceClaims,
   type IsolatedDeviceClaimStore,
-} from './support/device-claim-store.ts';
-import { acquireDeviceClaim, type DeviceClaimSessionOwnership } from '../device/device-claims.ts';
-import { resolveDeviceClaimPath } from '../device/device-claim-paths.ts';
+} from '../../__tests__/support/device-claim-store.ts';
+import {
+  acquireDeviceClaim,
+  type DeviceClaimSessionOwnership,
+} from '../../resources/device/device-claims.ts';
+import { resolveDeviceClaimPath } from '../../resources/device/device-claim-paths.ts';
 import { IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
diff --git a/src/daemon/__tests__/session-idle-expiry.test.ts b/packages/daemon/src/server/__tests__/session-idle-expiry.test.ts
similarity index 97%
rename from src/daemon/__tests__/session-idle-expiry.test.ts
rename to packages/daemon/src/server/__tests__/session-idle-expiry.test.ts
index 5349ca954e..0026c56bd7 100644
--- a/src/daemon/__tests__/session-idle-expiry.test.ts
+++ b/packages/daemon/src/server/__tests__/session-idle-expiry.test.ts
@@ -11,13 +11,13 @@ import {
   sessionIdleDeadlineMs,
   sessionIdleExpiredError,
 } from '../session-idle-expiry.ts';
-import { makeIosSession } from './support/session-factories.ts';
-import { makeTestScreenRecordingResource } from './support/screen-recording-live-handle.ts';
+import { makeIosSession } from '../../__tests__/support/session-factories.ts';
+import { makeTestScreenRecordingResource } from '../../__tests__/support/screen-recording-live-handle.ts';
 import { createDurableResourceEnvelope } from '@agent-device/capture-kit';
 import { localRuntimeOwner } from '@agent-device/contracts/platform-runtime';
 import { deviceIdentity } from '@agent-device/kernel/device';
 import type { DurableResourceEnvelope } from '@agent-device/contracts/durable-resource-envelope';
-import type { SessionState } from '../session-state.ts';
+import type { SessionState } from '../../core/session-state.ts';
 
 const CLAIM = {
   deviceKey: 'ios:sim-1',
diff --git a/src/daemon/__tests__/upload.test.ts b/packages/daemon/src/server/__tests__/upload.test.ts
similarity index 100%
rename from src/daemon/__tests__/upload.test.ts
rename to packages/daemon/src/server/__tests__/upload.test.ts
diff --git a/src/daemon/application-lifecycle-recovery.ts b/packages/daemon/src/server/application-lifecycle-recovery.ts
similarity index 97%
rename from src/daemon/application-lifecycle-recovery.ts
rename to packages/daemon/src/server/application-lifecycle-recovery.ts
index 3dc647f652..ff5910371d 100644
--- a/src/daemon/application-lifecycle-recovery.ts
+++ b/packages/daemon/src/server/application-lifecycle-recovery.ts
@@ -16,8 +16,11 @@ import {
 import type { PlatformRequestScope } from '@agent-device/contracts/platform-runtime-host';
 import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform-runtime-operations';
 import { AppError, errorMessage } from '@agent-device/kernel/errors';
-import type { SessionState } from './session-state.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from './request-runtime-binding.ts';
+import type { SessionState } from '../core/session-state.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../core/request-runtime-binding.ts';
 
 type SessionFinalization = Readonly<{
   inspectFacts: InspectDeviceRuntimeFacts;
diff --git a/src/daemon/artifact-archive.ts b/packages/daemon/src/server/artifact-archive.ts
similarity index 100%
rename from src/daemon/artifact-archive.ts
rename to packages/daemon/src/server/artifact-archive.ts
diff --git a/src/daemon/artifact-download.ts b/packages/daemon/src/server/artifact-download.ts
similarity index 100%
rename from src/daemon/artifact-download.ts
rename to packages/daemon/src/server/artifact-download.ts
diff --git a/src/daemon/daemon-stop.ts b/packages/daemon/src/server/daemon-stop.ts
similarity index 100%
rename from src/daemon/daemon-stop.ts
rename to packages/daemon/src/server/daemon-stop.ts
diff --git a/src/daemon/device/__tests__/device-claim-owner-recovery.test.ts b/packages/daemon/src/server/device/__tests__/device-claim-owner-recovery.test.ts
similarity index 98%
rename from src/daemon/device/__tests__/device-claim-owner-recovery.test.ts
rename to packages/daemon/src/server/device/__tests__/device-claim-owner-recovery.test.ts
index 882b18c370..3cd3f730cd 100644
--- a/src/daemon/device/__tests__/device-claim-owner-recovery.test.ts
+++ b/packages/daemon/src/server/device/__tests__/device-claim-owner-recovery.test.ts
@@ -5,7 +5,7 @@ import { test } from 'vitest';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import type { AppLogSessionArtifacts } from '@agent-device/contracts/app-log-runtime';
 import type { OwnedProcessRecordWriter } from '@agent-device/contracts/platform-runtime-host';
-import type { DeviceClaim } from '../device-claim-record.ts';
+import type { DeviceClaim } from '../../../resources/device/device-claim-record.ts';
 import {
   createOwnerScopedDeviceClaimReconciler,
   type OwnerScopedClaimRecoveryComposer,
diff --git a/src/daemon/device/device-claim-owner-recovery.ts b/packages/daemon/src/server/device/device-claim-owner-recovery.ts
similarity index 90%
rename from src/daemon/device/device-claim-owner-recovery.ts
rename to packages/daemon/src/server/device/device-claim-owner-recovery.ts
index 2cb4100105..a9f6895dd5 100644
--- a/src/daemon/device/device-claim-owner-recovery.ts
+++ b/packages/daemon/src/server/device/device-claim-owner-recovery.ts
@@ -1,14 +1,14 @@
 import type { PlatformRequestScope } from '@agent-device/contracts/platform-runtime-host';
 import { createOwnedProcessRecordStore } from '@agent-device/host-kit/process';
 import { resolveDaemonPaths } from '@agent-device/daemon-contracts/daemon-resolution';
-import { createDeviceClaimReconciler } from './device-claim-reconciliation.ts';
-import type { DeviceClaimReconciler } from './device-claims.ts';
-import type { ClaimRecoveryGatewayFactory } from './claim-recovery-gateway.ts';
+import { createDeviceClaimReconciler } from '../../sessions/device/device-claim-reconciliation.ts';
+import type { DeviceClaimReconciler } from '../../resources/device/device-claims.ts';
+import type { ClaimRecoveryGatewayFactory } from '../../resources/device/claim-recovery-gateway.ts';
 import {
   resolveSessionDir,
   resolveSessionAppLogPath,
   resolveSessionAppLogPidPath,
-} from '../session-artifact-paths.ts';
+} from '../../core/session-artifact-paths.ts';
 
 export type OwnerScopedClaimRecovery = {
   reconcile: DeviceClaimReconciler;
diff --git a/src/daemon/downloadable-artifact-http.ts b/packages/daemon/src/server/downloadable-artifact-http.ts
similarity index 97%
rename from src/daemon/downloadable-artifact-http.ts
rename to packages/daemon/src/server/downloadable-artifact-http.ts
index fa71ff2b44..532418f800 100644
--- a/src/daemon/downloadable-artifact-http.ts
+++ b/packages/daemon/src/server/downloadable-artifact-http.ts
@@ -1,12 +1,12 @@
 import fs from 'node:fs';
 import http from 'node:http';
 import { normalizeError } from '@agent-device/kernel/errors';
-import type { DaemonRequest } from './daemon-request.ts';
+import type { DaemonRequest } from '../core/daemon-request.ts';
 import {
   cleanupDownloadableArtifact,
   listDownloadableArtifacts,
   prepareDownloadableArtifact,
-} from './artifact-tracking.ts';
+} from '../resources/artifact-tracking.ts';
 import { failStreamedHttpResponse, sendRestJsonError } from './http-errors.ts';
 import { decodeUriSegment } from './http-request-target.ts';
 
diff --git a/src/daemon/host-lease-http.ts b/packages/daemon/src/server/host-lease-http.ts
similarity index 97%
rename from src/daemon/host-lease-http.ts
rename to packages/daemon/src/server/host-lease-http.ts
index 312420b2a7..e6946d937b 100644
--- a/src/daemon/host-lease-http.ts
+++ b/packages/daemon/src/server/host-lease-http.ts
@@ -8,13 +8,13 @@ import {
   sendJson,
   tryHandleHumanControlHttpRoute,
 } from './human-control-http.ts';
-import type { LeaseRegistry } from './lease-registry.ts';
+import type { LeaseRegistry } from '../resources/lease-registry.ts';
 import {
   leaseReleaseRequestFor,
   normalizeRequiredLeaseId,
   type AllocateLeaseRequest,
-} from './lease-registry-scope.ts';
-import { parseMacOsAppLeaseKey } from './macos-app-lease.ts';
+} from '../resources/lease-registry-scope.ts';
+import { parseMacOsAppLeaseKey } from '../resources/macos-app-lease.ts';
 
 /**
  * Host-only lease administration on the daemon's loopback listener. `agent-device proxy` forwards
diff --git a/src/daemon/http-errors.ts b/packages/daemon/src/server/http-errors.ts
similarity index 100%
rename from src/daemon/http-errors.ts
rename to packages/daemon/src/server/http-errors.ts
diff --git a/src/daemon/http-request-target.ts b/packages/daemon/src/server/http-request-target.ts
similarity index 100%
rename from src/daemon/http-request-target.ts
rename to packages/daemon/src/server/http-request-target.ts
diff --git a/src/daemon/human-control-http.ts b/packages/daemon/src/server/human-control-http.ts
similarity index 98%
rename from src/daemon/human-control-http.ts
rename to packages/daemon/src/server/human-control-http.ts
index 2d3dedb796..60a701b582 100644
--- a/src/daemon/human-control-http.ts
+++ b/packages/daemon/src/server/human-control-http.ts
@@ -6,8 +6,8 @@ import {
   HUMAN_CONTROL_HTTP_PREFIX,
   parseHumanControlHoldInput,
   type HumanControlHoldInput,
-} from './human-control-contract.ts';
-import type { LeaseRegistry } from './lease-registry.ts';
+} from '../resources/human-control-contract.ts';
+import type { LeaseRegistry } from '../resources/lease-registry.ts';
 
 const MAX_HOST_ADMIN_BODY_BYTES = 16 * 1024;
 
diff --git a/src/daemon/platform-request-scope.ts b/packages/daemon/src/server/platform-request-scope.ts
similarity index 95%
rename from src/daemon/platform-request-scope.ts
rename to packages/daemon/src/server/platform-request-scope.ts
index 2d1cb412b2..247634ca5a 100644
--- a/src/daemon/platform-request-scope.ts
+++ b/packages/daemon/src/server/platform-request-scope.ts
@@ -6,7 +6,7 @@ import type {
 import { getRequestSignal, emitRequestProgress } from '@agent-device/host-kit/request';
 
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
-import type { DaemonRequest } from './daemon-request.ts';
+import type { DaemonRequest } from '../core/daemon-request.ts';
 
 const processLifetimeSignal = new AbortController().signal;
 
diff --git a/src/daemon/provider-lease-expiry.ts b/packages/daemon/src/server/provider-lease-expiry.ts
similarity index 99%
rename from src/daemon/provider-lease-expiry.ts
rename to packages/daemon/src/server/provider-lease-expiry.ts
index ded6cb40e3..038ef2b07d 100644
--- a/src/daemon/provider-lease-expiry.ts
+++ b/packages/daemon/src/server/provider-lease-expiry.ts
@@ -6,7 +6,7 @@ import type {
   ProviderExpiredLeaseRecovery,
 } from '@agent-device/contracts/device';
 import { publishFileSync } from '@agent-device/host-kit/file';
-import { releaseExpiredProviderLease } from './lease-lifecycle.ts';
+import { releaseExpiredProviderLease } from '../sessions/lease-lifecycle.ts';
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
 import { sleep } from '@agent-device/host-kit/retry';
 
diff --git a/src/daemon/replay-device-selection.ts b/packages/daemon/src/server/replay-device-selection.ts
similarity index 98%
rename from src/daemon/replay-device-selection.ts
rename to packages/daemon/src/server/replay-device-selection.ts
index 9433679349..b0d37a510f 100644
--- a/src/daemon/replay-device-selection.ts
+++ b/packages/daemon/src/server/replay-device-selection.ts
@@ -7,7 +7,7 @@ import type { ResolveTargetDeviceOptions } from '@agent-device/device-selection/
 import type { CommandFlags } from '@agent-device/contracts/command';
 import { readReplayScriptSourceFile } from '@agent-device/replay-port/script-source';
 import type { ReplayBackend } from '@agent-device/replay-port/replay-backend-registry';
-import type { DaemonRequest } from './daemon-request.ts';
+import type { DaemonRequest } from '../core/daemon-request.ts';
 import {
   appTargetResolutionOptions,
   buildMaestroReplayTargetDeviceResolutionOptions,
diff --git a/src/daemon/request-binding.ts b/packages/daemon/src/server/request-binding.ts
similarity index 95%
rename from src/daemon/request-binding.ts
rename to packages/daemon/src/server/request-binding.ts
index d536376a36..43b719b4f0 100644
--- a/src/daemon/request-binding.ts
+++ b/packages/daemon/src/server/request-binding.ts
@@ -1,12 +1,12 @@
 import { resolveTargetDevice } from '@agent-device/device-selection/dispatch-resolve';
-import { hasDeviceSelectionInput } from './device/device-selector-intent.ts';
+import { hasDeviceSelectionInput } from '../core/device/device-selector-intent.ts';
 import { applyRequestLockPolicy } from './request-lock-policy.ts';
 import { buildOpenTargetDeviceResolutionOptions } from '@agent-device/device-selection/open-target';
 import { buildReplayTargetDeviceResolution } from './replay-device-selection.ts';
-import type { SessionStore } from './session-store.ts';
+import type { SessionStore } from '../core/session-store.ts';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import type { DaemonRequest } from './daemon-request.ts';
-import type { SessionRef } from './session-state.ts';
+import type { DaemonRequest } from '../core/daemon-request.ts';
+import type { SessionRef } from '../core/session-state.ts';
 
 export type RequestExecutionLockKey = `session:${string}` | `device:${string}`;
 
diff --git a/src/daemon/request-diagnostics-http.ts b/packages/daemon/src/server/request-diagnostics-http.ts
similarity index 98%
rename from src/daemon/request-diagnostics-http.ts
rename to packages/daemon/src/server/request-diagnostics-http.ts
index d64000c928..079f0dc52d 100644
--- a/src/daemon/request-diagnostics-http.ts
+++ b/packages/daemon/src/server/request-diagnostics-http.ts
@@ -17,13 +17,13 @@
 import fs from 'node:fs';
 import http from 'node:http';
 import { AppError, normalizeError, type DiagnosticsRecordRef } from '@agent-device/kernel/errors';
-import type { DaemonRequest } from './daemon-request.ts';
+import type { DaemonRequest } from '../core/daemon-request.ts';
 import { isSafeSessionSegment } from '@agent-device/host-kit/session-paths';
 import { decodeUriSegment } from './http-request-target.ts';
 import {
   isTenantAddressableSessionName,
   type TenantSessionNamespace,
-} from './session-tenant-scope.ts';
+} from '../core/session-tenant-scope.ts';
 import { failStreamedHttpResponse, sendRestJsonError } from './http-errors.ts';
 
 const REQUEST_DIAGNOSTICS_CONTENT_TYPE = 'application/x-ndjson';
diff --git a/src/daemon/request-execution-locks.ts b/packages/daemon/src/server/request-execution-locks.ts
similarity index 100%
rename from src/daemon/request-execution-locks.ts
rename to packages/daemon/src/server/request-execution-locks.ts
diff --git a/src/daemon/request-execution-scope.ts b/packages/daemon/src/server/request-execution-scope.ts
similarity index 92%
rename from src/daemon/request-execution-scope.ts
rename to packages/daemon/src/server/request-execution-scope.ts
index 2dab75935f..9d1cf7d8c9 100644
--- a/src/daemon/request-execution-scope.ts
+++ b/packages/daemon/src/server/request-execution-scope.ts
@@ -1,6 +1,6 @@
 import type { CommandFlags } from '@agent-device/contracts/command';
 import type { ProviderAppCatalog } from '@agent-device/contracts/device';
-import type { TrackDownloadableArtifact } from './artifact-tracking.ts';
+import type { TrackDownloadableArtifact } from '../resources/artifact-tracking.ts';
 import {
   emitDiagnostic,
   getDiagnosticsMeta,
@@ -10,42 +10,54 @@ import { AppError, normalizeError } from '@agent-device/kernel/errors';
 import {
   type DaemonCommandContext,
   contextFromFlags as contextFromFlagsWithLog,
-} from './context.ts';
-import { assertSessionSelectorMatches } from './session-selector.ts';
-import { resolveEffectiveSessionName } from './session-routing.ts';
-import { assertRequestLeaseAdmissionPreflight, scopeRequestSession } from './request-admission.ts';
-import { admitRequestLeaseForLockedScope, cleanupExpiredLeasedSession } from './lease-lifecycle.ts';
+} from '../core/context.ts';
+import { assertSessionSelectorMatches } from '../core/session-selector.ts';
+import { resolveEffectiveSessionName } from '../sessions/session-routing.ts';
+import {
+  assertRequestLeaseAdmissionPreflight,
+  scopeRequestSession,
+} from '../sessions/request-admission.ts';
+import {
+  admitRequestLeaseForLockedScope,
+  cleanupExpiredLeasedSession,
+} from '../sessions/lease-lifecycle.ts';
 import {
   prepareLockedRequestBinding,
   resolveRequestExecutionLockPlan,
   type RequestExecutionLockPlan,
 } from './request-binding.ts';
-import { beginOpenDeviceWait, readOpenWaitBudgetMs } from './open-device-contention-wait.ts';
+import {
+  beginOpenDeviceWait,
+  readOpenWaitBudgetMs,
+} from '../sessions/open-device-contention-wait.ts';
 import { createRequestExecutionLocks } from './request-execution-locks.ts';
 import { isRequestCanceled, throwIfRequestCanceled } from '@agent-device/host-kit/request';
 import { finalizeDaemonResponse } from './request-finalization.ts';
-import { refreshRecordingHealth } from './request-recording-health.ts';
+import { refreshRecordingHealth } from '../sessions/request-recording-health.ts';
 import { runAdmittedLeaseWork } from './request-lease-work.ts';
-import { assertMacOsAppLeaseProcess } from './macos-app-lease.ts';
+import { assertMacOsAppLeaseProcess } from '../resources/macos-app-lease.ts';
 import {
   getSessionCommandKind,
   shouldBlockForInvalidRecording,
   shouldLockSessionExecution,
   shouldValidateSessionSelector,
-} from './daemon-command-registry.ts';
+} from '../core/daemon-command-registry.ts';
 import {
   buildRequestFinishedEvent,
   buildRequestStartedEvent,
   shouldRecordEventForRequest,
 } from '@agent-device/session-journal/session-event-log';
-import type { LeaseRegistry } from './lease-registry.ts';
-import { type SessionStore } from './session-store.ts';
-import { resolveSessionRequestLog, resolveSessionRunnerLogPath } from './session-artifact-paths.ts';
-import type { DaemonRequest, DaemonResponse } from './daemon-request.ts';
-import type { SessionRef, SessionState } from './session-state.ts';
-import { teardownSessionResources } from './session-teardown.ts';
+import type { LeaseRegistry } from '../resources/lease-registry.ts';
+import { type SessionStore } from '../core/session-store.ts';
+import {
+  resolveSessionRequestLog,
+  resolveSessionRunnerLogPath,
+} from '../core/session-artifact-paths.ts';
+import type { DaemonRequest, DaemonResponse } from '../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../core/session-state.ts';
+import { teardownSessionResources } from '../sessions/session-teardown.ts';
 import { finalizeBoundSessionApplicationLifecycle } from './application-lifecycle-recovery.ts';
-import { runtimeHintValues } from './session-runtime.ts';
+import { runtimeHintValues } from '../sessions/session-runtime.ts';
 import type { DeviceRuntimeGateway } from '@agent-device/contracts/platform-runtime';
 import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform-runtime-operations';
 import type { PlatformRequestScope } from '@agent-device/contracts/platform-runtime-host';
@@ -55,25 +67,28 @@ import {
   type BindExactDeviceRuntime,
   type InspectDeviceRuntimeFacts,
   type RequestRuntimeBindings,
-} from './request-runtime-binding.ts';
+} from '../core/request-runtime-binding.ts';
 import {
   createDeviceClaimAdmission,
   type DeviceClaimAdmission,
-} from './device/device-claim-admission.ts';
+} from '../resources/device/device-claim-admission.ts';
 import { createOwnerScopedDeviceClaimReconciler } from './device/device-claim-owner-recovery.ts';
-import type { ClaimRecoveryGatewayFactory } from './device/claim-recovery-gateway.ts';
+import type { ClaimRecoveryGatewayFactory } from '../resources/device/claim-recovery-gateway.ts';
 import {
   applyCommandDefaults,
   resolveCommandDeviceClaimPolicy,
 } from '@agent-device/command-registry/registry';
-import type { PlatformResourceCleanup } from './platform-resource-cleanup.ts';
-import type { DaemonPlatformServices } from './platform-services.ts';
+import type { PlatformResourceCleanup } from '../core/platform-resource-cleanup.ts';
+import type { DaemonPlatformServices } from '../core/platform-services.ts';
 import {
   assertDaemonPolicyAdmitsDevice,
   assertDaemonPolicyAdmitsRequest,
-} from './daemon-policy.ts';
+} from '../core/daemon-policy.ts';
 import type { DaemonPolicy } from '@agent-device/daemon-contracts/daemon-policy-file';
-import { requestDispatchLedger, type RequestDispatchLedger } from './request-dispatch-ledger.ts';
+import {
+  requestDispatchLedger,
+  type RequestDispatchLedger,
+} from '../core/request-dispatch-ledger.ts';
 
 // Production daemon wiring owns one LeaseRegistry per process; scoping locks by registry keeps
 // test and embedded routers isolated without changing process-level serialization there.
diff --git a/src/daemon/request-finalization.ts b/packages/daemon/src/server/request-finalization.ts
similarity index 97%
rename from src/daemon/request-finalization.ts
rename to packages/daemon/src/server/request-finalization.ts
index 6199c100a4..3311cd8171 100644
--- a/src/daemon/request-finalization.ts
+++ b/packages/daemon/src/server/request-finalization.ts
@@ -5,10 +5,10 @@ import {
   flushDiagnosticsToSessionFile,
   getDiagnosticsMeta,
 } from '@agent-device/host-kit/diagnostics';
-import type { DaemonRequest, DaemonResponse, DaemonResponseData } from './daemon-request.ts';
+import type { DaemonRequest, DaemonResponse, DaemonResponseData } from '../core/daemon-request.ts';
 import type { DaemonArtifact } from '@agent-device/kernel/contracts';
 import { isDeviceRotation, type DeviceRotation } from '@agent-device/contracts/device';
-import type { TrackDownloadableArtifact } from './artifact-tracking.ts';
+import type { TrackDownloadableArtifact } from '../resources/artifact-tracking.ts';
 
 /** A response artifact plus the capture facts the inventory reports beside it. */
 type PendingArtifact = DaemonArtifact & { displayRotation?: DeviceRotation };
diff --git a/src/daemon/request-lease-work.ts b/packages/daemon/src/server/request-lease-work.ts
similarity index 85%
rename from src/daemon/request-lease-work.ts
rename to packages/daemon/src/server/request-lease-work.ts
index e7d6582b9e..e3a9453e78 100644
--- a/src/daemon/request-lease-work.ts
+++ b/packages/daemon/src/server/request-lease-work.ts
@@ -1,7 +1,7 @@
 import { isRequestCanceled } from '@agent-device/host-kit/request';
-import { isHumanControlMutation } from './daemon-command-registry.ts';
-import type { LeaseRegistry } from './lease-registry.ts';
-import type { DaemonRequest } from './daemon-request.ts';
+import { isHumanControlMutation } from '../core/daemon-command-registry.ts';
+import type { LeaseRegistry } from '../resources/lease-registry.ts';
+import type { DaemonRequest } from '../core/daemon-request.ts';
 
 /**
  * Runs one admitted request's work under the protection of its lease.
diff --git a/src/daemon/request-lock-policy.ts b/packages/daemon/src/server/request-lock-policy.ts
similarity index 96%
rename from src/daemon/request-lock-policy.ts
rename to packages/daemon/src/server/request-lock-policy.ts
index 86c43f7719..56d2f7410c 100644
--- a/src/daemon/request-lock-policy.ts
+++ b/packages/daemon/src/server/request-lock-policy.ts
@@ -1,22 +1,25 @@
 import type { CommandFlags } from '@agent-device/contracts/command';
 import { AppError } from '@agent-device/kernel/errors';
-import type { DaemonRequest } from './daemon-request.ts';
-import type { SessionRef, SessionState } from './session-state.ts';
+import type { DaemonRequest } from '../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../core/session-state.ts';
 import {
   formatSessionSelectorConflict,
   listSessionSelectorConflicts,
   type SessionSelectorConflict,
   type SessionSelectorConflictKey,
-} from './session-selector.ts';
+} from '../core/session-selector.ts';
 import {
   platformSelectorsConflict,
   publicPlatformString,
   type PlatformSelector,
 } from '@agent-device/kernel/device';
-import { buildSessionRecoveryHint, describeSessionDevice } from './session-recovery-hints.ts';
+import { buildSessionRecoveryHint, describeSessionDevice } from '../core/session-recovery-hints.ts';
 import { shellQuoteIfNeeded } from '@agent-device/kernel/device-shell';
-import { hasLockableDeviceSelector, hasSelectorValue } from './device/device-selector-intent.ts';
-import { canOverrideLockPolicySelector } from './daemon-command-registry.ts';
+import {
+  hasLockableDeviceSelector,
+  hasSelectorValue,
+} from '../core/device/device-selector-intent.ts';
+import { canOverrideLockPolicySelector } from '../core/daemon-command-registry.ts';
 
 type LockPlatform = NonNullable<DaemonRequest['meta']>['lockPlatform'];
 type NormalizedLockPlatform = NonNullable<PlatformSelector>;
diff --git a/src/daemon/request-platform-provider-context.ts b/packages/daemon/src/server/request-platform-provider-context.ts
similarity index 92%
rename from src/daemon/request-platform-provider-context.ts
rename to packages/daemon/src/server/request-platform-provider-context.ts
index 08f19d3cf3..e2c6cc9ba4 100644
--- a/src/daemon/request-platform-provider-context.ts
+++ b/packages/daemon/src/server/request-platform-provider-context.ts
@@ -3,11 +3,11 @@ import { resolveTargetDevice } from '@agent-device/device-selection/dispatch-res
 import {
   hasDeviceSelectionInput,
   hasExplicitDeviceSelector,
-} from './device/device-selector-intent.ts';
+} from '../core/device/device-selector-intent.ts';
 import { buildOpenTargetDeviceResolutionOptions } from '@agent-device/device-selection/open-target';
-import { resolveProviderDeviceResolutionIntent } from './daemon-command-registry.ts';
-import type { DaemonRequest } from './daemon-request.ts';
-import type { SessionState } from './session-state.ts';
+import { resolveProviderDeviceResolutionIntent } from '../core/daemon-command-registry.ts';
+import type { DaemonRequest } from '../core/daemon-request.ts';
+import type { SessionState } from '../core/session-state.ts';
 
 /**
  * Resolves the daemon-owned part of the request-provider seam.
diff --git a/src/daemon/request-router.ts b/packages/daemon/src/server/request-router.ts
similarity index 95%
rename from src/daemon/request-router.ts
rename to packages/daemon/src/server/request-router.ts
index c9a0467cf1..a08d8f1e75 100644
--- a/src/daemon/request-router.ts
+++ b/packages/daemon/src/server/request-router.ts
@@ -18,7 +18,7 @@ import {
   noActiveSessionError,
 } from '@agent-device/kernel/contracts';
 import type { CloudArtifactProvider } from '@agent-device/contracts/observability';
-import type { TrackDownloadableArtifact } from './artifact-tracking.ts';
+import type { TrackDownloadableArtifact } from '../resources/artifact-tracking.ts';
 import type {
   RequestPlatformProviderScope,
   RequestPlatformProviders,
@@ -28,9 +28,9 @@ import type {
   DaemonRequest,
   DaemonResponse,
   DaemonResponseData,
-} from './daemon-request.ts';
+} from '../core/daemon-request.ts';
 import { RESPONSE_VIEWS } from './response-views.ts';
-import { SessionStore } from './session-store.ts';
+import { SessionStore } from '../core/session-store.ts';
 import { resolvePlatformProviderRequestContext } from './request-platform-provider-context.ts';
 import {
   countDiagnosticEventsByPhase,
@@ -40,11 +40,11 @@ import {
   registerDiagnosticSensitiveValue,
   withDiagnosticsScope,
 } from '@agent-device/host-kit/diagnostics';
-import type { LeaseRegistry } from './lease-registry.ts';
+import type { LeaseRegistry } from '../resources/lease-registry.ts';
 import {
   loadGenericRequestHandlerModule,
   runRequestHandlerChain,
-} from './request-handler-chain.ts';
+} from '../sessions/request-handler-chain.ts';
 import {
   createRequestExecutionScope,
   finalizeRequestExecutionScope,
@@ -53,8 +53,8 @@ import {
   type RequestExecutionScope,
 } from './request-execution-scope.ts';
 import { unsupportedSaveScriptFlagResponse } from './request-save-script-policy.ts';
-import { canRunReplayScopedAction } from './daemon-command-registry.ts';
-import { isWebSession } from './web-session-names.ts';
+import { canRunReplayScopedAction } from '../core/daemon-command-registry.ts';
+import { isWebSession } from '../sessions/web-session-names.ts';
 import {
   inferFillText,
   isSensitiveFillText,
@@ -63,16 +63,16 @@ import {
 import { createPlatformRequestScope } from './platform-request-scope.ts';
 import { parameterizeSensitiveString } from '@agent-device/selectors/parameterized-recorded-fill';
 import { createOwnerScopedDeviceClaimReconciler } from './device/device-claim-owner-recovery.ts';
-import type { ClaimRecoveryGatewayFactory } from './device/claim-recovery-gateway.ts';
-import { isConfinedToAppLease, scopeRequestSession } from './request-admission.ts';
-import { redactMacOsAppLeaseResponse } from './macos-app-lease.ts';
-import { resolveEffectiveSessionName } from './session-routing.ts';
+import type { ClaimRecoveryGatewayFactory } from '../resources/device/claim-recovery-gateway.ts';
+import { isConfinedToAppLease, scopeRequestSession } from '../sessions/request-admission.ts';
+import { redactMacOsAppLeaseResponse } from '../resources/macos-app-lease.ts';
+import { resolveEffectiveSessionName } from '../sessions/session-routing.ts';
 import { sessionIdleExpiredError } from './session-idle-expiry.ts';
-import type { IdleSessionTombstone } from './session-idle-tombstone.ts';
+import type { IdleSessionTombstone } from '../core/session-idle-tombstone.ts';
 import {
   createAppLogAdmissionLedger,
   type AppLogAdmissionLedger,
-} from './app-log-admission-ledger.ts';
+} from '../resources/app-log-admission-ledger.ts';
 import {
   type AudioProbeAdmissionLedger,
   createAudioProbeAdmissionLedger,
@@ -86,15 +86,18 @@ import {
   type ScreenRecordingAdmissionLedger,
 } from '@agent-device/capture-kit/screen-recording-admission-ledger';
 import type { HostDiagnostics } from '@agent-device/contracts/host-diagnostics';
-import { resolveGenericRuntimeExecution } from './generic-runtime-execution.ts';
-import { discloseRequestDispatch, refusedBeforeDispatch } from './request-dispatch-disclosure.ts';
-import { recordNestedRequests } from './request-dispatch-ledger.ts';
+import { resolveGenericRuntimeExecution } from '../execution/generic-runtime-execution.ts';
+import {
+  discloseRequestDispatch,
+  refusedBeforeDispatch,
+} from '../execution/request-dispatch-disclosure.ts';
+import { recordNestedRequests } from '../core/request-dispatch-ledger.ts';
 import type { AndroidObservationAdapter } from '@agent-device/contracts/android-observation';
 import type { CreateDaemonCommandSurface } from '@agent-device/contracts/daemon-command-surface';
-import type { PlatformResourceCleanup } from './platform-resource-cleanup.ts';
-import type { DaemonPlatformServices } from './platform-services.ts';
+import type { PlatformResourceCleanup } from '../core/platform-resource-cleanup.ts';
+import type { DaemonPlatformServices } from '../core/platform-services.ts';
 import type { DaemonProviderCredentials } from '@agent-device/daemon-contracts/provider-credentials';
-import { restrictDeviceInventoryToDaemonPolicy } from './daemon-policy.ts';
+import { restrictDeviceInventoryToDaemonPolicy } from '../core/daemon-policy.ts';
 import type { DaemonPolicy } from '@agent-device/daemon-contracts/daemon-policy-file';
 
 // ---------------------------------------------------------------------------
diff --git a/src/daemon/request-save-script-policy.ts b/packages/daemon/src/server/request-save-script-policy.ts
similarity index 94%
rename from src/daemon/request-save-script-policy.ts
rename to packages/daemon/src/server/request-save-script-policy.ts
index 4c6d2c272c..c18d350989 100644
--- a/src/daemon/request-save-script-policy.ts
+++ b/packages/daemon/src/server/request-save-script-policy.ts
@@ -4,8 +4,11 @@ import {
   flushDiagnosticsToSessionFile,
   getDiagnosticsMeta,
 } from '@agent-device/host-kit/diagnostics';
-import { listSaveScriptFlagOwnerCommands, ownsSaveScriptFlag } from './daemon-command-registry.ts';
-import type { DaemonRequest, DaemonResponse } from './daemon-request.ts';
+import {
+  listSaveScriptFlagOwnerCommands,
+  ownsSaveScriptFlag,
+} from '../core/daemon-command-registry.ts';
+import type { DaemonRequest, DaemonResponse } from '../core/daemon-request.ts';
 
 /**
  * #1478: the released `--save-script` flag owners, read from the command
diff --git a/src/daemon/response-views.ts b/packages/daemon/src/server/response-views.ts
similarity index 99%
rename from src/daemon/response-views.ts
rename to packages/daemon/src/server/response-views.ts
index a46286e8d4..4b54e37311 100644
--- a/src/daemon/response-views.ts
+++ b/packages/daemon/src/server/response-views.ts
@@ -1,7 +1,7 @@
 import { isDeviceRotation } from '@agent-device/contracts/device';
 import type { ResponseLevel } from '@agent-device/kernel/contracts';
 import type { ScreenshotOverlayRef, SnapshotNode } from '@agent-device/kernel/snapshot';
-import type { DaemonResponseData } from './daemon-request.ts';
+import type { DaemonResponseData } from '../core/daemon-request.ts';
 
 /**
  * Phase 4 leveled response views. A view maps a command's `default` result data
diff --git a/src/daemon/resumable-upload-range.ts b/packages/daemon/src/server/resumable-upload-range.ts
similarity index 100%
rename from src/daemon/resumable-upload-range.ts
rename to packages/daemon/src/server/resumable-upload-range.ts
diff --git a/src/daemon/resumable-upload-transfer.ts b/packages/daemon/src/server/resumable-upload-transfer.ts
similarity index 100%
rename from src/daemon/resumable-upload-transfer.ts
rename to packages/daemon/src/server/resumable-upload-transfer.ts
diff --git a/src/daemon/resumable-upload.ts b/packages/daemon/src/server/resumable-upload.ts
similarity index 98%
rename from src/daemon/resumable-upload.ts
rename to packages/daemon/src/server/resumable-upload.ts
index d398d1982d..74a86bd2ba 100644
--- a/src/daemon/resumable-upload.ts
+++ b/packages/daemon/src/server/resumable-upload.ts
@@ -4,7 +4,10 @@ import path from 'node:path';
 import type { IncomingMessage } from 'node:http';
 import { AppError } from '@agent-device/kernel/errors';
 import { extractTarInstallableArtifact } from './artifact-archive.ts';
-import { requireTenantOwnedEntry, type TenantOwnedResourceKind } from './tenant-owned-entry.ts';
+import {
+  requireTenantOwnedEntry,
+  type TenantOwnedResourceKind,
+} from '../core/tenant-owned-entry.ts';
 import {
   createArtifactTempDir,
   sanitizeArtifactFilename,
diff --git a/src/daemon/server/daemon-lease-finalizer.test.ts b/packages/daemon/src/server/server/daemon-lease-finalizer.test.ts
similarity index 98%
rename from src/daemon/server/daemon-lease-finalizer.test.ts
rename to packages/daemon/src/server/server/daemon-lease-finalizer.test.ts
index 130aab229f..f5105d402e 100644
--- a/src/daemon/server/daemon-lease-finalizer.test.ts
+++ b/packages/daemon/src/server/server/daemon-lease-finalizer.test.ts
@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { expect, test, vi } from 'vitest';
-import { LeaseRegistry } from '../lease-registry.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
 import type { DeviceLease } from '@agent-device/contracts/device';
 import { createExpiredProviderLeaseReleaser } from '../provider-lease-expiry.ts';
 import { finalizeDaemonLeases } from './daemon-lease-finalizer.ts';
diff --git a/src/daemon/server/daemon-lease-finalizer.ts b/packages/daemon/src/server/server/daemon-lease-finalizer.ts
similarity index 92%
rename from src/daemon/server/daemon-lease-finalizer.ts
rename to packages/daemon/src/server/server/daemon-lease-finalizer.ts
index a8607b4a2e..2fe9cb0c47 100644
--- a/src/daemon/server/daemon-lease-finalizer.ts
+++ b/packages/daemon/src/server/server/daemon-lease-finalizer.ts
@@ -1,7 +1,7 @@
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
 import type { ExpiredProviderLeaseReleaser } from '../provider-lease-expiry.ts';
-import type { LeaseRegistry } from '../lease-registry.ts';
-import { leaseReleaseRequestFor } from '../lease-registry-scope.ts';
+import type { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { leaseReleaseRequestFor } from '../../resources/lease-registry-scope.ts';
 
 /**
  * Ends every lease still active at daemon shutdown, whether a session held it or its owner kept it
diff --git a/src/daemon/server/daemon-metadata-loss.test.ts b/packages/daemon/src/server/server/daemon-metadata-loss.test.ts
similarity index 100%
rename from src/daemon/server/daemon-metadata-loss.test.ts
rename to packages/daemon/src/server/server/daemon-metadata-loss.test.ts
diff --git a/src/daemon/server/daemon-metadata-loss.ts b/packages/daemon/src/server/server/daemon-metadata-loss.ts
similarity index 100%
rename from src/daemon/server/daemon-metadata-loss.ts
rename to packages/daemon/src/server/server/daemon-metadata-loss.ts
diff --git a/src/daemon/server/daemon-runtime-device-claims.test.ts b/packages/daemon/src/server/server/daemon-runtime-device-claims.test.ts
similarity index 83%
rename from src/daemon/server/daemon-runtime-device-claims.test.ts
rename to packages/daemon/src/server/server/daemon-runtime-device-claims.test.ts
index f530246768..5c2c724bf2 100644
--- a/src/daemon/server/daemon-runtime-device-claims.test.ts
+++ b/packages/daemon/src/server/server/daemon-runtime-device-claims.test.ts
@@ -2,10 +2,10 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { afterEach, expect, test, vi } from 'vitest';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { platformResourceCleanupFixture } from '../__tests__/support/platform-resource-cleanup-fixture.ts';
+import { platformResourceCleanupFixture } from '../../__tests__/support/platform-resource-cleanup-fixture.ts';
 
-vi.mock('../session-teardown.ts', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../session-teardown.ts')>();
+vi.mock('../../sessions/session-teardown.ts', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../sessions/session-teardown.ts')>();
   return {
     ...actual,
     stopSessionAppLog: vi.fn(async () => {}),
@@ -13,9 +13,9 @@ vi.mock('../session-teardown.ts', async (importOriginal) => {
   };
 });
 
-import { SessionStore } from '../session-store.ts';
-import { teardownSessionResources } from '../session-teardown.ts';
-import type { SessionState } from '../session-state.ts';
+import { SessionStore } from '../../core/session-store.ts';
+import { teardownSessionResources } from '../../sessions/session-teardown.ts';
+import type { SessionState } from '../../core/session-state.ts';
 import { teardownDaemonSessionForShutdown } from './daemon-runtime.ts';
 
 const mockTeardownSessionResources = vi.mocked(teardownSessionResources);
diff --git a/src/daemon/server/daemon-runtime.ts b/packages/daemon/src/server/server/daemon-runtime.ts
similarity index 95%
rename from src/daemon/server/daemon-runtime.ts
rename to packages/daemon/src/server/server/daemon-runtime.ts
index c1675b7f61..8995e73e5f 100644
--- a/src/daemon/server/daemon-runtime.ts
+++ b/packages/daemon/src/server/server/daemon-runtime.ts
@@ -1,34 +1,34 @@
 import crypto from 'node:crypto';
 import { asAppError, AppError, normalizeError } from '@agent-device/kernel/errors';
-import { SessionStore } from '../session-store.ts';
-import { resolveSessionRequestLogPath } from '../session-artifact-paths.ts';
+import { SessionStore } from '../../core/session-store.ts';
+import { resolveSessionRequestLogPath } from '../../core/session-artifact-paths.ts';
 import {
   resolveDaemonPaths,
   resolveDaemonServerMode,
 } from '@agent-device/daemon-contracts/daemon-resolution';
 import { createDaemonHttpServer } from './http-server.ts';
-import { trackDownloadableArtifact } from '../artifact-tracking.ts';
-import { installProviderDeviceAdmission } from '../provider-device-admission.ts';
+import { trackDownloadableArtifact } from '../../resources/artifact-tracking.ts';
+import { installProviderDeviceAdmission } from '../../core/provider-device-admission.ts';
 import {
   loadDaemonPolicy,
   type DaemonPolicy,
 } from '@agent-device/daemon-contracts/daemon-policy-file';
-import { assertDaemonPolicyAllowsCapability } from '../daemon-policy.ts';
-import { installInteractorResolution } from '../interactor-resolution.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
+import { assertDaemonPolicyAllowsCapability } from '../../core/daemon-policy.ts';
+import { installInteractorResolution } from '../../core/interactor-resolution.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
 import { createExpiredProviderLeaseReleaser } from '../provider-lease-expiry.ts';
 import { createRequestHandler } from '../request-router.ts';
 import type { RequestRouterDeps } from '../request-router.ts';
 import { getLeaseRegistryExecutionLocks } from '../request-execution-scope.ts';
-import { stopSessionAppLog, teardownSessionResources } from '../session-teardown.ts';
-import { resolveDaemonSessionTeardownTimeoutMs } from '../session-teardown-budget.ts';
+import { stopSessionAppLog, teardownSessionResources } from '../../sessions/session-teardown.ts';
+import { resolveDaemonSessionTeardownTimeoutMs } from '../../sessions/session-teardown-budget.ts';
 import { finalizeDaemonSessionApplicationLifecycle } from '../application-lifecycle-recovery.ts';
-import { runtimeHintValues } from '../session-runtime.ts';
+import { runtimeHintValues } from '../../sessions/session-runtime.ts';
 import { closeDaemonServers } from './server-shutdown.ts';
-import type { DaemonInvokeFn } from '../daemon-request.ts';
-import type { SessionRef, SessionState } from '../session-state.ts';
+import type { DaemonInvokeFn } from '../../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../../core/session-state.ts';
 import type { RuntimeHintValues } from '@agent-device/contracts/application-lifecycle-runtime';
-import { createDaemonIdleReap } from './daemon-idle-reap.ts';
+import { createDaemonIdleReap } from '../../sessions/server/daemon-idle-reap.ts';
 import { withDaemonDiagnosticsScope } from '@agent-device/daemon-contracts/daemon-diagnostics-scope';
 import { createSessionIdleExpiry } from './daemon-session-idle-expiry.ts';
 import { resolveSessionIdleExpiryMs } from '../session-idle-expiry.ts';
@@ -37,7 +37,7 @@ import {
   processOwnsActiveDeviceClaim,
   reconcileOrphanedDeviceClaims,
   type DeviceClaimReconciler,
-} from '../device/device-claims.ts';
+} from '../../resources/device/device-claims.ts';
 import { createOwnerScopedDeviceClaimReconciler } from '../device/device-claim-owner-recovery.ts';
 import { createDaemonShutdownClaimLedger } from './daemon-shutdown-claims.ts';
 import { createAudioProbeAdmissionLedger } from '@agent-device/capture-kit/audio-probe-admission-ledger';
@@ -70,16 +70,16 @@ import {
   type DaemonServer,
 } from './transport.ts';
 import { prewarmPngWorker, terminatePngWorker } from '@agent-device/capture-kit/png-worker-client';
-import { openWebSessionNames } from '../web-session-names.ts';
-import { recoverAppLogResourcesAfterDaemonLock } from '../app-log-resource-recovery.ts';
+import { openWebSessionNames } from '../../sessions/web-session-names.ts';
+import { recoverAppLogResourcesAfterDaemonLock } from '../../resources/app-log-resource-recovery.ts';
 import { createDaemonRecoveryPlatformScope } from '../platform-request-scope.ts';
-import { createAppLogAdmissionLedger } from '../app-log-admission-ledger.ts';
+import { createAppLogAdmissionLedger } from '../../resources/app-log-admission-ledger.ts';
 import type { AppLogSessionArtifacts } from '@agent-device/contracts/app-log-runtime';
-import type { InteractorResolution } from '../interactor-resolution.ts';
-import type { ProviderDeviceAdmission } from '../provider-device-admission.ts';
-import type { PlatformOwnerLifecycle } from '../platform-owner-lifecycle.ts';
-import type { PlatformResourceCleanup } from '../platform-resource-cleanup.ts';
-import type { ClaimRecoveryGatewayFactory } from '../device/claim-recovery-gateway.ts';
+import type { InteractorResolution } from '../../core/interactor-resolution.ts';
+import type { ProviderDeviceAdmission } from '../../core/provider-device-admission.ts';
+import type { PlatformOwnerLifecycle } from '../../core/platform-owner-lifecycle.ts';
+import type { PlatformResourceCleanup } from '../../core/platform-resource-cleanup.ts';
+import type { ClaimRecoveryGatewayFactory } from '../../resources/device/claim-recovery-gateway.ts';
 import type {
   LeaseLifecycleProvider,
   ProviderDeviceRuntime,
diff --git a/src/daemon/server/daemon-session-idle-expiry-scheduling.test.ts b/packages/daemon/src/server/server/daemon-session-idle-expiry-scheduling.test.ts
similarity index 99%
rename from src/daemon/server/daemon-session-idle-expiry-scheduling.test.ts
rename to packages/daemon/src/server/server/daemon-session-idle-expiry-scheduling.test.ts
index ceed209486..def78af4fe 100644
--- a/src/daemon/server/daemon-session-idle-expiry-scheduling.test.ts
+++ b/packages/daemon/src/server/server/daemon-session-idle-expiry-scheduling.test.ts
@@ -8,7 +8,7 @@ import {
   NOW,
   WINDOW_MS,
 } from '../__tests__/session-idle-expiry-harness.ts';
-import { makeIosSession } from '../__tests__/support/session-factories.ts';
+import { makeIosSession } from '../../__tests__/support/session-factories.ts';
 import { IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
 
 /**
diff --git a/src/daemon/server/daemon-session-idle-expiry.test.ts b/packages/daemon/src/server/server/daemon-session-idle-expiry.test.ts
similarity index 98%
rename from src/daemon/server/daemon-session-idle-expiry.test.ts
rename to packages/daemon/src/server/server/daemon-session-idle-expiry.test.ts
index b4f8c5250d..703275160e 100644
--- a/src/daemon/server/daemon-session-idle-expiry.test.ts
+++ b/packages/daemon/src/server/server/daemon-session-idle-expiry.test.ts
@@ -5,7 +5,7 @@ import path from 'node:path';
 import {
   readIdleSessionTombstoneFile,
   resolveIdleSessionTombstonePath,
-} from '../session-idle-tombstone.ts';
+} from '../../core/session-idle-tombstone.ts';
 import { createSessionIdleExpiry } from './daemon-session-idle-expiry.ts';
 import {
   createIdleExpiryHarness,
@@ -16,8 +16,8 @@ import {
 import {
   makeIosSession,
   makeRepairCompleteSession,
-} from '../__tests__/support/session-factories.ts';
-import { resolveDeviceClaimPath } from '../device/device-claim-paths.ts';
+} from '../../__tests__/support/session-factories.ts';
+import { resolveDeviceClaimPath } from '../../resources/device/device-claim-paths.ts';
 
 /**
  * #2833: what one expiry COMMITS, once it has run. Whether a session past its window is the kind that
diff --git a/src/daemon/server/daemon-session-idle-expiry.ts b/packages/daemon/src/server/server/daemon-session-idle-expiry.ts
similarity index 99%
rename from src/daemon/server/daemon-session-idle-expiry.ts
rename to packages/daemon/src/server/server/daemon-session-idle-expiry.ts
index 158f63873b..b2ba5c9071 100644
--- a/src/daemon/server/daemon-session-idle-expiry.ts
+++ b/packages/daemon/src/server/server/daemon-session-idle-expiry.ts
@@ -1,5 +1,8 @@
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
-import { clearDeviceClaim, type DeviceClaimClearOutcome } from '../device/device-claims.ts';
+import {
+  clearDeviceClaim,
+  type DeviceClaimClearOutcome,
+} from '../../resources/device/device-claims.ts';
 import { existingSessionExecutionLockKeys } from '../request-binding.ts';
 import { withRequestExecutionLockKeys } from '../request-execution-locks.ts';
 import type { RequestExecutionLockKey } from '../request-binding.ts';
@@ -11,8 +14,8 @@ import {
   sessionIdleDeadlineMs,
   type SessionIdleExpiryOutcome,
 } from '../session-idle-expiry.ts';
-import type { SessionRef, SessionState } from '../session-state.ts';
-import type { SessionStore } from '../session-store.ts';
+import type { SessionRef, SessionState } from '../../core/session-state.ts';
+import type { SessionStore } from '../../core/session-store.ts';
 
 /** Settles one expired session's owned resources. Supplied by the runtime, which owns the seams. */
 export type IdleSessionSettler = (ref: SessionRef) => Promise<void>;
diff --git a/src/daemon/server/daemon-shutdown-claims.test.ts b/packages/daemon/src/server/server/daemon-shutdown-claims.test.ts
similarity index 93%
rename from src/daemon/server/daemon-shutdown-claims.test.ts
rename to packages/daemon/src/server/server/daemon-shutdown-claims.test.ts
index f76e8dc34c..671cd43990 100644
--- a/src/daemon/server/daemon-shutdown-claims.test.ts
+++ b/packages/daemon/src/server/server/daemon-shutdown-claims.test.ts
@@ -3,13 +3,13 @@ import { ANDROID_EMULATOR } from '@agent-device/test-kit/device-fixtures';
 import {
   isolatedDeviceClaimStores,
   retainOrphanedDeviceClaims,
-} from '../__tests__/support/device-claim-store.ts';
+} from '../../__tests__/support/device-claim-store.ts';
 import fs from 'node:fs';
-import { acquireDeviceClaim } from '../device/device-claims.ts';
-import { resolveDeviceClaimPath } from '../device/device-claim-paths.ts';
-import { inspectDeviceClaims } from '../device/device-claim-inspection.ts';
+import { acquireDeviceClaim } from '../../resources/device/device-claims.ts';
+import { resolveDeviceClaimPath } from '../../resources/device/device-claim-paths.ts';
+import { inspectDeviceClaims } from '../../resources/device/device-claim-inspection.ts';
 import { createDaemonShutdownClaimLedger } from './daemon-shutdown-claims.ts';
-import type { SessionState } from '../session-state.ts';
+import type { SessionState } from '../../core/session-state.ts';
 
 afterEach(() => {
   vi.restoreAllMocks();
diff --git a/src/daemon/server/daemon-shutdown-claims.ts b/packages/daemon/src/server/server/daemon-shutdown-claims.ts
similarity index 96%
rename from src/daemon/server/daemon-shutdown-claims.ts
rename to packages/daemon/src/server/server/daemon-shutdown-claims.ts
index 5207dda372..a2b0c3bf87 100644
--- a/src/daemon/server/daemon-shutdown-claims.ts
+++ b/packages/daemon/src/server/server/daemon-shutdown-claims.ts
@@ -1,8 +1,11 @@
 import { publicPlatformString } from '@agent-device/kernel/device';
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
-import { clearDeviceClaim, type DeviceClaimClearOutcome } from '../device/device-claims.ts';
+import {
+  clearDeviceClaim,
+  type DeviceClaimClearOutcome,
+} from '../../resources/device/device-claims.ts';
 import type { DeviceClaimRecord } from '@agent-device/daemon-contracts/daemon-shutdown-report';
-import type { SessionState } from '../session-state.ts';
+import type { SessionState } from '../../core/session-state.ts';
 
 export type DaemonShutdownClaims = {
   released: DeviceClaimRecord[];
diff --git a/src/daemon/server/http-authorization.test.ts b/packages/daemon/src/server/server/http-authorization.test.ts
similarity index 98%
rename from src/daemon/server/http-authorization.test.ts
rename to packages/daemon/src/server/server/http-authorization.test.ts
index a9b944f738..7560029c9f 100644
--- a/src/daemon/server/http-authorization.test.ts
+++ b/packages/daemon/src/server/server/http-authorization.test.ts
@@ -3,7 +3,7 @@ import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import path from 'node:path';
 import { createDaemonHttpServer } from './http-server.ts';
-import type { DaemonResponse } from '../daemon-request.ts';
+import type { DaemonResponse } from '../../core/daemon-request.ts';
 import {
   closeLoopbackServer,
   listenOnLoopback,
diff --git a/src/daemon/server/http-authorization.ts b/packages/daemon/src/server/server/http-authorization.ts
similarity index 96%
rename from src/daemon/server/http-authorization.ts
rename to packages/daemon/src/server/server/http-authorization.ts
index bbcfa36509..d5877e217b 100644
--- a/src/daemon/server/http-authorization.ts
+++ b/packages/daemon/src/server/server/http-authorization.ts
@@ -7,17 +7,17 @@ import path from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { AppError, normalizeError, toAppErrorCode } from '@agent-device/kernel/errors';
 import { timingSafeStringEqual } from '@agent-device/host-kit/transport';
-import type { DaemonRequest } from '../daemon-request.ts';
-import { normalizeTenantId } from '../config.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
+import { normalizeTenantId } from '../../core/config.ts';
 import {
   DAEMON_HTTP_PUBLIC_NETWORK_ACCESS,
   DAEMON_HTTP_TENANT_HEADER,
 } from '@agent-device/contracts/daemon-http';
 import { sendRestJsonError } from '../http-errors.ts';
 import { resolveTrustedTenant, tenantTrustRejectionError } from './tenant-trust.ts';
-import type { TenantSessionNamespace } from '../session-tenant-scope.ts';
-import type { LeaseRegistry } from '../lease-registry.ts';
-import { assertMacOsAppLeaseTenantMayReadDiagnostics } from '../macos-app-lease.ts';
+import type { TenantSessionNamespace } from '../../core/session-tenant-scope.ts';
+import type { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { assertMacOsAppLeaseTenantMayReadDiagnostics } from '../../resources/macos-app-lease.ts';
 import { createRpcError } from './http-rpc-envelope.ts';
 import type { JsonRpcRequest, JsonRpcResponse } from './http-rpc-envelope.ts';
 
diff --git a/src/daemon/server/http-instance-precondition.test.ts b/packages/daemon/src/server/server/http-instance-precondition.test.ts
similarity index 100%
rename from src/daemon/server/http-instance-precondition.test.ts
rename to packages/daemon/src/server/server/http-instance-precondition.test.ts
diff --git a/src/daemon/server/http-instance-precondition.ts b/packages/daemon/src/server/server/http-instance-precondition.ts
similarity index 100%
rename from src/daemon/server/http-instance-precondition.ts
rename to packages/daemon/src/server/server/http-instance-precondition.ts
diff --git a/src/daemon/server/http-rpc-envelope.ts b/packages/daemon/src/server/server/http-rpc-envelope.ts
similarity index 100%
rename from src/daemon/server/http-rpc-envelope.ts
rename to packages/daemon/src/server/server/http-rpc-envelope.ts
diff --git a/src/daemon/server/http-rpc-methods.ts b/packages/daemon/src/server/server/http-rpc-methods.ts
similarity index 99%
rename from src/daemon/server/http-rpc-methods.ts
rename to packages/daemon/src/server/server/http-rpc-methods.ts
index cd682ad425..27c2486917 100644
--- a/src/daemon/server/http-rpc-methods.ts
+++ b/packages/daemon/src/server/server/http-rpc-methods.ts
@@ -10,7 +10,7 @@ import type {
 } from '@agent-device/kernel/contracts';
 import { commandRpcParamsSchema } from '@agent-device/kernel/contracts';
 import { readLeaseAllocateProviderFlags } from '@agent-device/contracts/lease-scope';
-import type { DaemonRequest } from '../daemon-request.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
 import { resolveToken } from './http-authorization.ts';
 
 type HttpInstallSource = Exclude<DaemonInstallSource, { kind: 'path' }>;
diff --git a/src/daemon/server/http-server.ts b/packages/daemon/src/server/server/http-server.ts
similarity index 99%
rename from src/daemon/server/http-server.ts
rename to packages/daemon/src/server/server/http-server.ts
index f8035334f6..504f6c428d 100644
--- a/src/daemon/server/http-server.ts
+++ b/packages/daemon/src/server/server/http-server.ts
@@ -11,7 +11,7 @@ import type { DiagnosticsRecordRef, NormalizedError } from '@agent-device/kernel
 import { normalizeError } from '@agent-device/kernel/errors';
 import { LEASE_BACKENDS } from '@agent-device/kernel/contracts';
 import { isRecord } from '@agent-device/kernel/record';
-import type { DaemonInvokeFn, DaemonRequest, DaemonResponse } from '../daemon-request.ts';
+import type { DaemonInvokeFn, DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
 import {
   clearRequestAbortRegistration,
@@ -32,7 +32,7 @@ import { tryHandleUploadHttpRoute } from '../upload-http.ts';
 import { tryHandleDownloadableArtifactHttpRoute } from '../downloadable-artifact-http.ts';
 import { tryHandleRequestDiagnosticsHttpRoute } from '../request-diagnostics-http.ts';
 import { tryHandleHostAdminHttpRoute } from '../host-lease-http.ts';
-import type { LeaseRegistry } from '../lease-registry.ts';
+import type { LeaseRegistry } from '../../resources/lease-registry.ts';
 import {
   authorizeAuxiliaryHttpRequest,
   authorizeDiagnosticsHttpRequest,
diff --git a/src/daemon/server/server-lifecycle.ts b/packages/daemon/src/server/server/server-lifecycle.ts
similarity index 100%
rename from src/daemon/server/server-lifecycle.ts
rename to packages/daemon/src/server/server/server-lifecycle.ts
diff --git a/src/daemon/server/server-shutdown.ts b/packages/daemon/src/server/server/server-shutdown.ts
similarity index 100%
rename from src/daemon/server/server-shutdown.ts
rename to packages/daemon/src/server/server/server-shutdown.ts
diff --git a/src/daemon/server/tenant-trust.ts b/packages/daemon/src/server/server/tenant-trust.ts
similarity index 100%
rename from src/daemon/server/tenant-trust.ts
rename to packages/daemon/src/server/server/tenant-trust.ts
diff --git a/src/daemon/server/transport.ts b/packages/daemon/src/server/server/transport.ts
similarity index 99%
rename from src/daemon/server/transport.ts
rename to packages/daemon/src/server/server/transport.ts
index a411f65cde..9d86702b99 100644
--- a/src/daemon/server/transport.ts
+++ b/packages/daemon/src/server/server/transport.ts
@@ -1,7 +1,7 @@
 import { AppError, normalizeError, createRequestCanceledError } from '@agent-device/kernel/errors';
 import net from 'node:net';
 import type { Server as HttpServer } from 'node:http';
-import type { DaemonInvokeFn, DaemonRequest, DaemonResponse } from '../daemon-request.ts';
+import type { DaemonInvokeFn, DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
 import {
   clearRequestAbortRegistration,
   isRequestCanceled,
diff --git a/src/daemon/session-idle-expiry.ts b/packages/daemon/src/server/session-idle-expiry.ts
similarity index 97%
rename from src/daemon/session-idle-expiry.ts
rename to packages/daemon/src/server/session-idle-expiry.ts
index 721a52449a..fbce77fd99 100644
--- a/src/daemon/session-idle-expiry.ts
+++ b/packages/daemon/src/server/session-idle-expiry.ts
@@ -1,7 +1,7 @@
 import { AppError } from '@agent-device/kernel/errors';
-import type { DeviceClaimClearOutcome } from './device/device-claims.ts';
-import type { SessionState } from './session-state.ts';
-import type { IdleSessionTombstone } from './session-idle-tombstone.ts';
+import type { DeviceClaimClearOutcome } from '../resources/device/device-claims.ts';
+import type { SessionState } from '../core/session-state.ts';
+import type { IdleSessionTombstone } from '../core/session-idle-tombstone.ts';
 
 /**
  * #2833: an opt-in inactivity deadline for a session holding a local device claim, off by default.
diff --git a/src/daemon/upload-http.ts b/packages/daemon/src/server/upload-http.ts
similarity index 98%
rename from src/daemon/upload-http.ts
rename to packages/daemon/src/server/upload-http.ts
index 107f661187..bd503a6e91 100644
--- a/src/daemon/upload-http.ts
+++ b/packages/daemon/src/server/upload-http.ts
@@ -1,7 +1,7 @@
 import http from 'node:http';
 import { AppError, normalizeError } from '@agent-device/kernel/errors';
-import type { DaemonRequest } from './daemon-request.ts';
-import { trackUploadedArtifact } from './artifact-tracking.ts';
+import type { DaemonRequest } from '../core/daemon-request.ts';
+import { trackUploadedArtifact } from '../resources/artifact-tracking.ts';
 import {
   type BeginResumableUploadOptions,
   beginResumableUpload,
diff --git a/src/daemon/upload.ts b/packages/daemon/src/server/upload.ts
similarity index 100%
rename from src/daemon/upload.ts
rename to packages/daemon/src/server/upload.ts
diff --git a/src/daemon/__tests__/install-source-resolution.test.ts b/packages/daemon/src/sessions/__tests__/install-source-resolution.test.ts
similarity index 94%
rename from src/daemon/__tests__/install-source-resolution.test.ts
rename to packages/daemon/src/sessions/__tests__/install-source-resolution.test.ts
index 3accda67e8..dbb0c5c199 100644
--- a/src/daemon/__tests__/install-source-resolution.test.ts
+++ b/packages/daemon/src/sessions/__tests__/install-source-resolution.test.ts
@@ -2,8 +2,8 @@ import { test, expect } from 'vitest';
 import fs from 'node:fs';
 import path from 'node:path';
 import { resolveInstallSource } from '../install-source-resolution.ts';
-import { trackUploadedArtifact } from '../artifact-tracking.ts';
-import type { DaemonRequest } from '../daemon-request.ts';
+import { trackUploadedArtifact } from '../../resources/artifact-tracking.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
 function makeRequest(meta?: DaemonRequest['meta']): DaemonRequest {
diff --git a/src/daemon/__tests__/lease-lifecycle.test.ts b/packages/daemon/src/sessions/__tests__/lease-lifecycle.test.ts
similarity index 96%
rename from src/daemon/__tests__/lease-lifecycle.test.ts
rename to packages/daemon/src/sessions/__tests__/lease-lifecycle.test.ts
index cfc5d7a8d4..692416ca6b 100644
--- a/src/daemon/__tests__/lease-lifecycle.test.ts
+++ b/packages/daemon/src/sessions/__tests__/lease-lifecycle.test.ts
@@ -1,8 +1,8 @@
 import { test, expect, vi } from 'vitest';
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
-import { makeIosSession } from './support/session-factories.ts';
-import { makeSessionStore } from './support/store-factory.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
+import { makeIosSession } from '../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
 import {
   admitRequestLeaseForLockedScope,
   cleanupExpiredLeasedSession,
@@ -10,7 +10,7 @@ import {
   releaseSessionLease,
   resolveSessionLeaseForRequest,
 } from '../lease-lifecycle.ts';
-import type { DaemonRequest } from '../daemon-request.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
 
 vi.mock('@agent-device/host-kit/diagnostics', async (importOriginal) => {
   const actual = await importOriginal<typeof import('@agent-device/host-kit/diagnostics')>();
diff --git a/src/daemon/__tests__/materialized-path-registry.test.ts b/packages/daemon/src/sessions/__tests__/materialized-path-registry.test.ts
similarity index 100%
rename from src/daemon/__tests__/materialized-path-registry.test.ts
rename to packages/daemon/src/sessions/__tests__/materialized-path-registry.test.ts
diff --git a/src/daemon/__tests__/open-device-contention-wait.test.ts b/packages/daemon/src/sessions/__tests__/open-device-contention-wait.test.ts
similarity index 97%
rename from src/daemon/__tests__/open-device-contention-wait.test.ts
rename to packages/daemon/src/sessions/__tests__/open-device-contention-wait.test.ts
index 212596df55..e875c2fcab 100644
--- a/src/daemon/__tests__/open-device-contention-wait.test.ts
+++ b/packages/daemon/src/sessions/__tests__/open-device-contention-wait.test.ts
@@ -4,10 +4,10 @@ import type { CommandFlags } from '@agent-device/contracts/command';
 import { clearRequestCanceled, markRequestCanceled } from '@agent-device/host-kit/request';
 import { IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
 import { getFlagDefinitionsForKey } from '@agent-device/command-registry/flag-registry';
-import { makeSessionStore } from './support/store-factory.ts';
-import type { DaemonRequest } from '../daemon-request.ts';
-import type { SessionState } from '../session-state.ts';
-import { SessionStore } from '../session-store.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
+import type { SessionState } from '../../core/session-state.ts';
+import { SessionStore } from '../../core/session-store.ts';
 import {
   beginOpenDeviceWait,
   describeOpenWaitForRefusal,
diff --git a/src/daemon/__tests__/replay-divergence/replay-session-fixture.ts b/packages/daemon/src/sessions/__tests__/replay-divergence/replay-session-fixture.ts
similarity index 91%
rename from src/daemon/__tests__/replay-divergence/replay-session-fixture.ts
rename to packages/daemon/src/sessions/__tests__/replay-divergence/replay-session-fixture.ts
index f5540373f8..10eb5ebc23 100644
--- a/src/daemon/__tests__/replay-divergence/replay-session-fixture.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-divergence/replay-session-fixture.ts
@@ -1,5 +1,5 @@
 import { createReplaySession } from '../../handlers/session-replay-command.ts';
-import type { SessionStore } from '../../session-store.ts';
+import type { SessionStore } from '../../../core/session-store.ts';
 
 export function replaySessionForTest(sessionStore: SessionStore, sessionName: string) {
   return createReplaySession(sessionName, '', sessionStore);
diff --git a/src/daemon/__tests__/replay-divergence/session-replay-divergence-android-occlusion.test.ts b/packages/daemon/src/sessions/__tests__/replay-divergence/session-replay-divergence-android-occlusion.test.ts
similarity index 92%
rename from src/daemon/__tests__/replay-divergence/session-replay-divergence-android-occlusion.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-divergence/session-replay-divergence-android-occlusion.test.ts
index 3a68f14d51..d215aa0d3b 100644
--- a/src/daemon/__tests__/replay-divergence/session-replay-divergence-android-occlusion.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-divergence/session-replay-divergence-android-occlusion.test.ts
@@ -1,27 +1,27 @@
 import path from 'node:path';
 import { beforeEach, expect, test, vi } from 'vitest';
 import type { RawSnapshotNode } from '@agent-device/kernel/snapshot';
-import { makeAndroidSession } from '../support/session-factories.ts';
+import { makeAndroidSession } from '../../../__tests__/support/session-factories.ts';
 import {
   ANDROID_QS_SHADE_CAPTURE_RAW_NODES,
   walkNonRawAndroidFixture,
 } from '@agent-device/platform-android/ui-hierarchy-fixtures';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { SessionStore } from '../../session-store.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import { replayCoordinatorForTest, replaySessionForTest } from './replay-session-fixture.ts';
 import {
   captureSnapshotThroughLegacyDispatchFixture,
   legacyDispatchCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
 import { buildReplayFailureDivergence } from '@agent-device/replay-port/session-replay-divergence';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
 
 vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal) => {
   const actual =
     await importOriginal<typeof import('@agent-device/device-selection/dispatch-resolve')>();
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
diff --git a/src/daemon/__tests__/replay-divergence/session-replay-divergence-capture-policy.test.ts b/packages/daemon/src/sessions/__tests__/replay-divergence/session-replay-divergence-capture-policy.test.ts
similarity index 95%
rename from src/daemon/__tests__/replay-divergence/session-replay-divergence-capture-policy.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-divergence/session-replay-divergence-capture-policy.test.ts
index e83062b722..42eb15777c 100644
--- a/src/daemon/__tests__/replay-divergence/session-replay-divergence-capture-policy.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-divergence/session-replay-divergence-capture-policy.test.ts
@@ -1,22 +1,22 @@
 import path from 'node:path';
 import { beforeEach, expect, test, vi } from 'vitest';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { makeAndroidSession } from '../support/session-factories.ts';
-import { SessionStore } from '../../session-store.ts';
+import { makeAndroidSession } from '../../../__tests__/support/session-factories.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import { buildReplayFailureDivergence } from '@agent-device/replay-port/session-replay-divergence';
 import { replayDivergenceForTest } from './replay-session-fixture.ts';
 import {
   legacyDispatchCapture,
   resetLegacySnapshotCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
 
 vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal) => {
   const actual =
     await importOriginal<typeof import('@agent-device/device-selection/dispatch-resolve')>();
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 // Stubs the Android freshness-retry delay to a no-op so the retry branch runs without
diff --git a/src/daemon/__tests__/replay-divergence/session-replay-divergence-chrome-filter.test.ts b/packages/daemon/src/sessions/__tests__/replay-divergence/session-replay-divergence-chrome-filter.test.ts
similarity index 97%
rename from src/daemon/__tests__/replay-divergence/session-replay-divergence-chrome-filter.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-divergence/session-replay-divergence-chrome-filter.test.ts
index 9182a31436..03a3c35198 100644
--- a/src/daemon/__tests__/replay-divergence/session-replay-divergence-chrome-filter.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-divergence/session-replay-divergence-chrome-filter.test.ts
@@ -1,26 +1,29 @@
 import path from 'node:path';
 import { beforeEach, expect, test, vi } from 'vitest';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { makeAndroidSession, makeIosSession } from '../support/session-factories.ts';
+import {
+  makeAndroidSession,
+  makeIosSession,
+} from '../../../__tests__/support/session-factories.ts';
 import {
   ANDROID_IME_CAPTURE_RAW_NODES,
   walkNonRawAndroidFixture,
 } from '@agent-device/platform-android/ui-hierarchy-fixtures';
-import { SessionStore } from '../../session-store.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import { buildReplayFailureDivergence } from '@agent-device/replay-port/session-replay-divergence';
 import { replayDivergenceForTest } from './replay-session-fixture.ts';
 import {
   legacyDispatchCapture,
   resetLegacySnapshotCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
 
 vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal) => {
   const actual =
     await importOriginal<typeof import('@agent-device/device-selection/dispatch-resolve')>();
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
diff --git a/src/daemon/__tests__/replay-divergence/session-replay-divergence-observation.test.ts b/packages/daemon/src/sessions/__tests__/replay-divergence/session-replay-divergence-observation.test.ts
similarity index 95%
rename from src/daemon/__tests__/replay-divergence/session-replay-divergence-observation.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-divergence/session-replay-divergence-observation.test.ts
index a4972560f7..ada527aac3 100644
--- a/src/daemon/__tests__/replay-divergence/session-replay-divergence-observation.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-divergence/session-replay-divergence-observation.test.ts
@@ -3,22 +3,22 @@ import { beforeEach, expect, test, vi } from 'vitest';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { AppError } from '@agent-device/kernel/errors';
 import { sleep } from '@agent-device/host-kit/retry';
-import { makeIosSession } from '../support/session-factories.ts';
-import { SessionStore } from '../../session-store.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import { captureDivergenceObservation } from '@agent-device/replay-port/session-replay-divergence';
 import { replayDivergenceForTest } from './replay-session-fixture.ts';
 import {
   legacyDispatchCapture,
   resetLegacySnapshotCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
 
 vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal) => {
   const actual =
     await importOriginal<typeof import('@agent-device/device-selection/dispatch-resolve')>();
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 // Stubs the Android freshness-retry delay to a no-op so the retry branch runs without
diff --git a/src/daemon/__tests__/replay-divergence/session-replay-divergence-overlay.test.ts b/packages/daemon/src/sessions/__tests__/replay-divergence/session-replay-divergence-overlay.test.ts
similarity index 97%
rename from src/daemon/__tests__/replay-divergence/session-replay-divergence-overlay.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-divergence/session-replay-divergence-overlay.test.ts
index f4d6cc3876..b74bfcf68a 100644
--- a/src/daemon/__tests__/replay-divergence/session-replay-divergence-overlay.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-divergence/session-replay-divergence-overlay.test.ts
@@ -1,27 +1,27 @@
 import path from 'node:path';
 import { beforeEach, expect, test, vi } from 'vitest';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { makeAndroidSession } from '../support/session-factories.ts';
+import { makeAndroidSession } from '../../../__tests__/support/session-factories.ts';
 import {
   ANDROID_IME_CAPTURE_RAW_NODES,
   walkNonRawAndroidFixture,
 } from '@agent-device/platform-android/ui-hierarchy-fixtures';
-import { SessionStore } from '../../session-store.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import { buildReplayFailureDivergence } from '@agent-device/replay-port/session-replay-divergence';
 import { replayDivergenceForTest } from './replay-session-fixture.ts';
-import { refFrameScope, refFrameState } from '../../ref-frame.ts';
+import { refFrameScope, refFrameState } from '../../../core/ref-frame.ts';
 import {
   legacyDispatchCapture,
   resetLegacySnapshotCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
 
 vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal) => {
   const actual =
     await importOriginal<typeof import('@agent-device/device-selection/dispatch-resolve')>();
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
diff --git a/src/daemon/__tests__/replay-divergence/session-replay-divergence-publication.test.ts b/packages/daemon/src/sessions/__tests__/replay-divergence/session-replay-divergence-publication.test.ts
similarity index 94%
rename from src/daemon/__tests__/replay-divergence/session-replay-divergence-publication.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-divergence/session-replay-divergence-publication.test.ts
index f4350b88cb..43ec3111b2 100644
--- a/src/daemon/__tests__/replay-divergence/session-replay-divergence-publication.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-divergence/session-replay-divergence-publication.test.ts
@@ -3,24 +3,32 @@ import path from 'node:path';
 import { beforeEach, expect, test, vi } from 'vitest';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
-import { makeIosSession } from '../support/session-factories.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
 import type { SnapshotState } from '@agent-device/kernel/snapshot';
 import type { ReplayDivergence } from '@agent-device/contracts/divergence';
-import { expireRefFrame, refFrameScope, refFrameState, refFrameTree } from '../../ref-frame.ts';
-import { markSessionPartialRefsIssued, setSessionSnapshot } from '../../session-snapshot.ts';
-import { SessionStore } from '../../session-store.ts';
+import {
+  expireRefFrame,
+  refFrameScope,
+  refFrameState,
+  refFrameTree,
+} from '../../../core/ref-frame.ts';
+import {
+  markSessionPartialRefsIssued,
+  setSessionSnapshot,
+} from '../../../execution/session-snapshot.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import { captureDivergenceObservation } from '@agent-device/replay-port/session-replay-divergence';
 import { boundReplayDivergenceForSession } from '@agent-device/replay-port/session-replay-divergence-publication';
 import { replaySessionForTest } from './replay-session-fixture.ts';
 import {
   captureSnapshotThroughLegacyDispatchFixture,
   legacyDispatchCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
 
 const mockDispatchCommand = legacyDispatchCapture;
 const mockCaptureSnapshotWithInteractor = vi.mocked(captureSnapshotWithInteractor);
diff --git a/src/daemon/__tests__/replay-divergence/session-replay-divergence-suggestions.test.ts b/packages/daemon/src/sessions/__tests__/replay-divergence/session-replay-divergence-suggestions.test.ts
similarity index 86%
rename from src/daemon/__tests__/replay-divergence/session-replay-divergence-suggestions.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-divergence/session-replay-divergence-suggestions.test.ts
index f484340ced..8f0379c6a6 100644
--- a/src/daemon/__tests__/replay-divergence/session-replay-divergence-suggestions.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-divergence/session-replay-divergence-suggestions.test.ts
@@ -1,22 +1,22 @@
 import path from 'node:path';
 import { beforeEach, expect, test, vi } from 'vitest';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { makeIosSession } from '../support/session-factories.ts';
-import { SessionStore } from '../../session-store.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import { buildReplayFailureDivergence } from '@agent-device/replay-port/session-replay-divergence';
 import { replayDivergenceForTest } from './replay-session-fixture.ts';
 import {
   legacyDispatchCapture,
   resetLegacySnapshotCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
 
 vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal) => {
   const actual =
     await importOriginal<typeof import('@agent-device/device-selection/dispatch-resolve')>();
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
diff --git a/src/daemon/__tests__/replay-maestro/session-replay-maestro-error-projection.test.ts b/packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-maestro-error-projection.test.ts
similarity index 91%
rename from src/daemon/__tests__/replay-maestro/session-replay-maestro-error-projection.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-maestro-error-projection.test.ts
index 96e659ae46..fa0175a7b1 100644
--- a/src/daemon/__tests__/replay-maestro/session-replay-maestro-error-projection.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-maestro-error-projection.test.ts
@@ -3,12 +3,12 @@ import path from 'node:path';
 import { expect, test } from 'vitest';
 import { stringify } from 'yaml';
 import { runTypedMaestroReplay } from '@agent-device/replay-port/session-replay-maestro-runtime';
-import { SessionStore } from '../../session-store.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import { replayCommandForTest } from '../replay-runtime/replay-command-fixture.ts';
-import { makeIosSession } from '../support/session-factories.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
 import { maestroScriptSourceBundleFor } from '@agent-device/replay-port/replay-script-source-fixtures';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import type { DaemonRequest } from '../../daemon-request.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
 
 // A replay error raised before any step runs carries no `failure`, so the route
 // projects the normalized error directly instead of through the divergence
diff --git a/src/daemon/__tests__/replay-maestro/session-replay-maestro-failure.test.ts b/packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-maestro-failure.test.ts
similarity index 97%
rename from src/daemon/__tests__/replay-maestro/session-replay-maestro-failure.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-maestro-failure.test.ts
index a35138f136..a5c92b3ae2 100644
--- a/src/daemon/__tests__/replay-maestro/session-replay-maestro-failure.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-maestro-failure.test.ts
@@ -7,7 +7,7 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
     await importOriginal<typeof import('@agent-device/device-selection/dispatch-resolve')>();
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 import fs from 'node:fs';
@@ -25,17 +25,17 @@ import {
   buildTypedMaestroFailureResponse,
 } from '@agent-device/replay-port/session-replay-maestro-failure';
 import { runReplayForTest } from '../replay-runtime/replay-command-fixture.ts';
-import { SessionStore } from '../../session-store.ts';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
-import { makeIosSession } from '../support/session-factories.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
 import { baseReplayRequest as baseReq } from '../replay-runtime/session-replay-runtime.fixtures.ts';
 import { replaySessionForTest } from '../replay-divergence/replay-session-fixture.ts';
 import type { SnapshotNode } from '@agent-device/kernel/snapshot';
 import {
   captureSnapshotThroughLegacyDispatchFixture,
   legacyDispatchCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
-import { refFrameScope } from '../../ref-frame.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
+import { refFrameScope } from '../../../core/ref-frame.ts';
 
 const mockDispatchCommand = legacyDispatchCapture;
 const mockCaptureSnapshotWithInteractor = vi.mocked(captureSnapshotWithInteractor);
diff --git a/src/daemon/__tests__/replay-maestro/session-replay-maestro-remote-evalscript.test.ts b/packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-maestro-remote-evalscript.test.ts
similarity index 90%
rename from src/daemon/__tests__/replay-maestro/session-replay-maestro-remote-evalscript.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-maestro-remote-evalscript.test.ts
index aeb15e5ea2..e0aa484eb1 100644
--- a/src/daemon/__tests__/replay-maestro/session-replay-maestro-remote-evalscript.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-maestro-remote-evalscript.test.ts
@@ -1,26 +1,26 @@
-import { daemonPlatformServicesFixture } from '../platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import fs from 'node:fs';
 import path from 'node:path';
 import { describe, expect, test, vi } from 'vitest';
 import { createScreenRecordingAdmissionLedger } from '@agent-device/capture-kit/screen-recording-admission-ledger';
-import { LeaseRegistry } from '../../lease-registry.ts';
-import { platformResourceCleanupFixture } from '../support/platform-resource-cleanup-fixture.ts';
-import { SessionStore } from '../../session-store.ts';
-import { makeIosSession } from '../support/session-factories.ts';
+import { LeaseRegistry } from '../../../resources/lease-registry.ts';
+import { platformResourceCleanupFixture } from '../../../__tests__/support/platform-resource-cleanup-fixture.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
 import { maestroScriptSourceBundleFor } from '@agent-device/replay-port/replay-script-source-fixtures';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import type { DaemonRequest } from '../../daemon-request.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
 import {
   unavailableBindDevice,
   unavailableBindExactDevice,
-} from '../support/unavailable-device-runtime-gateway.ts';
+} from '../../../__tests__/support/unavailable-device-runtime-gateway.ts';
 import {
   handleReplayCommand,
   handleReplayTestCommand,
 } from '../../handlers/session-replay-command.ts';
 import type { SessionCommandParams } from '../../handlers/session-command-input.ts';
 import * as maestro from '@agent-device/maestro';
-import { fakeCreateCommandSurface } from '../support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 const spy = vi.spyOn(maestro, 'executeMaestroFlow');
 
diff --git a/src/daemon/__tests__/replay-maestro/session-replay-maestro-session-address.test.ts b/packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-maestro-session-address.test.ts
similarity index 92%
rename from src/daemon/__tests__/replay-maestro/session-replay-maestro-session-address.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-maestro-session-address.test.ts
index 8880859e54..f2db04abcb 100644
--- a/src/daemon/__tests__/replay-maestro/session-replay-maestro-session-address.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-maestro-session-address.test.ts
@@ -3,12 +3,12 @@ import path from 'node:path';
 import { expect, test } from 'vitest';
 import { stringify } from 'yaml';
 import { runTypedMaestroReplay } from '@agent-device/replay-port/session-replay-maestro-runtime';
-import { SessionStore } from '../../session-store.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import { replayCommandForTest } from '../replay-runtime/replay-command-fixture.ts';
-import { makeIosSession } from '../support/session-factories.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
 import { maestroScriptSourceBundleFor } from '@agent-device/replay-port/replay-script-source-fixtures';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import type { DaemonRequest } from '../../daemon-request.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
 
 // The Maestro replay route resolves the store key upstream and then validates the session's
 // selectors, so its conflict recovery must name that key too — an implicitly cwd-scoped session
diff --git a/src/daemon/__tests__/replay-maestro/session-replay-runtime-maestro-dispatch.test.ts b/packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-runtime-maestro-dispatch.test.ts
similarity index 97%
rename from src/daemon/__tests__/replay-maestro/session-replay-runtime-maestro-dispatch.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-runtime-maestro-dispatch.test.ts
index 3cc75220c7..716db66dee 100644
--- a/src/daemon/__tests__/replay-maestro/session-replay-runtime-maestro-dispatch.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-runtime-maestro-dispatch.test.ts
@@ -4,10 +4,10 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { test } from 'vitest';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
-import { SessionStore } from '../../session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import { replayScriptSourceBundleFor } from '@agent-device/replay-port/replay-script-source-fixtures';
-import { makeIosSession } from '../support/session-factories.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
 
 const { runReplayFixture, runReplayForTest, assertNoUnresolvedInterpolation } =
   maestroReplayFixture;
diff --git a/src/daemon/__tests__/replay-maestro/session-replay-runtime-maestro-keyboard.test.ts b/packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-runtime-maestro-keyboard.test.ts
similarity index 100%
rename from src/daemon/__tests__/replay-maestro/session-replay-runtime-maestro-keyboard.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-runtime-maestro-keyboard.test.ts
diff --git a/src/daemon/__tests__/replay-maestro/session-replay-runtime-maestro-run-flow.test.ts b/packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-runtime-maestro-run-flow.test.ts
similarity index 100%
rename from src/daemon/__tests__/replay-maestro/session-replay-runtime-maestro-run-flow.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-runtime-maestro-run-flow.test.ts
diff --git a/src/daemon/__tests__/replay-maestro/session-replay-runtime-maestro-run-script.test.ts b/packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-runtime-maestro-run-script.test.ts
similarity index 100%
rename from src/daemon/__tests__/replay-maestro/session-replay-runtime-maestro-run-script.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-runtime-maestro-run-script.test.ts
diff --git a/src/daemon/__tests__/replay-maestro/session-replay-runtime-maestro-shell-artifacts.test.ts b/packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-runtime-maestro-shell-artifacts.test.ts
similarity index 98%
rename from src/daemon/__tests__/replay-maestro/session-replay-runtime-maestro-shell-artifacts.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-runtime-maestro-shell-artifacts.test.ts
index 35f904e81a..587bc5e2a3 100644
--- a/src/daemon/__tests__/replay-maestro/session-replay-runtime-maestro-shell-artifacts.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-runtime-maestro-shell-artifacts.test.ts
@@ -4,7 +4,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { test } from 'vitest';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { SessionStore } from '../../session-store.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import { replayScriptSourceBundleFor } from '@agent-device/replay-port/replay-script-source-fixtures';
 
 const { runReplayFixture, runReplayForTest } = maestroReplayFixture;
diff --git a/src/daemon/__tests__/replay-maestro/session-replay-runtime-maestro-swipe.test.ts b/packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-runtime-maestro-swipe.test.ts
similarity index 100%
rename from src/daemon/__tests__/replay-maestro/session-replay-runtime-maestro-swipe.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-runtime-maestro-swipe.test.ts
diff --git a/src/daemon/__tests__/replay-maestro/session-replay-runtime-maestro-targeting.test.ts b/packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-runtime-maestro-targeting.test.ts
similarity index 100%
rename from src/daemon/__tests__/replay-maestro/session-replay-runtime-maestro-targeting.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-runtime-maestro-targeting.test.ts
diff --git a/src/daemon/__tests__/replay-maestro/session-replay-runtime-maestro.fixtures.ts b/packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-runtime-maestro.fixtures.ts
similarity index 93%
rename from src/daemon/__tests__/replay-maestro/session-replay-runtime-maestro.fixtures.ts
rename to packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-runtime-maestro.fixtures.ts
index c99e275462..de05698ac3 100644
--- a/src/daemon/__tests__/replay-maestro/session-replay-runtime-maestro.fixtures.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-maestro/session-replay-runtime-maestro.fixtures.ts
@@ -35,7 +35,7 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
   };
 });
 
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
@@ -43,17 +43,21 @@ import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import path from 'node:path';
 import type { CommandFlags } from '@agent-device/contracts/command';
-import type { DaemonInvokeFn, DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
+import type {
+  DaemonInvokeFn,
+  DaemonRequest,
+  DaemonResponse,
+} from '../../../core/daemon-request.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { SessionStore } from '../../session-store.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import { runReplayForTest } from '../replay-runtime/replay-command-fixture.ts';
 import type { ReplayScriptSourceBundle } from '@agent-device/contracts/replay';
 import {
   maestroScriptSourceBundleFor,
   replayScriptSourceBundleFor,
 } from '@agent-device/replay-port/replay-script-source-fixtures';
-import { captureSnapshotThroughLegacyDispatchFixture } from '../legacy-snapshot-capture-fixture.ts';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
+import { captureSnapshotThroughLegacyDispatchFixture } from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
 import { seedReplayFixtureSession } from '../replay-runtime/session-replay-runtime.fixtures.ts';
 
 vi.mocked(captureSnapshotWithInteractor).mockImplementation(
diff --git a/src/daemon/__tests__/replay-repair/session-replay-repair-acceptance.test.ts b/packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-acceptance.test.ts
similarity index 93%
rename from src/daemon/__tests__/replay-repair/session-replay-repair-acceptance.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-acceptance.test.ts
index 41fa2c4ea9..e544dc4b39 100644
--- a/src/daemon/__tests__/replay-repair/session-replay-repair-acceptance.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-acceptance.test.ts
@@ -1,4 +1,4 @@
-import { storeSessionForTest } from '../support/store-factory.ts';
+import { storeSessionForTest } from '../../../__tests__/support/store-factory.ts';
 /**
  * ADR 0012 decision 6 acceptance test: a healed sibling `.ad` produced by the
  * repair loop must replay end-to-end in a FRESH session, with every selector
@@ -7,7 +7,7 @@ import { storeSessionForTest } from '../support/store-factory.ts';
  * the original recorded, so the fresh replay needs no hand-fixing.
  */
 import { test, expect, vi, beforeEach } from 'vitest';
-import { markRepairTransactionComplete } from '../../session-replay-transaction.ts';
+import { markRepairTransactionComplete } from '../../../core/session-replay-transaction.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
 vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal) => {
@@ -15,17 +15,17 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
     await importOriginal<typeof import('@agent-device/device-selection/dispatch-resolve')>();
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
 import fs from 'node:fs';
 import path from 'node:path';
 import { runReplayForTest } from '../replay-runtime/replay-command-fixture.ts';
-import { SessionStore } from '../../session-store.ts';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
-import { makeIosSession } from '../support/session-factories.ts';
-import type { DaemonRequest } from '../../daemon-request.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
 import { parseReplayScriptDetailed } from '@agent-device/ad-script';
 import {
   baseReplayRequest as baseReq,
@@ -35,7 +35,7 @@ import { freshEvidence, makeRecordingReplayInvoke } from './session-replay-repai
 import {
   captureSnapshotThroughLegacyDispatchFixture,
   legacyDispatchCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
 
 const mockDispatchCommand = legacyDispatchCapture;
 const mockCaptureSnapshotWithInteractor = vi.mocked(captureSnapshotWithInteractor);
diff --git a/src/daemon/__tests__/replay-repair/session-replay-repair-empty-tail.test.ts b/packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-empty-tail.test.ts
similarity index 97%
rename from src/daemon/__tests__/replay-repair/session-replay-repair-empty-tail.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-empty-tail.test.ts
index bce619f166..abba0b5bbc 100644
--- a/src/daemon/__tests__/replay-repair/session-replay-repair-empty-tail.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-empty-tail.test.ts
@@ -1,4 +1,4 @@
-import { storeSessionForTest } from '../support/store-factory.ts';
+import { storeSessionForTest } from '../../../__tests__/support/store-factory.ts';
 /**
  * ADR 0012 decision 6, R2/R3, extended per #1262: behaviors introduced
  * alongside the `resume.from` / `repairHint` agreement fix
@@ -31,22 +31,22 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
     await importOriginal<typeof import('@agent-device/device-selection/dispatch-resolve')>();
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
 import fs from 'node:fs';
 import path from 'node:path';
 import { runReplayForTest } from '../replay-runtime/replay-command-fixture.ts';
-import { SessionStore } from '../../session-store.ts';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
 import {
   captureSnapshotThroughLegacyDispatchFixture,
   legacyDispatchCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
-import { makeIosSession } from '../support/session-factories.ts';
-import { repairSessionBoundary } from '../../session-replay-transaction.ts';
-import type { SessionState } from '../../session-state.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
+import { repairSessionBoundary } from '../../../core/session-replay-transaction.ts';
+import type { SessionState } from '../../../core/session-state.ts';
 import {
   baseReplayRequest as baseReq,
   writeReplayFile,
diff --git a/src/daemon/__tests__/replay-repair/session-replay-repair-loop.test.ts b/packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-loop.test.ts
similarity index 96%
rename from src/daemon/__tests__/replay-repair/session-replay-repair-loop.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-loop.test.ts
index c94a04fcb8..d12c25768b 100644
--- a/src/daemon/__tests__/replay-repair/session-replay-repair-loop.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-loop.test.ts
@@ -1,5 +1,5 @@
-import { storeSessionForTest } from '../support/store-factory.ts';
-import { isSessionRecording } from '../../session-script-publication-capability.ts';
+import { storeSessionForTest } from '../../../__tests__/support/store-factory.ts';
+import { isSessionRecording } from '../../../core/session-script-publication-capability.ts';
 /**
  * ADR 0012 decision 6: `replay --save-script` arming (R1), the repair-run
  * boundary watermark (R6, sticky across `--from` legs, no amputation when
@@ -19,19 +19,22 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
     await importOriginal<typeof import('@agent-device/device-selection/dispatch-resolve')>();
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
 import path from 'node:path';
 import { runReplayForTest } from '../replay-runtime/replay-command-fixture.ts';
-import { SessionStore } from '../../session-store.ts';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
-import { makeIosSession, repairPublication } from '../support/session-factories.ts';
-import { repairSessionBoundary } from '../../session-replay-transaction.ts';
-import { NO_SCRIPT_PUBLICATION, scriptTargetPath } from '../../session-script-publication-state.ts';
-import type { DaemonRequest } from '../../daemon-request.ts';
-import type { SessionState } from '../../session-state.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
+import { makeIosSession, repairPublication } from '../../../__tests__/support/session-factories.ts';
+import { repairSessionBoundary } from '../../../core/session-replay-transaction.ts';
+import {
+  NO_SCRIPT_PUBLICATION,
+  scriptTargetPath,
+} from '../../../core/session-script-publication-state.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
+import type { SessionState } from '../../../core/session-state.ts';
 import {
   baseReplayRequest as baseReq,
   writeReplayFile,
@@ -40,7 +43,7 @@ import { freshEvidence, makeRecordingReplayInvoke } from './session-replay-repai
 import {
   captureSnapshotThroughLegacyDispatchFixture,
   legacyDispatchCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
 
 /** Repair-transaction status, or `undefined` outside a repair publication. */
 function sessionRepairStatus(session: SessionState | undefined) {
diff --git a/src/daemon/__tests__/replay-repair/session-replay-repair-record-exclusion.test.ts b/packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-record-exclusion.test.ts
similarity index 95%
rename from src/daemon/__tests__/replay-repair/session-replay-repair-record-exclusion.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-record-exclusion.test.ts
index 0056857fa6..62f583a4d0 100644
--- a/src/daemon/__tests__/replay-repair/session-replay-repair-record-exclusion.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-record-exclusion.test.ts
@@ -1,5 +1,5 @@
-import { daemonPlatformServicesFixture } from '../platform-services-fixture.ts';
-import { storeSessionForTest } from '../support/store-factory.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
+import { storeSessionForTest } from '../../../__tests__/support/store-factory.ts';
 /**
  * #1271 stage 2 (ADR 0012 amendment): repair-segment default exclusion of
  * observation-only commands (`snapshot`/`get`/`is`/a read-only `find`), the
@@ -39,17 +39,20 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
     await importOriginal<typeof import('@agent-device/device-selection/dispatch-resolve')>();
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 import fs from 'node:fs';
 import path from 'node:path';
 import { runReplayForTest } from '../replay-runtime/replay-command-fixture.ts';
 import { handleSessionCloseCommands as handleProductionCloseCommand } from '../../session-lifecycle/index.ts';
-import { SessionStore } from '../../session-store.ts';
-import { LeaseRegistry } from '../../lease-registry.ts';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
-import { makeIosSession, authoringPublication } from '../support/session-factories.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import { LeaseRegistry } from '../../../resources/lease-registry.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
+import {
+  makeIosSession,
+  authoringPublication,
+} from '../../../__tests__/support/session-factories.ts';
 import { parseReplayScriptDetailed } from '@agent-device/ad-script';
 import {
   baseReplayRequest as baseReq,
@@ -59,12 +62,12 @@ import { freshEvidence, makeRecordingReplayInvoke } from './session-replay-repai
 import {
   bindLifecycleRuntime,
   inspectLifecycleRuntimeFacts,
-} from '../application-lifecycle-runtime-harness.ts';
-import { platformResourceCleanupFixture } from '../support/platform-resource-cleanup-fixture.ts';
+} from '../../../__tests__/support/application-lifecycle-runtime-harness.ts';
+import { platformResourceCleanupFixture } from '../../../__tests__/support/platform-resource-cleanup-fixture.ts';
 import {
   captureSnapshotThroughLegacyDispatchFixture,
   legacyDispatchCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
 
 const mockDispatchCommand = legacyDispatchCapture;
 const mockCaptureSnapshotWithInteractor = vi.mocked(captureSnapshotWithInteractor);
diff --git a/src/daemon/__tests__/replay-repair/session-replay-repair-transaction-close-ordering.test.ts b/packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-transaction-close-ordering.test.ts
similarity index 95%
rename from src/daemon/__tests__/replay-repair/session-replay-repair-transaction-close-ordering.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-transaction-close-ordering.test.ts
index 4cdd31a880..5527f8becf 100644
--- a/src/daemon/__tests__/replay-repair/session-replay-repair-transaction-close-ordering.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-transaction-close-ordering.test.ts
@@ -1,5 +1,5 @@
-import { daemonPlatformServicesFixture } from '../platform-services-fixture.ts';
-import { storeSessionForTest } from '../support/store-factory.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
+import { storeSessionForTest } from '../../../__tests__/support/store-factory.ts';
 /**
  * ADR 0012 decision 6 repair-transaction close-ordering guarantees (BLOCKER 2/3 sequencing): the
  * platform close must run and succeed BEFORE the healed `.ad` commits (never claim a successful
@@ -31,21 +31,21 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
   const actual = (await importOriginal()) as Record<string, unknown>;
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 import fs from 'node:fs';
 import path from 'node:path';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
 import {
   legacyDispatchCapture,
   resetLegacySnapshotCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
-import { dispatchApplicationLifecycleEffect } from '../application-lifecycle-runtime-fixture.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
+import { dispatchApplicationLifecycleEffect } from '../../../__tests__/support/application-lifecycle-runtime-fixture.ts';
 import { AppError } from '@agent-device/kernel/errors';
-import { HEAL_COMPLETE_SENTINEL } from '../../session-script-writer.ts';
+import { HEAL_COMPLETE_SENTINEL } from '../../../core/session-script-writer.ts';
 import { parseReplayScriptDetailed } from '@agent-device/ad-script';
-import type { SessionState } from '../../session-state.ts';
+import type { SessionState } from '../../../core/session-state.ts';
 import { freshEvidence } from './session-replay-repair.fixtures.ts';
 import {
   handleCloseCommand,
diff --git a/src/daemon/__tests__/replay-repair/session-replay-repair-transaction-force.test.ts b/packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-transaction-force.test.ts
similarity index 95%
rename from src/daemon/__tests__/replay-repair/session-replay-repair-transaction-force.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-transaction-force.test.ts
index ef187f5222..be06a9a2c4 100644
--- a/src/daemon/__tests__/replay-repair/session-replay-repair-transaction-force.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-transaction-force.test.ts
@@ -1,5 +1,5 @@
-import { daemonPlatformServicesFixture } from '../platform-services-fixture.ts';
-import { storeSessionForTest } from '../support/store-factory.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
+import { storeSessionForTest } from '../../../__tests__/support/store-factory.ts';
 /**
  * ADR 0012 decision 6 repair-transaction `--force`/`--overwrite` semantics (#1258): a
  * `--save-script` target that already exists is refused at arm time, before any step runs, unless
@@ -29,32 +29,32 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
   const actual = (await importOriginal()) as Record<string, unknown>;
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 import fs from 'node:fs';
 import path from 'node:path';
 import { runReplayForTest } from '../replay-runtime/replay-command-fixture.ts';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
 import {
   legacyDispatchCapture,
   resetLegacySnapshotCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
-import { dispatchApplicationLifecycleEffect } from '../application-lifecycle-runtime-fixture.ts';
-import { repairPublication } from '../support/session-factories.ts';
-import { HEAL_COMPLETE_SENTINEL } from '../../session-script-writer.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
+import { dispatchApplicationLifecycleEffect } from '../../../__tests__/support/application-lifecycle-runtime-fixture.ts';
+import { repairPublication } from '../../../__tests__/support/session-factories.ts';
+import { HEAL_COMPLETE_SENTINEL } from '../../../core/session-script-writer.ts';
 import {
   repairSessionBoundary,
   markRepairTransactionComplete,
-} from '../../session-replay-transaction.ts';
+} from '../../../core/session-replay-transaction.ts';
 import {
   NO_SCRIPT_PUBLICATION,
   scriptTargetPath,
   scriptTargetForce,
-} from '../../session-script-publication-state.ts';
+} from '../../../core/session-script-publication-state.ts';
 import { parseReplayScriptDetailed } from '@agent-device/ad-script';
-import type { DaemonRequest } from '../../daemon-request.ts';
-import type { SessionState } from '../../session-state.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
+import type { SessionState } from '../../../core/session-state.ts';
 import {
   baseReplayRequest as baseReq,
   writeReplayFile,
diff --git a/src/daemon/__tests__/replay-repair/session-replay-repair-transaction.fixtures.ts b/packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-transaction.fixtures.ts
similarity index 88%
rename from src/daemon/__tests__/replay-repair/session-replay-repair-transaction.fixtures.ts
rename to packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-transaction.fixtures.ts
index c0f3e362e3..fb2e223d27 100644
--- a/src/daemon/__tests__/replay-repair/session-replay-repair-transaction.fixtures.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-transaction.fixtures.ts
@@ -1,18 +1,18 @@
 import path from 'node:path';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { SessionStore } from '../../session-store.ts';
-import { LeaseRegistry } from '../../lease-registry.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import { LeaseRegistry } from '../../../resources/lease-registry.ts';
 import {
   makeIosSession,
   makeRepairCompleteSession,
   repairPublication,
-} from '../support/session-factories.ts';
+} from '../../../__tests__/support/session-factories.ts';
 import { handleSessionCloseCommands as handleProductionCloseCommand } from '../../session-lifecycle/index.ts';
 import {
   bindLifecycleRuntime,
   inspectLifecycleRuntimeFacts,
-} from '../application-lifecycle-runtime-harness.ts';
-import { platformResourceCleanupFixture } from '../support/platform-resource-cleanup-fixture.ts';
+} from '../../../__tests__/support/application-lifecycle-runtime-harness.ts';
+import { platformResourceCleanupFixture } from '../../../__tests__/support/platform-resource-cleanup-fixture.ts';
 import { freshEvidence } from './session-replay-repair.fixtures.ts';
 
 /**
diff --git a/src/daemon/__tests__/replay-repair/session-replay-repair-transaction.test.ts b/packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-transaction.test.ts
similarity index 96%
rename from src/daemon/__tests__/replay-repair/session-replay-repair-transaction.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-transaction.test.ts
index db1ea9bd46..09e18bb822 100644
--- a/src/daemon/__tests__/replay-repair/session-replay-repair-transaction.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair-transaction.test.ts
@@ -1,5 +1,5 @@
-import { daemonPlatformServicesFixture } from '../platform-services-fixture.ts';
-import { storeSessionForTest } from '../support/store-factory.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
+import { storeSessionForTest } from '../../../__tests__/support/store-factory.ts';
 /**
  * ADR 0012 decision 6 "repair transaction" lifecycle fixes (Q1/Q2a/Q2b/Q2c):
  * proves the WHOLE chain end to end, at the layer these fixes actually live —
@@ -46,20 +46,20 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
   const actual = (await importOriginal()) as Record<string, unknown>;
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 import fs from 'node:fs';
 import path from 'node:path';
 import { runReplayForTest } from '../replay-runtime/replay-command-fixture.ts';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
 import {
   legacyDispatchCapture,
   resetLegacySnapshotCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
-import { dispatchApplicationLifecycleEffect } from '../application-lifecycle-runtime-fixture.ts';
-import { HEAL_COMPLETE_SENTINEL } from '../../session-script-writer.ts';
-import { repairSessionSourcePath } from '../../session-replay-transaction.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
+import { dispatchApplicationLifecycleEffect } from '../../../__tests__/support/application-lifecycle-runtime-fixture.ts';
+import { HEAL_COMPLETE_SENTINEL } from '../../../core/session-script-writer.ts';
+import { repairSessionSourcePath } from '../../../core/session-replay-transaction.ts';
 import { parseReplayScriptDetailed } from '@agent-device/ad-script';
 import {
   baseReplayRequest as baseReq,
diff --git a/src/daemon/__tests__/replay-repair/session-replay-repair.fixtures.test.ts b/packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair.fixtures.test.ts
similarity index 84%
rename from src/daemon/__tests__/replay-repair/session-replay-repair.fixtures.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair.fixtures.test.ts
index 6926756f37..e3e615ec72 100644
--- a/src/daemon/__tests__/replay-repair/session-replay-repair.fixtures.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair.fixtures.test.ts
@@ -1,6 +1,9 @@
 import { expect, test } from 'vitest';
-import { makeIosSession, authoringPublication } from '../support/session-factories.ts';
-import { makeSessionStore } from '../support/store-factory.ts';
+import {
+  makeIosSession,
+  authoringPublication,
+} from '../../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
 import { makeRecordingReplayInvoke } from './session-replay-repair.fixtures.ts';
 
 test('recording replay fixtures use the selected scoped journal without a public-name slot', async () => {
diff --git a/src/daemon/__tests__/replay-repair/session-replay-repair.fixtures.ts b/packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair.fixtures.ts
similarity index 86%
rename from src/daemon/__tests__/replay-repair/session-replay-repair.fixtures.ts
rename to packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair.fixtures.ts
index b95158fa6b..cce16e1dfc 100644
--- a/src/daemon/__tests__/replay-repair/session-replay-repair.fixtures.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-repair/session-replay-repair.fixtures.ts
@@ -1,6 +1,6 @@
-import { storeSessionForTest } from '../support/store-factory.ts';
-import { isSessionRecording } from '../../session-script-publication-capability.ts';
-import { NO_SCRIPT_PUBLICATION } from '../../session-script-publication-state.ts';
+import { storeSessionForTest } from '../../../__tests__/support/store-factory.ts';
+import { isSessionRecording } from '../../../core/session-script-publication-capability.ts';
+import { NO_SCRIPT_PUBLICATION } from '../../../core/session-script-publication-state.ts';
 /**
  * Shared fixtures for the ADR 0012 decision 6 repair-loop tests. The mock
  * `invoke` in these tests must ACTUALLY record via `sessionStore.recordAction`
@@ -9,10 +9,14 @@ import { NO_SCRIPT_PUBLICATION } from '../../session-script-publication-state.ts
  * session.actions." This factory keeps the per-test mock declarative (a config
  * object, no inline branching) so each test body stays linear.
  */
-import type { DaemonInvokeFn, DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
-import { SessionStore } from '../../session-store.ts';
-import { isInteractiveObservation } from '../../session-action-recorder.ts';
-import { makeIosSession } from '../support/session-factories.ts';
+import type {
+  DaemonInvokeFn,
+  DaemonRequest,
+  DaemonResponse,
+} from '../../../core/daemon-request.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import { isInteractiveObservation } from '../../../core/session-action-recorder.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
 import type { TargetAnnotationV1 } from '@agent-device/contracts/replay';
 
 export function freshEvidence(id: string, label: string): TargetAnnotationV1 {
diff --git a/src/daemon/__tests__/replay-runtime/application.test.ts b/packages/daemon/src/sessions/__tests__/replay-runtime/application.test.ts
similarity index 95%
rename from src/daemon/__tests__/replay-runtime/application.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-runtime/application.test.ts
index 33bd6be350..577958c7ef 100644
--- a/src/daemon/__tests__/replay-runtime/application.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-runtime/application.test.ts
@@ -9,10 +9,10 @@ import {
   withRequestProgressSink,
 } from '@agent-device/host-kit/request';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { makeIosSession } from '../support/session-factories.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
 import { withClientReplayScriptSources } from '@agent-device/replay-port/replay-script-source-fixtures';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
-import { SessionStore } from '../../session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import {
   createReplaySession,
   replayDaemonDependencies,
@@ -24,14 +24,14 @@ import {
   splitReplayCommandRequest,
 } from '@agent-device/replay-port/replay-dispatch-envelope';
 import type { ReplayCommand, ReplayTestCommand } from '@agent-device/replay-port/command-types';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
 import {
   legacyDispatchCapture,
   resetLegacySnapshotCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
 import { baseReplayRequest, writeReplayFile } from './session-replay-runtime.fixtures.ts';
 
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
diff --git a/src/daemon/__tests__/replay-runtime/replay-command-fixture.ts b/packages/daemon/src/sessions/__tests__/replay-runtime/replay-command-fixture.ts
similarity index 92%
rename from src/daemon/__tests__/replay-runtime/replay-command-fixture.ts
rename to packages/daemon/src/sessions/__tests__/replay-runtime/replay-command-fixture.ts
index 1e49f6d0d8..f742002b4e 100644
--- a/src/daemon/__tests__/replay-runtime/replay-command-fixture.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-runtime/replay-command-fixture.ts
@@ -1,6 +1,10 @@
 import type { ReplayTestAttemptStepSink } from '@agent-device/replay-test';
-import type { DaemonInvokeFn, DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
-import type { SessionStore } from '../../session-store.ts';
+import type {
+  DaemonInvokeFn,
+  DaemonRequest,
+  DaemonResponse,
+} from '../../../core/daemon-request.ts';
+import type { SessionStore } from '../../../core/session-store.ts';
 import {
   createReplaySession,
   replayDaemonDependencies,
diff --git a/src/daemon/__tests__/replay-runtime/session-replay-action-runtime.test.ts b/packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-action-runtime.test.ts
similarity index 97%
rename from src/daemon/__tests__/replay-runtime/session-replay-action-runtime.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-action-runtime.test.ts
index 6ac05818c5..85ab5c0e37 100644
--- a/src/daemon/__tests__/replay-runtime/session-replay-action-runtime.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-action-runtime.test.ts
@@ -1,8 +1,8 @@
 import type { SessionAction } from '@agent-device/contracts/session';
 import { expect, test } from 'vitest';
-import { makeIosSession } from '../support/session-factories.ts';
-import { recordActionEntry } from '../../session-action-recorder.ts';
-import type { DaemonRequest } from '../../daemon-request.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
+import { recordActionEntry } from '../../../core/session-action-recorder.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
 import {
   invokeReplayAction,
   replayStepReadinessSchedule,
diff --git a/src/daemon/__tests__/replay-runtime/session-replay-resume.test.ts b/packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-resume.test.ts
similarity index 97%
rename from src/daemon/__tests__/replay-runtime/session-replay-resume.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-resume.test.ts
index d8ad9823c1..ebc156d447 100644
--- a/src/daemon/__tests__/replay-runtime/session-replay-resume.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-resume.test.ts
@@ -3,8 +3,8 @@ import assert from 'node:assert/strict';
 import { test } from 'vitest';
 import { buildReplayDivergenceResume } from '@agent-device/replay-port/session-replay-resume';
 import { stampPendingRecordAndHealWatermark } from '../../session-replay-coordinator.ts';
-import type { SessionState } from '../../session-state.ts';
-import { makeIosSession } from '../support/session-factories.ts';
+import type { SessionState } from '../../../core/session-state.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
 
 function action(overrides: Partial<SessionAction> = {}): SessionAction {
   return { ts: 0, command: 'click', positionals: ['label="Save"'], flags: {}, ...overrides };
diff --git a/src/daemon/__tests__/replay-runtime/session-replay-runtime-artifact-ledger.test.ts b/packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime-artifact-ledger.test.ts
similarity index 97%
rename from src/daemon/__tests__/replay-runtime/session-replay-runtime-artifact-ledger.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime-artifact-ledger.test.ts
index 0fadd5aa69..92ba1be300 100644
--- a/src/daemon/__tests__/replay-runtime/session-replay-runtime-artifact-ledger.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime-artifact-ledger.test.ts
@@ -3,8 +3,8 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { test } from 'vitest';
 import { runReplayForTest } from './replay-command-fixture.ts';
-import { SessionStore } from '../../session-store.ts';
-import { makeIosSession } from '../support/session-factories.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
 import {
   baseReplayRequest as baseReq,
   writeReplayFile,
diff --git a/src/daemon/__tests__/replay-runtime/session-replay-runtime-binding.test.ts b/packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime-binding.test.ts
similarity index 92%
rename from src/daemon/__tests__/replay-runtime/session-replay-runtime-binding.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime-binding.test.ts
index 631a155bb2..a2ea3e9f66 100644
--- a/src/daemon/__tests__/replay-runtime/session-replay-runtime-binding.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime-binding.test.ts
@@ -1,12 +1,12 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { beforeEach, expect, test, vi } from 'vitest';
-import { makeIosSession } from '../support/session-factories.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
 import { resolveTargetDevice } from '@agent-device/device-selection/dispatch-resolve';
-import { captureSnapshotThroughLegacyDispatchFixture } from '../legacy-snapshot-capture-fixture.ts';
-import { SessionStore } from '../../session-store.ts';
+import { captureSnapshotThroughLegacyDispatchFixture } from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import { runReplayForTest } from './replay-command-fixture.ts';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
 import { baseReplayRequest as baseReq } from './session-replay-runtime.fixtures.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
@@ -16,7 +16,7 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
 
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
diff --git a/src/daemon/__tests__/replay-runtime/session-replay-runtime-failure-response.test.ts b/packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime-failure-response.test.ts
similarity index 96%
rename from src/daemon/__tests__/replay-runtime/session-replay-runtime-failure-response.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime-failure-response.test.ts
index 6eb7049efc..0357a81657 100644
--- a/src/daemon/__tests__/replay-runtime/session-replay-runtime-failure-response.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime-failure-response.test.ts
@@ -6,18 +6,18 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
     await importOriginal<typeof import('@agent-device/device-selection/dispatch-resolve')>();
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 import path from 'node:path';
 import { runReplayForTest } from './replay-command-fixture.ts';
-import { SessionStore } from '../../session-store.ts';
-import { makeIosSession } from '../support/session-factories.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
 import {
   captureSnapshotThroughLegacyDispatchFixture,
   legacyDispatchCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
 import {
   baseReplayRequest as baseReq,
   writeReplayFile,
diff --git a/src/daemon/__tests__/replay-runtime/session-replay-runtime-failure.test.ts b/packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime-failure.test.ts
similarity index 98%
rename from src/daemon/__tests__/replay-runtime/session-replay-runtime-failure.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime-failure.test.ts
index 08aa5b5960..d861669006 100644
--- a/src/daemon/__tests__/replay-runtime/session-replay-runtime-failure.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime-failure.test.ts
@@ -6,22 +6,22 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
     await importOriginal<typeof import('@agent-device/device-selection/dispatch-resolve')>();
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 import fs from 'node:fs';
 import path from 'node:path';
 import { runReplayForTest } from './replay-command-fixture.ts';
-import { SessionStore } from '../../session-store.ts';
-import type { DaemonResponse } from '../../daemon-request.ts';
-import { makeIosSession } from '../support/session-factories.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import type { DaemonResponse } from '../../../core/daemon-request.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
 import { formatReplayDivergenceReport } from '@agent-device/ad-replay/divergence';
 import { maestroScriptSourceBundleFor } from '@agent-device/replay-port/replay-script-source-fixtures';
 import {
   captureSnapshotThroughLegacyDispatchFixture,
   legacyDispatchCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
 import {
   baseReplayRequest as baseReq,
   writeReplayFile,
diff --git a/src/daemon/__tests__/replay-runtime/session-replay-runtime-keep-session.test.ts b/packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime-keep-session.test.ts
similarity index 97%
rename from src/daemon/__tests__/replay-runtime/session-replay-runtime-keep-session.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime-keep-session.test.ts
index 3491bc4301..9899ed882b 100644
--- a/src/daemon/__tests__/replay-runtime/session-replay-runtime-keep-session.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime-keep-session.test.ts
@@ -41,9 +41,9 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
 import fs from 'node:fs';
 import path from 'node:path';
 import { runReplayForTest } from './replay-command-fixture.ts';
-import { SessionStore } from '../../session-store.ts';
-import type { DaemonRequest } from '../../daemon-request.ts';
-import { makeIosSession } from '../support/session-factories.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
 import {
   baseReplayRequest as baseReq,
   writeReplayFile,
diff --git a/src/daemon/__tests__/replay-runtime/session-replay-runtime-plan.test.ts b/packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime-plan.test.ts
similarity index 98%
rename from src/daemon/__tests__/replay-runtime/session-replay-runtime-plan.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime-plan.test.ts
index 3ebbac31ad..f61b7070e1 100644
--- a/src/daemon/__tests__/replay-runtime/session-replay-runtime-plan.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime-plan.test.ts
@@ -7,21 +7,24 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
 
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
 import fs from 'node:fs';
 import path from 'node:path';
 import { runReplayForTest } from './replay-command-fixture.ts';
-import { SessionStore } from '../../session-store.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import { resolveTargetDevice } from '@agent-device/device-selection/dispatch-resolve';
 import {
   captureSnapshotThroughLegacyDispatchFixture,
   legacyDispatchCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
-import { makeAndroidSession, makeIosSession } from '../support/session-factories.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
+import {
+  makeAndroidSession,
+  makeIosSession,
+} from '../../../__tests__/support/session-factories.ts';
 import {
   baseReplayRequest as baseReq,
   writeReplayFile,
diff --git a/src/daemon/__tests__/replay-runtime/session-replay-runtime.fixtures.ts b/packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime.fixtures.ts
similarity index 88%
rename from src/daemon/__tests__/replay-runtime/session-replay-runtime.fixtures.ts
rename to packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime.fixtures.ts
index 016cb7a884..f2dc5418e1 100644
--- a/src/daemon/__tests__/replay-runtime/session-replay-runtime.fixtures.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime.fixtures.ts
@@ -1,9 +1,12 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { makeAndroidSession, makeIosSession } from '../support/session-factories.ts';
+import {
+  makeAndroidSession,
+  makeIosSession,
+} from '../../../__tests__/support/session-factories.ts';
 import { replayScriptSourceBundleFor } from '@agent-device/replay-port/replay-script-source-fixtures';
-import type { SessionStore } from '../../session-store.ts';
-import type { DaemonRequest } from '../../daemon-request.ts';
+import type { SessionStore } from '../../../core/session-store.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
 
 export function writeReplayFile(root: string, lines: string[]): string {
   const filePath = path.join(root, 'flow.ad');
diff --git a/src/daemon/__tests__/replay-runtime/session-replay-runtime.test.ts b/packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime.test.ts
similarity index 97%
rename from src/daemon/__tests__/replay-runtime/session-replay-runtime.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime.test.ts
index efbfd81883..8cf81aa459 100644
--- a/src/daemon/__tests__/replay-runtime/session-replay-runtime.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-runtime.test.ts
@@ -1,4 +1,4 @@
-import { isSessionRecording } from '../../session-script-publication-capability.ts';
+import { isSessionRecording } from '../../../core/session-script-publication-capability.ts';
 import { test, expect, vi, beforeEach } from 'vitest';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
@@ -8,20 +8,23 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
 
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
 import fs from 'node:fs';
 import path from 'node:path';
 import { runReplayForTest } from './replay-command-fixture.ts';
-import { SessionStore } from '../../session-store.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import {
   captureSnapshotThroughLegacyDispatchFixture,
   legacyDispatchCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
-import { makeIosSession, makeRepairArmedSession } from '../support/session-factories.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
+import {
+  makeIosSession,
+  makeRepairArmedSession,
+} from '../../../__tests__/support/session-factories.ts';
 import {
   baseReplayRequest as baseReq,
   writeReplayFile,
@@ -453,7 +456,7 @@ test('replay rejects legacy JSON payload files', async () => {
 // `req.flags` — so the `parseReplayInput` check that used to reject an
 // unrecognized `--replay-backend` value (`parseReplayInput`) no
 // longer ran on this path. `buildReplayTargetDeviceResolution`
-// (`src/daemon/replay-device-selection.ts`) still calls `parseReplayInput`
+// (`packages/daemon/src/server/replay-device-selection.ts`) still calls `parseReplayInput`
 // for advisory device-lock binding, but its `catch` deliberately swallows
 // any thrown error ("Parsing and validation stay in the replay handler."),
 // so a raw `.ad` replay with `replayBackend: 'unknown'` executed instead of
diff --git a/src/daemon/__tests__/replay-runtime/session-replay-script-source.test.ts b/packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-script-source.test.ts
similarity index 95%
rename from src/daemon/__tests__/replay-runtime/session-replay-script-source.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-script-source.test.ts
index 0521fb3dea..7ff2bb759f 100644
--- a/src/daemon/__tests__/replay-runtime/session-replay-script-source.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-runtime/session-replay-script-source.test.ts
@@ -13,15 +13,15 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
     await importOriginal<typeof import('@agent-device/device-selection/dispatch-resolve')>();
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
 import fs from 'node:fs';
 import path from 'node:path';
 import { runReplayForTest } from './replay-command-fixture.ts';
-import { SessionStore } from '../../session-store.ts';
-import { makeIosSession } from '../support/session-factories.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
 import {
   maestroScriptSourceBundleFor,
   replayScriptSourceBundleFor,
@@ -30,8 +30,8 @@ import { REPLAY_SCRIPT_SOURCE_REQUIRED_MESSAGE } from '@agent-device/replay-port
 import {
   captureSnapshotThroughLegacyDispatchFixture,
   legacyDispatchCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
 
 const mockCaptureSnapshotWithInteractor = vi.mocked(captureSnapshotWithInteractor);
 
diff --git a/src/daemon/__tests__/replay-suite/session-test-command-trust.test.ts b/packages/daemon/src/sessions/__tests__/replay-suite/session-test-command-trust.test.ts
similarity index 94%
rename from src/daemon/__tests__/replay-suite/session-test-command-trust.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-suite/session-test-command-trust.test.ts
index 54432d01cc..2920dca95d 100644
--- a/src/daemon/__tests__/replay-suite/session-test-command-trust.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-suite/session-test-command-trust.test.ts
@@ -5,7 +5,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { beforeEach, expect, test, vi } from 'vitest';
-import { SessionStore } from '../../session-store.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import {
   createReplaySession,
   replayDaemonDependencies,
@@ -14,7 +14,7 @@ import { runReplayTestCommand } from '@agent-device/replay-port/test-command';
 import type { ReplayCommand, ReplayTestCommand } from '@agent-device/replay-port/command-types';
 import { replayScriptSourceBundleFor } from '@agent-device/replay-port/replay-script-source-fixtures';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import type { DaemonInvokeFn, DaemonRequest } from '../../daemon-request.ts';
+import type { DaemonInvokeFn, DaemonRequest } from '../../../core/daemon-request.ts';
 
 const capturedCommands: ReplayCommand[] = [];
 
diff --git a/src/daemon/__tests__/replay-suite/session-test-fail-fast.test.ts b/packages/daemon/src/sessions/__tests__/replay-suite/session-test-fail-fast.test.ts
similarity index 79%
rename from src/daemon/__tests__/replay-suite/session-test-fail-fast.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-suite/session-test-fail-fast.test.ts
index 0f92172295..37ecc7da9f 100644
--- a/src/daemon/__tests__/replay-suite/session-test-fail-fast.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-suite/session-test-fail-fast.test.ts
@@ -1,13 +1,13 @@
-import { daemonPlatformServicesFixture } from '../platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import fs from 'node:fs';
 
 import path from 'node:path';
 import { expect, test } from 'vitest';
-import { makeSessionStore } from '../support/store-factory.ts';
-import { handleSessionCommands } from '../../handlers/__tests__/session-command-harness.ts';
+import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
+import { handleSessionCommands } from '../../../__tests__/support/handlers/session-command-harness.ts';
 
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from '../support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 test('test --fail-fast continues after passing scripts', async () => {
   const root = mkdtempForTestSync('agent-device-test-fail-fast-pass-');
diff --git a/src/daemon/__tests__/replay-suite/session-test-runner.test.ts b/packages/daemon/src/sessions/__tests__/replay-suite/session-test-runner.test.ts
similarity index 97%
rename from src/daemon/__tests__/replay-suite/session-test-runner.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-suite/session-test-runner.test.ts
index 5613fad4b3..577718ad30 100644
--- a/src/daemon/__tests__/replay-suite/session-test-runner.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-suite/session-test-runner.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from '../platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import { test, expect, vi } from 'vitest';
 import fs from 'node:fs';
 import * as path from 'node:path';
@@ -9,12 +9,12 @@ import {
   makeSession,
   noopInvoke,
   assertInvalidArgsMessage,
-} from '../../handlers/__tests__/session-test-harness.ts';
-import type { DaemonRequest } from '../../daemon-request.ts';
-import { handleSessionCommands } from '../../handlers/__tests__/session-command-harness.ts';
+} from '../../../__tests__/support/handlers/session-test-harness.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
+import { handleSessionCommands } from '../../../__tests__/support/handlers/session-command-harness.ts';
 
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from '../support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 // Opening a Simulator schedules a best-effort runner prewarm that outlives the request; a real one
 // would spawn xcodebuild after this file finished and land in whichever file the worker runs next.
diff --git a/src/daemon/__tests__/replay-suite/session-test-source-discovery.test.ts b/packages/daemon/src/sessions/__tests__/replay-suite/session-test-source-discovery.test.ts
similarity index 100%
rename from src/daemon/__tests__/replay-suite/session-test-source-discovery.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-suite/session-test-source-discovery.test.ts
diff --git a/src/daemon/__tests__/replay-suite/session-test-suite-command-cancellation.test.ts b/packages/daemon/src/sessions/__tests__/replay-suite/session-test-suite-command-cancellation.test.ts
similarity index 100%
rename from src/daemon/__tests__/replay-suite/session-test-suite-command-cancellation.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-suite/session-test-suite-command-cancellation.test.ts
diff --git a/src/daemon/__tests__/replay-suite/session-test-suite-command-nested-flags.test.ts b/packages/daemon/src/sessions/__tests__/replay-suite/session-test-suite-command-nested-flags.test.ts
similarity index 100%
rename from src/daemon/__tests__/replay-suite/session-test-suite-command-nested-flags.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-suite/session-test-suite-command-nested-flags.test.ts
diff --git a/src/daemon/__tests__/replay-suite/session-test-suite-command-remote-artifacts.test.ts b/packages/daemon/src/sessions/__tests__/replay-suite/session-test-suite-command-remote-artifacts.test.ts
similarity index 98%
rename from src/daemon/__tests__/replay-suite/session-test-suite-command-remote-artifacts.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-suite/session-test-suite-command-remote-artifacts.test.ts
index b074f45c62..fa107a9b17 100644
--- a/src/daemon/__tests__/replay-suite/session-test-suite-command-remote-artifacts.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-suite/session-test-suite-command-remote-artifacts.test.ts
@@ -17,7 +17,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { test } from 'vitest';
 import type { ReplaySuiteResult } from '@agent-device/contracts/replay';
-import type { DaemonRequest } from '../../daemon-request.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
 import { attachRemoteReplayTestArtifacts } from '@agent-device/replay-port/test-command';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
diff --git a/src/daemon/__tests__/replay-suite/session-test-suite-command-video.test.ts b/packages/daemon/src/sessions/__tests__/replay-suite/session-test-suite-command-video.test.ts
similarity index 96%
rename from src/daemon/__tests__/replay-suite/session-test-suite-command-video.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-suite/session-test-suite-command-video.test.ts
index 477d931847..dc5a42019d 100644
--- a/src/daemon/__tests__/replay-suite/session-test-suite-command-video.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-suite/session-test-suite-command-video.test.ts
@@ -1,12 +1,12 @@
-import { daemonPlatformServicesFixture } from '../platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 /** Per-attempt recording is finalized exactly once after cancellation. */
 import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import path from 'node:path';
 import { beforeEach, test, vi } from 'vitest';
-import { SessionStore } from '../../session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
-import { makeIosSession } from '../support/session-factories.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
 import { runReplayTestCommand } from '@agent-device/replay-port/test-command';
 import {
   replayInvokeOverDispatch,
@@ -17,7 +17,7 @@ import { replayScriptSourceBundleFor } from '@agent-device/replay-port/replay-sc
 import {
   unavailableBindDevice,
   unavailableBindExactDevice,
-} from '../support/unavailable-device-runtime-gateway.ts';
+} from '../../../__tests__/support/unavailable-device-runtime-gateway.ts';
 import { createScreenRecordingAdmissionLedger } from '@agent-device/capture-kit/screen-recording-admission-ledger';
 import type { RecordRuntimeHandlerParams } from '../../handlers/record-runtime.ts';
 import { createDurableResourceEnvelope } from '@agent-device/capture-kit';
diff --git a/src/daemon/__tests__/replay-suite/session-test-suite-infrastructure.test.ts b/packages/daemon/src/sessions/__tests__/replay-suite/session-test-suite-infrastructure.test.ts
similarity index 88%
rename from src/daemon/__tests__/replay-suite/session-test-suite-infrastructure.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-suite/session-test-suite-infrastructure.test.ts
index 70ca0e383b..03e8fca614 100644
--- a/src/daemon/__tests__/replay-suite/session-test-suite-infrastructure.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-suite/session-test-suite-infrastructure.test.ts
@@ -1,16 +1,16 @@
-import { daemonPlatformServicesFixture } from '../platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import { expect, test, vi } from 'vitest';
 import fs from 'node:fs';
 
 import path from 'node:path';
 
-import type { DaemonResponse } from '../../daemon-request.ts';
-import { handleSessionCommands } from '../../handlers/__tests__/session-command-harness.ts';
+import type { DaemonResponse } from '../../../core/daemon-request.ts';
+import { handleSessionCommands } from '../../../__tests__/support/handlers/session-command-harness.ts';
 import { expectOkData, makeSessionStore } from './session-test-suite.fixtures.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from '../support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(async () => {
     throw new Error('no device runner available in this test');
   }),
diff --git a/src/daemon/__tests__/replay-suite/session-test-suite.fixtures.ts b/packages/daemon/src/sessions/__tests__/replay-suite/session-test-suite.fixtures.ts
similarity index 79%
rename from src/daemon/__tests__/replay-suite/session-test-suite.fixtures.ts
rename to packages/daemon/src/sessions/__tests__/replay-suite/session-test-suite.fixtures.ts
index 6c389a1ff9..b62ee513fd 100644
--- a/src/daemon/__tests__/replay-suite/session-test-suite.fixtures.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-suite/session-test-suite.fixtures.ts
@@ -1,8 +1,8 @@
 import { expect } from 'vitest';
 import path from 'node:path';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { SessionStore } from '../../session-store.ts';
-import type { DaemonResponse, DaemonResponseData } from '../../daemon-request.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import type { DaemonResponse, DaemonResponseData } from '../../../core/daemon-request.ts';
 
 export function makeSessionStore(): SessionStore {
   const root = mkdtempForTestSync('agent-device-session-test-suite-');
diff --git a/src/daemon/__tests__/replay-suite/session-test-suite.test.ts b/packages/daemon/src/sessions/__tests__/replay-suite/session-test-suite.test.ts
similarity index 98%
rename from src/daemon/__tests__/replay-suite/session-test-suite.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-suite/session-test-suite.test.ts
index 763620a45f..d72ced78d1 100644
--- a/src/daemon/__tests__/replay-suite/session-test-suite.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-suite/session-test-suite.test.ts
@@ -1,7 +1,7 @@
-import { daemonPlatformServicesFixture } from '../platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import type { RequestProgressEvent } from '@agent-device/contracts/progress';
 import { test, expect, vi } from 'vitest';
-import { fakeCreateCommandSurface } from '../support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 // ADR 0012 migration step 2: every replay step failure now attempts a
 // post-failure screen digest capture + suggestion re-resolution through the
@@ -9,7 +9,7 @@ import { fakeCreateCommandSurface } from '../support/command-surface-fake.ts';
 // device runner, so without a mock those calls fall through to the real
 // (slow/hanging) runner dispatch path. Reject fast so failure-path tests keep
 // exercising `divergence.screen: unavailable` deterministically.
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(async () => {
     throw new Error('no device runner available in this test');
   }),
@@ -21,8 +21,8 @@ import path from 'node:path';
 import {
   handleSessionCommands,
   mockInspectDeviceRuntimeFacts,
-} from '../../handlers/__tests__/session-command-harness.ts';
-import type { DaemonRequest } from '../../daemon-request.ts';
+} from '../../../__tests__/support/handlers/session-command-harness.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
 import { expectOkData, makeSessionStore } from './session-test-suite.fixtures.ts';
 import {
   withRequestProgressSink,
@@ -34,9 +34,12 @@ import {
 
 import { withTestDeviceInventoryProvider as withDeviceInventoryProvider } from '@agent-device/device-selection/inventory-gateways-fixtures';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import { makeAndroidSession, makeMacOsSession } from '../support/session-factories.ts';
+import {
+  makeAndroidSession,
+  makeMacOsSession,
+} from '../../../__tests__/support/session-factories.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { storeSessionForTest } from '../support/store-factory.ts';
+import { storeSessionForTest } from '../../../__tests__/support/store-factory.ts';
 
 const ANDROID_ONE: DeviceInfo = {
   platform: 'android',
diff --git a/src/daemon/__tests__/replay-target/session-replay-dispatch-selector-miss.test.ts b/packages/daemon/src/sessions/__tests__/replay-target/session-replay-dispatch-selector-miss.test.ts
similarity index 96%
rename from src/daemon/__tests__/replay-target/session-replay-dispatch-selector-miss.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-target/session-replay-dispatch-selector-miss.test.ts
index ba97aeed3d..0f411ebb07 100644
--- a/src/daemon/__tests__/replay-target/session-replay-dispatch-selector-miss.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-target/session-replay-dispatch-selector-miss.test.ts
@@ -27,17 +27,17 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
     await importOriginal<typeof import('@agent-device/device-selection/dispatch-resolve')>();
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
 import path from 'node:path';
 import { runReplayForTest } from '../replay-runtime/replay-command-fixture.ts';
-import { SessionStore } from '../../session-store.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import { AppError } from '@agent-device/kernel/errors';
-import type { DaemonRequest } from '../../daemon-request.ts';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
-import { makeIosSession } from '../support/session-factories.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
 import {
   baseReplayRequest as baseReq,
   writeReplayFile,
@@ -49,7 +49,7 @@ import {
 import {
   captureSnapshotThroughLegacyDispatchFixture,
   legacyDispatchCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
 
 const mockDispatchCommand = legacyDispatchCapture;
 const mockCaptureSnapshotWithInteractor = vi.mocked(captureSnapshotWithInteractor);
diff --git a/src/daemon/__tests__/replay-target/session-replay-scenario.fixtures.ts b/packages/daemon/src/sessions/__tests__/replay-target/session-replay-scenario.fixtures.ts
similarity index 94%
rename from src/daemon/__tests__/replay-target/session-replay-scenario.fixtures.ts
rename to packages/daemon/src/sessions/__tests__/replay-target/session-replay-scenario.fixtures.ts
index a69742ffc8..08c7da086e 100644
--- a/src/daemon/__tests__/replay-target/session-replay-scenario.fixtures.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-target/session-replay-scenario.fixtures.ts
@@ -1,9 +1,13 @@
 import path from 'node:path';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { makeIosAppSession } from '../support/session-factories.ts';
-import { SessionStore } from '../../session-store.ts';
+import { makeIosAppSession } from '../../../__tests__/support/session-factories.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import type { ObservationClock } from '@agent-device/capture-kit/observe-until';
-import type { DaemonInvokeFn, DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
+import type {
+  DaemonInvokeFn,
+  DaemonRequest,
+  DaemonResponse,
+} from '../../../core/daemon-request.ts';
 import { runReplayForTest } from '../replay-runtime/replay-command-fixture.ts';
 import {
   baseReplayRequest,
diff --git a/src/daemon/__tests__/replay-target/session-replay-selector-routes.test.ts b/packages/daemon/src/sessions/__tests__/replay-target/session-replay-selector-routes.test.ts
similarity index 88%
rename from src/daemon/__tests__/replay-target/session-replay-selector-routes.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-target/session-replay-selector-routes.test.ts
index c56ec0899a..36fb244721 100644
--- a/src/daemon/__tests__/replay-target/session-replay-selector-routes.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-target/session-replay-selector-routes.test.ts
@@ -1,15 +1,15 @@
 import path from 'node:path';
 import { beforeEach, expect, test, vi } from 'vitest';
 
-import { makeIosSession } from '../support/session-factories.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { SessionStore } from '../../session-store.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import { runReplayForTest } from '../replay-runtime/replay-command-fixture.ts';
 import {
   captureSnapshotThroughLegacyDispatchFixture,
   legacyDispatchCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
 import {
   baseReplayRequest,
   writeReplayFile,
@@ -21,7 +21,7 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
 
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
diff --git a/src/daemon/__tests__/replay-target/session-replay-target-verification-runtime.test.ts b/packages/daemon/src/sessions/__tests__/replay-target/session-replay-target-verification-runtime.test.ts
similarity index 99%
rename from src/daemon/__tests__/replay-target/session-replay-target-verification-runtime.test.ts
rename to packages/daemon/src/sessions/__tests__/replay-target/session-replay-target-verification-runtime.test.ts
index ddffb39004..1f333aeafa 100644
--- a/src/daemon/__tests__/replay-target/session-replay-target-verification-runtime.test.ts
+++ b/packages/daemon/src/sessions/__tests__/replay-target/session-replay-target-verification-runtime.test.ts
@@ -14,7 +14,7 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
   return { ...actual, resolveTargetDevice: vi.fn() };
 });
 
-vi.mock('../../snapshot-interactor-capture.ts', () => ({
+vi.mock('../../../core/snapshot-interactor-capture.ts', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
@@ -43,8 +43,8 @@ import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
 import {
   legacyDispatchCapture,
   resetLegacySnapshotCapture,
-} from '../legacy-snapshot-capture-fixture.ts';
-import { captureSnapshotWithInteractor } from '../../snapshot-interactor-capture.ts';
+} from '../../../__tests__/support/legacy-snapshot-capture-fixture.ts';
+import { captureSnapshotWithInteractor } from '../../../core/snapshot-interactor-capture.ts';
 import {
   DRAG_ANNOTATION,
   DRAG_NODES,
diff --git a/src/daemon/__tests__/request-admission.test.ts b/packages/daemon/src/sessions/__tests__/request-admission.test.ts
similarity index 98%
rename from src/daemon/__tests__/request-admission.test.ts
rename to packages/daemon/src/sessions/__tests__/request-admission.test.ts
index d95ecc3d44..0b92d7116b 100644
--- a/src/daemon/__tests__/request-admission.test.ts
+++ b/packages/daemon/src/sessions/__tests__/request-admission.test.ts
@@ -1,10 +1,10 @@
 import { test } from 'vitest';
 import assert from 'node:assert/strict';
-import { makeIosSession, makeMacOsSession } from './support/session-factories.ts';
+import { makeIosSession, makeMacOsSession } from '../../__tests__/support/session-factories.ts';
 import { parseDaemonPolicy } from '@agent-device/daemon-contracts/daemon-policy-file';
-import { LeaseRegistry } from '../lease-registry.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
 import { assertRequestLeaseAdmission } from '../request-admission.ts';
-import type { DaemonRequest } from '../daemon-request.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
 import type { ProviderAppCatalog } from '@agent-device/contracts/device';
 
 const limrunAppCatalog: ProviderAppCatalog = {
diff --git a/src/daemon/__tests__/request-handler-catalog.test.ts b/packages/daemon/src/sessions/__tests__/request-handler-catalog.test.ts
similarity index 96%
rename from src/daemon/__tests__/request-handler-catalog.test.ts
rename to packages/daemon/src/sessions/__tests__/request-handler-catalog.test.ts
index bcd88c517c..79df2bf107 100644
--- a/src/daemon/__tests__/request-handler-catalog.test.ts
+++ b/packages/daemon/src/sessions/__tests__/request-handler-catalog.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from './platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../__tests__/support/platform-services-fixture.ts';
 import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import path from 'node:path';
@@ -7,12 +7,18 @@ import { withTestDeviceInventoryProvider as withTargetDeviceResolutionScope } fr
 import { INTERNAL_COMMANDS, PUBLIC_COMMANDS } from '@agent-device/command-registry/catalog';
 import { commandDescriptors } from '@agent-device/command-registry/registry';
 import { isRequestCanceledError, type AppError } from '@agent-device/kernel/errors';
-import { makeSessionStore } from './support/store-factory.ts';
-import { getDaemonCommandRoute, type DaemonCommandRoute } from '../daemon-command-registry.ts';
-import { cleanupDownloadableArtifact, trackDownloadableArtifact } from '../artifact-tracking.ts';
-import { contextFromFlags } from '../context.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import {
+  getDaemonCommandRoute,
+  type DaemonCommandRoute,
+} from '../../core/daemon-command-registry.ts';
+import {
+  cleanupDownloadableArtifact,
+  trackDownloadableArtifact,
+} from '../../resources/artifact-tracking.ts';
+import { contextFromFlags } from '../../core/context.ts';
 import { handleLeaseCommands } from '../handlers/lease.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
 import { runRequestHandlerChain } from '../request-handler-chain.ts';
 import {
   clearRequestAbortRegistration,
@@ -23,13 +29,13 @@ import {
   unavailableBindDevice,
   unavailableBindExactDevice,
   unavailableInspectFacts,
-} from './support/unavailable-device-runtime-gateway.ts';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
+} from '../../__tests__/support/unavailable-device-runtime-gateway.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { createAudioProbeAdmissionLedger } from '@agent-device/capture-kit/audio-probe-admission-ledger';
 import { createPerfCaptureAdmissionLedger } from '@agent-device/capture-kit/perf-capture-admission-ledger';
 import { createScreenRecordingAdmissionLedger } from '@agent-device/capture-kit/screen-recording-admission-ledger';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 const SPECIALIZED_ROUTES = [
   'humanControl',
diff --git a/src/daemon/__tests__/request-handler-chain-provider-scope.test.ts b/packages/daemon/src/sessions/__tests__/request-handler-chain-provider-scope.test.ts
similarity index 87%
rename from src/daemon/__tests__/request-handler-chain-provider-scope.test.ts
rename to packages/daemon/src/sessions/__tests__/request-handler-chain-provider-scope.test.ts
index 1c52f0a259..92c239f223 100644
--- a/src/daemon/__tests__/request-handler-chain-provider-scope.test.ts
+++ b/packages/daemon/src/sessions/__tests__/request-handler-chain-provider-scope.test.ts
@@ -1,9 +1,9 @@
-import { daemonPlatformServicesFixture } from './platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../__tests__/support/platform-services-fixture.ts';
 // Proves the exact androidAdbExecutor reference reaches the session handler
 // through the neutral providerScope, and that an empty scope forwards none.
 import assert from 'node:assert/strict';
 import { test, vi } from 'vitest';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 const handleSessionCommandsMock = vi.fn(async (_params: unknown) => ({ ok: true, data: {} }));
 vi.mock('../handlers/session.ts', () => ({
@@ -11,19 +11,19 @@ vi.mock('../handlers/session.ts', () => ({
 }));
 
 import { INTERNAL_COMMANDS } from '@agent-device/command-registry/catalog';
-import { LeaseRegistry } from '../lease-registry.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
 import { runRequestHandlerChain } from '../request-handler-chain.ts';
-import { makeIosSession } from './support/session-factories.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+import { makeIosSession } from '../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import {
   unavailableBindDevice,
   unavailableBindExactDevice,
   unavailableInspectFacts,
-} from './support/unavailable-device-runtime-gateway.ts';
+} from '../../__tests__/support/unavailable-device-runtime-gateway.ts';
 import { createAudioProbeAdmissionLedger } from '@agent-device/capture-kit/audio-probe-admission-ledger';
 import { createPerfCaptureAdmissionLedger } from '@agent-device/capture-kit/perf-capture-admission-ledger';
 import { createScreenRecordingAdmissionLedger } from '@agent-device/capture-kit/screen-recording-admission-ledger';
-import type { DaemonRequest } from '../daemon-request.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
 import type { AndroidAdbExecutor } from '@agent-device/platform-android/mechanics';
 
 function makeRequest(command: string, sessionName: string): DaemonRequest {
diff --git a/src/daemon/__tests__/request-recording-health.test.ts b/packages/daemon/src/sessions/__tests__/request-recording-health.test.ts
similarity index 95%
rename from src/daemon/__tests__/request-recording-health.test.ts
rename to packages/daemon/src/sessions/__tests__/request-recording-health.test.ts
index ab5699d401..afbff6ea41 100644
--- a/src/daemon/__tests__/request-recording-health.test.ts
+++ b/packages/daemon/src/sessions/__tests__/request-recording-health.test.ts
@@ -1,16 +1,16 @@
 import {
   daemonPlatformServicesFixture,
   daemonClaimRecoveryGatewayFixture,
-} from './platform-services-fixture.ts';
+} from '../../__tests__/support/platform-services-fixture.ts';
 import { test, expect, vi, beforeEach } from 'vitest';
-import type { SessionState } from '../session-state.ts';
-import { makeSessionStore } from './support/store-factory.ts';
+import type { SessionState } from '../../core/session-state.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
 import {
   createRequestExecutionScope,
   prepareLockedRequestScope,
-} from '../request-execution-scope.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { makeTestScreenRecordingResource } from './support/screen-recording-live-handle.ts';
+} from '../../server/request-execution-scope.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { makeTestScreenRecordingResource } from '../../__tests__/support/screen-recording-live-handle.ts';
 
 import { refreshRecordingHealth } from '../request-recording-health.ts';
 
diff --git a/src/daemon/__tests__/runtime-binding-conformance-completeness.test.ts b/packages/daemon/src/sessions/__tests__/runtime-binding-conformance-completeness.test.ts
similarity index 93%
rename from src/daemon/__tests__/runtime-binding-conformance-completeness.test.ts
rename to packages/daemon/src/sessions/__tests__/runtime-binding-conformance-completeness.test.ts
index a996a6f9c5..b2e9b65769 100644
--- a/src/daemon/__tests__/runtime-binding-conformance-completeness.test.ts
+++ b/packages/daemon/src/sessions/__tests__/runtime-binding-conformance-completeness.test.ts
@@ -8,13 +8,13 @@ import {
   refusedRuntimeOperation,
   refuseUnavailableExactOwnerFact,
   type ConformedRuntimeCommand,
-} from './runtime-binding-conformance.ts';
+} from '../../__tests__/support/runtime-binding-conformance.ts';
 
 /**
  * The command registry's `platformExecution` declarations are the production enumeration of
  * daemon runtime bindings: every device-runtime descriptor names the uses its route admits, and
  * `admitRuntimeOperations` is one seam with no table of its own. The generic and interaction routes
- * admit through per-command `src/daemon/<command>-runtime.ts` resolvers, so every single-use
+ * admit through per-command `packages/daemon/src/<command>-runtime.ts` resolvers, so every single-use
  * descriptor on those routes owes the family its conformance entry; the other direction holds any
  * entry to a cell its descriptor actually declares.
  */
diff --git a/src/daemon/__tests__/session-idle-activity.test.ts b/packages/daemon/src/sessions/__tests__/session-idle-activity.test.ts
similarity index 94%
rename from src/daemon/__tests__/session-idle-activity.test.ts
rename to packages/daemon/src/sessions/__tests__/session-idle-activity.test.ts
index a7c3f05e11..baeb0900f2 100644
--- a/src/daemon/__tests__/session-idle-activity.test.ts
+++ b/packages/daemon/src/sessions/__tests__/session-idle-activity.test.ts
@@ -11,25 +11,25 @@
 import {
   daemonPlatformServicesFixture,
   daemonClaimRecoveryGatewayFixture,
-} from './platform-services-fixture.ts';
+} from '../../__tests__/support/platform-services-fixture.ts';
 import { afterAll, test, expect, vi } from 'vitest';
 import fs from 'node:fs';
 import path from 'node:path';
 import { withDiagnosticsScope } from '@agent-device/host-kit/diagnostics';
 import { clearRequestCanceled, markRequestCanceled } from '@agent-device/host-kit/request';
-import { makeIosSession } from './support/session-factories.ts';
-import { makeSessionStore } from './support/store-factory.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
+import { makeIosSession } from '../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
 import {
   existingSessionExecutionLockKeys,
   resolveRequestExecutionLockPlan,
-} from '../request-binding.ts';
+} from '../../server/request-binding.ts';
 import {
   createRequestExecutionScope,
   getLeaseRegistryExecutionLocks,
-} from '../request-execution-scope.ts';
+} from '../../server/request-execution-scope.ts';
 import { withKeyedLock } from '@agent-device/kernel/keyed-lock';
-import type { DaemonRequest } from '../daemon-request.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
 const TEST_ROOT = mkdtempForTestSync('agent-device-session-idle-activity-');
diff --git a/src/daemon/__tests__/session-routing.test.ts b/packages/daemon/src/sessions/__tests__/session-routing.test.ts
similarity index 98%
rename from src/daemon/__tests__/session-routing.test.ts
rename to packages/daemon/src/sessions/__tests__/session-routing.test.ts
index ce1de8a1cb..e0caddd4fd 100644
--- a/src/daemon/__tests__/session-routing.test.ts
+++ b/packages/daemon/src/sessions/__tests__/session-routing.test.ts
@@ -4,10 +4,10 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { AppError } from '@agent-device/kernel/errors';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import { SessionStore } from '../session-store.ts';
+import { SessionStore } from '../../core/session-store.ts';
 import { resolveEffectiveSessionName, resolveSessionScope } from '../session-routing.ts';
-import type { DaemonRequest } from '../daemon-request.ts';
-import type { SessionState } from '../session-state.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
+import type { SessionState } from '../../core/session-state.ts';
 import type { SessionScope } from '@agent-device/contracts/session';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
diff --git a/src/daemon/__tests__/session-runtime.test.ts b/packages/daemon/src/sessions/__tests__/session-runtime.test.ts
similarity index 100%
rename from src/daemon/__tests__/session-runtime.test.ts
rename to packages/daemon/src/sessions/__tests__/session-runtime.test.ts
diff --git a/src/daemon/__tests__/session-teardown-budget.test.ts b/packages/daemon/src/sessions/__tests__/session-teardown-budget.test.ts
similarity index 86%
rename from src/daemon/__tests__/session-teardown-budget.test.ts
rename to packages/daemon/src/sessions/__tests__/session-teardown-budget.test.ts
index 8eb87b00b3..dc3ab65f00 100644
--- a/src/daemon/__tests__/session-teardown-budget.test.ts
+++ b/packages/daemon/src/sessions/__tests__/session-teardown-budget.test.ts
@@ -2,14 +2,17 @@ import path from 'node:path';
 import { expect, test } from 'vitest';
 import { AGENT_BROWSER_TIMEOUT_MS } from '@agent-device/platform-web';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { makeAndroidSession } from './support/session-factories.ts';
-import { SessionStore } from '../session-store.ts';
+import { makeAndroidSession } from '../../__tests__/support/session-factories.ts';
+import { SessionStore } from '../../core/session-store.ts';
 import {
   resolveDaemonSessionTeardownTimeoutMs,
   SCREEN_RECORDING_SESSION_TEARDOWN_BUDGET_MS,
   WEB_BROWSER_SESSION_TEARDOWN_BUDGET_MS,
 } from '../session-teardown-budget.ts';
-import { makeRecordingSession, makeWebSession } from './session-teardown.fixtures.ts';
+import {
+  makeRecordingSession,
+  makeWebSession,
+} from '../../__tests__/support/session-teardown.fixtures.ts';
 
 test('daemon session teardown budget extends for an active durable recording', () => {
   const root = mkdtempForTestSync('agent-device-shutdown-recording-budget-');
diff --git a/src/daemon/__tests__/snapshot-custom-actions-platform-guard.test.ts b/packages/daemon/src/sessions/__tests__/snapshot-custom-actions-platform-guard.test.ts
similarity index 89%
rename from src/daemon/__tests__/snapshot-custom-actions-platform-guard.test.ts
rename to packages/daemon/src/sessions/__tests__/snapshot-custom-actions-platform-guard.test.ts
index addc1883ac..20a76445fe 100644
--- a/src/daemon/__tests__/snapshot-custom-actions-platform-guard.test.ts
+++ b/packages/daemon/src/sessions/__tests__/snapshot-custom-actions-platform-guard.test.ts
@@ -11,18 +11,18 @@ import { test, expect } from 'vitest';
 import path from 'node:path';
 
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import { createRequestHandler } from './test-device-runtime-gateway.ts';
-import { LeaseRegistry } from '../lease-registry.ts';
-import { makeSessionStore } from './support/store-factory.ts';
-import type { SessionState } from '../session-state.ts';
+import { createRequestHandler } from '../../__tests__/support/test-device-runtime-gateway.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
+import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import type { SessionState } from '../../core/session-state.ts';
 import type { DeviceRuntimeGateway } from '@agent-device/contracts/platform-runtime';
 import {
   type PlatformRuntimeOperations,
   captureSnapshotUse,
 } from '@agent-device/contracts/platform-runtime-operations';
-import { snapshotRuntimeFixture } from './snapshot-runtime-fixture.ts';
+import { snapshotRuntimeFixture } from '../../__tests__/support/snapshot-runtime-fixture.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from './support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 function snapshotDeviceRuntimeGateway(): DeviceRuntimeGateway<PlatformRuntimeOperations> {
   const runtime = snapshotRuntimeFixture();
diff --git a/src/daemon/__tests__/snapshot-diff.test.ts b/packages/daemon/src/sessions/__tests__/snapshot-diff.test.ts
similarity index 100%
rename from src/daemon/__tests__/snapshot-diff.test.ts
rename to packages/daemon/src/sessions/__tests__/snapshot-diff.test.ts
diff --git a/src/daemon/__tests__/snapshot-publication-membership.test.ts b/packages/daemon/src/sessions/__tests__/snapshot-publication-membership.test.ts
similarity index 100%
rename from src/daemon/__tests__/snapshot-publication-membership.test.ts
rename to packages/daemon/src/sessions/__tests__/snapshot-publication-membership.test.ts
diff --git a/src/daemon/__tests__/snapshot-scope-ref.test.ts b/packages/daemon/src/sessions/__tests__/snapshot-scope-ref.test.ts
similarity index 90%
rename from src/daemon/__tests__/snapshot-scope-ref.test.ts
rename to packages/daemon/src/sessions/__tests__/snapshot-scope-ref.test.ts
index 1af3a4d973..8ef72c8232 100644
--- a/src/daemon/__tests__/snapshot-scope-ref.test.ts
+++ b/packages/daemon/src/sessions/__tests__/snapshot-scope-ref.test.ts
@@ -1,8 +1,8 @@
 import { expect, test } from 'vitest';
 import { STALE_REF_HINT } from '@agent-device/selectors';
 import { makeSnapshotState } from '@agent-device/selectors/snapshot-geometry-fixtures';
-import { resolveSnapshotScope } from '../snapshot-capture.ts';
-import { makeAndroidSession } from './support/session-factories.ts';
+import { resolveSnapshotScope } from '../../core/snapshot-capture.ts';
+import { makeAndroidSession } from '../../__tests__/support/session-factories.ts';
 
 const rect = { x: 0, y: 0, width: 100, height: 100 };
 const labeled = () =>
diff --git a/src/daemon/application-lifecycle-execution.ts b/packages/daemon/src/sessions/application-lifecycle-execution.ts
similarity index 81%
rename from src/daemon/application-lifecycle-execution.ts
rename to packages/daemon/src/sessions/application-lifecycle-execution.ts
index 17d2d4855e..df269ddf63 100644
--- a/src/daemon/application-lifecycle-execution.ts
+++ b/packages/daemon/src/sessions/application-lifecycle-execution.ts
@@ -1,7 +1,7 @@
-import { resolvePlannedOperations } from './execution-plan.ts';
+import { resolvePlannedOperations } from '../core/execution-plan.ts';
 import type { ApplicationLifecycleExecution } from '@agent-device/contracts/application-lifecycle-runtime';
-import { resolveRunnerLogicalLeaseContext } from './lease-context.ts';
-import type { DaemonRequest } from './daemon-request.ts';
+import { resolveRunnerLogicalLeaseContext } from '../core/lease-context.ts';
+import type { DaemonRequest } from '../core/daemon-request.ts';
 
 /** Builds the request-scoped context consumed by an already-admitted lifecycle binding. */
 export function applicationLifecycleExecutionFromRequest(
diff --git a/src/daemon/device/__tests__/device-claim-reconciliation.test.ts b/packages/daemon/src/sessions/device/__tests__/device-claim-reconciliation.test.ts
similarity index 97%
rename from src/daemon/device/__tests__/device-claim-reconciliation.test.ts
rename to packages/daemon/src/sessions/device/__tests__/device-claim-reconciliation.test.ts
index f30667ca7c..bc0a19e0c9 100644
--- a/src/daemon/device/__tests__/device-claim-reconciliation.test.ts
+++ b/packages/daemon/src/sessions/device/__tests__/device-claim-reconciliation.test.ts
@@ -12,8 +12,8 @@ import { createTestAppLogLiveHandle } from '@agent-device/test-kit/app-log-live-
 import { unavailableDeploymentSnapshotAndShutdownOperationFacts } from '@agent-device/test-kit/runtime-operation-facts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { createDeviceClaimReconciler } from '../device-claim-reconciliation.ts';
-import type { DeviceClaim } from '../device-claim-record.ts';
-import { appLogResourceStore } from '../../app-log-resource-store.ts';
+import type { DeviceClaim } from '../../../resources/device/device-claim-record.ts';
+import { appLogResourceStore } from '../../../resources/app-log-resource-store.ts';
 
 const scope = {
   signal: new AbortController().signal,
diff --git a/src/daemon/device/device-claim-reconciliation.ts b/packages/daemon/src/sessions/device/device-claim-reconciliation.ts
similarity index 94%
rename from src/daemon/device/device-claim-reconciliation.ts
rename to packages/daemon/src/sessions/device/device-claim-reconciliation.ts
index 96b0ca9e04..eb55c86401 100644
--- a/src/daemon/device/device-claim-reconciliation.ts
+++ b/packages/daemon/src/sessions/device/device-claim-reconciliation.ts
@@ -5,10 +5,10 @@ import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform
 import { sameDeviceIdentity } from '@agent-device/kernel/device';
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
 import { resolveDaemonPaths } from '@agent-device/daemon-contracts/daemon-resolution';
-import { appLogDurableResource } from '../app-log-session-resource.ts';
-import { recoverAppLogResourceAfterDaemonLock } from '../app-log-resource-recovery.ts';
-import type { DeviceClaim } from './device-claim-record.ts';
-import type { DeviceClaimReconciler } from './device-claims.ts';
+import { appLogDurableResource } from '../../resources/app-log-session-resource.ts';
+import { recoverAppLogResourceAfterDaemonLock } from '../../resources/app-log-resource-recovery.ts';
+import type { DeviceClaim } from '../../resources/device/device-claim-record.ts';
+import type { DeviceClaimReconciler } from '../../resources/device/device-claims.ts';
 import type { DurableCaptureRecoveryOutcome } from '@agent-device/capture-kit/durable-capture';
 import { recoverAudioProbeResourceAfterDaemonLock } from '@agent-device/capture-kit/audio-probe-recovery';
 import { audioProbeDurableResource } from '@agent-device/capture-kit/audio-probe-session-resource';
diff --git a/src/daemon/device/device-targets.ts b/packages/daemon/src/sessions/device/device-targets.ts
similarity index 100%
rename from src/daemon/device/device-targets.ts
rename to packages/daemon/src/sessions/device/device-targets.ts
diff --git a/src/daemon/dispatch-payload.test.ts b/packages/daemon/src/sessions/dispatch-payload.test.ts
similarity index 100%
rename from src/daemon/dispatch-payload.test.ts
rename to packages/daemon/src/sessions/dispatch-payload.test.ts
diff --git a/src/daemon/dispatch-payload.ts b/packages/daemon/src/sessions/dispatch-payload.ts
similarity index 100%
rename from src/daemon/dispatch-payload.ts
rename to packages/daemon/src/sessions/dispatch-payload.ts
diff --git a/src/daemon/handlers/__tests__/human-control.test.ts b/packages/daemon/src/sessions/handlers/__tests__/human-control.test.ts
similarity index 95%
rename from src/daemon/handlers/__tests__/human-control.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/human-control.test.ts
index d122846450..2fc4341818 100644
--- a/src/daemon/handlers/__tests__/human-control.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/human-control.test.ts
@@ -2,17 +2,17 @@ import assert from 'node:assert/strict';
 import {
   daemonPlatformServicesFixture,
   daemonClaimRecoveryGatewayFixture,
-} from '../../__tests__/platform-services-fixture.ts';
+} from '../../../__tests__/support/platform-services-fixture.ts';
 import { test } from 'vitest';
-import { createRequestExecutionScope } from '../../request-execution-scope.ts';
+import { createRequestExecutionScope } from '../../../server/request-execution-scope.ts';
 import {
   HUMAN_CONTROL_LEASE_REQUEST,
   HUMAN_CONTROL_SCOPE,
   humanControlRequest,
   isHumanControlError,
   createControlLatch,
-} from '../../__tests__/human-control-fixtures.ts';
-import { createHumanControlHarness } from '../../__tests__/human-control-router-fixture.ts';
+} from '../../../__tests__/support/human-control-fixtures.ts';
+import { createHumanControlHarness } from '../../../__tests__/support/human-control-router-fixture.ts';
 
 test('lease-owner takeover uses the production admission gate, preserves the session, and resumes after release', async () => {
   const { registry, lease, handleRequest, sessionStore, sessionName } = createHumanControlHarness();
diff --git a/src/daemon/handlers/__tests__/install-source.test.ts b/packages/daemon/src/sessions/handlers/__tests__/install-source.test.ts
similarity index 98%
rename from src/daemon/handlers/__tests__/install-source.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/install-source.test.ts
index 6ffd615673..569f319843 100644
--- a/src/daemon/handlers/__tests__/install-source.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/install-source.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import { readFileSync } from 'node:fs';
 import path from 'node:path';
 import { expect, test, vi } from 'vitest';
@@ -31,10 +31,10 @@ import { unavailableApplicationLifecycleOperationFacts } from '@agent-device/tes
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../request-runtime-binding.ts';
-import { SessionStore } from '../../session-store.ts';
-import type { DaemonRequest } from '../../daemon-request.ts';
-import type { SessionState } from '../../session-state.ts';
+} from '../../../core/request-runtime-binding.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
+import type { SessionState } from '../../../core/session-state.ts';
 import { handleInstallFromSourceDeploymentCommand } from '../session-app-source-deployment.ts';
 
 type SourceRuntimeOptions = Readonly<{
diff --git a/src/daemon/handlers/__tests__/lease-artifacts.test.ts b/packages/daemon/src/sessions/handlers/__tests__/lease-artifacts.test.ts
similarity index 97%
rename from src/daemon/handlers/__tests__/lease-artifacts.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/lease-artifacts.test.ts
index 89d203da3e..6216a9663c 100644
--- a/src/daemon/handlers/__tests__/lease-artifacts.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/lease-artifacts.test.ts
@@ -4,10 +4,10 @@ import type { CloudArtifactsQuery } from '@agent-device/contracts/observability'
 import type { DeviceLease } from '@agent-device/contracts/device';
 import { AppError, isRequestCanceledError } from '@agent-device/kernel/errors';
 import { clearRequestCanceled, markRequestCanceled } from '@agent-device/host-kit/request';
-import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
+import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
 import { handleLeaseCommands } from '../lease.ts';
-import { LeaseRegistry } from '../../lease-registry.ts';
+import { LeaseRegistry } from '../../../resources/lease-registry.ts';
 
 const CLOUD_PROVIDER = 'fake-cloud';
 
diff --git a/src/daemon/handlers/__tests__/lease.test.ts b/packages/daemon/src/sessions/handlers/__tests__/lease.test.ts
similarity index 97%
rename from src/daemon/handlers/__tests__/lease.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/lease.test.ts
index ee916d6d4e..baa95a665d 100644
--- a/src/daemon/handlers/__tests__/lease.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/lease.test.ts
@@ -1,9 +1,9 @@
 import assert from 'node:assert/strict';
 import { test } from 'vitest';
 import { handleLeaseCommands } from '../lease.ts';
-import { LeaseRegistry } from '../../lease-registry.ts';
-import type { DaemonRequest } from '../../daemon-request.ts';
-import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import { LeaseRegistry } from '../../../resources/lease-registry.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
+import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
 import type { DeviceLease } from '@agent-device/contracts/device';
 import { AppError } from '@agent-device/kernel/errors';
 import {
@@ -16,7 +16,7 @@ import {
   HUMAN_CONTROL_SCOPE,
   createControlLatch,
   humanControlRequest,
-} from '../../__tests__/human-control-fixtures.ts';
+} from '../../../__tests__/support/human-control-fixtures.ts';
 
 for (const operation of ['allocate', 'release'] as const) {
   test(`host activation drains provider lease ${operation} before reporting active`, async () => {
diff --git a/src/daemon/handlers/__tests__/record-runtime-request.test.ts b/packages/daemon/src/sessions/handlers/__tests__/record-runtime-request.test.ts
similarity index 100%
rename from src/daemon/handlers/__tests__/record-runtime-request.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/record-runtime-request.test.ts
diff --git a/src/daemon/handlers/__tests__/record-runtime-response.test.ts b/packages/daemon/src/sessions/handlers/__tests__/record-runtime-response.test.ts
similarity index 100%
rename from src/daemon/handlers/__tests__/record-runtime-response.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/record-runtime-response.test.ts
diff --git a/src/daemon/handlers/__tests__/record-runtime-start.test.ts b/packages/daemon/src/sessions/handlers/__tests__/record-runtime-start.test.ts
similarity index 100%
rename from src/daemon/handlers/__tests__/record-runtime-start.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/record-runtime-start.test.ts
diff --git a/src/daemon/handlers/__tests__/record-runtime-stop-recovery.test.ts b/packages/daemon/src/sessions/handlers/__tests__/record-runtime-stop-recovery.test.ts
similarity index 100%
rename from src/daemon/handlers/__tests__/record-runtime-stop-recovery.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/record-runtime-stop-recovery.test.ts
diff --git a/src/daemon/handlers/__tests__/record-runtime.fixtures.ts b/packages/daemon/src/sessions/handlers/__tests__/record-runtime.fixtures.ts
similarity index 94%
rename from src/daemon/handlers/__tests__/record-runtime.fixtures.ts
rename to packages/daemon/src/sessions/handlers/__tests__/record-runtime.fixtures.ts
index 820a37364b..6767857e81 100644
--- a/src/daemon/handlers/__tests__/record-runtime.fixtures.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/record-runtime.fixtures.ts
@@ -1,5 +1,5 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
-import { expect, vi } from 'vitest';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
+import { expect, vi, type Mock } from 'vitest';
 import { applicationLifecycleOperationFacts } from '@agent-device/contracts/application-lifecycle-runtime';
 import { PendingTransferGuard } from '@agent-device/contracts/async-lifecycle';
 import type { CleanupOutcome } from '@agent-device/contracts/durable-resource';
@@ -11,14 +11,17 @@ import {
 } from '@agent-device/contracts/platform-runtime';
 import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform-runtime-operations';
 import type { ScreenRecordingLiveHandle } from '@agent-device/contracts/screen-recording-runtime';
-import type { DaemonRequest } from '../../daemon-request.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
 import { unavailableDeploymentSnapshotAndShutdownOperationFacts } from '@agent-device/test-kit/runtime-operation-facts';
 import { createDurableResourceEnvelope } from '@agent-device/capture-kit';
-import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
 import { createScreenRecordingAdmissionLedger } from '@agent-device/capture-kit/screen-recording-admission-ledger';
 import { screenRecordingResourceStore } from '@agent-device/capture-kit/screen-recording-resource-store';
-import type { BindDeviceRuntime, BindExactDeviceRuntime } from '../../request-runtime-binding.ts';
-import type { SessionState } from '../../session-state.ts';
+import type {
+  BindDeviceRuntime,
+  BindExactDeviceRuntime,
+} from '../../../core/request-runtime-binding.ts';
+import type { SessionState } from '../../../core/session-state.ts';
 import { handleRecordCommand } from '../record-runtime.ts';
 
 type RuntimeOptions = {
@@ -225,7 +228,7 @@ function makeRuntime(session: SessionState, options: RuntimeOptions = {}) {
     [Symbol.asyncDispose]: async () => {},
   };
   const bindDevice: BindDeviceRuntime = async (_device, use) => narrowDeviceBinding(binding, use);
-  const bindExactDeviceCalls = vi.fn();
+  const bindExactDeviceCalls = vi.fn() as Mock;
   const bindExactDevice: BindExactDeviceRuntime = async (device, ownerRef, fence, use, scope) => {
     bindExactDeviceCalls(device, ownerRef, fence, use, scope);
     return narrowDeviceBinding(binding, use);
diff --git a/src/daemon/handlers/__tests__/session-appstate-device-runtime.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-appstate-device-runtime.test.ts
similarity index 97%
rename from src/daemon/handlers/__tests__/session-appstate-device-runtime.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-appstate-device-runtime.test.ts
index e5413faee7..c8af517973 100644
--- a/src/daemon/handlers/__tests__/session-appstate-device-runtime.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-appstate-device-runtime.test.ts
@@ -1,8 +1,8 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import { test, expect, vi } from 'vitest';
 
 import { handleAppStateCommand } from '../session-appstate.ts';
-import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
 import { withTestDeviceInventory } from '@agent-device/device-selection/inventory-gateways-fixtures';
 import { unavailableDeploymentSnapshotAndShutdownOperationFacts } from '@agent-device/test-kit/runtime-operation-facts';
 import { applicationLifecycleOperationFacts } from '@agent-device/contracts/application-lifecycle-runtime';
@@ -18,7 +18,7 @@ import {
 } from '@agent-device/contracts/platform-runtime-operations';
 import { createUnavailablePlatformRuntimeFacts } from '@agent-device/contracts/platform-runtime-unavailable';
 import { deviceShape, type DeviceInfo } from '@agent-device/kernel/device';
-import type { BindDeviceRuntime } from '../../request-runtime-binding.ts';
+import type { BindDeviceRuntime } from '../../../core/request-runtime-binding.ts';
 
 test('appstate rejects web before Android app-state backend dispatch', async () => {
   const device = {
diff --git a/src/daemon/handlers/__tests__/session-appstate-input.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-appstate-input.test.ts
similarity index 95%
rename from src/daemon/handlers/__tests__/session-appstate-input.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-appstate-input.test.ts
index badd02449c..0f74de140b 100644
--- a/src/daemon/handlers/__tests__/session-appstate-input.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-appstate-input.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import { test, expect } from 'vitest';
 import * as path from 'node:path';
 import {
@@ -7,11 +7,14 @@ import {
   makeSessionStore,
   makeSession,
   noopInvoke,
-} from './session-test-harness.ts';
+} from '../../../__tests__/support/handlers/session-test-harness.ts';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import type { SessionState } from '../../session-state.ts';
-import type { DaemonRequest } from '../../daemon-request.ts';
-import { handleSessionCommands, mockInspectDeviceRuntimeFacts } from './session-command-harness.ts';
+import type { SessionState } from '../../../core/session-state.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
+import {
+  handleSessionCommands,
+  mockInspectDeviceRuntimeFacts,
+} from '../../../__tests__/support/handlers/session-command-harness.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { AppError } from '@agent-device/kernel/errors';
 import type {
@@ -28,8 +31,8 @@ import {
   type DeviceBinding,
   type RuntimeFacts,
 } from '@agent-device/contracts/platform-runtime';
-import type { BindDeviceRuntime } from '../../request-runtime-binding.ts';
-import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
+import type { BindDeviceRuntime } from '../../../core/request-runtime-binding.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 test('appstate on iOS requires active session on selected device', async () => {
   const sessionStore = makeSessionStore();
diff --git a/src/daemon/handlers/__tests__/session-appstate.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-appstate.test.ts
similarity index 93%
rename from src/daemon/handlers/__tests__/session-appstate.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-appstate.test.ts
index c1c66862d3..f60bc51a7b 100644
--- a/src/daemon/handlers/__tests__/session-appstate.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-appstate.test.ts
@@ -1,8 +1,8 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import { test, expect } from 'vitest';
-import { makeSessionStore } from './session-test-harness.ts';
+import { makeSessionStore } from '../../../__tests__/support/handlers/session-test-harness.ts';
 import { handleAppStateCommand } from '../session-appstate.ts';
-import type { DaemonRequest } from '../../daemon-request.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
 
 function appStateRequest(session: string, flags: DaemonRequest['flags']): DaemonRequest {
   return { token: 't', session, command: 'appstate', positionals: [], flags };
diff --git a/src/daemon/handlers/__tests__/session-boot-shutdown-device-claims.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-boot-shutdown-device-claims.test.ts
similarity index 88%
rename from src/daemon/handlers/__tests__/session-boot-shutdown-device-claims.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-boot-shutdown-device-claims.test.ts
index 4bcaf6ab78..24e6eb0a17 100644
--- a/src/daemon/handlers/__tests__/session-boot-shutdown-device-claims.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-boot-shutdown-device-claims.test.ts
@@ -1,30 +1,30 @@
 import {
   daemonPlatformServicesFixture,
   daemonClaimRecoveryGatewayFixture,
-} from '../../__tests__/platform-services-fixture.ts';
+} from '../../../__tests__/support/platform-services-fixture.ts';
 import { expect, test } from 'vitest';
 import fs from 'node:fs';
 import path from 'node:path';
-import { mockResolveTargetDevice } from './session-test-harness.ts';
+import { mockResolveTargetDevice } from '../../../__tests__/support/handlers/session-test-harness.ts';
 import {
   mockEnsureReadyRuntime,
   mockShutdownTargetRuntime,
   readinessDeviceRuntimeGateway,
-} from './session-command-harness.ts';
+} from '../../../__tests__/support/handlers/session-command-harness.ts';
 import { normalizeError } from '@agent-device/kernel/errors';
 import { ANDROID_EMULATOR } from '@agent-device/test-kit/device-fixtures';
 import {
   isolatedDeviceClaimStores,
   retainOrphanedDeviceClaims,
-} from '../../__tests__/support/device-claim-store.ts';
-import { SessionStore } from '../../session-store.ts';
-import { LeaseRegistry } from '../../lease-registry.ts';
-import { acquireDeviceClaim } from '../../device/device-claims.ts';
-import { inspectDeviceClaims } from '../../device/device-claim-inspection.ts';
-import { createRequestExecutionScope } from '../../request-execution-scope.ts';
+} from '../../../__tests__/support/device-claim-store.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import { LeaseRegistry } from '../../../resources/lease-registry.ts';
+import { acquireDeviceClaim } from '../../../resources/device/device-claims.ts';
+import { inspectDeviceClaims } from '../../../resources/device/device-claim-inspection.ts';
+import { createRequestExecutionScope } from '../../../server/request-execution-scope.ts';
 import { handleBootCommand } from '../session-boot.ts';
 import { handleShutdownCommand } from '../session-shutdown.ts';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
 
 // #1799: `boot`/`shutdown` route through a daemon that need not own the target
 // device. Two daemons on one host each keep their own state directory, so the
diff --git a/src/daemon/handlers/__tests__/session-boot-warmup.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-boot-warmup.test.ts
similarity index 72%
rename from src/daemon/handlers/__tests__/session-boot-warmup.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-boot-warmup.test.ts
index fea012e006..dcd6bf05f2 100644
--- a/src/daemon/handlers/__tests__/session-boot-warmup.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-boot-warmup.test.ts
@@ -1,13 +1,13 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import {
   makeSessionStore,
   mockPrewarmAppleRunnerCache,
   mockResolveTargetDevice,
   noopInvoke,
-} from './session-test-harness.ts';
+} from '../../../__tests__/support/handlers/session-test-harness.ts';
 import { expect, test } from 'vitest';
-import { handleSessionCommands } from './session-command-harness.ts';
-import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
+import { handleSessionCommands } from '../../../__tests__/support/handlers/session-command-harness.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 test('boot leaves Apple keep-hot policy inside the platform runtime', async () => {
   mockResolveTargetDevice.mockResolvedValue({
diff --git a/src/daemon/handlers/__tests__/session-boot.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-boot.test.ts
similarity index 97%
rename from src/daemon/handlers/__tests__/session-boot.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-boot.test.ts
index f573c2ac2c..df65c1e7e7 100644
--- a/src/daemon/handlers/__tests__/session-boot.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-boot.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import { test, expect } from 'vitest';
 import * as path from 'node:path';
 import { AppError } from '@agent-device/kernel/errors';
@@ -8,21 +8,21 @@ import {
   makeSessionStore,
   makeSession,
   noopInvoke,
-} from './session-test-harness.ts';
+} from '../../../__tests__/support/handlers/session-test-harness.ts';
 import { createUnavailablePlatformRuntimeFacts } from '@agent-device/contracts/platform-runtime-unavailable';
 import { applicationLifecycleOperationFacts } from '@agent-device/contracts/application-lifecycle-runtime';
 import { localRuntimeOwner } from '@agent-device/contracts/platform-runtime';
 import { handleBootCommand } from '../session-boot.ts';
-import type { SessionState } from '../../session-state.ts';
+import type { SessionState } from '../../../core/session-state.ts';
 import {
   handleSessionCommands,
   mockBindDeviceRuntime,
   mockEnsureReadyHeadlessRuntime,
   mockEnsureReadyRuntime,
   mockInspectDeviceRuntimeFacts,
-} from './session-command-harness.ts';
+} from '../../../__tests__/support/handlers/session-command-harness.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 test('boot requires session or explicit selector', async () => {
   const sessionStore = makeSessionStore();
diff --git a/src/daemon/handlers/__tests__/session-command-replay.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-command-replay.test.ts
similarity index 96%
rename from src/daemon/handlers/__tests__/session-command-replay.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-command-replay.test.ts
index 00a783d3a9..9fa6f88b4e 100644
--- a/src/daemon/handlers/__tests__/session-command-replay.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-command-replay.test.ts
@@ -1,14 +1,14 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import { test, expect } from 'vitest';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import { makeSessionStore } from './session-test-harness.ts';
-import { handleSessionCommands } from './session-command-harness.ts';
-import type { DaemonRequest } from '../../daemon-request.ts';
+import { makeSessionStore } from '../../../__tests__/support/handlers/session-test-harness.ts';
+import { handleSessionCommands } from '../../../__tests__/support/handlers/session-command-harness.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
 
 import { replayScriptSourceBundleFor } from '@agent-device/replay-port/replay-script-source-fixtures';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 test('replay parses open --relaunch flag and replays open with relaunch semantics', async () => {
   const sessionStore = makeSessionStore();
diff --git a/src/daemon/handlers/__tests__/session-device-claims.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-device-claims.test.ts
similarity index 94%
rename from src/daemon/handlers/__tests__/session-device-claims.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-device-claims.test.ts
index 6c3891ad91..017debb24f 100644
--- a/src/daemon/handlers/__tests__/session-device-claims.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-device-claims.test.ts
@@ -1,16 +1,16 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import path from 'node:path';
 import { afterEach, test, vi } from 'vitest';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal) => {
   const actual =
     await importOriginal<typeof import('@agent-device/device-selection/dispatch-resolve')>();
   const { selectionFromResolveTargetDevice } =
-    await import('../../__tests__/device-selection-stub.ts');
+    await import('../../../__tests__/support/device-selection-stub.ts');
   const resolveTargetDevice = vi.fn();
   return {
     ...actual,
@@ -18,7 +18,9 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
     resolveTargetDeviceSelection: vi.fn(selectionFromResolveTargetDevice(resolveTargetDevice)),
   };
 });
-vi.mock('../../device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));
+vi.mock('../../../core/device/device-ready.ts', () => ({
+  ensureDeviceReady: vi.fn(async () => {}),
+}));
 vi.mock('@agent-device/platform-android/mechanics', () => ({
   activateAndroidTestIme: vi.fn(async () => ({ activated: false })),
   restoreAndroidTestIme: vi.fn(async () => ({ restored: false, reason: 'no-record' })),
@@ -33,7 +35,7 @@ vi.mock('@agent-device/host-kit/process', async (importOriginal) =>
 );
 
 import { resolveTargetDevice } from '@agent-device/device-selection/dispatch-resolve';
-import { ensureDeviceReady } from '../../device/device-ready.ts';
+import { ensureDeviceReady } from '../../../core/device/device-ready.ts';
 import {
   activateAndroidTestIme,
   resolveAndroidPackageForOpen,
@@ -42,18 +44,18 @@ import {
   applyRuntimeHintsFixture,
   dispatchApplicationLifecycleEffect,
   prepareApplicationOpenFixture,
-} from '../../__tests__/application-lifecycle-runtime-fixture.ts';
+} from '../../../__tests__/support/application-lifecycle-runtime-fixture.ts';
 import { clearRequestCanceled, markRequestCanceled } from '@agent-device/host-kit/request';
-import { acquireDeviceClaim as acquireProductionDeviceClaim } from '../../device/device-claims.ts';
-import { inspectDeviceClaims } from '../../device/device-claim-inspection.ts';
-import { LeaseRegistry } from '../../lease-registry.ts';
-import { SessionStore } from '../../session-store.ts';
+import { acquireDeviceClaim as acquireProductionDeviceClaim } from '../../../resources/device/device-claims.ts';
+import { inspectDeviceClaims } from '../../../resources/device/device-claim-inspection.ts';
+import { LeaseRegistry } from '../../../resources/lease-registry.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import {
   handleSessionCloseCommands as handleProductionCloseCommand,
   handleSessionOpenCommands as handleProductionOpenCommand,
 } from '../../session-lifecycle/index.ts';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import { makeAuthoringSession } from '../../__tests__/support/session-factories.ts';
+import { makeAuthoringSession } from '../../../__tests__/support/session-factories.ts';
 import { MACOS_DEVICE } from '@agent-device/test-kit/device-fixtures';
 import { AppError } from '@agent-device/kernel/errors';
 import {
@@ -61,8 +63,8 @@ import {
   bindLifecycleRuntime,
   inspectProviderLifecycleRuntimeFacts,
   inspectLifecycleRuntimeFacts,
-} from '../../__tests__/application-lifecycle-runtime-harness.ts';
-import { platformResourceCleanupFixture } from '../../__tests__/support/platform-resource-cleanup-fixture.ts';
+} from '../../../__tests__/support/application-lifecycle-runtime-harness.ts';
+import { platformResourceCleanupFixture } from '../../../__tests__/support/platform-resource-cleanup-fixture.ts';
 
 const mockDispatch = vi.mocked(dispatchApplicationLifecycleEffect);
 const mockPrepareApplicationOpen = vi.mocked(prepareApplicationOpenFixture);
diff --git a/src/daemon/handlers/__tests__/session-device-status-response.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-device-status-response.test.ts
similarity index 100%
rename from src/daemon/handlers/__tests__/session-device-status-response.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-device-status-response.test.ts
diff --git a/src/daemon/handlers/__tests__/session-doctor-app-runtime.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-doctor-app-runtime.test.ts
similarity index 96%
rename from src/daemon/handlers/__tests__/session-doctor-app-runtime.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-doctor-app-runtime.test.ts
index 3181acc0de..1143c114f9 100644
--- a/src/daemon/handlers/__tests__/session-doctor-app-runtime.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-doctor-app-runtime.test.ts
@@ -1,11 +1,11 @@
 import { expect, test, vi } from 'vitest';
 import { AppError } from '@agent-device/kernel/errors';
 import { LINUX_DEVICE } from '@agent-device/test-kit/device-fixtures';
-import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../request-runtime-binding.ts';
+} from '../../../core/request-runtime-binding.ts';
 import { applicationLifecycleOperationFacts } from '@agent-device/contracts/application-lifecycle-runtime';
 import {
   type RuntimeFacts,
@@ -15,7 +15,7 @@ import {
 import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform-runtime-operations';
 import { unavailableDeploymentSnapshotAndShutdownOperationFacts } from '@agent-device/test-kit/runtime-operation-facts';
 import { handleDoctorCommand } from '../session-doctor.ts';
-import { hostDiagnosticsFixture } from '../../__tests__/support/host-diagnostics-fixture.ts';
+import { hostDiagnosticsFixture } from '../../../__tests__/support/host-diagnostics-fixture.ts';
 
 vi.mock('../session-doctor-device.ts', async (importOriginal) => {
   const actual = await importOriginal<typeof import('../session-doctor-device.ts')>();
diff --git a/src/daemon/handlers/__tests__/session-doctor-device.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-doctor-device.test.ts
similarity index 98%
rename from src/daemon/handlers/__tests__/session-doctor-device.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-doctor-device.test.ts
index e113a25f84..d268913a14 100644
--- a/src/daemon/handlers/__tests__/session-doctor-device.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-doctor-device.test.ts
@@ -7,7 +7,7 @@ import {
 import { AppError } from '@agent-device/kernel/errors';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import { attachAdbFailureHint } from '@agent-device/platform-android/mechanics';
-import type { DaemonRequest } from '../../daemon-request.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
 import { appendDeviceInventoryCheck } from '../session-doctor-device.ts';
 import type { DoctorCheck } from '@agent-device/contracts/observability';
 
diff --git a/src/daemon/handlers/__tests__/session-doctor-metro.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-doctor-metro.test.ts
similarity index 100%
rename from src/daemon/handlers/__tests__/session-doctor-metro.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-doctor-metro.test.ts
diff --git a/src/daemon/handlers/__tests__/session-doctor-options.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-doctor-options.test.ts
similarity index 90%
rename from src/daemon/handlers/__tests__/session-doctor-options.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-doctor-options.test.ts
index 7cf5430ad0..daad8a8fbb 100644
--- a/src/daemon/handlers/__tests__/session-doctor-options.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-doctor-options.test.ts
@@ -1,6 +1,6 @@
 import { expect, test } from 'vitest';
-import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
-import { makeIosSession } from '../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
+import { makeIosSession } from '../../../__tests__/support/session-factories.ts';
 import { sessionChecks } from '../session-doctor-options.ts';
 
 // The doctor's recovery command must carry each session's ADDRESS — the string `close --session`
diff --git a/src/daemon/handlers/__tests__/session-install-source-ref-frame.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-install-source-ref-frame.test.ts
similarity index 86%
rename from src/daemon/handlers/__tests__/session-install-source-ref-frame.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-install-source-ref-frame.test.ts
index e9bf6e62d8..b5709b5f21 100644
--- a/src/daemon/handlers/__tests__/session-install-source-ref-frame.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-install-source-ref-frame.test.ts
@@ -1,18 +1,18 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import { expect, test, vi } from 'vitest';
-import type { InspectDeviceRuntimeFacts } from '../../request-runtime-binding.ts';
-import type { DaemonRequest } from '../../daemon-request.ts';
-import type { SessionState } from '../../session-state.ts';
-import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import type { InspectDeviceRuntimeFacts } from '../../../core/request-runtime-binding.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
+import type { SessionState } from '../../../core/session-state.ts';
+import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
 import {
   handleSessionCommands,
   mockBindDeviceRuntime,
   mockDeployMaterializedAppRuntime,
   mockInspectDeviceRuntimeFacts,
   mockMaterializeAppSourceRuntime,
-} from './session-command-harness.ts';
-import { activateCompleteRefFrame, refFrameState } from '../../ref-frame.ts';
-import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
+} from '../../../__tests__/support/handlers/session-command-harness.ts';
+import { activateCompleteRefFrame, refFrameState } from '../../../core/ref-frame.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 const invoke = async (): Promise<never> => {
   throw new Error('install_source ref-frame tests must stay on the runtime route');
diff --git a/src/daemon/handlers/__tests__/session-prepare.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-prepare.test.ts
similarity index 95%
rename from src/daemon/handlers/__tests__/session-prepare.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-prepare.test.ts
index 7872a18b4f..243d1fe4c3 100644
--- a/src/daemon/handlers/__tests__/session-prepare.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-prepare.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import { expect, test, vi } from 'vitest';
 import type { CommandFlags } from '@agent-device/contracts/command';
 import { resolveCommandTimeoutPolicy } from '@agent-device/command-registry/registry';
@@ -10,12 +10,12 @@ import {
 } from '@agent-device/contracts/platform-runtime';
 import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform-runtime-operations';
 import { IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
-import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
 import { createUnavailableRuntimeFactsForTest } from '@agent-device/test-kit/runtime-operation-facts';
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../request-runtime-binding.ts';
+} from '../../../core/request-runtime-binding.ts';
 import { handlePrepareCommand } from '../session-prepare.ts';
 
 // `resolveCommandDevice` widens to `resolveTargetDevice` for an explicit selector (this test
diff --git a/src/daemon/handlers/__tests__/session-push-ref-frame.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-push-ref-frame.test.ts
similarity index 82%
rename from src/daemon/handlers/__tests__/session-push-ref-frame.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-push-ref-frame.test.ts
index 3c0e220351..5c764d9d58 100644
--- a/src/daemon/handlers/__tests__/session-push-ref-frame.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-push-ref-frame.test.ts
@@ -1,17 +1,17 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import { expect, test, vi } from 'vitest';
-import type { InspectDeviceRuntimeFacts } from '../../request-runtime-binding.ts';
-import type { DaemonRequest } from '../../daemon-request.ts';
-import type { SessionState } from '../../session-state.ts';
-import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import type { InspectDeviceRuntimeFacts } from '../../../core/request-runtime-binding.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
+import type { SessionState } from '../../../core/session-state.ts';
+import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
 import {
   handleSessionCommands,
   mockBindDeviceRuntime,
   mockInspectDeviceRuntimeFacts,
   mockPushNotificationRuntime,
-} from './session-command-harness.ts';
-import { activateCompleteRefFrame, refFrameState } from '../../ref-frame.ts';
-import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
+} from '../../../__tests__/support/handlers/session-command-harness.ts';
+import { activateCompleteRefFrame, refFrameState } from '../../../core/ref-frame.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 const invoke = async (): Promise<never> => {
   throw new Error('push ref-frame tests must stay on the runtime route');
diff --git a/src/daemon/handlers/__tests__/session-push.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-push.test.ts
similarity index 94%
rename from src/daemon/handlers/__tests__/session-push.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-push.test.ts
index 9627e7a7ee..9a847df5d7 100644
--- a/src/daemon/handlers/__tests__/session-push.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-push.test.ts
@@ -1,14 +1,14 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import fs from 'node:fs';
 import path from 'node:path';
 import { expect, test, vi } from 'vitest';
 import type {
   InspectDeviceRuntimeFacts,
   BindDeviceRuntime,
-} from '../../request-runtime-binding.ts';
+} from '../../../core/request-runtime-binding.ts';
 
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
-import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
+import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import {
   handleSessionCommands,
@@ -16,8 +16,8 @@ import {
   mockEnsureReadyRuntime,
   mockInspectDeviceRuntimeFacts,
   mockPushNotificationRuntime,
-} from './session-command-harness.ts';
-import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
+} from '../../../__tests__/support/handlers/session-command-harness.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 const invoke = async (_req: DaemonRequest): Promise<DaemonResponse> => {
   return {
diff --git a/src/daemon/handlers/__tests__/session-reinstall.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-reinstall.test.ts
similarity index 94%
rename from src/daemon/handlers/__tests__/session-reinstall.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-reinstall.test.ts
index 28c27eb420..f429546ef5 100644
--- a/src/daemon/handlers/__tests__/session-reinstall.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-reinstall.test.ts
@@ -1,17 +1,17 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import fs from 'node:fs';
 import path from 'node:path';
 import { beforeEach, expect, test, vi } from 'vitest';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { trackUploadedArtifact } from '../../artifact-tracking.ts';
+import { trackUploadedArtifact } from '../../../resources/artifact-tracking.ts';
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../request-runtime-binding.ts';
-import { SessionStore } from '../../session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
-import type { SessionState } from '../../session-state.ts';
-import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
+} from '../../../core/request-runtime-binding.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
+import type { SessionState } from '../../../core/session-state.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal) => {
   const actual =
@@ -25,7 +25,7 @@ import {
   mockBindDeviceRuntime,
   mockDeployAppRuntime,
   mockInspectDeviceRuntimeFacts,
-} from './session-command-harness.ts';
+} from '../../../__tests__/support/handlers/session-command-harness.ts';
 
 function makeStore(): SessionStore {
   return new SessionStore(
diff --git a/src/daemon/handlers/__tests__/session-relaunch-guards.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-relaunch-guards.test.ts
similarity index 90%
rename from src/daemon/handlers/__tests__/session-relaunch-guards.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-relaunch-guards.test.ts
index 1276065c3f..ab16543ccd 100644
--- a/src/daemon/handlers/__tests__/session-relaunch-guards.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-relaunch-guards.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import { test, expect } from 'vitest';
 import * as path from 'node:path';
 import {
@@ -7,11 +7,11 @@ import {
   makeSessionStore,
   makeSession,
   noopInvoke,
-} from './session-test-harness.ts';
-import { handleSessionCommands } from './session-command-harness.ts';
-import { makeTestScreenRecordingResource } from '../../__tests__/support/screen-recording-live-handle.ts';
+} from '../../../__tests__/support/handlers/session-test-harness.ts';
+import { handleSessionCommands } from '../../../__tests__/support/handlers/session-command-harness.ts';
+import { makeTestScreenRecordingResource } from '../../../__tests__/support/screen-recording-live-handle.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 test('open --relaunch fails without app when no session exists', async () => {
   const sessionStore = makeSessionStore();
diff --git a/src/daemon/handlers/__tests__/session-replay-command.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-replay-command.test.ts
similarity index 79%
rename from src/daemon/handlers/__tests__/session-replay-command.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-replay-command.test.ts
index a0ca5b4297..24af32e8ec 100644
--- a/src/daemon/handlers/__tests__/session-replay-command.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-replay-command.test.ts
@@ -1,18 +1,18 @@
 import path from 'node:path';
 import { expect, test } from 'vitest';
-import { LeaseRegistry } from '../../lease-registry.ts';
+import { LeaseRegistry } from '../../../resources/lease-registry.ts';
 import {
   unavailableBindDevice,
   unavailableBindExactDevice,
-} from '../../__tests__/support/unavailable-device-runtime-gateway.ts';
+} from '../../../__tests__/support/unavailable-device-runtime-gateway.ts';
 import { createScreenRecordingAdmissionLedger } from '@agent-device/capture-kit/screen-recording-admission-ledger';
-import { platformResourceCleanupFixture } from '../../__tests__/support/platform-resource-cleanup-fixture.ts';
+import { platformResourceCleanupFixture } from '../../../__tests__/support/platform-resource-cleanup-fixture.ts';
 import type { SessionCommandParams } from '../session-command-input.ts';
 import { handleReplayTestCommand } from '../session-replay-command.ts';
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
-import { makeSessionStore } from './session-test-harness.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
+import { makeSessionStore } from '../../../__tests__/support/handlers/session-test-harness.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 test('replay test handler threads the complete video owner into the application command', async () => {
   const root = mkdtempForTestSync('agent-device-replay-handler-video-');
diff --git a/src/daemon/handlers/__tests__/session-runtime-command.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-runtime-command.test.ts
similarity index 94%
rename from src/daemon/handlers/__tests__/session-runtime-command.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-runtime-command.test.ts
index 64108a82f6..2d52895bad 100644
--- a/src/daemon/handlers/__tests__/session-runtime-command.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-runtime-command.test.ts
@@ -1,28 +1,28 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import { expect, test } from 'vitest';
 
 import path from 'node:path';
-import type { DaemonRequest } from '../../daemon-request.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
 import {
   makeSession,
   makeSessionStore,
   mockClearRuntimeHints,
   noopInvoke,
-} from './session-test-harness.ts';
+} from '../../../__tests__/support/handlers/session-test-harness.ts';
 import {
   handleSessionCommands,
   mockBindDeviceRuntime,
   mockInspectDeviceRuntimeFacts,
-} from './session-command-harness.ts';
-import { lifecycleRuntimeFacts } from '../../__tests__/application-lifecycle-runtime-harness.ts';
+} from '../../../__tests__/support/handlers/session-command-harness.ts';
+import { lifecycleRuntimeFacts } from '../../../__tests__/support/application-lifecycle-runtime-harness.ts';
 import {
   gestureBindDevice,
   gestureInspectFacts,
   gestureRuntimeSpies,
-} from '../../__tests__/test-device-runtime-gateway.ts';
-import { refFrameState } from '../../ref-frame.ts';
+} from '../../../__tests__/support/test-device-runtime-gateway.ts';
+import { refFrameState } from '../../../core/ref-frame.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 test('runtime set/show/clear manages session-scoped runtime hints before open', async () => {
   const sessionStore = makeSessionStore();
diff --git a/src/daemon/handlers/__tests__/session-runtime-port-reverse.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-runtime-port-reverse.test.ts
similarity index 91%
rename from src/daemon/handlers/__tests__/session-runtime-port-reverse.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-runtime-port-reverse.test.ts
index 814bd09f02..238e600a6b 100644
--- a/src/daemon/handlers/__tests__/session-runtime-port-reverse.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-runtime-port-reverse.test.ts
@@ -1,6 +1,6 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import { expect, test, vi } from 'vitest';
-import type { DaemonRequest } from '../../daemon-request.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
 import { handlePortReverseCommand } from '../session-runtime-port-reverse.ts';
 
 const baseRequest = {
diff --git a/src/daemon/handlers/__tests__/session-script-publication.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-script-publication.test.ts
similarity index 96%
rename from src/daemon/handlers/__tests__/session-script-publication.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-script-publication.test.ts
index 430a3e4c2f..14d6fc926e 100644
--- a/src/daemon/handlers/__tests__/session-script-publication.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-script-publication.test.ts
@@ -1,4 +1,4 @@
-import { isSessionRecording } from '../../session-script-publication-capability.ts';
+import { isSessionRecording } from '../../../core/session-script-publication-capability.ts';
 import fs from 'node:fs';
 import path from 'node:path';
 import { beforeEach, expect, test } from 'vitest';
@@ -8,17 +8,17 @@ import {
   makeAuthoringSession,
   authoringPublication,
   repairPublication,
-} from '../../__tests__/support/session-factories.ts';
+} from '../../../__tests__/support/session-factories.ts';
 import type { TargetAnnotationV1 } from '@agent-device/contracts/replay';
-import { SessionStore } from '../../session-store.ts';
-import type { DaemonRequest } from '../../daemon-request.ts';
-import type { SessionState } from '../../session-state.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
+import type { SessionState } from '../../../core/session-state.ts';
 import { handleSessionScriptPublication } from '../session-script-publication.ts';
 import {
   NO_SCRIPT_PUBLICATION,
   scriptTargetPath,
   scriptTargetForce,
-} from '../../session-script-publication-state.ts';
+} from '../../../core/session-script-publication-state.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
 const TARGET_EVIDENCE: TargetAnnotationV1 = {
diff --git a/src/daemon/handlers/__tests__/session-shutdown.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-shutdown.test.ts
similarity index 94%
rename from src/daemon/handlers/__tests__/session-shutdown.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-shutdown.test.ts
index c4429b692a..789ed4b702 100644
--- a/src/daemon/handlers/__tests__/session-shutdown.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-shutdown.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import { test, expect } from 'vitest';
 import * as path from 'node:path';
 import {
@@ -7,16 +7,16 @@ import {
   makeSessionStore,
   makeSession,
   noopInvoke,
-} from './session-test-harness.ts';
-import type { SessionState } from '../../session-state.ts';
+} from '../../../__tests__/support/handlers/session-test-harness.ts';
+import type { SessionState } from '../../../core/session-state.ts';
 import {
   handleSessionCommands,
   mockBindDeviceRuntime,
   mockInspectDeviceRuntimeFacts,
   mockShutdownTargetRuntime,
-} from './session-command-harness.ts';
+} from '../../../__tests__/support/handlers/session-command-harness.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 test('shutdown turns off selected iOS simulator', async () => {
   const sessionStore = makeSessionStore();
diff --git a/src/daemon/handlers/__tests__/session-trigger.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session-trigger.test.ts
similarity index 69%
rename from src/daemon/handlers/__tests__/session-trigger.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session-trigger.test.ts
index 043878706f..c777ef042e 100644
--- a/src/daemon/handlers/__tests__/session-trigger.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session-trigger.test.ts
@@ -1,10 +1,10 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import { test, expect } from 'vitest';
 
-import { handleSessionCommands } from './session-command-harness.ts';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
-import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
-import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
+import { handleSessionCommands } from '../../../__tests__/support/handlers/session-command-harness.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
+import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 const invoke = async (_req: DaemonRequest): Promise<DaemonResponse> => {
   return {
diff --git a/src/daemon/handlers/__tests__/session.test.ts b/packages/daemon/src/sessions/handlers/__tests__/session.test.ts
similarity index 77%
rename from src/daemon/handlers/__tests__/session.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/session.test.ts
index c193940715..4fe664d2a6 100644
--- a/src/daemon/handlers/__tests__/session.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/session.test.ts
@@ -1,11 +1,11 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import { expect, test } from 'vitest';
 import * as path from 'node:path';
-import { handleSessionCommands } from './session-command-harness.ts';
-import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import { handleSessionCommands } from '../../../__tests__/support/handlers/session-command-harness.ts';
+import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
-import type { DaemonRequest } from '../../daemon-request.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
 
 function request(command: string): DaemonRequest {
   return { token: 't', session: 'default', command, positionals: [], flags: {} };
diff --git a/src/daemon/handlers/__tests__/snapshot.test.ts b/packages/daemon/src/sessions/handlers/__tests__/snapshot.test.ts
similarity index 100%
rename from src/daemon/handlers/__tests__/snapshot.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/snapshot.test.ts
diff --git a/src/daemon/handlers/__tests__/trace-runtime.test.ts b/packages/daemon/src/sessions/handlers/__tests__/trace-runtime.test.ts
similarity index 95%
rename from src/daemon/handlers/__tests__/trace-runtime.test.ts
rename to packages/daemon/src/sessions/handlers/__tests__/trace-runtime.test.ts
index 5161749522..3be7649c90 100644
--- a/src/daemon/handlers/__tests__/trace-runtime.test.ts
+++ b/packages/daemon/src/sessions/handlers/__tests__/trace-runtime.test.ts
@@ -2,9 +2,9 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { expect, test } from 'vitest';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { SessionStore } from '../../session-store.ts';
-import type { DaemonRequest } from '../../daemon-request.ts';
-import type { SessionState } from '../../session-state.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
+import type { SessionState } from '../../../core/session-state.ts';
 import { handleTraceCommand } from '../trace-runtime.ts';
 
 function fixture() {
diff --git a/src/daemon/handlers/human-control.ts b/packages/daemon/src/sessions/handlers/human-control.ts
similarity index 89%
rename from src/daemon/handlers/human-control.ts
rename to packages/daemon/src/sessions/handlers/human-control.ts
index bdb73d4d2b..6102fb04cd 100644
--- a/src/daemon/handlers/human-control.ts
+++ b/packages/daemon/src/sessions/handlers/human-control.ts
@@ -1,8 +1,8 @@
 import { AppError } from '@agent-device/kernel/errors';
 import { getRequestSignal } from '@agent-device/host-kit/request';
-import { parseHumanControlHoldInput } from '../human-control-contract.ts';
-import type { LeaseRegistry } from '../lease-registry.ts';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
+import { parseHumanControlHoldInput } from '../../resources/human-control-contract.ts';
+import type { LeaseRegistry } from '../../resources/lease-registry.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
 
 export async function handleHumanControlCommand(params: {
   req: DaemonRequest;
diff --git a/src/daemon/handlers/lease.ts b/packages/daemon/src/sessions/handlers/lease.ts
similarity index 97%
rename from src/daemon/handlers/lease.ts
rename to packages/daemon/src/sessions/handlers/lease.ts
index 8cbfaac63d..a917e0c567 100644
--- a/src/daemon/handlers/lease.ts
+++ b/packages/daemon/src/sessions/handlers/lease.ts
@@ -8,19 +8,19 @@ import type {
   AgentArtifactsResult,
   CloudArtifactProvider,
 } from '@agent-device/contracts/observability';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
-import type { LeaseRegistry } from '../lease-registry.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
+import type { LeaseRegistry } from '../../resources/lease-registry.ts';
 import {
   leaseReleaseRequestFor,
   normalizeLeaseBackend,
   type ReleaseLeaseRequest,
-} from '../lease-registry-scope.ts';
-import type { SessionStore } from '../session-store.ts';
+} from '../../resources/lease-registry-scope.ts';
+import type { SessionStore } from '../../core/session-store.ts';
 import {
   isProxyLeaseScope,
   resolveLeaseScope,
   resolveRequestOrSessionLeaseScope,
-} from '../lease-context.ts';
+} from '../../core/lease-context.ts';
 import {
   leaseScopeToAllocateRequest,
   leaseScopeToHeartbeatRequest,
@@ -29,8 +29,8 @@ import {
 import { AppError, createRequestCanceledError, errorMessage } from '@agent-device/kernel/errors';
 import { LEASE_ALLOCATION_BUDGET_MS } from '@agent-device/command-registry/timeout-policy';
 import { getRequestSignal, isRequestCanceled } from '@agent-device/host-kit/request';
-import { listDownloadableArtifacts } from '../artifact-tracking.ts';
-import { providerSessionIdFromData } from '../provider-session-ownership.ts';
+import { listDownloadableArtifacts } from '../../resources/artifact-tracking.ts';
+import { providerSessionIdFromData } from '../../resources/provider-session-ownership.ts';
 import type { DaemonProviderCredentials } from '@agent-device/daemon-contracts/provider-credentials';
 import { shellQuoteIfNeeded } from '@agent-device/kernel/device-shell';
 
diff --git a/src/daemon/handlers/record-runtime-request.ts b/packages/daemon/src/sessions/handlers/record-runtime-request.ts
similarity index 97%
rename from src/daemon/handlers/record-runtime-request.ts
rename to packages/daemon/src/sessions/handlers/record-runtime-request.ts
index af7c6f687a..d357e26dce 100644
--- a/src/daemon/handlers/record-runtime-request.ts
+++ b/packages/daemon/src/sessions/handlers/record-runtime-request.ts
@@ -6,7 +6,7 @@ import {
 } from '@agent-device/contracts/recording';
 import { retiredScreenshotMaxSizeFlagError } from '@agent-device/contracts/capture';
 import { AppError } from '@agent-device/kernel/errors';
-import type { DaemonRequest } from '../daemon-request.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
 import { hasExplicitSessionFlag } from '../session-routing.ts';
 
 const IOS_DEVICE_RECORD_MIN_FPS = 1;
diff --git a/src/daemon/handlers/record-runtime-response.ts b/packages/daemon/src/sessions/handlers/record-runtime-response.ts
similarity index 98%
rename from src/daemon/handlers/record-runtime-response.ts
rename to packages/daemon/src/sessions/handlers/record-runtime-response.ts
index c068b18bd8..c9c97eadb7 100644
--- a/src/daemon/handlers/record-runtime-response.ts
+++ b/packages/daemon/src/sessions/handlers/record-runtime-response.ts
@@ -5,7 +5,7 @@ import type {
   ScreenRecordingLiveSnapshot,
 } from '@agent-device/contracts/screen-recording-runtime';
 import type { RuntimeOperationUnavailability } from '@agent-device/contracts/platform-runtime';
-import type { DaemonArtifact, DaemonResponse } from '../daemon-request.ts';
+import type { DaemonArtifact, DaemonResponse } from '../../core/daemon-request.ts';
 import { deriveRecordingTelemetryPath } from '@agent-device/capture-kit/recording-telemetry';
 
 export function buildRecordingStartResponse(
diff --git a/src/daemon/handlers/record-runtime.ts b/packages/daemon/src/sessions/handlers/record-runtime.ts
similarity index 94%
rename from src/daemon/handlers/record-runtime.ts
rename to packages/daemon/src/sessions/handlers/record-runtime.ts
index 58ef483f0d..3f5d4c5273 100644
--- a/src/daemon/handlers/record-runtime.ts
+++ b/packages/daemon/src/sessions/handlers/record-runtime.ts
@@ -1,4 +1,4 @@
-import type { DaemonPlatformServices } from '../platform-services.ts';
+import type { DaemonPlatformServices } from '../../core/platform-services.ts';
 import path from 'node:path';
 import type { PlatformRequestScope } from '@agent-device/contracts/platform-runtime-host';
 import type {
@@ -8,7 +8,7 @@ import type {
 import {
   bindSessionScreenRecording,
   bindRecordOnlyScreenRecording,
-} from '../session-capture-binding.ts';
+} from '../../core/session-capture-binding.ts';
 import {
   resolveScreenRecordingRuntimePlan,
   screenRecordingAdmissionUse,
@@ -18,7 +18,7 @@ import {
 import { isWholeScreenRecordingScope } from '@agent-device/contracts/recording';
 import { AppError, normalizeError } from '@agent-device/kernel/errors';
 import { resolveTargetDevice } from '@agent-device/device-selection/dispatch-resolve';
-import { ensureBoundDeviceReady } from '../request-runtime-binding.ts';
+import { ensureBoundDeviceReady } from '../../core/request-runtime-binding.ts';
 import { type ScreenRecordingAdmissionLedger } from '@agent-device/capture-kit/screen-recording-admission-ledger';
 import { createScreenRecordingRecoveryControl } from '@agent-device/capture-kit/screen-recording-recovery';
 import {
@@ -32,11 +32,14 @@ import {
   screenRecordingManifestIsTerminal,
 } from '@agent-device/capture-kit/screen-recording-stop-recovery';
 import { resolveSessionScope } from '../session-routing.ts';
-import type { SessionStore } from '../session-store.ts';
-import type { BindDeviceRuntime, BindExactDeviceRuntime } from '../request-runtime-binding.ts';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
-import type { SessionRef, SessionState } from '../session-state.ts';
-import { recordSessionAction } from '../session-action-recorder.ts';
+import type { SessionStore } from '../../core/session-store.ts';
+import type {
+  BindDeviceRuntime,
+  BindExactDeviceRuntime,
+} from '../../core/request-runtime-binding.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../../core/session-state.ts';
+import { recordSessionAction } from '../../core/session-action-recorder.ts';
 import {
   missingAppSessionResponse,
   prepareRecordingRequest,
diff --git a/src/daemon/handlers/record-trace.ts b/packages/daemon/src/sessions/handlers/record-trace.ts
similarity index 81%
rename from src/daemon/handlers/record-trace.ts
rename to packages/daemon/src/sessions/handlers/record-trace.ts
index 9eadd601c7..80594c6624 100644
--- a/src/daemon/handlers/record-trace.ts
+++ b/packages/daemon/src/sessions/handlers/record-trace.ts
@@ -1,8 +1,11 @@
-import type { DaemonPlatformServices } from '../platform-services.ts';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
-import { SessionStore } from '../session-store.ts';
+import type { DaemonPlatformServices } from '../../core/platform-services.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
+import { SessionStore } from '../../core/session-store.ts';
 import { handleRecordCommand } from './record-runtime.ts';
-import type { BindDeviceRuntime, BindExactDeviceRuntime } from '../request-runtime-binding.ts';
+import type {
+  BindDeviceRuntime,
+  BindExactDeviceRuntime,
+} from '../../core/request-runtime-binding.ts';
 import { type ScreenRecordingAdmissionLedger } from '@agent-device/capture-kit/screen-recording-admission-ledger';
 import type { PlatformRequestScope } from '@agent-device/contracts/platform-runtime-host';
 import { handleTraceCommand } from './trace-runtime.ts';
diff --git a/src/daemon/handlers/session-app-deployment-route.ts b/packages/daemon/src/sessions/handlers/session-app-deployment-route.ts
similarity index 80%
rename from src/daemon/handlers/session-app-deployment-route.ts
rename to packages/daemon/src/sessions/handlers/session-app-deployment-route.ts
index 36068d66ed..8e14acb8a0 100644
--- a/src/daemon/handlers/session-app-deployment-route.ts
+++ b/packages/daemon/src/sessions/handlers/session-app-deployment-route.ts
@@ -1,7 +1,10 @@
-import type { DaemonPlatformServices } from '../platform-services.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import { SessionStore } from '../session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
+import type { DaemonPlatformServices } from '../../core/platform-services.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import { SessionStore } from '../../core/session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
 import {
   handleAppDeploymentCommand,
   handlePushNotificationCommand,
diff --git a/src/daemon/handlers/session-app-deployment.ts b/packages/daemon/src/sessions/handlers/session-app-deployment.ts
similarity index 91%
rename from src/daemon/handlers/session-app-deployment.ts
rename to packages/daemon/src/sessions/handlers/session-app-deployment.ts
index 744dc30cc0..5adc81fb20 100644
--- a/src/daemon/handlers/session-app-deployment.ts
+++ b/packages/daemon/src/sessions/handlers/session-app-deployment.ts
@@ -1,4 +1,4 @@
-import type { DaemonPlatformServices } from '../platform-services.ts';
+import type { DaemonPlatformServices } from '../../core/platform-services.ts';
 import { expandSessionPath } from '@agent-device/host-kit/session-paths';
 import fs from 'node:fs';
 import type { AppDeploymentResult } from '@agent-device/contracts/app-deployment-runtime';
@@ -8,26 +8,32 @@ import {
 } from '@agent-device/contracts/app-deployment-runtime-plan';
 import { isIosFamily, publicPlatformString } from '@agent-device/kernel/device';
 import { readNotificationPayload } from '../dispatch-payload.ts';
-import { cleanupUploadedArtifact, prepareUploadedArtifact } from '../artifact-tracking.ts';
-import { expireRefFrame } from '../ref-frame.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import type { SessionStore } from '../session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
-import type { SessionRef, SessionState } from '../session-state.ts';
+import {
+  cleanupUploadedArtifact,
+  prepareUploadedArtifact,
+} from '../../resources/artifact-tracking.ts';
+import { expireRefFrame } from '../../core/ref-frame.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import type { SessionStore } from '../../core/session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../../core/session-state.ts';
 import { resolvePayloadInput } from '../payload-input.ts';
 import { resolveDeployResultTarget } from '@agent-device/contracts/deploy-result-target';
 import { withSuccessText } from '@agent-device/kernel/success-text';
-import { recordSessionAction } from '../session-action-recorder.ts';
+import { recordSessionAction } from '../../core/session-action-recorder.ts';
 import {
   requireSessionOrExplicitSelector,
   resolveCommandDevice,
-} from '../session-device-resolution.ts';
+} from '../../resources/session-device-resolution.ts';
 import {
   requireRuntimeBinding,
   requireRuntimeFacts,
   type RuntimeCommandHandlerParams,
   unavailableRuntimeOperationResponse,
-} from '../session-runtime-admission.ts';
+} from '../../core/session-runtime-admission.ts';
 import { errorResponse } from '@agent-device/kernel/contracts';
 
 type DeployCommand = 'install' | 'reinstall';
diff --git a/src/daemon/handlers/session-app-source-deployment.ts b/packages/daemon/src/sessions/handlers/session-app-source-deployment.ts
similarity index 93%
rename from src/daemon/handlers/session-app-source-deployment.ts
rename to packages/daemon/src/sessions/handlers/session-app-source-deployment.ts
index fffcd5ac94..169722d4e5 100644
--- a/src/daemon/handlers/session-app-source-deployment.ts
+++ b/packages/daemon/src/sessions/handlers/session-app-source-deployment.ts
@@ -1,4 +1,4 @@
-import type { DaemonPlatformServices } from '../platform-services.ts';
+import type { DaemonPlatformServices } from '../../core/platform-services.ts';
 import type {
   AppDeploymentResult,
   MaterializedAppSource,
@@ -16,21 +16,24 @@ import {
   retainMaterializedPaths,
   type RetainedMaterializedPaths,
 } from '../materialized-path-registry.ts';
-import { expireRefFrame } from '../ref-frame.ts';
+import { expireRefFrame } from '../../core/ref-frame.ts';
 import { resolveInstallSource } from '../install-source-resolution.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import { SessionStore } from '../session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
-import type { SessionState } from '../session-state.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import { SessionStore } from '../../core/session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
+import type { SessionState } from '../../core/session-state.ts';
 import { resolveInstallFromSourceResultTarget } from '@agent-device/contracts/deploy-result-target';
 import { withSuccessText } from '@agent-device/kernel/success-text';
-import { recordSessionAction } from '../session-action-recorder.ts';
-import { resolveCommandDevice } from '../session-device-resolution.ts';
+import { recordSessionAction } from '../../core/session-action-recorder.ts';
+import { resolveCommandDevice } from '../../resources/session-device-resolution.ts';
 import {
   requireRuntimeBinding,
   requireRuntimeFacts,
   unavailableRuntimeOperationResponse,
-} from '../session-runtime-admission.ts';
+} from '../../core/session-runtime-admission.ts';
 
 type Retention = Readonly<{ enabled: boolean; ttlMs?: number }>;
 type InstallFromSourceResult = Readonly<{
diff --git a/src/daemon/handlers/session-appstate-apple-session.ts b/packages/daemon/src/sessions/handlers/session-appstate-apple-session.ts
similarity index 95%
rename from src/daemon/handlers/session-appstate-apple-session.ts
rename to packages/daemon/src/sessions/handlers/session-appstate-apple-session.ts
index e49122639a..d8091de675 100644
--- a/src/daemon/handlers/session-appstate-apple-session.ts
+++ b/packages/daemon/src/sessions/handlers/session-appstate-apple-session.ts
@@ -10,9 +10,9 @@ import { errorResponse } from '@agent-device/kernel/contracts';
 import { asAppError, isRequestCanceledError } from '@agent-device/kernel/errors';
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
 import { appStateUse } from '@agent-device/contracts/platform-runtime-operations';
-import { admitRuntimeUse } from '../runtime-admission.ts';
-import type { RuntimeCommandHandlerParams } from '../session-runtime-admission.ts';
-import type { DaemonResponse } from '../daemon-request.ts';
+import { admitRuntimeUse } from '../../core/runtime-admission.ts';
+import type { RuntimeCommandHandlerParams } from '../../core/session-runtime-admission.ts';
+import type { DaemonResponse } from '../../core/daemon-request.ts';
 
 /**
  * The session facts this answer is built from, as a structural view: the handler reads exactly
diff --git a/src/daemon/handlers/session-appstate-device-runtime.ts b/packages/daemon/src/sessions/handlers/session-appstate-device-runtime.ts
similarity index 89%
rename from src/daemon/handlers/session-appstate-device-runtime.ts
rename to packages/daemon/src/sessions/handlers/session-appstate-device-runtime.ts
index 5854f70513..854da580cf 100644
--- a/src/daemon/handlers/session-appstate-device-runtime.ts
+++ b/packages/daemon/src/sessions/handlers/session-appstate-device-runtime.ts
@@ -6,9 +6,9 @@ import {
   type DeviceInfo,
 } from '@agent-device/kernel/device';
 import { resolveAndroidSerialAllowlist } from '@agent-device/kernel/device-isolation';
-import { admitRuntimeUse } from '../runtime-admission.ts';
-import type { RuntimeCommandHandlerParams } from '../session-runtime-admission.ts';
-import type { DaemonResponse } from '../daemon-request.ts';
+import { admitRuntimeUse } from '../../core/runtime-admission.ts';
+import type { RuntimeCommandHandlerParams } from '../../core/session-runtime-admission.ts';
+import type { DaemonResponse } from '../../core/daemon-request.ts';
 import { appleSessionRequiredRefusal } from './session-appstate-apple-session.ts';
 
 function sortedAndroidSerialAllowlist(value: string | undefined): string[] | undefined {
diff --git a/src/daemon/handlers/session-appstate.ts b/packages/daemon/src/sessions/handlers/session-appstate.ts
similarity index 94%
rename from src/daemon/handlers/session-appstate.ts
rename to packages/daemon/src/sessions/handlers/session-appstate.ts
index f496bbea54..dacdab15ec 100644
--- a/src/daemon/handlers/session-appstate.ts
+++ b/packages/daemon/src/sessions/handlers/session-appstate.ts
@@ -5,9 +5,9 @@ import {
   requireSessionOrExplicitSelector,
   resolveCommandDevice,
   selectorTargetsSessionDevice,
-} from '../session-device-resolution.ts';
-import type { RuntimeCommandHandlerParams } from '../session-runtime-admission.ts';
-import type { DaemonResponse } from '../daemon-request.ts';
+} from '../../resources/session-device-resolution.ts';
+import type { RuntimeCommandHandlerParams } from '../../core/session-runtime-admission.ts';
+import type { DaemonResponse } from '../../core/daemon-request.ts';
 import {
   appleSessionAppStateResponse,
   appleSessionRequiredRefusal,
diff --git a/src/daemon/handlers/session-batch.ts b/packages/daemon/src/sessions/handlers/session-batch.ts
similarity index 94%
rename from src/daemon/handlers/session-batch.ts
rename to packages/daemon/src/sessions/handlers/session-batch.ts
index 16ade23c6d..8b785ec196 100644
--- a/src/daemon/handlers/session-batch.ts
+++ b/packages/daemon/src/sessions/handlers/session-batch.ts
@@ -1,5 +1,5 @@
 import { runBatch } from '@agent-device/command-registry/batch';
-import type { DaemonInvokeFn, DaemonRequest, DaemonResponse } from '../daemon-request.ts';
+import type { DaemonInvokeFn, DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
 
 export async function runBatchCommands(
   req: DaemonRequest,
diff --git a/src/daemon/handlers/session-boot.ts b/packages/daemon/src/sessions/handlers/session-boot.ts
similarity index 93%
rename from src/daemon/handlers/session-boot.ts
rename to packages/daemon/src/sessions/handlers/session-boot.ts
index b0e4e86c2d..2cf8216bf3 100644
--- a/src/daemon/handlers/session-boot.ts
+++ b/packages/daemon/src/sessions/handlers/session-boot.ts
@@ -6,11 +6,14 @@ import { resolveAndroidSerialAllowlist } from '@agent-device/kernel/device-isola
 import {
   requireSessionOrExplicitSelector,
   resolveCommandDevice,
-} from '../session-device-resolution.ts';
-import { admitRuntimeOperations, type UnavailableRuntimeResponse } from '../runtime-admission.ts';
+} from '../../resources/session-device-resolution.ts';
+import {
+  admitRuntimeOperations,
+  type UnavailableRuntimeResponse,
+} from '../../core/runtime-admission.ts';
 import { startupDeadlineAtMs } from '../startup-deadline.ts';
-import type { RuntimeCommandHandlerParams } from '../session-runtime-admission.ts';
-import type { DaemonResponse } from '../daemon-request.ts';
+import type { RuntimeCommandHandlerParams } from '../../core/session-runtime-admission.ts';
+import type { DaemonResponse } from '../../core/daemon-request.ts';
 import { deviceStatusReportResponse } from './session-device-status-response.ts';
 
 /** `boot --headless` reports an unsupported cell as a request error, not a device capability gap. */
diff --git a/src/daemon/handlers/session-command-input.ts b/packages/daemon/src/sessions/handlers/session-command-input.ts
similarity index 79%
rename from src/daemon/handlers/session-command-input.ts
rename to packages/daemon/src/sessions/handlers/session-command-input.ts
index f78332afee..e99d840813 100644
--- a/src/daemon/handlers/session-command-input.ts
+++ b/packages/daemon/src/sessions/handlers/session-command-input.ts
@@ -1,22 +1,22 @@
-import type { DaemonPlatformServices } from '../platform-services.ts';
+import type { DaemonPlatformServices } from '../../core/platform-services.ts';
 import type { LeaseLifecycleProvider, ProviderAppCatalog } from '@agent-device/contracts/device';
 import type { HostDiagnostics } from '@agent-device/contracts/host-diagnostics';
-import type { PlatformResourceCleanup } from '../platform-resource-cleanup.ts';
+import type { PlatformResourceCleanup } from '../../core/platform-resource-cleanup.ts';
 import type { PlatformRequestScope } from '@agent-device/contracts/platform-runtime-host';
 import type { CreateDaemonCommandSurface } from '@agent-device/contracts/daemon-command-surface';
-import type { DaemonInvokeFn, DaemonRequest, DaemonResponse } from '../daemon-request.ts';
-import type { AppLogAdmissionLedger } from '../app-log-admission-ledger.ts';
+import type { DaemonInvokeFn, DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
+import type { AppLogAdmissionLedger } from '../../resources/app-log-admission-ledger.ts';
 import { type AudioProbeAdmissionLedger } from '@agent-device/capture-kit/audio-probe-admission-ledger';
 import { type PerfCaptureAdmissionLedger } from '@agent-device/capture-kit/perf-capture-admission-ledger';
 import { type ScreenRecordingAdmissionLedger } from '@agent-device/capture-kit/screen-recording-admission-ledger';
-import type { DeviceClaimReconciler } from '../device/device-claims.ts';
-import type { LeaseRegistry } from '../lease-registry.ts';
+import type { DeviceClaimReconciler } from '../../resources/device/device-claims.ts';
+import type { LeaseRegistry } from '../../resources/lease-registry.ts';
 import type {
   BindDeviceRuntime,
   BindExactDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../request-runtime-binding.ts';
-import type { SessionStore } from '../session-store.ts';
+} from '../../core/request-runtime-binding.ts';
+import type { SessionStore } from '../../core/session-store.ts';
 
 export type SessionCommandInput = {
   req: DaemonRequest;
diff --git a/src/daemon/handlers/session-device-status-response.ts b/packages/daemon/src/sessions/handlers/session-device-status-response.ts
similarity index 95%
rename from src/daemon/handlers/session-device-status-response.ts
rename to packages/daemon/src/sessions/handlers/session-device-status-response.ts
index 267ce49ad4..3042a82880 100644
--- a/src/daemon/handlers/session-device-status-response.ts
+++ b/packages/daemon/src/sessions/handlers/session-device-status-response.ts
@@ -4,7 +4,7 @@ import {
   publicPlatformString,
   type DeviceInfo,
 } from '@agent-device/kernel/device';
-import type { DaemonResponse } from '../daemon-request.ts';
+import type { DaemonResponse } from '../../core/daemon-request.ts';
 
 /** The per-command status field a device-status report carries beside the device identity. */
 export type DeviceStatusReport = Readonly<{ booted: true } | { shutdown: TargetShutdownResult }>;
diff --git a/src/daemon/handlers/session-doctor-app.ts b/packages/daemon/src/sessions/handlers/session-doctor-app.ts
similarity index 97%
rename from src/daemon/handlers/session-doctor-app.ts
rename to packages/daemon/src/sessions/handlers/session-doctor-app.ts
index 9dc7299fc7..c7b1a6a5f0 100644
--- a/src/daemon/handlers/session-doctor-app.ts
+++ b/packages/daemon/src/sessions/handlers/session-doctor-app.ts
@@ -1,6 +1,6 @@
 import { publicPlatformString, type DeviceInfo } from '@agent-device/kernel/device';
 import { AppError, normalizeError } from '@agent-device/kernel/errors';
-import type { SessionState } from '../session-state.ts';
+import type { SessionState } from '../../core/session-state.ts';
 import { appendDoctorCheck } from './session-doctor-output.ts';
 import type { DoctorCheck } from '@agent-device/contracts/observability';
 import type { InstalledAppInfo } from '@agent-device/contracts/app-inventory-runtime';
diff --git a/src/daemon/handlers/session-doctor-device.ts b/packages/daemon/src/sessions/handlers/session-doctor-device.ts
similarity index 98%
rename from src/daemon/handlers/session-doctor-device.ts
rename to packages/daemon/src/sessions/handlers/session-doctor-device.ts
index 9b9e0ca4fb..383244406a 100644
--- a/src/daemon/handlers/session-doctor-device.ts
+++ b/packages/daemon/src/sessions/handlers/session-doctor-device.ts
@@ -15,8 +15,8 @@ import {
   type PublicPlatform,
 } from '@agent-device/kernel/device';
 import { normalizeError } from '@agent-device/kernel/errors';
-import type { DaemonRequest } from '../daemon-request.ts';
-import type { SessionState } from '../session-state.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
+import type { SessionState } from '../../core/session-state.ts';
 import type { DoctorCheck } from '@agent-device/contracts/observability';
 import type { DeviceInventoryDiscovery } from '@agent-device/contracts/platform-module';
 import { appendDoctorCheck } from './session-doctor-output.ts';
diff --git a/src/daemon/handlers/session-doctor-metro.ts b/packages/daemon/src/sessions/handlers/session-doctor-metro.ts
similarity index 100%
rename from src/daemon/handlers/session-doctor-metro.ts
rename to packages/daemon/src/sessions/handlers/session-doctor-metro.ts
diff --git a/src/daemon/handlers/session-doctor-options.ts b/packages/daemon/src/sessions/handlers/session-doctor-options.ts
similarity index 96%
rename from src/daemon/handlers/session-doctor-options.ts
rename to packages/daemon/src/sessions/handlers/session-doctor-options.ts
index 7481ac986d..49ab39dbde 100644
--- a/src/daemon/handlers/session-doctor-options.ts
+++ b/packages/daemon/src/sessions/handlers/session-doctor-options.ts
@@ -1,8 +1,8 @@
 import { detectProjectRuntimeKind } from '@agent-device/host-kit/project-runtime';
 import { publicPlatformString } from '@agent-device/kernel/device';
-import type { SessionStore } from '../session-store.ts';
-import type { DaemonRequest } from '../daemon-request.ts';
-import type { SessionState } from '../session-state.ts';
+import type { SessionStore } from '../../core/session-store.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
+import type { SessionState } from '../../core/session-state.ts';
 import type { DoctorOptions } from './session-doctor-types.ts';
 import type { DoctorCheck, DoctorKind } from '@agent-device/contracts/observability';
 
diff --git a/src/daemon/handlers/session-doctor-output.ts b/packages/daemon/src/sessions/handlers/session-doctor-output.ts
similarity index 100%
rename from src/daemon/handlers/session-doctor-output.ts
rename to packages/daemon/src/sessions/handlers/session-doctor-output.ts
diff --git a/src/daemon/handlers/session-doctor-types.ts b/packages/daemon/src/sessions/handlers/session-doctor-types.ts
similarity index 100%
rename from src/daemon/handlers/session-doctor-types.ts
rename to packages/daemon/src/sessions/handlers/session-doctor-types.ts
diff --git a/src/daemon/handlers/session-doctor.ts b/packages/daemon/src/sessions/handlers/session-doctor.ts
similarity index 96%
rename from src/daemon/handlers/session-doctor.ts
rename to packages/daemon/src/sessions/handlers/session-doctor.ts
index 85a8667cca..ca6be82f68 100644
--- a/src/daemon/handlers/session-doctor.ts
+++ b/packages/daemon/src/sessions/handlers/session-doctor.ts
@@ -3,15 +3,15 @@ import { PUBLIC_COMMANDS } from '@agent-device/command-registry/catalog';
 import { isIosFamily, publicPlatformString, type DeviceInfo } from '@agent-device/kernel/device';
 import { AppError } from '@agent-device/kernel/errors';
 import { emitRequestProgress } from '@agent-device/host-kit/request';
-import { isActiveProviderDevice } from '../provider-device-admission.ts';
+import { isActiveProviderDevice } from '../../core/provider-device-admission.ts';
 import {
   listLocalDeviceInventory,
   shouldPropagateDeviceInventoryProbeError,
 } from '@agent-device/device-selection/device-inventory-context';
 import { readVersion } from '@agent-device/host-kit/version';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
-import type { SessionState } from '../session-state.ts';
-import { SessionStore } from '../session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
+import type { SessionState } from '../../core/session-state.ts';
+import { SessionStore } from '../../core/session-store.ts';
 import { appendAppChecks, type DoctorAppInventory } from './session-doctor-app.ts';
 import {
   appendDeviceInventoryCheck,
@@ -41,8 +41,11 @@ import { resolveAndroidSerialAllowlist } from '@agent-device/kernel/device-isola
 import type { InstalledAppInfo } from '@agent-device/contracts/app-inventory-runtime';
 import type { BoundDeviceRuntime } from '@agent-device/contracts/platform-runtime';
 import { appsRuntimeUse } from '@agent-device/contracts/platform-runtime-operations';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import { ensureAppsRuntimeReady, listAppsFromRuntime } from '../apps-runtime.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import { ensureAppsRuntimeReady, listAppsFromRuntime } from '../../execution/apps-runtime.ts';
 
 export async function handleDoctorCommand(params: {
   req: DaemonRequest;
diff --git a/src/daemon/handlers/session-prepare.ts b/packages/daemon/src/sessions/handlers/session-prepare.ts
similarity index 90%
rename from src/daemon/handlers/session-prepare.ts
rename to packages/daemon/src/sessions/handlers/session-prepare.ts
index 28ff44820a..aef1f77e15 100644
--- a/src/daemon/handlers/session-prepare.ts
+++ b/packages/daemon/src/sessions/handlers/session-prepare.ts
@@ -1,18 +1,21 @@
-import type { DaemonPlatformServices } from '../platform-services.ts';
+import type { DaemonPlatformServices } from '../../core/platform-services.ts';
 import { prepareAppleRunnerRuntimeUse } from '@agent-device/contracts/application-lifecycle-runtime-plan';
 import type { BoundDeviceRuntime } from '@agent-device/contracts/platform-runtime';
 import { PUBLIC_COMMANDS } from '@agent-device/command-registry/catalog';
 import { PREPARE_STARTUP_BUDGET_MS } from '@agent-device/command-registry/timeout-policy';
 import { publicPlatformString, type DeviceInfo } from '@agent-device/kernel/device';
-import { resolveRunnerLogicalLeaseContext } from '../lease-context.ts';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
-import { SessionStore } from '../session-store.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import { admitRuntimeUse } from '../runtime-admission.ts';
+import { resolveRunnerLogicalLeaseContext } from '../../core/lease-context.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
+import { SessionStore } from '../../core/session-store.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import { admitRuntimeUse } from '../../core/runtime-admission.ts';
 import {
   requireSessionOrExplicitSelector,
   resolveCommandDevice,
-} from '../session-device-resolution.ts';
+} from '../../resources/session-device-resolution.ts';
 import { errorResponse } from '@agent-device/kernel/contracts';
 
 const PREPARE_IOS_RUNNER_TIMING_NOTE =
diff --git a/src/daemon/handlers/session-replay-command.ts b/packages/daemon/src/sessions/handlers/session-replay-command.ts
similarity index 89%
rename from src/daemon/handlers/session-replay-command.ts
rename to packages/daemon/src/sessions/handlers/session-replay-command.ts
index 1047cd4966..e2c0e022d4 100644
--- a/src/daemon/handlers/session-replay-command.ts
+++ b/packages/daemon/src/sessions/handlers/session-replay-command.ts
@@ -1,12 +1,15 @@
-import type { DaemonPlatformServices } from '../platform-services.ts';
+import type { DaemonPlatformServices } from '../../core/platform-services.ts';
 import { AppError } from '@agent-device/kernel/errors';
-import type { DaemonRequest } from '../daemon-request.ts';
-import type { SessionState } from '../session-state.ts';
-import type { SessionStore } from '../session-store.ts';
-import { bindInternalObservationAuthority } from '../internal-observation.ts';
-import type { LeaseRegistry } from '../lease-registry.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import type { PlatformResourceCleanup } from '../platform-resource-cleanup.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
+import type { SessionState } from '../../core/session-state.ts';
+import type { SessionStore } from '../../core/session-store.ts';
+import { bindInternalObservationAuthority } from '../../execution/internal-observation.ts';
+import type { LeaseRegistry } from '../../resources/lease-registry.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import type { PlatformResourceCleanup } from '../../core/platform-resource-cleanup.ts';
 import { runReplayCommand } from '@agent-device/replay-port/native-command';
 import { runReplayTestCommand } from '@agent-device/replay-port/test-command';
 import { bindReplaySession } from '@agent-device/replay-port/replay-session-binding';
@@ -19,10 +22,10 @@ import type {
   ReplaySession,
 } from '@agent-device/replay-port/command-types';
 import { createReplayCoordinator } from '../session-replay-coordinator.ts';
-import { assertSessionSelectorMatches } from '../session-selector.ts';
+import { assertSessionSelectorMatches } from '../../core/session-selector.ts';
 import { resolveSessionScope } from '../session-routing.ts';
 import { resolveEffectiveOpenRuntimeHints } from '../session-runtime.ts';
-import { captureSnapshot } from '../snapshot-capture.ts';
+import { captureSnapshot } from '../../core/snapshot-capture.ts';
 import { handleSessionCloseCommands } from '../session-lifecycle/index.ts';
 import { createReplayTestVideoOwner } from './session-replay-video-owner.ts';
 import type { SessionCommandHandler } from './session-command-input.ts';
diff --git a/src/daemon/handlers/session-replay-video-owner.ts b/packages/daemon/src/sessions/handlers/session-replay-video-owner.ts
similarity index 86%
rename from src/daemon/handlers/session-replay-video-owner.ts
rename to packages/daemon/src/sessions/handlers/session-replay-video-owner.ts
index d14d3f17f8..7ce5724df0 100644
--- a/src/daemon/handlers/session-replay-video-owner.ts
+++ b/packages/daemon/src/sessions/handlers/session-replay-video-owner.ts
@@ -1,10 +1,13 @@
-import type { DaemonPlatformServices } from '../platform-services.ts';
+import type { DaemonPlatformServices } from '../../core/platform-services.ts';
 import { handleRecordCommand } from './record-runtime.ts';
-import type { BindDeviceRuntime, BindExactDeviceRuntime } from '../request-runtime-binding.ts';
+import type {
+  BindDeviceRuntime,
+  BindExactDeviceRuntime,
+} from '../../core/request-runtime-binding.ts';
 import { type ScreenRecordingAdmissionLedger } from '@agent-device/capture-kit/screen-recording-admission-ledger';
 import type { PlatformRequestScope } from '@agent-device/contracts/platform-runtime-host';
-import type { DaemonRequest } from '../daemon-request.ts';
-import type { SessionStore } from '../session-store.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
+import type { SessionStore } from '../../core/session-store.ts';
 import type { ReplayTestVideoOwner } from '@agent-device/replay-port/command-types';
 
 type ReplayRecordVideoRequest = Parameters<ReplayTestVideoOwner['record']>[0];
diff --git a/src/daemon/handlers/session-runtime-command.ts b/packages/daemon/src/sessions/handlers/session-runtime-command.ts
similarity index 91%
rename from src/daemon/handlers/session-runtime-command.ts
rename to packages/daemon/src/sessions/handlers/session-runtime-command.ts
index 2fecd9bb43..c5a1aa9927 100644
--- a/src/daemon/handlers/session-runtime-command.ts
+++ b/packages/daemon/src/sessions/handlers/session-runtime-command.ts
@@ -1,11 +1,11 @@
-import type { DaemonPlatformServices } from '../platform-services.ts';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
+import type { DaemonPlatformServices } from '../../core/platform-services.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
 import { publicPlatformString } from '@agent-device/kernel/device';
 import { clearRuntimeHintsRuntimeUse } from '@agent-device/contracts/application-lifecycle-runtime-plan';
-import { SessionStore } from '../session-store.ts';
-import type { SessionRef } from '../session-state.ts';
-import { expireRefFrame } from '../ref-frame.ts';
-import { admitRuntimeUse } from '../runtime-admission.ts';
+import { SessionStore } from '../../core/session-store.ts';
+import type { SessionRef } from '../../core/session-state.ts';
+import { expireRefFrame } from '../../core/ref-frame.ts';
+import { admitRuntimeUse } from '../../core/runtime-admission.ts';
 import {
   buildRuntimeHints,
   countConfiguredRuntimeHints,
@@ -14,10 +14,13 @@ import {
   runtimeHintValues,
   toRuntimePlatform,
 } from '../session-runtime.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
 import { handlePortReverseCommand } from './session-runtime-port-reverse.ts';
-import { contextFromFlags } from '../context.ts';
-import { resolveBoundGestureViewportRuntime } from '../gesture-runtime.ts';
+import { contextFromFlags } from '../../core/context.ts';
+import { resolveBoundGestureViewportRuntime } from '../../core/gesture-runtime.ts';
 import { errorResponse } from '@agent-device/kernel/contracts';
 
 type RuntimeAction = 'set' | 'show' | 'clear';
diff --git a/src/daemon/handlers/session-runtime-port-reverse.ts b/packages/daemon/src/sessions/handlers/session-runtime-port-reverse.ts
similarity index 89%
rename from src/daemon/handlers/session-runtime-port-reverse.ts
rename to packages/daemon/src/sessions/handlers/session-runtime-port-reverse.ts
index b97af9a1c0..2c45150bf1 100644
--- a/src/daemon/handlers/session-runtime-port-reverse.ts
+++ b/packages/daemon/src/sessions/handlers/session-runtime-port-reverse.ts
@@ -1,14 +1,17 @@
-import type { DaemonPlatformServices } from '../platform-services.ts';
+import type { DaemonPlatformServices } from '../../core/platform-services.ts';
 import type { ProviderPortReverseOptions } from '@agent-device/contracts/device';
 import { configureProviderPortReverseRuntimeUse } from '@agent-device/contracts/application-lifecycle-runtime-plan';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
-import type { SessionStore } from '../session-store.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import { admitRuntimeUse } from '../runtime-admission.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
+import type { SessionStore } from '../../core/session-store.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import { admitRuntimeUse } from '../../core/runtime-admission.ts';
 import {
   requireSessionOrExplicitSelector,
   resolveCommandDevice,
-} from '../session-device-resolution.ts';
+} from '../../resources/session-device-resolution.ts';
 import { errorResponse } from '@agent-device/kernel/contracts';
 
 type PortReverseParseResult =
diff --git a/src/daemon/handlers/session-script-publication.ts b/packages/daemon/src/sessions/handlers/session-script-publication.ts
similarity index 92%
rename from src/daemon/handlers/session-script-publication.ts
rename to packages/daemon/src/sessions/handlers/session-script-publication.ts
index dc6826dac1..68f7a27820 100644
--- a/src/daemon/handlers/session-script-publication.ts
+++ b/packages/daemon/src/sessions/handlers/session-script-publication.ts
@@ -6,11 +6,11 @@ import {
   isAuthoringArmedSession,
   markActivePublicationDone,
   retargetActivePublication,
-} from '../session-script-publication-capability.ts';
-import { isRepairArmedSession } from '../session-replay-transaction.ts';
-import { SessionStore } from '../session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
-import type { SessionState } from '../session-state.ts';
+} from '../../core/session-script-publication-capability.ts';
+import { isRepairArmedSession } from '../../core/session-replay-transaction.ts';
+import { SessionStore } from '../../core/session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
+import type { SessionState } from '../../core/session-state.ts';
 
 export function handleSessionScriptPublication(params: {
   req: DaemonRequest;
diff --git a/src/daemon/handlers/session-shutdown.ts b/packages/daemon/src/sessions/handlers/session-shutdown.ts
similarity index 95%
rename from src/daemon/handlers/session-shutdown.ts
rename to packages/daemon/src/sessions/handlers/session-shutdown.ts
index 6d73e5bc7e..3683569735 100644
--- a/src/daemon/handlers/session-shutdown.ts
+++ b/packages/daemon/src/sessions/handlers/session-shutdown.ts
@@ -6,13 +6,13 @@ import { errorResponse } from '@agent-device/kernel/contracts';
 import {
   requireSessionOrExplicitSelector,
   resolveCommandDevice,
-} from '../session-device-resolution.ts';
+} from '../../resources/session-device-resolution.ts';
 import {
   requireRuntimeBinding,
   requireRuntimeFacts,
   type RuntimeCommandHandlerParams,
-} from '../session-runtime-admission.ts';
-import type { DaemonResponse } from '../daemon-request.ts';
+} from '../../core/session-runtime-admission.ts';
+import type { DaemonResponse } from '../../core/daemon-request.ts';
 import { deviceStatusReportResponse } from './session-device-status-response.ts';
 
 function shutdownUnavailableResponse(fact: RuntimeOperationFact) {
diff --git a/src/daemon/handlers/session.ts b/packages/daemon/src/sessions/handlers/session.ts
similarity index 94%
rename from src/daemon/handlers/session.ts
rename to packages/daemon/src/sessions/handlers/session.ts
index 13b0ce7e42..b732cf07bc 100644
--- a/src/daemon/handlers/session.ts
+++ b/packages/daemon/src/sessions/handlers/session.ts
@@ -1,7 +1,10 @@
-import type { DaemonResponse } from '../daemon-request.ts';
+import type { DaemonResponse } from '../../core/daemon-request.ts';
 import { handleReleaseMaterializedPathsCommand } from './session-app-source-deployment.ts';
 import { handleRuntimeCommand } from './session-runtime-command.ts';
-import { handleKeyboardCommand, handleAppEventCommand } from './session-selector-dispatch.ts';
+import {
+  handleKeyboardCommand,
+  handleAppEventCommand,
+} from '../../execution/handlers/session-selector-dispatch.ts';
 import { handleSessionAppDeploymentCommand } from './session-app-deployment-route.ts';
 import { runBatchCommands } from './session-batch.ts';
 import {
@@ -15,7 +18,7 @@ import { handleAppStateCommand } from './session-appstate.ts';
 import { handleSessionObservabilityCommands } from '../session-observability/index.ts';
 import { handleReplayCommand, handleReplayTestCommand } from './session-replay-command.ts';
 import { handleSessionScriptPublication } from './session-script-publication.ts';
-import { handleSessionClipboardCommand } from './session-clipboard.ts';
+import { handleSessionClipboardCommand } from '../../execution/handlers/session-clipboard.ts';
 import { handleDoctorCommand } from './session-doctor.ts';
 import { handlePrepareCommand } from './session-prepare.ts';
 import type {
@@ -30,7 +33,7 @@ import type {
 } from '../session-lifecycle/index.ts';
 import type { SessionObservabilityCommandInput } from '../session-observability/index.ts';
 import type { DescriptorSessionRouteCommandName } from '@agent-device/command-registry/registry';
-import { LeaseRegistry } from '../lease-registry.ts';
+import { LeaseRegistry } from '../../resources/lease-registry.ts';
 
 const handleSessionInventoryCommandGroup: SessionCommandHandler = (
   params: SessionCommandParams & SessionInventoryCommandInput,
@@ -91,7 +94,7 @@ const handleSessionObservabilityCommandGroup: SessionCommandHandler = async ({
 /**
  * Descriptor-driven exhaustive dispatch table for the daemon's `session`
  * route (mirrors `DISPATCH_HANDLERS` in -device/device-selection/dispatch-resolve and
- * `SNAPSHOT_COMMAND_HANDLER_IMPLS` in src/daemon/handlers/snapshot.ts). The
+ * `SNAPSHOT_COMMAND_HANDLER_IMPLS` in packages/daemon/src/sessions/handlers/snapshot.ts). The
  * `satisfies Record<DescriptorSessionRouteCommandName, …>` check means a
  * session-routed descriptor added to the registry without a matching entry
  * here is a COMPILE error, not a runtime routing gap. Command-kind groupings
diff --git a/src/daemon/handlers/snapshot-runtime-route.test.ts b/packages/daemon/src/sessions/handlers/snapshot-runtime-route.test.ts
similarity index 90%
rename from src/daemon/handlers/snapshot-runtime-route.test.ts
rename to packages/daemon/src/sessions/handlers/snapshot-runtime-route.test.ts
index f2abc611d6..74571362cb 100644
--- a/src/daemon/handlers/snapshot-runtime-route.test.ts
+++ b/packages/daemon/src/sessions/handlers/snapshot-runtime-route.test.ts
@@ -1,6 +1,6 @@
-import { daemonPlatformServicesFixture } from '../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../__tests__/support/platform-services-fixture.ts';
 import { beforeEach, expect, test, vi } from 'vitest';
-import { fakeCreateCommandSurface } from '../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
 
 const { dispatchSnapshotDiffViaRuntime, dispatchSnapshotViaRuntime } = vi.hoisted(() => ({
   dispatchSnapshotDiffViaRuntime: vi.fn(),
@@ -15,8 +15,8 @@ vi.mock('../snapshot-runtime.ts', () => ({
   dispatchSnapshotViaRuntime,
 }));
 
-import { SessionStore } from '../session-store.ts';
-import type { DaemonRequest } from '../daemon-request.ts';
+import { SessionStore } from '../../core/session-store.ts';
+import type { DaemonRequest } from '../../core/daemon-request.ts';
 import { handleSnapshotCommands } from './snapshot.ts';
 
 beforeEach(() => {
diff --git a/src/daemon/handlers/snapshot.ts b/packages/daemon/src/sessions/handlers/snapshot.ts
similarity index 85%
rename from src/daemon/handlers/snapshot.ts
rename to packages/daemon/src/sessions/handlers/snapshot.ts
index 83d09fffda..796001fc5f 100644
--- a/src/daemon/handlers/snapshot.ts
+++ b/packages/daemon/src/sessions/handlers/snapshot.ts
@@ -1,14 +1,20 @@
-import type { DaemonPlatformServices } from '../platform-services.ts';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
-import { SessionStore } from '../session-store.ts';
-import { handleAlertCommand } from './snapshot-alert.ts';
-import { handleSettingsCommand, parseSettingsArgs } from './snapshot-settings.ts';
+import type { DaemonPlatformServices } from '../../core/platform-services.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
+import { SessionStore } from '../../core/session-store.ts';
+import { handleAlertCommand } from '../../execution/handlers/snapshot-alert.ts';
+import {
+  handleSettingsCommand,
+  parseSettingsArgs,
+} from '../../execution/handlers/snapshot-settings.ts';
 import { dispatchSnapshotDiffViaRuntime } from '../snapshot-diff-runtime.ts';
 import { dispatchSnapshotViaRuntime } from '../snapshot-runtime.ts';
-import { dispatchWaitViaRuntime } from '../wait-runtime.ts';
-import { resolveSessionDevice, withSessionlessRunnerCleanup } from '../snapshot-session.ts';
-import type { BindDeviceRuntime, InspectDeviceRuntimeFacts } from '../request-runtime-binding.ts';
-import type { PlatformResourceCleanup } from '../platform-resource-cleanup.ts';
+import { dispatchWaitViaRuntime } from '../../execution/wait-runtime.ts';
+import { resolveSessionDevice, withSessionlessRunnerCleanup } from '../../core/snapshot-session.ts';
+import type {
+  BindDeviceRuntime,
+  InspectDeviceRuntimeFacts,
+} from '../../core/request-runtime-binding.ts';
+import type { PlatformResourceCleanup } from '../../core/platform-resource-cleanup.ts';
 import type { CreateDaemonCommandSurface } from '@agent-device/contracts/daemon-command-surface';
 import { errorResponse } from '@agent-device/kernel/contracts';
 
diff --git a/src/daemon/handlers/trace-runtime.ts b/packages/daemon/src/sessions/handlers/trace-runtime.ts
similarity index 90%
rename from src/daemon/handlers/trace-runtime.ts
rename to packages/daemon/src/sessions/handlers/trace-runtime.ts
index 01d6486c61..af7eb84206 100644
--- a/src/daemon/handlers/trace-runtime.ts
+++ b/packages/daemon/src/sessions/handlers/trace-runtime.ts
@@ -2,10 +2,10 @@ import { expandSessionPath } from '@agent-device/host-kit/session-paths';
 import fs from 'node:fs';
 import path from 'node:path';
 import type { TraceCommandResult } from '@agent-device/contracts/recording';
-import type { SessionStore } from '../session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../daemon-request.ts';
-import type { SessionRef } from '../session-state.ts';
-import { recordSessionAction } from '../session-action-recorder.ts';
+import type { SessionStore } from '../../core/session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../core/daemon-request.ts';
+import type { SessionRef } from '../../core/session-state.ts';
+import { recordSessionAction } from '../../core/session-action-recorder.ts';
 import { errorResponse } from '@agent-device/kernel/contracts';
 
 export function handleTraceCommand(params: {
diff --git a/src/daemon/install-source-resolution.ts b/packages/daemon/src/sessions/install-source-resolution.ts
similarity index 91%
rename from src/daemon/install-source-resolution.ts
rename to packages/daemon/src/sessions/install-source-resolution.ts
index 07ebbcfeef..86652c9dfd 100644
--- a/src/daemon/install-source-resolution.ts
+++ b/packages/daemon/src/sessions/install-source-resolution.ts
@@ -1,7 +1,10 @@
 import { AppError } from '@agent-device/kernel/errors';
 import type { DaemonInstallSource, LocalInstallSource } from '@agent-device/kernel/contracts';
-import { cleanupUploadedArtifact, prepareUploadedArtifact } from './artifact-tracking.ts';
-import type { DaemonRequest } from './daemon-request.ts';
+import {
+  cleanupUploadedArtifact,
+  prepareUploadedArtifact,
+} from '../resources/artifact-tracking.ts';
+import type { DaemonRequest } from '../core/daemon-request.ts';
 
 function assertUnsupportedInstallSource(source: never): never {
   throw new AppError(
diff --git a/src/daemon/lease-lifecycle.ts b/packages/daemon/src/sessions/lease-lifecycle.ts
similarity index 92%
rename from src/daemon/lease-lifecycle.ts
rename to packages/daemon/src/sessions/lease-lifecycle.ts
index 4a432e04a3..7524b4ff99 100644
--- a/src/daemon/lease-lifecycle.ts
+++ b/packages/daemon/src/sessions/lease-lifecycle.ts
@@ -1,18 +1,18 @@
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
 import { leaseScopeToReleaseRequest } from '@agent-device/contracts/lease-scope';
-import { clearDeviceClaim } from './device/device-claims.ts';
-import type { LeaseRegistry } from './lease-registry.ts';
+import { clearDeviceClaim } from '../resources/device/device-claims.ts';
+import type { LeaseRegistry } from '../resources/lease-registry.ts';
 import type {
   DeviceLease,
   LeaseLifecycleProvider,
   ProviderAppCatalog,
 } from '@agent-device/contracts/device';
-import { buildSessionLeaseFromRequest, type SessionLease } from './lease-context.ts';
+import { buildSessionLeaseFromRequest, type SessionLease } from '../core/lease-context.ts';
 import { assertRequestLeaseAdmission } from './request-admission.ts';
-import type { SessionStore } from './session-store.ts';
-import type { DaemonRequest } from './daemon-request.ts';
-import type { SessionRef, SessionState } from './session-state.ts';
-import { providerSessionIdFromData } from './provider-session-ownership.ts';
+import type { SessionStore } from '../core/session-store.ts';
+import type { DaemonRequest } from '../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../core/session-state.ts';
+import { providerSessionIdFromData } from '../resources/provider-session-ownership.ts';
 import type { DaemonPolicy } from '@agent-device/daemon-contracts/daemon-policy-file';
 
 export type ExpiredProviderLeaseRecovery = (lease: DeviceLease) => Promise<void>;
diff --git a/src/daemon/materialized-path-registry.ts b/packages/daemon/src/sessions/materialized-path-registry.ts
similarity index 97%
rename from src/daemon/materialized-path-registry.ts
rename to packages/daemon/src/sessions/materialized-path-registry.ts
index 92f2924ae8..edc4d9e207 100644
--- a/src/daemon/materialized-path-registry.ts
+++ b/packages/daemon/src/sessions/materialized-path-registry.ts
@@ -2,7 +2,10 @@ import crypto from 'node:crypto';
 import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
-import { requireTenantOwnedEntry, type TenantOwnedResourceKind } from './tenant-owned-entry.ts';
+import {
+  requireTenantOwnedEntry,
+  type TenantOwnedResourceKind,
+} from '../core/tenant-owned-entry.ts';
 
 const DEFAULT_MATERIALIZED_PATH_TTL_MS = 15 * 60 * 1000;
 
diff --git a/src/daemon/open-device-contention-wait.ts b/packages/daemon/src/sessions/open-device-contention-wait.ts
similarity index 97%
rename from src/daemon/open-device-contention-wait.ts
rename to packages/daemon/src/sessions/open-device-contention-wait.ts
index 58dfc8679f..a9ce0283c6 100644
--- a/src/daemon/open-device-contention-wait.ts
+++ b/packages/daemon/src/sessions/open-device-contention-wait.ts
@@ -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 { DaemonRequest } from './daemon-request.ts';
-import type { SessionStore } from './session-store.ts';
-import type { SessionRecoveryOptions } from './session-recovery-hints.ts';
+import type { DaemonRequest } from '../core/daemon-request.ts';
+import type { SessionStore } from '../core/session-store.ts';
+import type { SessionRecoveryOptions } from '../core/session-recovery-hints.ts';
 
 /**
  * How often a waiting open re-checks its device. Contention ends when another session closes or
diff --git a/src/daemon/payload-input.ts b/packages/daemon/src/sessions/payload-input.ts
similarity index 100%
rename from src/daemon/payload-input.ts
rename to packages/daemon/src/sessions/payload-input.ts
diff --git a/src/daemon/request-admission.ts b/packages/daemon/src/sessions/request-admission.ts
similarity index 93%
rename from src/daemon/request-admission.ts
rename to packages/daemon/src/sessions/request-admission.ts
index 1b61a57a9e..f704da4cbc 100644
--- a/src/daemon/request-admission.ts
+++ b/packages/daemon/src/sessions/request-admission.ts
@@ -1,24 +1,24 @@
 import { AppError } from '@agent-device/kernel/errors';
-import { normalizeTenantId, resolveSessionIsolationMode } from './config.ts';
-import { isTenantOwnedSessionName, tenantScopedSessionName } from './session-tenant-scope.ts';
+import { normalizeTenantId, resolveSessionIsolationMode } from '../core/config.ts';
+import { isTenantOwnedSessionName, tenantScopedSessionName } from '../core/session-tenant-scope.ts';
 import {
   isAppLeaseAllowed,
   isLeaseAdmissionExempt,
   isHumanControlMutation,
   resolveSessionlessLeaseAdmissionExemption,
-} from './daemon-command-registry.ts';
+} from '../core/daemon-command-registry.ts';
 import type { DeviceLease, ProviderAppCatalog } from '@agent-device/contracts/device';
 import {
   findMissingProxyLeaseFields,
   resolveLeaseScope,
   resolveRequestOrSessionLeaseScope,
-} from './lease-context.ts';
+} from '../core/lease-context.ts';
 import { leaseScopeToHeartbeatRequest } from '@agent-device/contracts/lease-scope';
-import type { LeaseRegistry } from './lease-registry.ts';
-import type { DaemonRequest } from './daemon-request.ts';
-import type { SessionState } from './session-state.ts';
-import { assertMacOsAppLeaseAdmitsRequest } from './macos-app-lease.ts';
-import { assertDaemonPolicyAdmitsLease } from './daemon-policy.ts';
+import type { LeaseRegistry } from '../resources/lease-registry.ts';
+import type { DaemonRequest } from '../core/daemon-request.ts';
+import type { SessionState } from '../core/session-state.ts';
+import { assertMacOsAppLeaseAdmitsRequest } from '../resources/macos-app-lease.ts';
+import { assertDaemonPolicyAdmitsLease } from '../core/daemon-policy.ts';
 import type { DaemonPolicy } from '@agent-device/daemon-contracts/daemon-policy-file';
 
 export function scopeRequestSession(req: DaemonRequest): DaemonRequest {
diff --git a/src/daemon/request-handler-chain.ts b/packages/daemon/src/sessions/request-handler-chain.ts
similarity index 90%
rename from src/daemon/request-handler-chain.ts
rename to packages/daemon/src/sessions/request-handler-chain.ts
index 2f01cce66d..2c229c8303 100644
--- a/src/daemon/request-handler-chain.ts
+++ b/packages/daemon/src/sessions/request-handler-chain.ts
@@ -1,22 +1,22 @@
-import type { DaemonPlatformServices } from './platform-services.ts';
+import type { DaemonPlatformServices } from '../core/platform-services.ts';
 import type { CommandFlags } from '@agent-device/contracts/command';
 import type { CloudArtifactProvider } from '@agent-device/contracts/observability';
 import { AppError } from '@agent-device/kernel/errors';
 import type { DaemonCommandRoute } from '@agent-device/command-registry/daemon-command-descriptor';
-import { getDaemonCommandRoute } from './daemon-command-registry.ts';
-import * as genericRequestHandlerModule from './request-generic-dispatch.ts';
-import type { DaemonCommandContext } from './context.ts';
+import { getDaemonCommandRoute } from '../core/daemon-command-registry.ts';
+import * as genericRequestHandlerModule from '../execution/request-generic-dispatch.ts';
+import type { DaemonCommandContext } from '../core/context.ts';
 import type { LeaseLifecycleProvider, ProviderAppCatalog } from '@agent-device/contracts/device';
-import type { LeaseRegistry } from './lease-registry.ts';
-import type { SessionStore } from './session-store.ts';
-import type { DaemonInvokeFn, DaemonRequest, DaemonResponse } from './daemon-request.ts';
+import type { LeaseRegistry } from '../resources/lease-registry.ts';
+import type { SessionStore } from '../core/session-store.ts';
+import type { DaemonInvokeFn, DaemonRequest, DaemonResponse } from '../core/daemon-request.ts';
 import type {
   BindDeviceRuntime,
   BindExactDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from './request-runtime-binding.ts';
-import type { DeviceClaimReconciler } from './device/device-claims.ts';
-import type { AppLogAdmissionLedger } from './app-log-admission-ledger.ts';
+} from '../core/request-runtime-binding.ts';
+import type { DeviceClaimReconciler } from '../resources/device/device-claims.ts';
+import type { AppLogAdmissionLedger } from '../resources/app-log-admission-ledger.ts';
 import { type AudioProbeAdmissionLedger } from '@agent-device/capture-kit/audio-probe-admission-ledger';
 import { type PerfCaptureAdmissionLedger } from '@agent-device/capture-kit/perf-capture-admission-ledger';
 import { type ScreenRecordingAdmissionLedger } from '@agent-device/capture-kit/screen-recording-admission-ledger';
@@ -25,7 +25,7 @@ import type { PlatformRequestScope } from '@agent-device/contracts/platform-runt
 import type { RequestPlatformProviderScope } from '@agent-device/contracts/platform-providers';
 import type { AndroidObservationAdapter } from '@agent-device/contracts/android-observation';
 import type { CreateDaemonCommandSurface } from '@agent-device/contracts/daemon-command-surface';
-import type { PlatformResourceCleanup } from './platform-resource-cleanup.ts';
+import type { PlatformResourceCleanup } from '../core/platform-resource-cleanup.ts';
 import type { DaemonProviderCredentials } from '@agent-device/daemon-contracts/provider-credentials';
 
 type RequestHandlerChainParams = {
@@ -90,7 +90,7 @@ const DAEMON_ROUTE_HANDLERS = {
     run: runSnapshotHandler,
   }),
   reactNative: defineDaemonRoute({
-    load: () => import('./handlers/react-native.ts'),
+    load: () => import('../execution/handlers/react-native.ts'),
     run: runReactNativeHandler,
   }),
   recordTrace: defineDaemonRoute({
@@ -98,11 +98,11 @@ const DAEMON_ROUTE_HANDLERS = {
     run: runRecordTraceHandler,
   }),
   find: defineDaemonRoute({
-    load: () => import('./interaction/index.ts'),
+    load: () => import('../execution/interaction/index.ts'),
     run: runFindHandler,
   }),
   interaction: defineDaemonRoute({
-    load: () => import('./interaction/index.ts'),
+    load: () => import('../execution/interaction/index.ts'),
     run: runInteractionHandler,
   }),
   generic: defineDaemonRoute({
@@ -127,7 +127,7 @@ export async function runRequestHandlerChain(
 }
 
 export async function loadGenericRequestHandlerModule(): Promise<
-  typeof import('./request-generic-dispatch.ts')
+  typeof import('../execution/request-generic-dispatch.ts')
 > {
   return await DAEMON_ROUTE_HANDLERS.generic.loadModule();
 }
@@ -222,7 +222,7 @@ async function runSnapshotHandler(
 }
 
 async function runReactNativeHandler(
-  { handleReactNativeCommands }: typeof import('./handlers/react-native.ts'),
+  { handleReactNativeCommands }: typeof import('../execution/handlers/react-native.ts'),
   params: RequestHandlerChainParams,
 ): Promise<DaemonResponse> {
   return expectHandlerResponse(
@@ -269,7 +269,7 @@ async function runRecordTraceHandler(
 }
 
 async function runFindHandler(
-  { handleFindCommands }: typeof import('./interaction/index.ts'),
+  { handleFindCommands }: typeof import('../execution/interaction/index.ts'),
   params: RequestHandlerChainParams,
 ): Promise<DaemonResponse> {
   return expectHandlerResponse(
@@ -290,7 +290,7 @@ async function runFindHandler(
 }
 
 async function runInteractionHandler(
-  { handleInteractionCommands }: typeof import('./interaction/index.ts'),
+  { handleInteractionCommands }: typeof import('../execution/interaction/index.ts'),
   params: RequestHandlerChainParams,
 ): Promise<DaemonResponse> {
   return expectHandlerResponse(
diff --git a/src/daemon/request-recording-health.ts b/packages/daemon/src/sessions/request-recording-health.ts
similarity index 86%
rename from src/daemon/request-recording-health.ts
rename to packages/daemon/src/sessions/request-recording-health.ts
index 1b5a4bf8a9..9a63be8cea 100644
--- a/src/daemon/request-recording-health.ts
+++ b/packages/daemon/src/sessions/request-recording-health.ts
@@ -1,7 +1,7 @@
 import { isIosFamily } from '@agent-device/kernel/device';
-import type { SessionRef, SessionState } from './session-state.ts';
-import type { SessionStore } from './session-store.ts';
-import type { DaemonPlatformServices } from './platform-services.ts';
+import type { SessionRef, SessionState } from '../core/session-state.ts';
+import type { SessionStore } from '../core/session-store.ts';
+import type { DaemonPlatformServices } from '../core/platform-services.ts';
 
 export async function refreshRecordingHealth(
   store: SessionStore,
diff --git a/src/daemon/route-owner-files.ts b/packages/daemon/src/sessions/route-owner-files.ts
similarity index 66%
rename from src/daemon/route-owner-files.ts
rename to packages/daemon/src/sessions/route-owner-files.ts
index e8d7fc785d..071ea5808a 100644
--- a/src/daemon/route-owner-files.ts
+++ b/packages/daemon/src/sessions/route-owner-files.ts
@@ -17,15 +17,15 @@ import type { DaemonCommandRoute } from './request-handler-chain.ts';
  * each path still points at the module that route's loader imports.
  */
 const DAEMON_ROUTE_OWNER_FILES = {
-  humanControl: 'src/daemon/handlers/human-control.ts',
-  lease: 'src/daemon/handlers/lease.ts',
-  session: 'src/daemon/handlers/session.ts',
-  snapshot: 'src/daemon/handlers/snapshot.ts',
-  reactNative: 'src/daemon/handlers/react-native.ts',
-  recordTrace: 'src/daemon/handlers/record-trace.ts',
-  find: 'src/daemon/interaction/index.ts',
-  interaction: 'src/daemon/interaction/index.ts',
-  generic: 'src/daemon/request-generic-dispatch.ts',
+  humanControl: 'packages/daemon/src/sessions/handlers/human-control.ts',
+  lease: 'packages/daemon/src/sessions/handlers/lease.ts',
+  session: 'packages/daemon/src/sessions/handlers/session.ts',
+  snapshot: 'packages/daemon/src/sessions/handlers/snapshot.ts',
+  reactNative: 'packages/daemon/src/execution/handlers/react-native.ts',
+  recordTrace: 'packages/daemon/src/sessions/handlers/record-trace.ts',
+  find: 'packages/daemon/src/execution/interaction/index.ts',
+  interaction: 'packages/daemon/src/execution/interaction/index.ts',
+  generic: 'packages/daemon/src/execution/request-generic-dispatch.ts',
 } as const satisfies Record<DaemonCommandRoute, string>;
 
 export function getDaemonRouteOwnerFiles(): Record<DaemonCommandRoute, string> {
diff --git a/src/daemon/server/daemon-idle-reap.test.ts b/packages/daemon/src/sessions/server/daemon-idle-reap.test.ts
similarity index 96%
rename from src/daemon/server/daemon-idle-reap.test.ts
rename to packages/daemon/src/sessions/server/daemon-idle-reap.test.ts
index 91319676c7..b5bb667720 100644
--- a/src/daemon/server/daemon-idle-reap.test.ts
+++ b/packages/daemon/src/sessions/server/daemon-idle-reap.test.ts
@@ -2,9 +2,9 @@ import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import path from 'node:path';
 import { afterEach, beforeEach, test, vi } from 'vitest';
-import { makeIosSession } from '../__tests__/support/session-factories.ts';
-import { SessionStore } from '../session-store.ts';
-import type { SessionState } from '../session-state.ts';
+import { makeIosSession } from '../../__tests__/support/session-factories.ts';
+import { SessionStore } from '../../core/session-store.ts';
+import type { SessionState } from '../../core/session-state.ts';
 import {
   createDaemonIdleReap,
   hasActiveRecording,
@@ -13,7 +13,7 @@ import {
   resolveDaemonIdleReapMs,
 } from './daemon-idle-reap.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { makeTestScreenRecordingResource } from '../__tests__/support/screen-recording-live-handle.ts';
+import { makeTestScreenRecordingResource } from '../../__tests__/support/screen-recording-live-handle.ts';
 
 let stateDir: string;
 let sessionStore: SessionStore;
diff --git a/src/daemon/server/daemon-idle-reap.ts b/packages/daemon/src/sessions/server/daemon-idle-reap.ts
similarity index 95%
rename from src/daemon/server/daemon-idle-reap.ts
rename to packages/daemon/src/sessions/server/daemon-idle-reap.ts
index 61e085b29a..3f749e7f68 100644
--- a/src/daemon/server/daemon-idle-reap.ts
+++ b/packages/daemon/src/sessions/server/daemon-idle-reap.ts
@@ -1,7 +1,7 @@
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
-import type { SessionStore } from '../session-store.ts';
-import type { SessionState } from '../session-state.ts';
-import { isUncommittedRepairSession } from '../session-replay-transaction.ts';
+import type { SessionStore } from '../../core/session-store.ts';
+import type { SessionState } from '../../core/session-state.ts';
+import { isUncommittedRepairSession } from '../../core/session-replay-transaction.ts';
 
 // Bounds the daemon's own lifetime when nothing is using it. Each
 // AGENT_DEVICE_STATE_DIR spawns a dedicated daemon that otherwise never exits
diff --git a/src/daemon/session-lifecycle/__tests__/application.test.ts b/packages/daemon/src/sessions/session-lifecycle/__tests__/application.test.ts
similarity index 93%
rename from src/daemon/session-lifecycle/__tests__/application.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/__tests__/application.test.ts
index 7f4836431e..ac9f2f2c55 100644
--- a/src/daemon/session-lifecycle/__tests__/application.test.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/__tests__/application.test.ts
@@ -1,9 +1,9 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import { beforeEach, expect, test, vi } from 'vitest';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
-import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
+import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
 import { sessionOrDeviceSelectorRequiredDetails } from '@agent-device/kernel/errors';
-import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 vi.mock('@agent-device/device-selection/device-inventory-context', async (importOriginal) => {
   const actual =
diff --git a/src/daemon/session-lifecycle/index.ts b/packages/daemon/src/sessions/session-lifecycle/index.ts
similarity index 100%
rename from src/daemon/session-lifecycle/index.ts
rename to packages/daemon/src/sessions/session-lifecycle/index.ts
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-capabilities-install-projection.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-capabilities-install-projection.test.ts
similarity index 92%
rename from src/daemon/session-lifecycle/internal/__tests__/session-capabilities-install-projection.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-capabilities-install-projection.test.ts
index c1d1440dd8..9ac5aaa698 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-capabilities-install-projection.test.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-capabilities-install-projection.test.ts
@@ -1,18 +1,18 @@
-import { daemonPlatformServicesFixture } from '../../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
 import { expect, test } from 'vitest';
 
 import path from 'node:path';
 import { PUBLIC_COMMANDS } from '@agent-device/command-registry/catalog';
-import { makeAndroidSession } from '../../../__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
+import { makeAndroidSession } from '../../../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../../../__tests__/support/store-factory.ts';
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../../request-runtime-binding.ts';
+} from '../../../../core/request-runtime-binding.ts';
 import { createCapabilitiesAdmissionRuntime } from './session-capabilities.fixtures.ts';
-import { handleSessionCommands } from '../../../handlers/__tests__/session-command-harness.ts';
+import { handleSessionCommands } from '../../../../__tests__/support/handlers/session-command-harness.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../../__tests__/support/command-surface-fake.ts';
 
 test('capabilities projects the install family from exactly one facts inspection', async () => {
   const { sessionName, sessionStore } = createAndroidCapabilitiesSession('install-family');
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-capabilities.fixtures.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-capabilities.fixtures.ts
similarity index 99%
rename from src/daemon/session-lifecycle/internal/__tests__/session-capabilities.fixtures.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-capabilities.fixtures.ts
index 05cf2bfa3d..1ed3790f07 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-capabilities.fixtures.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-capabilities.fixtures.ts
@@ -12,7 +12,7 @@ import { HOVER_UNAVAILABLE_HINT } from '@agent-device/contracts/touch-runtime';
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../../request-runtime-binding.ts';
+} from '../../../../core/request-runtime-binding.ts';
 import {
   createUnavailableRuntimeFactsForTest,
   unavailableApplicationLifecycleOperationFacts,
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-capabilities.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-capabilities.test.ts
similarity index 97%
rename from src/daemon/session-lifecycle/internal/__tests__/session-capabilities.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-capabilities.test.ts
index 509a78a4ed..999aa393b3 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-capabilities.test.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-capabilities.test.ts
@@ -1,11 +1,14 @@
-import { daemonPlatformServicesFixture } from '../../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
 import { test, expect, vi } from 'vitest';
 import path from 'node:path';
 
 import { PUBLIC_COMMANDS } from '@agent-device/command-registry/catalog';
 import { LINUX_DEVICE, WEB_DESKTOP_DEVICE } from '@agent-device/test-kit/device-fixtures';
-import { makeAndroidSession, makeSession } from '../../../__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
+import {
+  makeAndroidSession,
+  makeSession,
+} from '../../../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../../../__tests__/support/store-factory.ts';
 import { withTestDeviceInventoryProvider as withTargetDeviceResolutionScope } from '@agent-device/device-selection/inventory-gateways-fixtures';
 import { unavailableDeploymentSnapshotAndShutdownOperationFacts } from '@agent-device/test-kit/runtime-operation-facts';
 import type { DeviceInfo } from '@agent-device/kernel/device';
@@ -24,10 +27,10 @@ import { perfRuntimeOperationFacts } from '@agent-device/contracts/perf-runtime'
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../../request-runtime-binding.ts';
-import { handleSessionCommands } from '../../../handlers/__tests__/session-command-harness.ts';
+} from '../../../../core/request-runtime-binding.ts';
+import { handleSessionCommands } from '../../../../__tests__/support/handlers/session-command-harness.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../../__tests__/support/command-surface-fake.ts';
 
 /** The system leaves this owner refuses: the retired fallback listed them unconditionally. */
 const ANDROID_REFUSED_SYSTEM_COMMANDS = ['clipboard', 'alert', 'settings', 'app-switcher'];
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-close-cwd-scoped-resources.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-cwd-scoped-resources.test.ts
similarity index 97%
rename from src/daemon/session-lifecycle/internal/__tests__/session-close-cwd-scoped-resources.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-cwd-scoped-resources.test.ts
index 5571ba2093..e112931867 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-close-cwd-scoped-resources.test.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-cwd-scoped-resources.test.ts
@@ -1,11 +1,11 @@
-import { daemonPlatformServicesFixture } from '../../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
 import { beforeEach, expect, test, vi } from 'vitest';
 import type { AppLogLiveHandle } from '@agent-device/contracts/app-log-runtime';
 import type { AudioProbeLiveHandle } from '@agent-device/contracts/audio-probe-runtime';
 import type { PerfNativeCaptureLiveHandle } from '@agent-device/contracts/perf-runtime';
 import type { DurableResourceEnvelope } from '@agent-device/contracts/durable-resource-envelope';
 import { createDurableResourceEnvelope } from '@agent-device/capture-kit';
-import { appLogResourceStore } from '../../../app-log-resource-store.ts';
+import { appLogResourceStore } from '../../../../resources/app-log-resource-store.ts';
 import { audioProbeResourceStore } from '@agent-device/capture-kit/audio-probe-resource-store';
 import { perfCaptureResourceStore } from '@agent-device/capture-kit/perf-capture-resource-store';
 import { screenRecordingResourceStore } from '@agent-device/capture-kit/screen-recording-resource-store';
@@ -16,7 +16,7 @@ import {
 } from './session-close-shutdown.fixtures.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { encodeHostAudioProbeDescriptor } from '@agent-device/capture-kit/audio-probe-descriptor-fixtures';
-import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../../__tests__/support/command-surface-fake.ts';
 
 const {
   handleSessionCommands,
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-close-error-precedence.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-error-precedence.test.ts
similarity index 98%
rename from src/daemon/session-lifecycle/internal/__tests__/session-close-error-precedence.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-error-precedence.test.ts
index f8460cfcd2..7614988154 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-close-error-precedence.test.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-error-precedence.test.ts
@@ -1,10 +1,10 @@
-import { daemonPlatformServicesFixture } from '../../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
 import { beforeEach, expect, test, vi } from 'vitest';
 import {
   sessionCloseShutdownFixture,
   type SessionState,
 } from './session-close-shutdown.fixtures.ts';
-import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../../__tests__/support/command-surface-fake.ts';
 
 const {
   acquireDeviceClaim,
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-close-lifecycle-runtime.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-lifecycle-runtime.test.ts
similarity index 88%
rename from src/daemon/session-lifecycle/internal/__tests__/session-close-lifecycle-runtime.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-lifecycle-runtime.test.ts
index d7036354b7..5adc2475d9 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-close-lifecycle-runtime.test.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-lifecycle-runtime.test.ts
@@ -1,24 +1,24 @@
-import { daemonPlatformServicesFixture } from '../../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
 import { beforeEach, expect, test, vi } from 'vitest';
 
 import path from 'node:path';
-import { SessionStore } from '../../../session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../../../daemon-request.ts';
-import type { SessionState } from '../../../session-state.ts';
+import { SessionStore } from '../../../../core/session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../../core/daemon-request.ts';
+import type { SessionState } from '../../../../core/session-state.ts';
 import {
   activateCompleteRefFrame,
   readSessionRuntimeRevision,
   refFrameState,
-} from '../../../ref-frame.ts';
-import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
+} from '../../../../core/ref-frame.ts';
+import { fakeCreateCommandSurface } from '../../../../__tests__/support/command-surface-fake.ts';
 
 import {
   handleSessionCommands,
   mockBindDeviceRuntime,
   mockInspectDeviceRuntimeFacts,
-} from '../../../handlers/__tests__/session-command-harness.ts';
-import { lifecycleRuntimeFacts } from '../../../__tests__/application-lifecycle-runtime-harness.ts';
-import { dispatchApplicationLifecycleEffect } from '../../../__tests__/application-lifecycle-runtime-fixture.ts';
+} from '../../../../__tests__/support/handlers/session-command-harness.ts';
+import { lifecycleRuntimeFacts } from '../../../../__tests__/support/application-lifecycle-runtime-harness.ts';
+import { dispatchApplicationLifecycleEffect } from '../../../../__tests__/support/application-lifecycle-runtime-fixture.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
 const mockDispatch = vi.mocked(dispatchApplicationLifecycleEffect);
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-close-resource-cleanup.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-resource-cleanup.test.ts
similarity index 96%
rename from src/daemon/session-lifecycle/internal/__tests__/session-close-resource-cleanup.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-resource-cleanup.test.ts
index 873f09817c..22c53d3e50 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-close-resource-cleanup.test.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-resource-cleanup.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from '../../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
 import { beforeEach, expect, test, vi } from 'vitest';
 import type { AudioProbeLiveHandle } from '@agent-device/contracts/audio-probe-runtime';
 import { createDurableResourceEnvelope } from '@agent-device/capture-kit';
@@ -9,8 +9,8 @@ import {
 } from './session-close-shutdown.fixtures.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { encodeHostAudioProbeDescriptor } from '@agent-device/capture-kit/audio-probe-descriptor-fixtures';
-import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
-import { platformResourceCleanupFixture } from '../../../__tests__/support/platform-resource-cleanup-fixture.ts';
+import { fakeCreateCommandSurface } from '../../../../__tests__/support/command-surface-fake.ts';
+import { platformResourceCleanupFixture } from '../../../../__tests__/support/platform-resource-cleanup-fixture.ts';
 
 const {
   AppError,
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-close-save-script.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-save-script.test.ts
similarity index 89%
rename from src/daemon/session-lifecycle/internal/__tests__/session-close-save-script.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-save-script.test.ts
index 8d480525bd..7ad6fcb12c 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-close-save-script.test.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-save-script.test.ts
@@ -1,8 +1,8 @@
-import { daemonPlatformServicesFixture } from '../../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
 import { beforeEach, expect, test } from 'vitest';
 import { sessionCloseShutdownFixture } from './session-close-shutdown.fixtures.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../../__tests__/support/command-surface-fake.ts';
 
 const {
   handleSessionCommands,
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-close-script.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-script.test.ts
similarity index 96%
rename from src/daemon/session-lifecycle/internal/__tests__/session-close-script.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-script.test.ts
index acc6696de6..0d69a7a9e7 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-close-script.test.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-script.test.ts
@@ -6,9 +6,9 @@ import {
   authoringPublication,
   makeIosSession,
   makeRepairCompleteSession,
-} from '../../../__tests__/support/session-factories.ts';
-import { SessionStore } from '../../../session-store.ts';
-import type { DaemonRequest } from '../../../daemon-request.ts';
+} from '../../../../__tests__/support/session-factories.ts';
+import { SessionStore } from '../../../../core/session-store.ts';
+import type { DaemonRequest } from '../../../../core/daemon-request.ts';
 import {
   buildRetriableRepairCloseFailureResponse,
   commitRepairScriptBeforeClose,
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-close-shutdown-platform.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-shutdown-platform.test.ts
similarity index 97%
rename from src/daemon/session-lifecycle/internal/__tests__/session-close-shutdown-platform.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-shutdown-platform.test.ts
index 5302ffca76..a30bdffe1d 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-close-shutdown-platform.test.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-shutdown-platform.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from '../../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
 import { beforeEach, expect, test, vi } from 'vitest';
 import {
   sessionCloseShutdownFixture,
@@ -6,7 +6,7 @@ import {
   type PlatformRuntimeOperations,
 } from './session-close-shutdown.fixtures.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../../__tests__/support/command-surface-fake.ts';
 
 const {
   handleSessionCommands,
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-close-shutdown.fixtures.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-shutdown.fixtures.ts
similarity index 90%
rename from src/daemon/session-lifecycle/internal/__tests__/session-close-shutdown.fixtures.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-shutdown.fixtures.ts
index a30981c43a..f768e962de 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-close-shutdown.fixtures.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-close-shutdown.fixtures.ts
@@ -1,9 +1,9 @@
 import { vi } from 'vitest';
 import fs from 'node:fs';
 import path from 'node:path';
-import { SessionStore } from '../../../session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../../../daemon-request.ts';
-import type { SessionState } from '../../../session-state.ts';
+import { SessionStore } from '../../../../core/session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../../core/daemon-request.ts';
+import type { SessionState } from '../../../../core/session-state.ts';
 import { AppError } from '@agent-device/kernel/errors';
 
 vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal) => {
@@ -49,10 +49,10 @@ import {
   mockBindDeviceRuntime,
   mockInspectDeviceRuntimeFacts,
   mockShutdownTargetRuntime,
-} from '../../../handlers/__tests__/session-command-harness.ts';
+} from '../../../../__tests__/support/handlers/session-command-harness.ts';
 import { teardownSessionResources as teardownProductionSessionResources } from '../../../session-teardown.ts';
-import { platformResourceCleanupFixture } from '../../../__tests__/support/platform-resource-cleanup-fixture.ts';
-import { LeaseRegistry } from '../../../lease-registry.ts';
+import { platformResourceCleanupFixture } from '../../../../__tests__/support/platform-resource-cleanup-fixture.ts';
+import { LeaseRegistry } from '../../../../resources/lease-registry.ts';
 import { runCmd } from '@agent-device/host-kit/command';
 import {
   flushDiagnosticsToSessionFile,
@@ -65,8 +65,8 @@ import {
 } from '@agent-device/platform-apple/runner/operations';
 import { cleanupAppleXctracePerfCapture } from '@agent-device/platform-apple/perf';
 import { WEB_DESKTOP_DEVICE } from '@agent-device/test-kit/device-fixtures';
-import { acquireDeviceClaim } from '../../../device/device-claims.ts';
-import { inspectDeviceClaims } from '../../../device/device-claim-inspection.ts';
+import { acquireDeviceClaim } from '../../../../resources/device/device-claims.ts';
+import { inspectDeviceClaims } from '../../../../resources/device/device-claim-inspection.ts';
 
 import {
   type DeviceBinding,
@@ -78,8 +78,8 @@ import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform
 import type { ScreenRecordingLiveHandle } from '@agent-device/contracts/screen-recording-runtime';
 import { createDurableResourceEnvelope } from '@agent-device/capture-kit';
 import { screenRecordingResourceStore } from '@agent-device/capture-kit/screen-recording-resource-store';
-import { lifecycleRuntimeFacts } from '../../../__tests__/application-lifecycle-runtime-harness.ts';
-import { dispatchApplicationLifecycleEffect } from '../../../__tests__/application-lifecycle-runtime-fixture.ts';
+import { lifecycleRuntimeFacts } from '../../../../__tests__/support/application-lifecycle-runtime-harness.ts';
+import { dispatchApplicationLifecycleEffect } from '../../../../__tests__/support/application-lifecycle-runtime-fixture.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
 export type { DeviceBinding, PlatformRuntimeOperations, SessionState };
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-devices-batch-runtime.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-devices-batch-runtime.test.ts
similarity index 96%
rename from src/daemon/session-lifecycle/internal/__tests__/session-devices-batch-runtime.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-devices-batch-runtime.test.ts
index 1766eefa55..4a70c78ad1 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-devices-batch-runtime.test.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-devices-batch-runtime.test.ts
@@ -1,8 +1,8 @@
-import { daemonPlatformServicesFixture } from '../../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
 import { test, expect, vi } from 'vitest';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../../__tests__/support/command-surface-fake.ts';
 
 vi.mock('../../../materialized-path-registry.ts', async (importOriginal) => {
   const actual = await importOriginal<typeof import('../../../materialized-path-registry.ts')>();
@@ -16,10 +16,10 @@ import {
 import { handleSessionInventoryCommands } from '../inventory.ts';
 import { runBatchCommands } from '../../../handlers/session-batch.ts';
 import { handleReleaseMaterializedPathsCommand } from '../../../handlers/session-app-source-deployment.ts';
-import { handleSessionCommands } from '../../../handlers/__tests__/session-command-harness.ts';
-import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
-import { makeSession } from '../../../__tests__/support/session-factories.ts';
-import type { DaemonRequest, DaemonResponse } from '../../../daemon-request.ts';
+import { handleSessionCommands } from '../../../../__tests__/support/handlers/session-command-harness.ts';
+import { makeSessionStore } from '../../../../__tests__/support/store-factory.ts';
+import { makeSession } from '../../../../__tests__/support/session-factories.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../../core/daemon-request.ts';
 
 import { withTestDeviceInventory } from '@agent-device/device-selection/inventory-gateways-fixtures';
 import type { DeviceInfo } from '@agent-device/kernel/device';
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-inventory-appleos.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-inventory-appleos.test.ts
similarity index 94%
rename from src/daemon/session-lifecycle/internal/__tests__/session-inventory-appleos.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-inventory-appleos.test.ts
index 1d4090bef3..c344801d28 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-inventory-appleos.test.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-inventory-appleos.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from '../../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
 import { test, expect, vi, beforeEach } from 'vitest';
 
 // The `devices` handler resolves its inventory through listDeviceInventory; mocking it
@@ -14,8 +14,8 @@ vi.mock('@agent-device/device-selection/device-inventory-context', async (import
 
 import { handleSessionInventoryCommands } from '../inventory.ts';
 import { listDeviceInventory } from '@agent-device/device-selection/device-inventory-context';
-import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
-import type { DaemonRequest, DaemonResponse } from '../../../daemon-request.ts';
+import { makeSessionStore } from '../../../../__tests__/support/store-factory.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../../core/daemon-request.ts';
 import type { AppleOS, DeviceInfo } from '@agent-device/kernel/device';
 import { AppError } from '@agent-device/kernel/errors';
 import {
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-inventory-apps-runtime.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-inventory-apps-runtime.test.ts
similarity index 95%
rename from src/daemon/session-lifecycle/internal/__tests__/session-inventory-apps-runtime.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-inventory-apps-runtime.test.ts
index de0609e47c..005338f468 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-inventory-apps-runtime.test.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-inventory-apps-runtime.test.ts
@@ -1,7 +1,10 @@
-import { daemonPlatformServicesFixture } from '../../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
 import { beforeEach, expect, test, vi } from 'vitest';
-import type { DaemonRequest } from '../../../daemon-request.ts';
-import { makeSession, makeSessionStore } from '../../../handlers/__tests__/session-test-harness.ts';
+import type { DaemonRequest } from '../../../../core/daemon-request.ts';
+import {
+  makeSession,
+  makeSessionStore,
+} from '../../../../__tests__/support/handlers/session-test-harness.ts';
 import { handleSessionInventoryCommands } from '../inventory.ts';
 import { applicationLifecycleOperationFacts } from '@agent-device/contracts/application-lifecycle-runtime';
 import {
@@ -14,7 +17,7 @@ import { unavailableDeploymentSnapshotAndShutdownOperationFacts } from '@agent-d
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../../request-runtime-binding.ts';
+} from '../../../../core/request-runtime-binding.ts';
 import {
   clearRequestAbortRegistration,
   registerRequestAbort,
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-inventory-harmonyos.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-inventory-harmonyos.test.ts
similarity index 92%
rename from src/daemon/session-lifecycle/internal/__tests__/session-inventory-harmonyos.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-inventory-harmonyos.test.ts
index 06c35da11e..38eb673a13 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-inventory-harmonyos.test.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-inventory-harmonyos.test.ts
@@ -1,7 +1,10 @@
-import { daemonPlatformServicesFixture } from '../../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
 import { beforeEach, expect, test, vi } from 'vitest';
-import type { DaemonRequest, DaemonResponse } from '../../../daemon-request.ts';
-import { makeSession, makeSessionStore } from '../../../handlers/__tests__/session-test-harness.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../../core/daemon-request.ts';
+import {
+  makeSession,
+  makeSessionStore,
+} from '../../../../__tests__/support/handlers/session-test-harness.ts';
 import { handleSessionInventoryCommands } from '../inventory.ts';
 import { applicationLifecycleOperationFacts } from '@agent-device/contracts/application-lifecycle-runtime';
 import {
@@ -14,7 +17,7 @@ import { unavailableDeploymentSnapshotAndShutdownOperationFacts } from '@agent-d
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../../request-runtime-binding.ts';
+} from '../../../../core/request-runtime-binding.ts';
 
 const HARMONY_DEVICE = {
   platform: 'harmonyos' as const,
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-inventory-scoped-paths.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-inventory-scoped-paths.test.ts
similarity index 92%
rename from src/daemon/session-lifecycle/internal/__tests__/session-inventory-scoped-paths.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-inventory-scoped-paths.test.ts
index 4b54f78459..a108a1928d 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-inventory-scoped-paths.test.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-inventory-scoped-paths.test.ts
@@ -1,13 +1,13 @@
-import { daemonPlatformServicesFixture } from '../../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
 import { test, expect } from 'vitest';
 import path from 'node:path';
 import { handleSessionInventoryCommands } from '../inventory.ts';
-import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
-import type { DaemonRequest, DaemonResponse } from '../../../daemon-request.ts';
-import type { SessionState } from '../../../session-state.ts';
+import { makeSessionStore } from '../../../../__tests__/support/store-factory.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../../core/daemon-request.ts';
+import type { SessionState } from '../../../../core/session-state.ts';
 import { IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
 import { resolveImplicitSessionScope } from '../../../session-routing.ts';
-import { tenantScopedSessionName } from '../../../session-tenant-scope.ts';
+import { tenantScopedSessionName } from '../../../../core/session-tenant-scope.ts';
 
 // A session opened without an explicit --session is NAMED `default` and STORED under
 // `cwd:<hash>:default`. `session list` resolved its paths from the name, so it answered with
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-open-device-in-use.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-device-in-use.test.ts
similarity index 95%
rename from src/daemon/session-lifecycle/internal/__tests__/session-open-device-in-use.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-device-in-use.test.ts
index 1054a6b808..55059741af 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-open-device-in-use.test.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-device-in-use.test.ts
@@ -1,10 +1,10 @@
-import { makeStoredSessionRef } from '../../../__tests__/support/store-factory.ts';
+import { makeStoredSessionRef } from '../../../../__tests__/support/store-factory.ts';
 import { test, expect } from 'vitest';
 import {
   buildDeviceInUseBySessionError,
   buildForeignWorkspaceSessionConflict,
-} from '../../../session-recovery-hints.ts';
-import type { SessionRef } from '../../../session-state.ts';
+} from '../../../../core/session-recovery-hints.ts';
+import type { SessionRef } from '../../../../core/session-state.ts';
 import { IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
 
 // DEVICE_IN_USE named `SessionState.name`, and for an implicitly cwd-scoped session that is
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-open-execution-runtime.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-execution-runtime.test.ts
similarity index 97%
rename from src/daemon/session-lifecycle/internal/__tests__/session-open-execution-runtime.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-execution-runtime.test.ts
index 31477ba42c..804053fac4 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-open-execution-runtime.test.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-execution-runtime.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from '../../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
 import { test, expect, vi, beforeEach } from 'vitest';
 
 import path from 'node:path';
@@ -7,14 +7,14 @@ import type {
   ApplicationLifecycleRuntimeOperations,
   OpenApplicationInput,
 } from '@agent-device/contracts/application-lifecycle-runtime';
-import type { DaemonRequest } from '../../../daemon-request.ts';
+import type { DaemonRequest } from '../../../../core/daemon-request.ts';
 import {
   registerRequestAbort,
   markRequestCanceled,
   clearRequestAbortRegistration,
 } from '@agent-device/host-kit/request';
 import { AppError } from '@agent-device/kernel/errors';
-import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../../__tests__/support/command-surface-fake.ts';
 
 const { mockResolveTargetDevice } = vi.hoisted(() => ({
   mockResolveTargetDevice: vi.fn(),
@@ -24,14 +24,16 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
   const actual =
     await importOriginal<typeof import('@agent-device/device-selection/dispatch-resolve')>();
   const { selectionFromResolveTargetDevice } =
-    await import('../../../__tests__/device-selection-stub.ts');
+    await import('../../../../__tests__/support/device-selection-stub.ts');
   return {
     ...actual,
     resolveTargetDevice: mockResolveTargetDevice,
     resolveTargetDeviceSelection: vi.fn(selectionFromResolveTargetDevice(mockResolveTargetDevice)),
   };
 });
-vi.mock('../../../device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));
+vi.mock('../../../../core/device/device-ready.ts', () => ({
+  ensureDeviceReady: vi.fn(async () => {}),
+}));
 vi.mock('@agent-device/platform-apple/app-resolution', async (importOriginal) => {
   const actual =
     await importOriginal<typeof import('@agent-device/platform-apple/app-resolution')>();
@@ -54,13 +56,13 @@ import {
   handleSessionCommands,
   mockBindDeviceRuntime,
   mockInspectDeviceRuntimeFacts,
-} from '../../../handlers/__tests__/session-command-harness.ts';
+} from '../../../../__tests__/support/handlers/session-command-harness.ts';
 import {
   applyRuntimeHintsFixture,
   clearRuntimeHintsFixture,
   dispatchApplicationLifecycleEffect,
   resolveOpenTargetFixture,
-} from '../../../__tests__/application-lifecycle-runtime-fixture.ts';
+} from '../../../../__tests__/support/application-lifecycle-runtime-fixture.ts';
 import { resolveAndroidPackageForOpen } from '@agent-device/platform-android/mechanics';
 import {
   makeAndroidEmulator,
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-open-existing.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-existing.test.ts
similarity index 90%
rename from src/daemon/session-lifecycle/internal/__tests__/session-open-existing.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-existing.test.ts
index 2b101ddc64..5b6ee39d2f 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-open-existing.test.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-existing.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from '../../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
 import { test, expect } from 'vitest';
 import * as path from 'node:path';
 import { buildSnapshotSignatures } from '@agent-device/capture-kit/snapshot-freshness';
@@ -10,11 +10,11 @@ import {
   makeSession,
   noopInvoke,
   withMockedPlatform,
-} from '../../../handlers/__tests__/session-test-harness.ts';
-import type { SessionState } from '../../../session-state.ts';
-import { handleSessionCommands } from '../../../handlers/__tests__/session-command-harness.ts';
+} from '../../../../__tests__/support/handlers/session-test-harness.ts';
+import type { SessionState } from '../../../../core/session-state.ts';
+import { handleSessionCommands } from '../../../../__tests__/support/handlers/session-command-harness.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../../__tests__/support/command-surface-fake.ts';
 
 test('open on existing iOS session refreshes unavailable simulator by name', async () => {
   const sessionStore = makeSessionStore();
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-open-foreground.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-foreground.test.ts
similarity index 97%
rename from src/daemon/session-lifecycle/internal/__tests__/session-open-foreground.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-foreground.test.ts
index 135a2015e7..d10d15fff1 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-open-foreground.test.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-foreground.test.ts
@@ -1,6 +1,6 @@
-import { daemonPlatformServicesFixture } from '../../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
 import { beforeEach, expect, test, vi } from 'vitest';
-import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../../__tests__/support/command-surface-fake.ts';
 
 const dispatchSnapshotViaRuntime = vi.hoisted(() => vi.fn());
 
@@ -12,7 +12,7 @@ import {
   makeAndroidEmulator,
 } from './session-open-runtime.fixtures.ts';
 import { AppError } from '@agent-device/kernel/errors';
-import type { DaemonRequest, DaemonResponse } from '../../../daemon-request.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../../core/daemon-request.ts';
 import {
   composeOpenWithInitialSnapshot,
   resolveForegroundOpenRequest,
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-open-runtime.fixtures.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-runtime.fixtures.ts
similarity index 83%
rename from src/daemon/session-lifecycle/internal/__tests__/session-open-runtime.fixtures.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-runtime.fixtures.ts
index 0b26e2c7d9..73c7ec5162 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-open-runtime.fixtures.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-runtime.fixtures.ts
@@ -1,7 +1,7 @@
 import path from 'node:path';
-import { SessionStore } from '../../../session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../../../daemon-request.ts';
-import type { SessionState } from '../../../session-state.ts';
+import { SessionStore } from '../../../../core/session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../../core/daemon-request.ts';
+import type { SessionState } from '../../../../core/session-state.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
 export const noopInvoke = async (_req: DaemonRequest): Promise<DaemonResponse> => ({
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-open-runtime.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-runtime.test.ts
similarity index 95%
rename from src/daemon/session-lifecycle/internal/__tests__/session-open-runtime.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-runtime.test.ts
index eca8ad39b7..c93f2d1036 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-open-runtime.test.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-runtime.test.ts
@@ -1,8 +1,8 @@
-import { daemonPlatformServicesFixture } from '../../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
 import { test, expect, vi, beforeEach } from 'vitest';
 
 import path from 'node:path';
-import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '../../../../__tests__/support/command-surface-fake.ts';
 
 const mockResolveTargetDevice = vi.hoisted(() => vi.fn());
 
@@ -10,14 +10,16 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
   const actual =
     await importOriginal<typeof import('@agent-device/device-selection/dispatch-resolve')>();
   const { selectionFromResolveTargetDevice } =
-    await import('../../../__tests__/device-selection-stub.ts');
+    await import('../../../../__tests__/support/device-selection-stub.ts');
   return {
     ...actual,
     resolveTargetDevice: mockResolveTargetDevice,
     resolveTargetDeviceSelection: vi.fn(selectionFromResolveTargetDevice(mockResolveTargetDevice)),
   };
 });
-vi.mock('../../../device/device-ready.ts', () => ({ ensureDeviceReady: vi.fn(async () => {}) }));
+vi.mock('../../../../core/device/device-ready.ts', () => ({
+  ensureDeviceReady: vi.fn(async () => {}),
+}));
 vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal) => {
   const actual =
     await importOriginal<typeof import('@agent-device/platform-apple/runner/operations')>();
@@ -50,14 +52,14 @@ import {
   handleSessionCommands,
   mockBindDeviceRuntime,
   mockInspectDeviceRuntimeFacts,
-} from '../../../handlers/__tests__/session-command-harness.ts';
+} from '../../../../__tests__/support/handlers/session-command-harness.ts';
 import {
   applyRuntimeHintsFixture,
   dispatchApplicationLifecycleEffect,
   resolveOpenTargetFixture,
-} from '../../../__tests__/application-lifecycle-runtime-fixture.ts';
+} from '../../../../__tests__/support/application-lifecycle-runtime-fixture.ts';
 import { resolveAndroidPackageForOpen } from '@agent-device/platform-android/mechanics';
-import { lifecycleRuntimeFacts } from '../../../__tests__/application-lifecycle-runtime-harness.ts';
+import { lifecycleRuntimeFacts } from '../../../../__tests__/support/application-lifecycle-runtime-harness.ts';
 import {
   makeAndroidDevice,
   makeAndroidEmulator,
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-open-state.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-state.test.ts
similarity index 93%
rename from src/daemon/session-lifecycle/internal/__tests__/session-open-state.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-state.test.ts
index 62f6bf5401..f3629d097a 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-open-state.test.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-state.test.ts
@@ -5,9 +5,9 @@ import { makeSessionStore } from './session-open-runtime.fixtures.ts';
 import {
   authoringPublication,
   makeIosSession,
-} from '../../../__tests__/support/session-factories.ts';
+} from '../../../../__tests__/support/session-factories.ts';
 import { IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
-import { isSessionRecording } from '../../../session-script-publication-capability.ts';
+import { isSessionRecording } from '../../../../core/session-script-publication-capability.ts';
 
 // --- #1533: a re-open cannot resurrect a terminal authoring lifecycle ---
 //
diff --git a/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-surface.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-surface.test.ts
new file mode 100644
index 0000000000..dc1e065ec6
--- /dev/null
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-surface.test.ts
@@ -0,0 +1,78 @@
+import { test } from 'vitest';
+import { buildOpenResult } from '../session-open-surface.ts';
+import { IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
+import assert from 'node:assert/strict';
+
+test('buildOpenResult exposes the Vega serial without leaking an internal platform alias', () => {
+  const result = buildOpenResult({
+    sessionName: 'vega-tv',
+    sessionStateDir: '/tmp/state',
+    runnerLogPath: '/tmp/runner.log',
+    requestLogPath: '/tmp/request.ndjson',
+    eventLogPath: '/tmp/events.ndjson',
+    appName: 'com.example.app.main',
+    surface: 'app',
+    device: {
+      platform: 'vega',
+      id: 'amazon-vvd',
+      name: 'Vega Virtual Device',
+      kind: 'emulator',
+      target: 'tv',
+      booted: true,
+    },
+    runtimeHintCount: () => 0,
+    sessionReused: false,
+  });
+
+  assert.equal(result.platform, 'vega');
+  assert.equal(result.serial, 'amazon-vvd');
+  assert.equal(result.target, 'tv');
+});
+
+test('buildOpenResult exposes typed device-selection evidence once at response level', () => {
+  const result = buildOpenResult({
+    sessionName: 'ios-selection',
+    sessionStateDir: '/tmp/state',
+    runnerLogPath: '/tmp/runner.log',
+    requestLogPath: '/tmp/request.ndjson',
+    eventLogPath: '/tmp/events.ndjson',
+    surface: 'app',
+    device: IOS_SIMULATOR,
+    runtimeHintCount: () => 0,
+    sessionReused: false,
+    selection: {
+      device: IOS_SIMULATOR,
+      reason: 'single-booted-local',
+      source: 'local',
+      candidateCount: 1,
+      bootOccurred: false,
+    },
+  });
+
+  assert.deepEqual(result.selection, {
+    reason: 'single-booted-local',
+    source: 'local',
+    candidateCount: 1,
+    bootOccurred: false,
+  });
+});
+
+test('buildOpenResult reports an answered launch confirmation and omits one that never appeared', () => {
+  const base = {
+    sessionName: 'ios-launch-url',
+    sessionStateDir: '/tmp/state',
+    runnerLogPath: '/tmp/runner.log',
+    requestLogPath: '/tmp/request.ndjson',
+    eventLogPath: '/tmp/events.ndjson',
+    surface: 'app' as const,
+    device: IOS_SIMULATOR,
+    runtimeHintCount: () => 0,
+    sessionReused: false,
+  };
+
+  assert.equal(
+    buildOpenResult({ ...base, launchConfirmation: 'accepted' }).launchConfirmation,
+    'accepted',
+  );
+  assert.equal('launchConfirmation' in buildOpenResult(base), false);
+});
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-open-warnings.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-warnings.test.ts
similarity index 100%
rename from src/daemon/session-lifecycle/internal/__tests__/session-open-warnings.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-open-warnings.test.ts
diff --git a/src/daemon/session-lifecycle/internal/__tests__/session-teardown-resources.test.ts b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-teardown-resources.test.ts
similarity index 98%
rename from src/daemon/session-lifecycle/internal/__tests__/session-teardown-resources.test.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-teardown-resources.test.ts
index 2628f857c0..4bff9ab897 100644
--- a/src/daemon/session-lifecycle/internal/__tests__/session-teardown-resources.test.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-teardown-resources.test.ts
@@ -3,7 +3,7 @@ import {
   sessionCloseShutdownFixture,
   type SessionState,
 } from './session-close-shutdown.fixtures.ts';
-import { platformResourceCleanupFixture } from '../../../__tests__/support/platform-resource-cleanup-fixture.ts';
+import { platformResourceCleanupFixture } from '../../../../__tests__/support/platform-resource-cleanup-fixture.ts';
 
 const {
   AppError,
diff --git a/src/daemon/session-lifecycle/internal/inventory.ts b/packages/daemon/src/sessions/session-lifecycle/internal/inventory.ts
similarity index 94%
rename from src/daemon/session-lifecycle/internal/inventory.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/inventory.ts
index f6fd19ad5b..c7af5f2e77 100644
--- a/src/daemon/session-lifecycle/internal/inventory.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/inventory.ts
@@ -1,4 +1,4 @@
-import type { DaemonPlatformServices } from '../../platform-services.ts';
+import type { DaemonPlatformServices } from '../../../core/platform-services.ts';
 import {
   commandRuntimeUseRequirements,
   listRuntimeFactCommands,
@@ -6,7 +6,10 @@ import {
 import { listDeviceInventory } from '@agent-device/device-selection/device-inventory-context';
 import { assertResolvedAppsFilter } from '@agent-device/contracts/device';
 import { asAppError } from '@agent-device/kernel/errors';
-import { requireRuntimeBinding, requireRuntimeFacts } from '../../session-runtime-admission.ts';
+import {
+  requireRuntimeBinding,
+  requireRuntimeFacts,
+} from '../../../core/session-runtime-admission.ts';
 import {
   isApplePlatform,
   isIosFamily,
@@ -24,18 +27,18 @@ import {
 import {
   deviceClaimOwnerCannotRelease,
   inspectDeviceClaims,
-} from '../../device/device-claim-inspection.ts';
-import { canonicalLocalDeviceKey } from '../../device/device-claim-paths.ts';
-import { deviceClaimIdentity } from '../../device/device-claims.ts';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
-import type { SessionRef } from '../../session-state.ts';
-import { SessionStore } from '../../session-store.ts';
-import { resolveSessionRunnerLogPath } from '../../session-artifact-paths.ts';
+} from '../../../resources/device/device-claim-inspection.ts';
+import { canonicalLocalDeviceKey } from '../../../resources/device/device-claim-paths.ts';
+import { deviceClaimIdentity } from '../../../resources/device/device-claims.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
+import type { SessionRef } from '../../../core/session-state.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import { resolveSessionRunnerLogPath } from '../../../core/session-artifact-paths.ts';
 import {
   requireSessionOrExplicitSelector,
   resolveCommandDevice,
   selectorTargetsSessionDevice,
-} from '../../session-device-resolution.ts';
+} from '../../../resources/session-device-resolution.ts';
 import { resolveSessionScope, sessionMatchesInventoryScope } from '../../session-routing.ts';
 import type {
   BoundDeviceRuntime,
@@ -46,13 +49,13 @@ import {
   type PlatformRuntimeOperations,
   appsRuntimeUse,
 } from '@agent-device/contracts/platform-runtime-operations';
-import { ensureAppsRuntimeReady, listAppsFromRuntime } from '../../apps-runtime.ts';
+import { ensureAppsRuntimeReady, listAppsFromRuntime } from '../../../execution/apps-runtime.ts';
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../request-runtime-binding.ts';
+} from '../../../core/request-runtime-binding.ts';
 import type { ProviderAppCatalog, ProviderAppCatalogQuery } from '@agent-device/contracts/device';
-import { resolveLeaseScope } from '../../lease-context.ts';
+import { resolveLeaseScope } from '../../../core/lease-context.ts';
 import { getRequestSignal } from '@agent-device/host-kit/request';
 
 export type SessionInventoryCommandInput = Readonly<{
diff --git a/src/daemon/session-lifecycle/internal/session-close-lifecycle-teardown.ts b/packages/daemon/src/sessions/session-lifecycle/internal/session-close-lifecycle-teardown.ts
similarity index 94%
rename from src/daemon/session-lifecycle/internal/session-close-lifecycle-teardown.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/session-close-lifecycle-teardown.ts
index 202996c16d..6984fcc013 100644
--- a/src/daemon/session-lifecycle/internal/session-close-lifecycle-teardown.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/session-close-lifecycle-teardown.ts
@@ -1,8 +1,8 @@
 import type { CloseApplicationFinalizationResult } from '@agent-device/contracts/application-lifecycle-runtime';
 import type { TargetShutdownResult } from '@agent-device/contracts/device';
-import type { DaemonRequest } from '../../daemon-request.ts';
-import type { SessionRef, SessionState } from '../../session-state.ts';
-import { SessionStore } from '../../session-store.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../../../core/session-state.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import { cleanupRetainedMaterializedPathsForSession } from '../../materialized-path-registry.ts';
 import {
   reportSessionCleanupFailures,
@@ -13,7 +13,7 @@ import {
   stopSessionPerfCapture,
   type SessionCleanupFailure,
 } from '../../session-teardown.ts';
-import type { PlatformResourceCleanup } from '../../platform-resource-cleanup.ts';
+import type { PlatformResourceCleanup } from '../../../core/platform-resource-cleanup.ts';
 import { hasRuntimeTransportHints, runtimeHintValues } from '../../session-runtime.ts';
 import type {
   CloseRuntime,
diff --git a/src/daemon/session-lifecycle/internal/session-close-runtime-admission.ts b/packages/daemon/src/sessions/session-lifecycle/internal/session-close-runtime-admission.ts
similarity index 88%
rename from src/daemon/session-lifecycle/internal/session-close-runtime-admission.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/session-close-runtime-admission.ts
index ec26998ad0..fec244230a 100644
--- a/src/daemon/session-lifecycle/internal/session-close-runtime-admission.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/session-close-runtime-admission.ts
@@ -1,16 +1,16 @@
-import type { DaemonPlatformServices } from '../../platform-services.ts';
+import type { DaemonPlatformServices } from '../../../core/platform-services.ts';
 import {
   closeApplicationRuntimeUse,
   closeApplicationWithRuntimeHintClearUse,
 } from '@agent-device/contracts/application-lifecycle-runtime-plan';
 import type { BoundDeviceRuntime } from '@agent-device/contracts/platform-runtime';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import type { DaemonResponse } from '../../daemon-request.ts';
+import type { DaemonResponse } from '../../../core/daemon-request.ts';
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../request-runtime-binding.ts';
-import { admitRuntimeOperations } from '../../runtime-admission.ts';
+} from '../../../core/request-runtime-binding.ts';
+import { admitRuntimeOperations } from '../../../core/runtime-admission.ts';
 
 export type CloseRuntime = BoundDeviceRuntime<typeof closeApplicationRuntimeUse>;
 export type CloseRuntimeWithRuntimeHintClear = BoundDeviceRuntime<
diff --git a/src/daemon/session-lifecycle/internal/session-close-script.ts b/packages/daemon/src/sessions/session-lifecycle/internal/session-close-script.ts
similarity index 88%
rename from src/daemon/session-lifecycle/internal/session-close-script.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/session-close-script.ts
index ea8c3a69a6..55c31057fb 100644
--- a/src/daemon/session-lifecycle/internal/session-close-script.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/session-close-script.ts
@@ -1,16 +1,22 @@
 import { AppError, normalizeError } from '@agent-device/kernel/errors';
 import { successText } from '@agent-device/kernel/success-text';
 import type { CommandFlags } from '@agent-device/contracts/command';
-import type { SessionStore } from '../../session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
-import type { SessionRef, SessionState } from '../../session-state.ts';
-import { NO_SCRIPT_PUBLICATION, scriptTargetPath } from '../../session-script-publication-state.ts';
+import type { SessionStore } from '../../../core/session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../../../core/session-state.ts';
+import {
+  NO_SCRIPT_PUBLICATION,
+  scriptTargetPath,
+} from '../../../core/session-script-publication-state.ts';
 import {
   effectiveWriteForce,
   isSessionScriptPublished,
   markCloseGeneratedPublicationDone,
-} from '../../session-script-publication-capability.ts';
-import { abortRepairTransaction, isRepairArmedSession } from '../../session-replay-transaction.ts';
+} from '../../../core/session-script-publication-capability.ts';
+import {
+  abortRepairTransaction,
+  isRepairArmedSession,
+} from '../../../core/session-replay-transaction.ts';
 
 export type RepairCloseCommit =
   | { kind: 'not-armed' }
diff --git a/src/daemon/session-lifecycle/internal/session-close.ts b/packages/daemon/src/sessions/session-lifecycle/internal/session-close.ts
similarity index 94%
rename from src/daemon/session-lifecycle/internal/session-close.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/session-close.ts
index bd04ff3c2f..c59c123a47 100644
--- a/src/daemon/session-lifecycle/internal/session-close.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/session-close.ts
@@ -1,30 +1,30 @@
-import type { DaemonPlatformServices } from '../../platform-services.ts';
+import type { DaemonPlatformServices } from '../../../core/platform-services.ts';
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
 import { AppError, normalizeError } from '@agent-device/kernel/errors';
 import type { LeaseLifecycleProvider, TargetShutdownResult } from '@agent-device/contracts/device';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
-import type { SessionRef, SessionState } from '../../session-state.ts';
-import { SessionStore } from '../../session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../../../core/session-state.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import { successText, withSuccessText } from '@agent-device/kernel/success-text';
-import { resolveCommandDevice } from '../../session-device-resolution.ts';
-import { expireRefFrame } from '../../ref-frame.ts';
-import type { LeaseRegistry } from '../../lease-registry.ts';
+import { resolveCommandDevice } from '../../../resources/session-device-resolution.ts';
+import { expireRefFrame } from '../../../core/ref-frame.ts';
+import type { LeaseRegistry } from '../../../resources/lease-registry.ts';
 import { releaseSessionLease } from '../../lease-lifecycle.ts';
 import {
   hasRepairPlatformCloseReceipt,
   isRepairArmedSession,
   recordRepairPlatformClose,
-} from '../../session-replay-transaction.ts';
-import { isAuthoringArmedSession } from '../../session-script-publication-capability.ts';
+} from '../../../core/session-replay-transaction.ts';
+import { isAuthoringArmedSession } from '../../../core/session-script-publication-capability.ts';
 import type { SessionCleanupFailure } from '../../session-teardown.ts';
 import { isWebSession } from '../../web-session-names.ts';
-import { clearDeviceClaim } from '../../device/device-claims.ts';
+import { clearDeviceClaim } from '../../../resources/device/device-claims.ts';
 import { applicationLifecycleExecutionFromRequest } from '../../application-lifecycle-execution.ts';
 import { hasRuntimeTransportHints } from '../../session-runtime.ts';
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../request-runtime-binding.ts';
+} from '../../../core/request-runtime-binding.ts';
 import {
   buildRetriableRepairCloseFailureResponse,
   commitRepairScriptBeforeClose,
@@ -37,7 +37,7 @@ import {
   type RuntimeHintClearOperation,
 } from './session-close-runtime-admission.ts';
 import { closeCleanupError, runSessionCloseTeardown } from './session-close-lifecycle-teardown.ts';
-import type { PlatformResourceCleanup } from '../../platform-resource-cleanup.ts';
+import type { PlatformResourceCleanup } from '../../../core/platform-resource-cleanup.ts';
 import { errorResponse } from '@agent-device/kernel/contracts';
 
 export type SessionCloseCommandInput = Readonly<{
diff --git a/src/daemon/session-lifecycle/internal/session-open-execution.ts b/packages/daemon/src/sessions/session-lifecycle/internal/session-open-execution.ts
similarity index 95%
rename from src/daemon/session-lifecycle/internal/session-open-execution.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/session-open-execution.ts
index 5ff7dd3486..6b1831ac7a 100644
--- a/src/daemon/session-lifecycle/internal/session-open-execution.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/session-open-execution.ts
@@ -11,21 +11,21 @@ import type { BoundDeviceRuntime } from '@agent-device/contracts/platform-runtim
 import type { SessionSurface } from '@agent-device/contracts/session';
 import type { OpenApplicationTiming } from '@agent-device/contracts/application-lifecycle-runtime';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import type { DaemonPlatformServices } from '../../platform-services.ts';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
-import type { SessionRef, SessionState } from '../../session-state.ts';
+import type { DaemonPlatformServices } from '../../../core/platform-services.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../../../core/session-state.ts';
 import {
   abortAuthoringOnSecondOpen,
   armAuthoringOnOpen,
   isAuthoringArmedSession,
-} from '../../session-script-publication-capability.ts';
+} from '../../../core/session-script-publication-capability.ts';
 import { isRequestCanceled } from '@agent-device/host-kit/request';
 import { createRequestCanceledError } from '@agent-device/kernel/errors';
-import { SessionStore } from '../../session-store.ts';
+import { SessionStore } from '../../../core/session-store.ts';
 import {
   resolveSessionRequestLogPath,
   resolveSessionRunnerLogPath,
-} from '../../session-artifact-paths.ts';
+} from '../../../core/session-artifact-paths.ts';
 import {
   countConfiguredRuntimeHints,
   runtimeHintValues,
@@ -37,7 +37,7 @@ import { publishOpenSession, requireOpenSessionAdmission } from './session-open-
 import {
   markDeferredInteractionOutcome,
   markPostOpenStabilization,
-} from '../../deferred-interaction-outcome.ts';
+} from '../../../core/deferred-interaction-outcome.ts';
 import { emitDiagnostic, getDiagnosticsMeta } from '@agent-device/host-kit/diagnostics';
 import {
   prepareOpenCommandDetails,
@@ -46,7 +46,7 @@ import {
 import {
   buildDeviceInUseBySessionError,
   buildForeignWorkspaceSessionConflict,
-} from '../../session-recovery-hints.ts';
+} from '../../../core/session-recovery-hints.ts';
 import { describeOpenWaitForRefusal } from '../../open-device-contention-wait.ts';
 import { isImplicitSessionScopeConflict, resolvePublicSessionName } from '../../session-routing.ts';
 import { applicationLifecycleExecutionFromRequest } from '../../application-lifecycle-execution.ts';
@@ -58,11 +58,11 @@ import {
   type DeviceClaimAcquireResult,
   type DeviceClaimSessionOwnership,
   type DeviceClaimReconciler,
-} from '../../device/device-claims.ts';
-import type { TakenOverDeviceClaim } from '../../device/device-claim-reboot.ts';
+} from '../../../resources/device/device-claims.ts';
+import type { TakenOverDeviceClaim } from '../../../resources/device/device-claim-reboot.ts';
 import { appendResponseWarning } from './session-open-warnings.ts';
-import { buildDeviceClaimConflictError } from '../../device/device-claim-conflict.ts';
-import { deviceClaimRuleForOwner } from '../../device/device-claim-rule.ts';
+import { buildDeviceClaimConflictError } from '../../../resources/device/device-claim-conflict.ts';
+import { deviceClaimRuleForOwner } from '../../../resources/device/device-claim-rule.ts';
 import { errorResponse, type DaemonFailureResponse } from '@agent-device/kernel/contracts';
 
 export type SessionOpenResult =
diff --git a/src/daemon/session-lifecycle/internal/session-open-foreground.ts b/packages/daemon/src/sessions/session-lifecycle/internal/session-open-foreground.ts
similarity index 95%
rename from src/daemon/session-lifecycle/internal/session-open-foreground.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/session-open-foreground.ts
index 9a59edec2e..fd3791ecf9 100644
--- a/src/daemon/session-lifecycle/internal/session-open-foreground.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/session-open-foreground.ts
@@ -1,14 +1,14 @@
-import type { DaemonPlatformServices } from '../../platform-services.ts';
+import type { DaemonPlatformServices } from '../../../core/platform-services.ts';
 import { normalizeError, type NormalizedError } from '@agent-device/kernel/errors';
 import type { CreateDaemonCommandSurface } from '@agent-device/contracts/daemon-command-surface';
 import { dispatchSnapshotViaRuntime } from '../../snapshot-runtime.ts';
-import type { SessionRef } from '../../session-state.ts';
-import type { SessionStore } from '../../session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
+import type { SessionRef } from '../../../core/session-state.ts';
+import type { SessionStore } from '../../../core/session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../request-runtime-binding.ts';
+} from '../../../core/request-runtime-binding.ts';
 import { readResponseWarnings } from '@agent-device/kernel/success-text';
 import { errorResponse } from '@agent-device/kernel/contracts';
 
diff --git a/src/daemon/session-lifecycle/internal/session-open-prepare.ts b/packages/daemon/src/sessions/session-lifecycle/internal/session-open-prepare.ts
similarity index 94%
rename from src/daemon/session-lifecycle/internal/session-open-prepare.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/session-open-prepare.ts
index 4d6f787af7..5d3cd350de 100644
--- a/src/daemon/session-lifecycle/internal/session-open-prepare.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/session-open-prepare.ts
@@ -3,11 +3,11 @@ import type { RuntimeHintsApplicationInput } from '@agent-device/contracts/appli
 import { openApplicationRuntimeUse } from '@agent-device/contracts/application-lifecycle-runtime-plan';
 import type { BoundDeviceRuntime } from '@agent-device/contracts/platform-runtime';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
 import { startupDeadlineAtMs } from '../../startup-deadline.ts';
-import type { SessionRuntimeHints, SessionState } from '../../session-state.ts';
-import { SessionStore } from '../../session-store.ts';
-import type { DaemonPlatformServices } from '../../platform-services.ts';
+import type { SessionRuntimeHints, SessionState } from '../../../core/session-state.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import type { DaemonPlatformServices } from '../../../core/platform-services.ts';
 import {
   hasRuntimeTransportHints,
   maybeClearRemovedRuntimeTransportHints,
@@ -16,7 +16,7 @@ import {
 } from '../../session-runtime.ts';
 import { AppError } from '@agent-device/kernel/errors';
 import type { SessionSurface } from '@agent-device/contracts/session';
-import { resolveRunnerLogicalLeaseContext } from '../../lease-context.ts';
+import { resolveRunnerLogicalLeaseContext } from '../../../core/lease-context.ts';
 import { errorResponse } from '@agent-device/kernel/contracts';
 
 type OpenCommandDetails = {
diff --git a/src/daemon/session-lifecycle/internal/session-open-state.ts b/packages/daemon/src/sessions/session-lifecycle/internal/session-open-state.ts
similarity index 82%
rename from src/daemon/session-lifecycle/internal/session-open-state.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/session-open-state.ts
index 828c6c564d..e1cf41eb7e 100644
--- a/src/daemon/session-lifecycle/internal/session-open-state.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/session-open-state.ts
@@ -1,10 +1,10 @@
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import type { SessionSurface } from '@agent-device/contracts/session';
-import type { DaemonRequest } from '../../daemon-request.ts';
-import type { SessionRef } from '../../session-state.ts';
-import type { SessionStore } from '../../session-store.ts';
-import type { DeviceClaimSessionOwnership } from '../../device/device-claims.ts';
-import { clearSessionSnapshot } from '../../session-snapshot.ts';
+import type { DaemonRequest } from '../../../core/daemon-request.ts';
+import type { SessionRef } from '../../../core/session-state.ts';
+import type { SessionStore } from '../../../core/session-store.ts';
+import type { DeviceClaimSessionOwnership } from '../../../resources/device/device-claims.ts';
+import { clearSessionSnapshot } from '../../../execution/session-snapshot.ts';
 import { resolveSessionLeaseForRequest } from '../../lease-lifecycle.ts';
 import { resolvePublicSessionName, resolveSessionScope } from '../../session-routing.ts';
 
diff --git a/src/daemon/session-lifecycle/internal/session-open-surface.ts b/packages/daemon/src/sessions/session-lifecycle/internal/session-open-surface.ts
similarity index 97%
rename from src/daemon/session-lifecycle/internal/session-open-surface.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/session-open-surface.ts
index daa220a92e..b2e47f090a 100644
--- a/src/daemon/session-lifecycle/internal/session-open-surface.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/session-open-surface.ts
@@ -6,7 +6,7 @@ import {
   publicPlatformString,
   type DeviceInfo,
 } from '@agent-device/kernel/device';
-import type { SessionRuntimeHints } from '../../session-state.ts';
+import type { SessionRuntimeHints } from '../../../core/session-state.ts';
 import { successText } from '@agent-device/kernel/success-text';
 import type { StartupPerfSample } from './session-startup-metrics.ts';
 import type { DeviceSelectionResult } from '@agent-device/device-selection/device-selection-resolver';
diff --git a/src/daemon/session-lifecycle/internal/session-open-warnings.ts b/packages/daemon/src/sessions/session-lifecycle/internal/session-open-warnings.ts
similarity index 100%
rename from src/daemon/session-lifecycle/internal/session-open-warnings.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/session-open-warnings.ts
diff --git a/src/daemon/session-lifecycle/internal/session-open.ts b/packages/daemon/src/sessions/session-lifecycle/internal/session-open.ts
similarity index 94%
rename from src/daemon/session-lifecycle/internal/session-open.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/session-open.ts
index 2d20864f20..df5afa0467 100644
--- a/src/daemon/session-lifecycle/internal/session-open.ts
+++ b/packages/daemon/src/sessions/session-lifecycle/internal/session-open.ts
@@ -1,4 +1,4 @@
-import type { DaemonPlatformServices } from '../../platform-services.ts';
+import type { DaemonPlatformServices } from '../../../core/platform-services.ts';
 import { resolveTargetDeviceSelection } from '@agent-device/device-selection/dispatch-resolve';
 import {
   openApplicationRuntimeUse,
@@ -8,10 +8,10 @@ import {
   resolveOpenApplicationRuntimePlan,
 } from '@agent-device/contracts/application-lifecycle-runtime-plan';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
-import type { SessionState } from '../../session-state.ts';
-import { SessionStore } from '../../session-store.ts';
-import { refreshSessionDeviceIfNeeded } from '../../session-device-resolution.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
+import type { SessionState } from '../../../core/session-state.ts';
+import { SessionStore } from '../../../core/session-store.ts';
+import { refreshSessionDeviceIfNeeded } from '../../../resources/session-device-resolution.ts';
 import { withKeyedLock } from '@agent-device/kernel/keyed-lock';
 import { buildOpenTargetDeviceResolutionOptions } from '@agent-device/device-selection/open-target';
 import {
@@ -27,15 +27,18 @@ import {
   composeOpenWithInitialSnapshot,
   resolveForegroundOpenRequest,
 } from './session-open-foreground.ts';
-import { expireRefFrame } from '../../ref-frame.ts';
-import type { DeviceClaimReconciler } from '../../device/device-claims.ts';
+import { expireRefFrame } from '../../../core/ref-frame.ts';
+import type { DeviceClaimReconciler } from '../../../resources/device/device-claims.ts';
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../request-runtime-binding.ts';
-import { admitRuntimeOperations } from '../../runtime-admission.ts';
+} from '../../../core/request-runtime-binding.ts';
+import { admitRuntimeOperations } from '../../../core/runtime-admission.ts';
 import { resolveExistingSessionDeviceSelection } from '@agent-device/device-selection/device-selection-resolver';
-import { requireRuntimeBinding, requireRuntimeFacts } from '../../session-runtime-admission.ts';
+import {
+  requireRuntimeBinding,
+  requireRuntimeFacts,
+} from '../../../core/session-runtime-admission.ts';
 import {
   completeOpenCommand,
   openNewSessionWithDeviceClaim,
diff --git a/src/daemon/session-lifecycle/internal/session-startup-metrics.ts b/packages/daemon/src/sessions/session-lifecycle/internal/session-startup-metrics.ts
similarity index 100%
rename from src/daemon/session-lifecycle/internal/session-startup-metrics.ts
rename to packages/daemon/src/sessions/session-lifecycle/internal/session-startup-metrics.ts
diff --git a/src/daemon/session-observability/__tests__/application.test.ts b/packages/daemon/src/sessions/session-observability/__tests__/application.test.ts
similarity index 86%
rename from src/daemon/session-observability/__tests__/application.test.ts
rename to packages/daemon/src/sessions/session-observability/__tests__/application.test.ts
index 3107767a34..271e198305 100644
--- a/src/daemon/session-observability/__tests__/application.test.ts
+++ b/packages/daemon/src/sessions/session-observability/__tests__/application.test.ts
@@ -1,8 +1,8 @@
-import { daemonPlatformServicesFixture } from '../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../__tests__/support/platform-services-fixture.ts';
 import { beforeEach, expect, test, vi } from 'vitest';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
-import { makeSessionStore } from '../../__tests__/support/store-factory.ts';
-import { fakeCreateCommandSurface } from '../../__tests__/support/command-surface-fake.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
+import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
+import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
 
 vi.mock('../index.ts', async (importOriginal) => {
   const actual = await importOriginal<typeof import('../index.ts')>();
diff --git a/src/daemon/session-observability/__tests__/session-audio.coverage.ts b/packages/daemon/src/sessions/session-observability/__tests__/session-audio.coverage.ts
similarity index 100%
rename from src/daemon/session-observability/__tests__/session-audio.coverage.ts
rename to packages/daemon/src/sessions/session-observability/__tests__/session-audio.coverage.ts
diff --git a/src/daemon/session-observability/index.ts b/packages/daemon/src/sessions/session-observability/index.ts
similarity index 100%
rename from src/daemon/session-observability/index.ts
rename to packages/daemon/src/sessions/session-observability/index.ts
diff --git a/src/daemon/session-observability/internal/__tests__/session-audio.test.ts b/packages/daemon/src/sessions/session-observability/internal/__tests__/session-audio.test.ts
similarity index 98%
rename from src/daemon/session-observability/internal/__tests__/session-audio.test.ts
rename to packages/daemon/src/sessions/session-observability/internal/__tests__/session-audio.test.ts
index 7493ed7aa4..04d75ef1e3 100644
--- a/src/daemon/session-observability/internal/__tests__/session-audio.test.ts
+++ b/packages/daemon/src/sessions/session-observability/internal/__tests__/session-audio.test.ts
@@ -15,16 +15,16 @@ import {
   makeIosSession,
   makeMacOsSession,
   makeSession,
-} from '../../../__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
+} from '../../../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../../../__tests__/support/store-factory.ts';
 import {
   unavailableApplicationLifecycleOperationFacts,
   unavailableDeploymentSnapshotAndShutdownOperationFacts,
 } from '@agent-device/test-kit/runtime-operation-facts';
 import { createAudioProbeAdmissionLedger } from '@agent-device/capture-kit/audio-probe-admission-ledger';
 import { audioProbeDurableResource } from '@agent-device/capture-kit/audio-probe-session-resource';
-import type { SessionStore } from '../../../session-store.ts';
-import type { DaemonResponse } from '../../../daemon-request.ts';
+import type { SessionStore } from '../../../../core/session-store.ts';
+import type { DaemonResponse } from '../../../../core/daemon-request.ts';
 import { handleSessionObservabilityCommands } from '../../index.ts';
 import { ANDROID_AUDIO_CONTRACT_EVIDENCE } from '../../__tests__/session-audio.coverage.ts';
 import { encodeHostAudioProbeDescriptor } from '@agent-device/capture-kit/audio-probe-descriptor-fixtures';
diff --git a/src/daemon/session-observability/internal/__tests__/session-logs.test.ts b/packages/daemon/src/sessions/session-observability/internal/__tests__/session-logs.test.ts
similarity index 96%
rename from src/daemon/session-observability/internal/__tests__/session-logs.test.ts
rename to packages/daemon/src/sessions/session-observability/internal/__tests__/session-logs.test.ts
index 034f16919c..700bb8be09 100644
--- a/src/daemon/session-observability/internal/__tests__/session-logs.test.ts
+++ b/packages/daemon/src/sessions/session-observability/internal/__tests__/session-logs.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from '../../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
 import fs from 'node:fs';
 import { beforeEach, expect, test, vi } from 'vitest';
 import type { AppLogRuntimeOperations } from '@agent-device/contracts/app-log-runtime';
@@ -18,18 +18,18 @@ import { AppError } from '@agent-device/kernel/errors';
 import {
   createAppLogAdmissionLedger,
   type AppLogAdmissionLedger,
-} from '../../../app-log-admission-ledger.ts';
-import { handleSessionCommands } from '../../../handlers/__tests__/session-command-harness.ts';
-import { appLogResourceStore } from '../../../app-log-resource-store.ts';
-import type { BindDeviceRuntime } from '../../../request-runtime-binding.ts';
-import type { SessionStore } from '../../../session-store.ts';
+} from '../../../../resources/app-log-admission-ledger.ts';
+import { handleSessionCommands } from '../../../../__tests__/support/handlers/session-command-harness.ts';
+import { appLogResourceStore } from '../../../../resources/app-log-resource-store.ts';
+import type { BindDeviceRuntime } from '../../../../core/request-runtime-binding.ts';
+import type { SessionStore } from '../../../../core/session-store.ts';
 import {
   makeSession,
   makeSessionStore,
   makeTestAppLogResource,
   noopInvoke,
-} from '../../../handlers/__tests__/session-test-harness.ts';
-import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
+} from '../../../../__tests__/support/handlers/session-test-harness.ts';
+import { fakeCreateCommandSurface } from '../../../../__tests__/support/command-surface-fake.ts';
 
 const DEVICE: DeviceInfo = {
   platform: 'apple',
diff --git a/src/daemon/session-observability/internal/__tests__/session-network-runtime-parity-fixtures.ts b/packages/daemon/src/sessions/session-observability/internal/__tests__/session-network-runtime-parity-fixtures.ts
similarity index 100%
rename from src/daemon/session-observability/internal/__tests__/session-network-runtime-parity-fixtures.ts
rename to packages/daemon/src/sessions/session-observability/internal/__tests__/session-network-runtime-parity-fixtures.ts
diff --git a/src/daemon/session-observability/internal/__tests__/session-network-runtime-parity.test.ts b/packages/daemon/src/sessions/session-observability/internal/__tests__/session-network-runtime-parity.test.ts
similarity index 91%
rename from src/daemon/session-observability/internal/__tests__/session-network-runtime-parity.test.ts
rename to packages/daemon/src/sessions/session-observability/internal/__tests__/session-network-runtime-parity.test.ts
index 7bf36d1551..0863d49176 100644
--- a/src/daemon/session-observability/internal/__tests__/session-network-runtime-parity.test.ts
+++ b/packages/daemon/src/sessions/session-observability/internal/__tests__/session-network-runtime-parity.test.ts
@@ -1,18 +1,21 @@
-import { daemonPlatformServicesFixture } from '../../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
 import path from 'node:path';
 import { expect, test } from 'vitest';
 import { providerRuntimeOwner } from '@agent-device/contracts/platform-runtime';
-import type { BindDeviceRuntime } from '../../../request-runtime-binding.ts';
-import { handleSessionCommands } from '../../../handlers/__tests__/session-command-harness.ts';
+import type { BindDeviceRuntime } from '../../../../core/request-runtime-binding.ts';
+import { handleSessionCommands } from '../../../../__tests__/support/handlers/session-command-harness.ts';
 import {
   makeSession,
   makeSessionStore,
   makeTestAppLogResource,
   noopInvoke,
-} from '../../../handlers/__tests__/session-test-harness.ts';
+} from '../../../../__tests__/support/handlers/session-test-harness.ts';
 import { NETWORK_RUNTIME_PROJECTION_PARITY } from './session-network-runtime-parity-fixtures.ts';
-import { createNetworkRuntime, emptyAppLogResult } from './network-runtime-harness.ts';
-import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
+import {
+  createNetworkRuntime,
+  emptyAppLogResult,
+} from '../../../../__tests__/support/session-observability/internal/network-runtime-harness.ts';
+import { fakeCreateCommandSurface } from '../../../../__tests__/support/command-surface-fake.ts';
 
 test.each(NETWORK_RUNTIME_PROJECTION_PARITY)(
   'network $action preserves the $include projection through the request runtime',
diff --git a/src/daemon/session-observability/internal/__tests__/session-network.test.ts b/packages/daemon/src/sessions/session-observability/internal/__tests__/session-network.test.ts
similarity index 79%
rename from src/daemon/session-observability/internal/__tests__/session-network.test.ts
rename to packages/daemon/src/sessions/session-observability/internal/__tests__/session-network.test.ts
index e9e0473236..73e7b8926d 100644
--- a/src/daemon/session-observability/internal/__tests__/session-network.test.ts
+++ b/packages/daemon/src/sessions/session-observability/internal/__tests__/session-network.test.ts
@@ -1,14 +1,17 @@
-import { daemonPlatformServicesFixture } from '../../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
 import path from 'node:path';
 import { expect, test } from 'vitest';
-import { handleSessionCommands } from '../../../handlers/__tests__/session-command-harness.ts';
-import { createNetworkRuntime, emptyAppLogResult } from './network-runtime-harness.ts';
+import { handleSessionCommands } from '../../../../__tests__/support/handlers/session-command-harness.ts';
+import {
+  createNetworkRuntime,
+  emptyAppLogResult,
+} from '../../../../__tests__/support/session-observability/internal/network-runtime-harness.ts';
 import {
   makeSession,
   makeSessionStore,
   noopInvoke,
-} from '../../../handlers/__tests__/session-test-harness.ts';
-import { fakeCreateCommandSurface } from '../../../__tests__/support/command-surface-fake.ts';
+} from '../../../../__tests__/support/handlers/session-test-harness.ts';
+import { fakeCreateCommandSurface } from '../../../../__tests__/support/command-surface-fake.ts';
 
 test('network requires an active session before requesting a runtime binding', async () => {
   const sessionStore = makeSessionStore();
diff --git a/src/daemon/session-observability/internal/__tests__/session-observability.test.ts b/packages/daemon/src/sessions/session-observability/internal/__tests__/session-observability.test.ts
similarity index 89%
rename from src/daemon/session-observability/internal/__tests__/session-observability.test.ts
rename to packages/daemon/src/sessions/session-observability/internal/__tests__/session-observability.test.ts
index ba91c6dcf8..02b6af5e6c 100644
--- a/src/daemon/session-observability/internal/__tests__/session-observability.test.ts
+++ b/packages/daemon/src/sessions/session-observability/internal/__tests__/session-observability.test.ts
@@ -1,10 +1,13 @@
-import { daemonPlatformServicesFixture } from '../../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
 import assert from 'node:assert/strict';
 import { test } from 'vitest';
-import { makeAndroidSession } from '../../../__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
+import { makeAndroidSession } from '../../../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../../../__tests__/support/store-factory.ts';
 import { handleSessionObservabilityCommands } from '../../index.ts';
-import { createNetworkRuntime, emptyAppLogResult } from './network-runtime-harness.ts';
+import {
+  createNetworkRuntime,
+  emptyAppLogResult,
+} from '../../../../__tests__/support/session-observability/internal/network-runtime-harness.ts';
 
 test('network dump validates include mode directly', async () => {
   const sessionStore = makeAndroidStore();
diff --git a/src/daemon/session-observability/internal/__tests__/session-perf-runtime.test.ts b/packages/daemon/src/sessions/session-observability/internal/__tests__/session-perf-runtime.test.ts
similarity index 97%
rename from src/daemon/session-observability/internal/__tests__/session-perf-runtime.test.ts
rename to packages/daemon/src/sessions/session-observability/internal/__tests__/session-perf-runtime.test.ts
index 689d472a8c..16e0a8aa28 100644
--- a/src/daemon/session-observability/internal/__tests__/session-perf-runtime.test.ts
+++ b/packages/daemon/src/sessions/session-observability/internal/__tests__/session-perf-runtime.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from '../../../__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '../../../../__tests__/support/platform-services-fixture.ts';
 import assert from 'node:assert/strict';
 import { test, vi } from 'vitest';
 import { PendingTransferGuard } from '@agent-device/contracts/async-lifecycle';
@@ -17,14 +17,14 @@ import {
 import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform-runtime-operations';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import { deviceIdentity } from '@agent-device/kernel/device';
-import { makeAndroidSession } from '../../../__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../../__tests__/support/store-factory.ts';
+import { makeAndroidSession } from '../../../../__tests__/support/session-factories.ts';
+import { makeSessionStore } from '../../../../__tests__/support/store-factory.ts';
 import { unavailableDeploymentSnapshotAndShutdownOperationFacts } from '@agent-device/test-kit/runtime-operation-facts';
 import { createPerfCaptureAdmissionLedger } from '@agent-device/capture-kit/perf-capture-admission-ledger';
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../../request-runtime-binding.ts';
+} from '../../../../core/request-runtime-binding.ts';
 import { handleSessionObservabilityCommands } from '../../index.ts';
 
 const available = Object.freeze({ available: true as const });
diff --git a/src/daemon/session-observability/internal/session-audio.ts b/packages/daemon/src/sessions/session-observability/internal/session-audio.ts
similarity index 94%
rename from src/daemon/session-observability/internal/session-audio.ts
rename to packages/daemon/src/sessions/session-observability/internal/session-audio.ts
index 76513ace47..747e66a3f3 100644
--- a/src/daemon/session-observability/internal/session-audio.ts
+++ b/packages/daemon/src/sessions/session-observability/internal/session-audio.ts
@@ -1,4 +1,4 @@
-import type { DaemonPlatformServices } from '../../platform-services.ts';
+import type { DaemonPlatformServices } from '../../../core/platform-services.ts';
 import path from 'node:path';
 import { normalizeError } from '@agent-device/kernel/errors';
 import {
@@ -18,11 +18,11 @@ import {
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../request-runtime-binding.ts';
-import type { SessionStore } from '../../session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
-import type { SessionRef } from '../../session-state.ts';
-import { bindSessionAudioProbe } from '../../session-capture-binding.ts';
+} from '../../../core/request-runtime-binding.ts';
+import type { SessionStore } from '../../../core/session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
+import type { SessionRef } from '../../../core/session-state.ts';
+import { bindSessionAudioProbe } from '../../../core/session-capture-binding.ts';
 import { type DaemonFailureResponse, errorResponse } from '@agent-device/kernel/contracts';
 
 type AudioParams = {
diff --git a/src/daemon/session-observability/internal/session-network.ts b/packages/daemon/src/sessions/session-observability/internal/session-network.ts
similarity index 95%
rename from src/daemon/session-observability/internal/session-network.ts
rename to packages/daemon/src/sessions/session-observability/internal/session-network.ts
index 67c77c034e..2c0a5fc8b3 100644
--- a/src/daemon/session-observability/internal/session-network.ts
+++ b/packages/daemon/src/sessions/session-observability/internal/session-network.ts
@@ -1,4 +1,4 @@
-import type { DaemonPlatformServices } from '../../platform-services.ts';
+import type { DaemonPlatformServices } from '../../../core/platform-services.ts';
 import type { NetworkDumpResult } from '@agent-device/contracts/network-runtime';
 import {
   networkAdmissionUse,
@@ -11,9 +11,9 @@ import {
   errorResponse,
 } from '@agent-device/kernel/contracts';
 import { AppError, normalizeError } from '@agent-device/kernel/errors';
-import type { BindDeviceRuntime } from '../../request-runtime-binding.ts';
-import type { SessionStore } from '../../session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
+import type { BindDeviceRuntime } from '../../../core/request-runtime-binding.ts';
+import type { SessionStore } from '../../../core/session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
 
 const NETWORK_ACTIONS = ['dump', 'log'] as const;
 const NETWORK_ACTIONS_MESSAGE = `network requires ${NETWORK_ACTIONS.join(' or ')}`;
diff --git a/src/daemon/session-observability/internal/session-observability.ts b/packages/daemon/src/sessions/session-observability/internal/session-observability.ts
similarity index 95%
rename from src/daemon/session-observability/internal/session-observability.ts
rename to packages/daemon/src/sessions/session-observability/internal/session-observability.ts
index 674f20efd5..1e28817db2 100644
--- a/src/daemon/session-observability/internal/session-observability.ts
+++ b/packages/daemon/src/sessions/session-observability/internal/session-observability.ts
@@ -1,4 +1,4 @@
-import type { DaemonPlatformServices } from '../../platform-services.ts';
+import type { DaemonPlatformServices } from '../../../core/platform-services.ts';
 import type { LogBackend } from '@agent-device/contracts/observability';
 import type {
   AppLogFailure,
@@ -12,11 +12,11 @@ import {
 import type { RuntimeOwnerRef } from '@agent-device/contracts/platform-runtime';
 import { uniqueStrings } from '@agent-device/kernel/collections';
 import { AppError, normalizeError } from '@agent-device/kernel/errors';
-import { appendAppLogMarker, getAppLogPathMetadata } from '../../app-log.ts';
-import type { AppLogAdmissionLedger } from '../../app-log-admission-ledger.ts';
+import { appendAppLogMarker, getAppLogPathMetadata } from '../../../resources/app-log.ts';
+import type { AppLogAdmissionLedger } from '../../../resources/app-log-admission-ledger.ts';
 import { type AudioProbeAdmissionLedger } from '@agent-device/capture-kit/audio-probe-admission-ledger';
 import { type PerfCaptureAdmissionLedger } from '@agent-device/capture-kit/perf-capture-admission-ledger';
-import { appLogResourceStore } from '../../app-log-resource-store.ts';
+import { appLogResourceStore } from '../../../resources/app-log-resource-store.ts';
 import {
   adoptStartedSessionAppLog,
   bindSessionAppLog,
@@ -25,15 +25,15 @@ import {
   inspectSessionAppLog,
   recordSessionAppLogFailure,
   type AppLogSessionSnapshot,
-} from '../../app-log-session-resource.ts';
-import { createNextAppLogFence } from '../../app-log-start-preflight.ts';
+} from '../../../resources/app-log-session-resource.ts';
+import { createNextAppLogFence } from '../../../resources/app-log-start-preflight.ts';
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../request-runtime-binding.ts';
-import type { SessionStore } from '../../session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
-import type { SessionRef, SessionState } from '../../session-state.ts';
+} from '../../../core/request-runtime-binding.ts';
+import type { SessionStore } from '../../../core/session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../../../core/session-state.ts';
 import { handleAudioCommand } from './session-audio.ts';
 import { handlePerfRuntimeCommand } from './session-perf-runtime.ts';
 import { handleNetworkCommand } from './session-network.ts';
diff --git a/src/daemon/session-observability/internal/session-perf-runtime.ts b/packages/daemon/src/sessions/session-observability/internal/session-perf-runtime.ts
similarity index 96%
rename from src/daemon/session-observability/internal/session-perf-runtime.ts
rename to packages/daemon/src/sessions/session-observability/internal/session-perf-runtime.ts
index ba60e3eeae..d7a4020057 100644
--- a/src/daemon/session-observability/internal/session-perf-runtime.ts
+++ b/packages/daemon/src/sessions/session-observability/internal/session-perf-runtime.ts
@@ -29,19 +29,19 @@ import { isRecord } from '@agent-device/kernel/record';
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../request-runtime-binding.ts';
-import type { SessionStore } from '../../session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../../daemon-request.ts';
-import type { SessionRef, SessionState } from '../../session-state.ts';
-import { bindSessionPerfCapture } from '../../session-capture-binding.ts';
-import { recordSessionAction } from '../../session-action-recorder.ts';
+} from '../../../core/request-runtime-binding.ts';
+import type { SessionStore } from '../../../core/session-store.ts';
+import type { DaemonRequest, DaemonResponse } from '../../../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../../../core/session-state.ts';
+import { bindSessionPerfCapture } from '../../../core/session-capture-binding.ts';
+import { recordSessionAction } from '../../../core/session-action-recorder.ts';
 import {
   admitRuntimePlan,
   requireRuntimeBinding,
   unavailableRuntimeOperationResponse,
   unwrapAdmittedRuntimePlan,
   type AdmittedRuntimePlan,
-} from '../../session-runtime-admission.ts';
+} from '../../../core/session-runtime-admission.ts';
 import { errorResponse } from '@agent-device/kernel/contracts';
 
 export type PerfRuntimeHandlerParams = Readonly<{
diff --git a/src/daemon/session-replay-coordinator.ts b/packages/daemon/src/sessions/session-replay-coordinator.ts
similarity index 97%
rename from src/daemon/session-replay-coordinator.ts
rename to packages/daemon/src/sessions/session-replay-coordinator.ts
index 7b288f6b6b..12edab7596 100644
--- a/src/daemon/session-replay-coordinator.ts
+++ b/packages/daemon/src/sessions/session-replay-coordinator.ts
@@ -1,21 +1,21 @@
 import type { SessionAction } from '@agent-device/contracts/session';
 import type { ReplayDivergenceResume, ReplayRepairHint } from '@agent-device/contracts/divergence';
 import { readReplayDivergenceResume } from '@agent-device/ad-replay/divergence';
-import type { DaemonResponse } from './daemon-request.ts';
-import type { SessionRuntimeHints, SessionState } from './session-state.ts';
+import type { DaemonResponse } from '../core/daemon-request.ts';
+import type { SessionRuntimeHints, SessionState } from '../core/session-state.ts';
 import {
   armRepairStep,
   isUncommittedRepairSession,
   markRepairTransactionComplete,
   repairSessionBoundary,
   resetRepairCompletionForRerun,
-} from './session-replay-transaction.ts';
+} from '../core/session-replay-transaction.ts';
 import {
   NO_SCRIPT_PUBLICATION,
   scriptTargetForce,
   scriptTargetPath,
   type SessionScriptPublicationState,
-} from './session-script-publication-state.ts';
+} from '../core/session-script-publication-state.ts';
 import { healedScriptSiblingPath } from '@agent-device/replay-port/session-replay-heal';
 import type {
   ReplayCoordinator,
diff --git a/src/daemon/session-routing.ts b/packages/daemon/src/sessions/session-routing.ts
similarity index 97%
rename from src/daemon/session-routing.ts
rename to packages/daemon/src/sessions/session-routing.ts
index e76e97cf95..d929f4040a 100644
--- a/src/daemon/session-routing.ts
+++ b/packages/daemon/src/sessions/session-routing.ts
@@ -8,11 +8,14 @@ import {
   type PlatformSelector,
   publicPlatformString,
 } from '@agent-device/kernel/device';
-import type { DaemonRequest } from './daemon-request.ts';
-import type { SessionRef, SessionState } from './session-state.ts';
+import type { DaemonRequest } from '../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../core/session-state.ts';
 import type { SessionScope } from '@agent-device/contracts/session';
-import { SessionStore } from './session-store.ts';
-import { listSessionSelectorConflicts, type SessionSelectorConflict } from './session-selector.ts';
+import { SessionStore } from '../core/session-store.ts';
+import {
+  listSessionSelectorConflicts,
+  type SessionSelectorConflict,
+} from '../core/session-selector.ts';
 
 const DEFAULT_SESSION_NAME = 'default';
 const IMPLICIT_SESSION_KEY_PREFIX = 'cwd';
diff --git a/src/daemon/session-runtime.ts b/packages/daemon/src/sessions/session-runtime.ts
similarity index 98%
rename from src/daemon/session-runtime.ts
rename to packages/daemon/src/sessions/session-runtime.ts
index e218c35e27..89ec1834f5 100644
--- a/src/daemon/session-runtime.ts
+++ b/packages/daemon/src/sessions/session-runtime.ts
@@ -10,8 +10,8 @@ import {
   isSessionRuntimePlatform,
 } from '@agent-device/kernel/contracts';
 import { publicPlatformString, type DeviceInfo } from '@agent-device/kernel/device';
-import type { SessionRuntimeHints, SessionState } from './session-state.ts';
-import { SessionStore } from './session-store.ts';
+import type { SessionRuntimeHints, SessionState } from '../core/session-state.ts';
+import { SessionStore } from '../core/session-store.ts';
 import { trimRuntimeValue } from '@agent-device/host-kit/runtime-transport-hints';
 import { isAndroidEmulator, isIosSimulator } from './device/device-targets.ts';
 
diff --git a/src/daemon/session-teardown-budget.ts b/packages/daemon/src/sessions/session-teardown-budget.ts
similarity index 91%
rename from src/daemon/session-teardown-budget.ts
rename to packages/daemon/src/sessions/session-teardown-budget.ts
index e111c1277d..b94f5ee607 100644
--- a/src/daemon/session-teardown-budget.ts
+++ b/packages/daemon/src/sessions/session-teardown-budget.ts
@@ -1,4 +1,4 @@
-import type { SessionState } from './session-state.ts';
+import type { SessionState } from '../core/session-state.ts';
 import { isWebSession } from './web-session-names.ts';
 
 export const DAEMON_SESSION_TEARDOWN_TIMEOUT_MS = 5_000;
diff --git a/src/daemon/session-teardown.ts b/packages/daemon/src/sessions/session-teardown.ts
similarity index 95%
rename from src/daemon/session-teardown.ts
rename to packages/daemon/src/sessions/session-teardown.ts
index b4bbff4fee..9446afba9f 100644
--- a/src/daemon/session-teardown.ts
+++ b/packages/daemon/src/sessions/session-teardown.ts
@@ -1,18 +1,18 @@
 import { AppError } from '@agent-device/kernel/errors';
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
 import { cleanupRetainedMaterializedPathsForSession } from './materialized-path-registry.ts';
-import type { SessionRef, SessionState } from './session-state.ts';
+import type { SessionRef, SessionState } from '../core/session-state.ts';
 import {
   bindSessionAudioProbe,
   bindSessionPerfCapture,
   bindSessionScreenRecording,
-} from './session-capture-binding.ts';
-import type { SessionStore } from './session-store.ts';
+} from '../core/session-capture-binding.ts';
+import type { SessionStore } from '../core/session-store.ts';
 import { finishLiveAudioProbe } from '@agent-device/capture-kit/audio-probe-session-resource';
 import { finishLivePerfCapture } from '@agent-device/capture-kit/perf-capture-session-resource';
 import { finishLiveScreenRecording } from '@agent-device/capture-kit/screen-recording-session-resource';
 import { openWebSessionNames } from './web-session-names.ts';
-import type { PlatformResourceCleanup } from './platform-resource-cleanup.ts';
+import type { PlatformResourceCleanup } from '../core/platform-resource-cleanup.ts';
 
 export async function stopSessionAppLog(params: {
   ref: SessionRef;
@@ -20,7 +20,7 @@ export async function stopSessionAppLog(params: {
 }): Promise<void> {
   const ref = params.sessionStore.refresh(params.ref);
   if (!ref.session.appLog) return;
-  const { forceCleanupSessionAppLog } = await import('./app-log-session-resource.ts');
+  const { forceCleanupSessionAppLog } = await import('../resources/app-log-session-resource.ts');
   await forceCleanupSessionAppLog({ ...params, ref });
 }
 
diff --git a/src/daemon/snapshot-command-runtime.ts b/packages/daemon/src/sessions/snapshot-command-runtime.ts
similarity index 92%
rename from src/daemon/snapshot-command-runtime.ts
rename to packages/daemon/src/sessions/snapshot-command-runtime.ts
index f65d11d8e6..cd2c54df48 100644
--- a/src/daemon/snapshot-command-runtime.ts
+++ b/packages/daemon/src/sessions/snapshot-command-runtime.ts
@@ -11,26 +11,26 @@ import type { AgentDeviceBackend, BackendSnapshotResult } from '@agent-device/co
 import type { CommandSessionRecord } from '@agent-device/contracts/runtime-contract';
 import type { CreateDaemonCommandSurface } from '@agent-device/contracts/daemon-command-surface';
 import { getRequestSignal } from '@agent-device/host-kit/request';
-import { maybeBuildAndroidSnapshotTimeoutFailure } from './android-snapshot-timeout-evidence.ts';
-import { captureSnapshot } from './snapshot-capture.ts';
-import { createSnapshotSession, withSessionlessRunnerCleanup } from './snapshot-session.ts';
+import { maybeBuildAndroidSnapshotTimeoutFailure } from '../execution/android-snapshot-timeout-evidence.ts';
+import { captureSnapshot } from '../core/snapshot-capture.ts';
+import { createSnapshotSession, withSessionlessRunnerCleanup } from '../core/snapshot-session.ts';
 import { resolveSessionScope } from './session-routing.ts';
-import { activateCompleteRefFrame } from './ref-frame.ts';
+import { activateCompleteRefFrame } from '../core/ref-frame.ts';
 import {
   applyRecoveredWarningLatch,
   type CapturedSnapshotQuality,
 } from './snapshot-quality-latch.ts';
-import { createDaemonRuntimePolicy } from './runtime-policy.ts';
-import { createDaemonRuntimeSessionStore } from './runtime-session.ts';
-import { isInteractiveObservation } from './session-action-recorder.ts';
-import { setCommandSnapshot } from './session-snapshot.ts';
-import { SessionStore } from './session-store.ts';
+import { createDaemonRuntimePolicy } from '../execution/runtime-policy.ts';
+import { createDaemonRuntimeSessionStore } from '../core/runtime-session.ts';
+import { isInteractiveObservation } from '../core/session-action-recorder.ts';
+import { setCommandSnapshot } from '../execution/session-snapshot.ts';
+import { SessionStore } from '../core/session-store.ts';
 import {
   resolveBoundSnapshotCaptureRuntime,
   type SnapshotRuntimeRouteParams,
-} from './snapshot-runtime-binding.ts';
-import type { DaemonRequest, DaemonResponse, DaemonResponseData } from './daemon-request.ts';
-import type { SessionRef, SessionState } from './session-state.ts';
+} from '../core/snapshot-runtime-binding.ts';
+import type { DaemonRequest, DaemonResponse, DaemonResponseData } from '../core/daemon-request.ts';
+import type { SessionRef, SessionState } from '../core/session-state.ts';
 
 export type SnapshotRuntimeRecord =
   | { kind: 'snapshot'; nodes: number; truncated: boolean | undefined }
diff --git a/src/daemon/snapshot-diff-runtime.ts b/packages/daemon/src/sessions/snapshot-diff-runtime.ts
similarity index 86%
rename from src/daemon/snapshot-diff-runtime.ts
rename to packages/daemon/src/sessions/snapshot-diff-runtime.ts
index 1bd644ad44..7fdc2e1ad5 100644
--- a/src/daemon/snapshot-diff-runtime.ts
+++ b/packages/daemon/src/sessions/snapshot-diff-runtime.ts
@@ -1,6 +1,6 @@
 import { dispatchSnapshotRuntimeCommand } from './snapshot-command-runtime.ts';
-import type { SnapshotRuntimeRouteParams } from './snapshot-runtime-binding.ts';
-import type { DaemonResponse } from './daemon-request.ts';
+import type { SnapshotRuntimeRouteParams } from '../core/snapshot-runtime-binding.ts';
+import type { DaemonResponse } from '../core/daemon-request.ts';
 
 /** Canonical `diff snapshot` route over one facts-first, request-bound capture runtime. */
 export async function dispatchSnapshotDiffViaRuntime(
diff --git a/src/daemon/snapshot-quality-latch.ts b/packages/daemon/src/sessions/snapshot-quality-latch.ts
similarity index 97%
rename from src/daemon/snapshot-quality-latch.ts
rename to packages/daemon/src/sessions/snapshot-quality-latch.ts
index 95f2b2e2c8..ec9840e110 100644
--- a/src/daemon/snapshot-quality-latch.ts
+++ b/packages/daemon/src/sessions/snapshot-quality-latch.ts
@@ -1,8 +1,8 @@
 import type { SnapshotQualityVerdict } from '@agent-device/kernel/snapshot';
 import { readResponseWarnings } from '@agent-device/kernel/success-text';
 import { recoveredSnapshotQualityWarning } from '@agent-device/capture-kit/quality-warnings';
-import type { DaemonResponseData } from './daemon-request.ts';
-import type { SessionState } from './session-state.ts';
+import type { DaemonResponseData } from '../core/daemon-request.ts';
+import type { SessionState } from '../core/session-state.ts';
 
 type RecoveredWarningLatch = NonNullable<SessionState['recoveredSnapshotWarningLatch']>;
 
diff --git a/src/daemon/snapshot-runtime.ts b/packages/daemon/src/sessions/snapshot-runtime.ts
similarity index 88%
rename from src/daemon/snapshot-runtime.ts
rename to packages/daemon/src/sessions/snapshot-runtime.ts
index 58f8f2c02f..72576bbf45 100644
--- a/src/daemon/snapshot-runtime.ts
+++ b/packages/daemon/src/sessions/snapshot-runtime.ts
@@ -4,13 +4,13 @@ import {
   SNAPSHOT_COMMAND_OPTION_KEYS,
   snapshotOptionsFromFlags,
 } from '@agent-device/kernel/snapshot';
-import type { RequestCaptureProof } from './capture-disclosure.ts';
-import { withTargetActivationDisclosure } from './capture-disclosure.ts';
+import type { RequestCaptureProof } from '../core/capture-disclosure.ts';
+import { withTargetActivationDisclosure } from '../core/capture-disclosure.ts';
 import { dispatchSnapshotRuntimeCommand } from './snapshot-command-runtime.ts';
-import { captureSparseFallbackScreenshot } from './sparse-fallback-screenshot.ts';
-import type { SnapshotRuntimeRouteParams } from './snapshot-runtime-binding.ts';
-import type { DaemonRequest, DaemonResponse } from './daemon-request.ts';
-import type { SessionState } from './session-state.ts';
+import { captureSparseFallbackScreenshot } from '../execution/sparse-fallback-screenshot.ts';
+import type { SnapshotRuntimeRouteParams } from '../core/snapshot-runtime-binding.ts';
+import type { DaemonRequest, DaemonResponse } from '../core/daemon-request.ts';
+import type { SessionState } from '../core/session-state.ts';
 
 export async function dispatchSnapshotViaRuntime(
   params: SnapshotRuntimeRouteParams,
diff --git a/src/daemon/startup-deadline.ts b/packages/daemon/src/sessions/startup-deadline.ts
similarity index 100%
rename from src/daemon/startup-deadline.ts
rename to packages/daemon/src/sessions/startup-deadline.ts
diff --git a/src/daemon/web-session-names.ts b/packages/daemon/src/sessions/web-session-names.ts
similarity index 72%
rename from src/daemon/web-session-names.ts
rename to packages/daemon/src/sessions/web-session-names.ts
index 8cc944da63..ac1b592215 100644
--- a/src/daemon/web-session-names.ts
+++ b/packages/daemon/src/sessions/web-session-names.ts
@@ -1,5 +1,5 @@
-import type { SessionStore } from './session-store.ts';
-import type { SessionState } from './session-state.ts';
+import type { SessionStore } from '../core/session-store.ts';
+import type { SessionState } from '../core/session-state.ts';
 
 export function isWebSession(session: SessionState): boolean {
   return session.device.platform === 'web';
diff --git a/packages/daemon/tsconfig.json b/packages/daemon/tsconfig.json
new file mode 100644
index 0000000000..71114553ab
--- /dev/null
+++ b/packages/daemon/tsconfig.json
@@ -0,0 +1,69 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "composite": true,
+    "noEmit": false,
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationDir": "./dist-types",
+    "rootDir": "./src",
+    "tsBuildInfoFile": "./dist-types/index.tsbuildinfo"
+  },
+  "include": ["src"],
+  "references": [
+    {
+      "path": "../ad-replay"
+    },
+    {
+      "path": "../ad-script"
+    },
+    {
+      "path": "../capture-kit"
+    },
+    {
+      "path": "../command-registry"
+    },
+    {
+      "path": "../contracts"
+    },
+    {
+      "path": "../daemon-contracts"
+    },
+    {
+      "path": "../device-selection"
+    },
+    {
+      "path": "../host-kit"
+    },
+    {
+      "path": "../kernel"
+    },
+    {
+      "path": "../maestro"
+    },
+    {
+      "path": "../platform-android"
+    },
+    {
+      "path": "../platform-apple"
+    },
+    {
+      "path": "../platform-web"
+    },
+    {
+      "path": "../replay-port"
+    },
+    {
+      "path": "../replay-test"
+    },
+    {
+      "path": "../selectors"
+    },
+    {
+      "path": "../session-journal"
+    },
+    {
+      "path": "../test-kit"
+    }
+  ]
+}
diff --git a/packages/host-kit/src/code-signature.ts b/packages/host-kit/src/code-signature.ts
index edea9084ce..8ca89ae0e7 100644
--- a/packages/host-kit/src/code-signature.ts
+++ b/packages/host-kit/src/code-signature.ts
@@ -69,7 +69,7 @@ export function resolveDaemonCodeSignature(): string {
  * first: two installed trees of one version hold the same artifact and have nothing to
  * compare (#2458), while a checkout's code moves under a version that does not move
  * with it. A running daemon publishes its own answer beside its signature
- * (`src/daemon/server/server-lifecycle.ts`) because the question is about the code that
+ * (`packages/daemon/src/server/server/server-lifecycle.ts`) because the question is about the code that
  * is RUNNING, not only about the client asking it.
  */
 export type DaemonCodeOrigin = 'installed' | 'checkout';
diff --git a/packages/maestro/test/conformance/differential/invariants.ts b/packages/maestro/test/conformance/differential/invariants.ts
index 5d11103d3d..68bbc7da29 100644
--- a/packages/maestro/test/conformance/differential/invariants.ts
+++ b/packages/maestro/test/conformance/differential/invariants.ts
@@ -6,7 +6,7 @@
 // loop has no reflectable upstream constant to cross-check in layer 2).
 //
 // These invariants read the `replay-timing.ndjson` written by the test runtime
-// (src/daemon/handlers/session-test-runtime.ts) and assert engine-side facts —
+// (packages/replay-test/src/internal/session-test-runtime.ts) and assert engine-side facts —
 // e.g. a tap's stability loop must latch rather than run out of settle budget.
 //
 // The evaluator is pure and unit-tested against synthetic traces; the device run
diff --git a/packages/replay-port/src/daemon-port/test-command.ts b/packages/replay-port/src/daemon-port/test-command.ts
index 4ab1e65bea..4450dd1a80 100644
--- a/packages/replay-port/src/daemon-port/test-command.ts
+++ b/packages/replay-port/src/daemon-port/test-command.ts
@@ -301,7 +301,7 @@ export async function runReplayTestCommand(command: ReplayTestCommand): Promise<
  * client-side *before* the suite runs, so it never contains the suite's own invocation id.
  *
  * `data.artifactsDir` (the daemon-local suite directory) is always `<redirected root>/<suite
- * invocation id>`: `createDirectoryArchive` (`src/daemon/artifact-tracking.ts`) tars it as
+ * invocation id>`: `createDirectoryArchive` (`packages/daemon/src/resources/artifact-tracking.ts`) tars it as
  * `-C dirname(daemonRoot) -- basename(daemonRoot)`, so extracting that archive under the
  * caller-local root reproduces the SAME invocation-id segment there. The caller-facing root is
  * therefore `path.join(clientRoot, basename(daemonRoot))`, not `clientRoot` itself — every path
diff --git a/packages/replay-test/src/internal/__tests__/session-test-runtime.test.ts b/packages/replay-test/src/internal/__tests__/session-test-runtime.test.ts
index 6bd8cb8fbd..fa1f8ec1d3 100644
--- a/packages/replay-test/src/internal/__tests__/session-test-runtime.test.ts
+++ b/packages/replay-test/src/internal/__tests__/session-test-runtime.test.ts
@@ -11,7 +11,7 @@ import { mkdtempForTestSync } from '../../tmp-dir.fixtures.ts';
 // What the scheduler owes its host around cancellation (#1478 P3b): cancel exactly once when
 // an attempt times out, and always release when it settles. How the daemon then maps that onto
 // its request registry is the adapter's contract, pinned in
-// `src/daemon/__tests__/replay-suite/session-test-suite-command-cancellation.test.ts`.
+// `packages/daemon/src/sessions/__tests__/replay-suite/session-test-suite-command-cancellation.test.ts`.
 const cancellations: Array<{ attemptId: string; canceled: number; released: number }> = [];
 
 function trackCancellation() {
diff --git a/packages/session-journal/src/__tests__/journal-request-input.test.ts b/packages/session-journal/src/__tests__/journal-request-input.test.ts
index 742f69c174..3bec80b8ae 100644
--- a/packages/session-journal/src/__tests__/journal-request-input.test.ts
+++ b/packages/session-journal/src/__tests__/journal-request-input.test.ts
@@ -93,7 +93,7 @@ type ReachableTypes<
           : never;
 
 /**
- * The structural minimum of `src/daemon/session-state.ts`'s `SessionState`. The package may not
+ * The structural minimum of `packages/daemon/src/core/session-state.ts`'s `SessionState`. The package may not
  * import that module (R11), so the live session record is named by the three required fields no
  * other shape in the public request vocabulary carries together. Anything typed as `SessionState`
  * is assignable to this, which is what `Extract` needs.
diff --git a/packages/test-kit/src/boundary-fault-matrix.ts b/packages/test-kit/src/boundary-fault-matrix.ts
index afdc2d6fcc..c747da4584 100644
--- a/packages/test-kit/src/boundary-fault-matrix.ts
+++ b/packages/test-kit/src/boundary-fault-matrix.ts
@@ -176,7 +176,7 @@ export const BOUNDARY_FAULT_MATRIX = {
     'artifact-producing': {
       kind: 'covered',
       evidence: [
-        'src/daemon/__tests__/filesystem-boundary-faults.test.ts',
+        'packages/daemon/src/resources/__tests__/filesystem-boundary-faults.test.ts',
         'packages/platform-apple/src/runner/__tests__/runner-lease-filesystem-boundary-faults.test.ts',
       ],
       invariants: ['atomic-publication', 'publication-residue-free'],
@@ -184,7 +184,7 @@ export const BOUNDARY_FAULT_MATRIX = {
     'session-lifecycle': {
       kind: 'covered',
       evidence: [
-        'src/daemon/__tests__/filesystem-boundary-faults.test.ts',
+        'packages/daemon/src/resources/__tests__/filesystem-boundary-faults.test.ts',
         'packages/platform-apple/src/runner/__tests__/runner-lease-filesystem-boundary-faults.test.ts',
       ],
       invariants: ['atomic-publication', 'publication-residue-free', 'claim-or-lease-state'],
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 62654b0d05..0d344c6697 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -34,6 +34,9 @@ importers:
       '@agent-device/contracts':
         specifier: workspace:*
         version: link:packages/contracts
+      '@agent-device/daemon':
+        specifier: workspace:*
+        version: link:packages/daemon
       '@agent-device/daemon-contracts':
         specifier: workspace:*
         version: link:packages/daemon-contracts
@@ -280,6 +283,76 @@ importers:
         specifier: ^4.9.0
         version: 4.9.0
 
+  packages/daemon:
+    dependencies:
+      '@agent-device/ad-replay':
+        specifier: workspace:*
+        version: link:../ad-replay
+      '@agent-device/ad-script':
+        specifier: workspace:*
+        version: link:../ad-script
+      '@agent-device/capture-kit':
+        specifier: workspace:*
+        version: link:../capture-kit
+      '@agent-device/command-registry':
+        specifier: workspace:*
+        version: link:../command-registry
+      '@agent-device/contracts':
+        specifier: workspace:*
+        version: link:../contracts
+      '@agent-device/daemon-contracts':
+        specifier: workspace:*
+        version: link:../daemon-contracts
+      '@agent-device/device-selection':
+        specifier: workspace:*
+        version: link:../device-selection
+      '@agent-device/host-kit':
+        specifier: workspace:*
+        version: link:../host-kit
+      '@agent-device/kernel':
+        specifier: workspace:*
+        version: link:../kernel
+      '@agent-device/maestro':
+        specifier: workspace:*
+        version: link:../maestro
+      '@agent-device/platform-android':
+        specifier: workspace:*
+        version: link:../platform-android
+      '@agent-device/platform-apple':
+        specifier: workspace:*
+        version: link:../platform-apple
+      '@agent-device/platform-web':
+        specifier: workspace:*
+        version: link:../platform-web
+      '@agent-device/replay-port':
+        specifier: workspace:*
+        version: link:../replay-port
+      '@agent-device/replay-test':
+        specifier: workspace:*
+        version: link:../replay-test
+      '@agent-device/selectors':
+        specifier: workspace:*
+        version: link:../selectors
+      '@agent-device/session-journal':
+        specifier: workspace:*
+        version: link:../session-journal
+      '@agent-device/test-kit':
+        specifier: workspace:*
+        version: link:../test-kit
+    devDependencies:
+      fast-check:
+        specifier: ^4.9.0
+        version: 4.9.0
+      oxc-parser:
+        specifier: ^0.146.0
+        version: 0.146.0
+      vitest:
+        specifier: 5.0.4
+        version: 5.0.4(@types/node@22.20.1)(@vitest/coverage-v8@5.0.4)(vite@8.2.1(@types/node@22.20.1)(yaml@2.9.0))
+      yaml:
+        specifier: ^2.9.0
+        version: 2.9.0
+
   packages/daemon-contracts:
     dependencies:
       '@agent-device/command-registry':
diff --git a/scripts/__tests__/committed-source-tree.ts b/scripts/__tests__/committed-source-tree.ts
index 2c61e4bee9..80e42cf0db 100644
--- a/scripts/__tests__/committed-source-tree.ts
+++ b/scripts/__tests__/committed-source-tree.ts
@@ -42,10 +42,29 @@ export function headCommit(repoRoot: string): string {
   return git(repoRoot, ['rev-parse', 'HEAD']).toString('utf8').trim();
 }
 
-/** Files renamed since `base`, current path -> path at `base`, so a rename is not a new entry. */
-export function renamedSince(repoRoot: string, base: string): ReadonlyMap<string, string> {
+/**
+ * Files renamed between `base` and `head` (the working tree unless a commit is given),
+ * head path -> base path, so a rename is not a new entry. The explicit rename limit keeps
+ * inexact detection on regardless of the clone's `diff.renameLimit` config — a bulk move
+ * with edits (the daemon extraction) is exactly the inexact case the ratchets must see.
+ */
+export function renamedSince(
+  repoRoot: string,
+  base: string,
+  head?: string,
+): ReadonlyMap<string, string> {
   const renamed = new Map<string, string>();
-  const status = git(repoRoot, ['diff', '--name-status', '-M', '--diff-filter=R', '-z', base]);
+  const status = git(repoRoot, [
+    '-c',
+    'diff.renameLimit=0',
+    'diff',
+    '--name-status',
+    '-M',
+    '--diff-filter=R',
+    '-z',
+    base,
+    ...(head ? [head] : []),
+  ]);
   const fields = status.toString('utf8').split('\0');
   for (let index = 0; index + 2 < fields.length; index += 3) {
     const [from, to] = [fields[index + 1], fields[index + 2]];
diff --git a/scripts/__tests__/eager-closure-budgets.test.ts b/scripts/__tests__/eager-closure-budgets.test.ts
index c8ca29456f..50b32056c5 100644
--- a/scripts/__tests__/eager-closure-budgets.test.ts
+++ b/scripts/__tests__/eager-closure-budgets.test.ts
@@ -506,6 +506,56 @@ test('a renamed entry is followed to its path at the base, not treated as first-
   ).toBe(null);
 });
 
+test('rename detection survives a git mv with an edit and a hostile renameLimit', () => {
+  // The daemon move is the load-bearing case: `git mv` PLUS a per-file edit makes the rename
+  // inexact, and a clone-side `diff.renameLimit` below the file count silently disables the
+  // scan. `renamedSince` pins the limit off, so both must still pair.
+  const repo = mkGitFixtureRepo('renamed-since-inexact-');
+  // git mv PLUS an edit: inexact rename detection has to score similarity to pair this one.
+  // The fixture files are one statement long, so an appended edit would be a rewrite git
+  // refuses to pair at all; pad in the base commit first, then move and touch a line the
+  // way the daemon files were touched.
+  for (const file of ['packages/demo/src/entry.ts', 'packages/demo/src/facades/top.ts'])
+    fs.appendFileSync(
+      path.join(repo, file),
+      Array.from({ length: 40 }, (_, i) => `export const pad${i} = ${i};`).join('\n') + '\n',
+    );
+  execFileSync('git', ['commit', '-aqm', 'pad'], { cwd: repo });
+  execFileSync('git', ['mv', 'packages/demo/src/entry.ts', 'packages/demo/src/moved.ts'], {
+    cwd: repo,
+  });
+  fs.appendFileSync(path.join(repo, 'packages/demo/src/moved.ts'), '\nexport const touched = 1;\n');
+  execFileSync(
+    'git',
+    ['mv', 'packages/demo/src/facades/top.ts', 'packages/demo/src/facades/top2.ts'],
+    {
+      cwd: repo,
+    },
+  );
+  fs.appendFileSync(
+    path.join(repo, 'packages/demo/src/facades/top2.ts'),
+    '\nexport const t2 = 1;\n',
+  );
+  execFileSync('git', ['add', '-A'], { cwd: repo });
+  execFileSync('git', ['commit', '-qm', 'two moved edits'], { cwd: repo });
+  const withEdits = renamedSince(repo, 'HEAD~1', 'HEAD');
+  expect(withEdits.get('packages/demo/src/moved.ts')).toBe('packages/demo/src/entry.ts');
+  expect(withEdits.get('packages/demo/src/facades/top2.ts')).toBe(
+    'packages/demo/src/facades/top.ts',
+  );
+  // A clone-side limit BELOW the two inexact renames must not disable detection: the helper
+  // passes its own `-c diff.renameLimit=0` (unlimited).
+  execFileSync('git', ['config', 'diff.renameLimit', '1'], { cwd: repo });
+  const underLimit = renamedSince(repo, 'HEAD~1', 'HEAD');
+  expect(underLimit.get('packages/demo/src/moved.ts')).toBe('packages/demo/src/entry.ts');
+  expect(underLimit.get('packages/demo/src/facades/top2.ts')).toBe(
+    'packages/demo/src/facades/top.ts',
+  );
+  // The base -> head direction the wire-compat ledger canonicalizes with (#3546 review).
+  const baseToHead = new Map([...underLimit].map(([headPath, basePath]) => [basePath, headPath]));
+  expect(baseToHead.get('packages/demo/src/entry.ts')).toBe('packages/demo/src/moved.ts');
+});
+
 test('discovery is recursive and reads TRACKED files only', () => {
   // Two holes in one fixture, because both are about discovery seeing the wrong set of files.
   //
diff --git a/scripts/__tests__/eager-closure-budgets.ts b/scripts/__tests__/eager-closure-budgets.ts
index e17b81e142..53f5571dfa 100644
--- a/scripts/__tests__/eager-closure-budgets.ts
+++ b/scripts/__tests__/eager-closure-budgets.ts
@@ -109,7 +109,7 @@ export const HUB_ENTRY_FILES: readonly string[] = [
   'src/daemon.ts',
   'src/platform-runtime.ts',
   'src/core/interactors/register-builtins.ts',
-  'src/daemon/session-teardown.ts',
+  'packages/daemon/src/sessions/session-teardown.ts',
 ];
 
 /** A platform façade evaluates exactly this many modules: itself. */
diff --git a/scripts/__tests__/eager-closure-gate-fixtures.ts b/scripts/__tests__/eager-closure-gate-fixtures.ts
index 02e24f8c20..9276097384 100644
--- a/scripts/__tests__/eager-closure-gate-fixtures.ts
+++ b/scripts/__tests__/eager-closure-gate-fixtures.ts
@@ -36,11 +36,14 @@ export function mkGitFixtureRepo(prefix: string): string {
   fs.mkdirSync(path.join(repo, 'scripts'));
   fs.writeFileSync(path.join(repo, 'scripts/standalone.ts'), 'export const outside = 1;\n');
   execFileSync('git', ['init', '-q'], { cwd: repo });
+  // Pin identity and signing into the repo config rather than the run's `-c` flags or the
+  // runner's global config: callers commit more than the base (e.g. the pad commit in
+  // eager-closure-budgets.test.ts), and a CI runner without a global identity fails those
+  // later commits with "Author identity unknown".
+  execFileSync('git', ['config', 'user.name', 'Gate'], { cwd: repo });
+  execFileSync('git', ['config', 'user.email', 'gate@example.test'], { cwd: repo });
+  execFileSync('git', ['config', 'commit.gpgsign', 'false'], { cwd: repo });
   execFileSync('git', ['add', '.'], { cwd: repo });
-  execFileSync(
-    'git',
-    ['-c', 'user.name=Gate', '-c', 'user.email=gate@example.test', 'commit', '-qm', 'base'],
-    { cwd: repo },
-  );
+  execFileSync('git', ['commit', '-qm', 'base'], { cwd: repo });
   return repo;
 }
diff --git a/scripts/__tests__/help-conformance-sample-producers.ts b/scripts/__tests__/help-conformance-sample-producers.ts
index 025abbca5b..a453009400 100644
--- a/scripts/__tests__/help-conformance-sample-producers.ts
+++ b/scripts/__tests__/help-conformance-sample-producers.ts
@@ -20,13 +20,16 @@ import { interactionCliOutputFormatters } from '../../src/commands/interaction/o
 import { snapshotCliOutput } from '../../src/commands/capture/output.ts';
 import { openCliOutput } from '../../src/commands/management/output.ts';
 import { NEVER_SETTLED_HINT } from '../../src/commands/interaction/runtime/settle.ts';
-import { buildAmbiguousMatchError } from '../../src/daemon/selector-match-errors.ts';
-import { refMutationAdmissionResponse } from '../../src/daemon/interaction/index.ts';
-import { buildDeviceInUseBySessionError } from '../../src/daemon/session-recovery-hints.ts';
-import { buildDeviceClaimConflictError } from '../../src/daemon/device/device-claim-conflict.ts';
-import { activateCompleteRefFrame, readRefMutationFrame } from '../../src/daemon/ref-frame.ts';
-import { resolveRefStalenessWarning } from '../../src/daemon/session-snapshot.ts';
-import type { SessionState } from '../../src/daemon/session-state.ts';
+import { buildAmbiguousMatchError } from '@agent-device/daemon/testing/selector-match-errors';
+import { refMutationAdmissionResponse } from '@agent-device/daemon/testing/interaction/index';
+import { buildDeviceInUseBySessionError } from '@agent-device/daemon/testing/session-recovery-hints';
+import { buildDeviceClaimConflictError } from '@agent-device/daemon/testing/device/device-claim-conflict';
+import {
+  activateCompleteRefFrame,
+  readRefMutationFrame,
+} from '@agent-device/daemon/testing/ref-frame';
+import { resolveRefStalenessWarning } from '@agent-device/daemon/testing/session-snapshot';
+import type { SessionState } from '@agent-device/daemon/testing/session-state';
 import { buildAppNotInstalledError } from '@agent-device/platform-apple/app-resolution';
 import {
   presentConnectReadiness,
diff --git a/scripts/check-affected/device-lanes.test.ts b/scripts/check-affected/device-lanes.test.ts
index b3f3eb388d..b8924627d3 100644
--- a/scripts/check-affected/device-lanes.test.ts
+++ b/scripts/check-affected/device-lanes.test.ts
@@ -3,6 +3,7 @@
 // a tooling change beside it still fails open to the full set.
 
 import assert from 'node:assert/strict';
+import fs from 'node:fs';
 import { test } from 'node:test';
 import { deviceLaneLeaf, deviceLanesFor, isDeviceLaneSurface, isUnitTest } from './device-lanes.ts';
 import { selectChecks, type CheckId } from './model.ts';
@@ -71,9 +72,9 @@ test('the macOS coverage manifest selects its executable gate and macOS replay l
 
 test('shared runtime surface owns every device lane', () => {
   for (const file of [
-    'src/daemon/handlers/session.ts',
+    'packages/daemon/src/sessions/handlers/session.ts',
     'packages/kernel/src/errors.ts',
-    'src/daemon/android-system-dialog.ts', // naming convention in a shared dir, not a boundary
+    'packages/daemon/src/execution/android-system-dialog.ts', // naming convention in a shared dir, not a boundary
     'test/integration/smoke-daemon-clean.test.ts',
     'packages/provision-kit/src/install-source.ts',
   ]) {
@@ -127,7 +128,7 @@ test('the fixture app owns the mobile lanes whichever subtree changes', () => {
 
 test('unit tests under src/ and packages/*/src own no lane', () => {
   for (const file of [
-    'src/daemon/selectors.test.ts',
+    'packages/daemon/src/sessions/handlers/snapshot-runtime-route.test.ts',
     'src/__tests__/contracts/interaction-guarantees.test.ts',
     'packages/platform-apple/src/core/__tests__/apps.test.ts',
     'packages/platform-apple/src/runtime.test.ts',
@@ -137,7 +138,11 @@ test('unit tests under src/ and packages/*/src own no lane', () => {
     assert.deepEqual(lanes(file), [], file);
   }
   // Non-TypeScript under __tests__ is a fixture the selector cannot place, not a unit test.
-  assert.ok(!isUnitTest('packages/platform-android/src/fixtures/android-ime-capture.raw.json'));
+  // The existence pin keeps this from going vacuous when the fixture moves again: a path that
+  // no longer exists satisfies !isUnitTest for the wrong reason.
+  const imeFixture = 'packages/platform-android/src/fixtures/android-ime-capture.raw.json';
+  assert.ok(fs.existsSync(imeFixture), imeFixture);
+  assert.ok(!isUnitTest(imeFixture));
   // Package tests outside src/ have no owner and keep failing open.
   assert.ok(!isUnitTest('packages/maestro/test/conformance/verify.test.ts'));
   assert.equal(
diff --git a/scripts/check-affected/device-lanes.ts b/scripts/check-affected/device-lanes.ts
index 7ba9503c6d..435b4e20c8 100644
--- a/scripts/check-affected/device-lanes.ts
+++ b/scripts/check-affected/device-lanes.ts
@@ -8,7 +8,7 @@
 //
 // What enumerates the surface. The import graph cannot: the daemon value-imports every
 // platform module (`src/platform-runtime.ts` composes all six families; `src/core/interactors/*`
-// import each family's actions; `src/daemon/session-teardown.ts` calls Android cleanup on every
+// import each family's actions; `packages/daemon/src/sessions/session-teardown.ts` calls Android cleanup on every
 // session close), so reachability from `src/bin.ts` is the whole tree, and the layering graph
 // does not resolve relative imports inside `packages/`. The repo's *enforced* platform partition
 // can: `CANONICAL_PLATFORM_FAMILIES` names the families, layering R13 pins each family's runtime
@@ -77,7 +77,7 @@ function leafOfSegment(segment: string): Leaf | null {
 
 // Under test/integration/ the smoke files carry their lane in the leading tokens of the first
 // segment (`smoke-android-emulator.test.ts`, `ios-simulator-e2e/`, `android-emulator-e2e/`).
-// Elsewhere only directory segments tag: `src/daemon/android-system-dialog.ts` is a naming
+// Elsewhere only directory segments tag: `packages/daemon/src/execution/android-system-dialog.ts` is a naming
 // convention in a shared directory, not an enforced boundary, so it stays shared.
 function tagSegments(file: string): string[] {
   const segments = file.split('/');
diff --git a/scripts/check-affected/model.test.ts b/scripts/check-affected/model.test.ts
index 5036aca8dc..aa642d18b4 100644
--- a/scripts/check-affected/model.test.ts
+++ b/scripts/check-affected/model.test.ts
@@ -46,7 +46,7 @@ test('platform package source additionally selects provider-integration', () =>
 });
 
 test('unit test files delegate affected-test discovery to Vitest', () => {
-  const result = ids(['src/daemon/selectors.test.ts']);
+  const result = ids(['packages/daemon/src/selectors.test.ts']);
   assert.ok(result.includes('vitest-related'));
   assert.ok(!result.includes('unit'));
   assert.ok(!result.includes('provider-integration'));
diff --git a/scripts/check-bundle-owner-files.ts b/scripts/check-bundle-owner-files.ts
index eb8d8bfa29..1fceefb948 100644
--- a/scripts/check-bundle-owner-files.ts
+++ b/scripts/check-bundle-owner-files.ts
@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { COMMAND_OWNER_FILES } from '@agent-device/command-registry/owner-files';
-import { getDaemonRouteOwnerFiles } from '../src/daemon/route-owner-files.ts';
+import { getDaemonRouteOwnerFiles } from '@agent-device/daemon/route-owner-files';
 import { walkFiles } from './lib/walk-files.ts';
 
 const repoRoot = path.resolve(import.meta.dirname, '..');
diff --git a/scripts/coverage-crap/fallow-health-report.fixture.json b/scripts/coverage-crap/fallow-health-report.fixture.json
index e97f3449ba..d56b234fe2 100644
--- a/scripts/coverage-crap/fallow-health-report.fixture.json
+++ b/scripts/coverage-crap/fallow-health-report.fixture.json
@@ -38,7 +38,7 @@
       "coverage_source": "istanbul"
     },
     {
-      "path": "src/daemon/server/http-server.ts",
+      "path": "packages/daemon/src/server/server/http-server.ts",
       "name": "<arrow>",
       "line": 188,
       "col": 18,
diff --git a/scripts/coverage-crap/model.test.ts b/scripts/coverage-crap/model.test.ts
index ceacd0004f..1647f2cad1 100644
--- a/scripts/coverage-crap/model.test.ts
+++ b/scripts/coverage-crap/model.test.ts
@@ -417,6 +417,8 @@ test('a captured fallow 3.32 report yields its measured findings past leading ou
   assert.deepEqual(
     findings.map((entry) => [entry.path, entry.name, entry.line, entry.crap]),
     [
+      // The captured fixture keeps the historical capture path: it never existed
+      // at head (the module lives at the package root), so the sweep left it.
       ['src/daemon/handlers/session-state.ts', 'handleSessionStateCommands', 232, 34.1],
       ['src/daemon/handlers/session-state.ts', 'handleAppStateCommand', 112, 30.4],
     ],
diff --git a/scripts/daemon-edge-residue-scan.mjs b/scripts/daemon-edge-residue-scan.mjs
deleted file mode 100644
index fe96a27118..0000000000
--- a/scripts/daemon-edge-residue-scan.mjs
+++ /dev/null
@@ -1,90 +0,0 @@
-// Daemon residue scan (11a-4): every module specifier in a file under src/daemon/ that resolves
-// to a non-package module outside src/daemon/. The rule: daemon files may import workspace
-// packages, externals, and each other — nothing else. Once the daemon is its own package, R11 in
-// the layering guard (#3546) enforces this permanently; until then this scan is the measurement.
-//
-// Why a naive regex reported zero edges while five mocks survived: a single alternation that
-// starts at `import|export` and bridges to the next `from` with `[\s\S]*?` swallows everything in
-// between — including a `vi.mock('../../../platform-runtime-….ts', …)` whose own specifier sits
-// between an earlier `importOriginal<typeof import(...)>` and the file's next static `from`. The
-// mocked specifier is then attributed to the wrong (allowed) capture or skipped entirely. So each
-// specifier form is matched independently, statement-anchored where the language is:
-//
-//   - static `import`/`export … from '…'` and side-effect `import '…'`, anchored at a statement
-//     start (line start or `;`), never bridging statements;
-//   - `import type` / `export type` variants (same anchor);
-//   - dynamic `import('…')` / `require('…')` with a string or no-substitution template argument;
-//   - `vi.mock` / `vi.doMock` / `vi.unmock` / `vi.importMock` / `vi.importActual` /
-//     `vi.importOriginal` first argument, any position, string or template literal;
-//   - `importOriginal<typeof import('…')>` type-position specifiers (the dynamic-import form).
-//
-// Known limits: computed specifiers (variables, string concatenation) are out of scope — none
-// exist in the daemon tree, and a runtime resolver is the only tool that could see them.
-//
-// Usage: `node scripts/daemon-edge-residue-scan.mjs` from the repo root. Exit code 1 when any
-// edge is found.
-import fs from 'node:fs';
-import path from 'node:path';
-
-const root = process.cwd();
-
-function walk(dir, out) {
-  for (const ent of fs.readdirSync(dir, { withFileTypes: true })) {
-    const p = path.join(dir, ent.name);
-    if (ent.isDirectory()) walk(p, out);
-    else if (/\.(ts|tsx|mjs)$/.test(ent.name)) out.push(p);
-  }
-  return out;
-}
-
-// A quoted string or no-substitution template literal as the specifier position.
-const SPEC = '(?:\'([^\']*)\'|"([^"]*)"|`([^`]*)`)';
-const forms = [
-  // Static import/export with a `from` clause; the keyword must start a statement.
-  new RegExp(`(?:^|[;\\n])\\s*(?:import|export)\\b[^'"()\`]*?\\bfrom\\s*${SPEC}`, 'gm'),
-  // Side-effect import.
-  new RegExp(`(?:^|[;\\n])\\s*import\\s+${SPEC}`, 'gm'),
-  // Dynamic import (also catches `typeof import('…')` in type positions) and require.
-  new RegExp(`\\bimport\\s*\\(\\s*${SPEC}`, 'g'),
-  new RegExp(`\\brequire\\s*\\(\\s*${SPEC}`, 'g'),
-  // Vitest module-factory hoists, any position in the file.
-  new RegExp(
-    `\\bvi\\.(?:mock|doMock|unmock|importMock|importActual|importOriginal)\\s*\\(\\s*${SPEC}`,
-    'g',
-  ),
-];
-
-const files = walk(path.join(root, 'src/daemon'), []);
-const edges = [];
-for (const file of files) {
-  const rel = path.relative(root, file);
-  const source = fs.readFileSync(file, 'utf8');
-  const seen = new Set();
-  for (const form of forms) {
-    form.lastIndex = 0;
-    let match;
-    while ((match = form.exec(source))) {
-      const specifier = match[1] ?? match[2] ?? match[3];
-      if (!specifier) continue;
-      if (!specifier.startsWith('.')) continue; // bare specifier: package or external, allowed
-      const resolved = path
-        .normalize(path.join(path.dirname(rel), specifier))
-        .replace(/\.tsx?$/, '');
-      // path.join yields backslashes on Windows, so compare against the native separator.
-      const daemonDir = path.join('src', 'daemon');
-      if (resolved === daemonDir || resolved.startsWith(`${daemonDir}${path.sep}`)) continue;
-      if (seen.has(resolved)) continue;
-      seen.add(resolved);
-      // The static forms anchor at the preceding `;`/newline, so slice(0, match.index)
-      // counts lines only up to that separator and reports one early. Count to the
-      // keyword inside the match (position 0 for the unanchored forms).
-      const keywordAt = match[0].search(/import|export|require|vi\./);
-      const line = source.slice(0, match.index + keywordAt).split('\n').length;
-      edges.push(`${rel}:${line} -> ${resolved}`);
-    }
-  }
-}
-edges.sort();
-if (edges.length > 0) process.stdout.write(edges.join('\n') + '\n');
-process.stdout.write(`daemon residue edges: ${edges.length}\n`);
-if (edges.length > 0) process.exit(1);
diff --git a/scripts/depgraph/README.md b/scripts/depgraph/README.md
index d0dc146f54..07be60d307 100644
--- a/scripts/depgraph/README.md
+++ b/scripts/depgraph/README.md
@@ -14,7 +14,7 @@ productive artifact is the JSON, queried directly.
 
 ```sh
 pnpm depgraph affected packages/host-kit/src/command.ts # bounded text
-pnpm depgraph affected src/daemon/ref-frame.ts --json --limit 25
+pnpm depgraph affected packages/daemon/src/core/ref-frame.ts --json --limit 25
 ```
 
 Reverse reachability over the value-edge graph, plus the three lookups that used to follow it:
@@ -162,9 +162,9 @@ roots, exports, and named live-state symbols in `scripts/layering/architecture-o
 
 - `vocabulary` — the target is a declared contract facade root.
 - `capability` — the target is a declared capability root and the import names a declared export.
-- `live-state-shape` — the edge names the exact `SessionState` type from `src/daemon/session-state.ts`.
+- `live-state-shape` — the edge names the exact `SessionState` type from `packages/daemon/src/core/session-state.ts`.
 - `live-state-authority` — the edge names the exact `SessionStore` class from
-  `src/daemon/session-store.ts`.
+  `packages/daemon/src/core/session-store.ts`.
 - `executable-policy` — the source is under a declared executable-policy root.
 - `ordinary` — no declared authority evidence matches the edge.
 
diff --git a/scripts/depgraph/affected-run.ts b/scripts/depgraph/affected-run.ts
index 11479e729c..001591e206 100644
--- a/scripts/depgraph/affected-run.ts
+++ b/scripts/depgraph/affected-run.ts
@@ -1,7 +1,7 @@
 // `pnpm depgraph affected <path>` — the blast radius of one file in one query.
 //
 //   pnpm depgraph affected packages/host-kit/src/command.ts
-//   pnpm depgraph affected src/daemon/ref-frame.ts --json --limit 20
+//   pnpm depgraph affected packages/daemon/src/core/ref-frame.ts --json --limit 20
 //
 // Answers, from the sources of truth rather than a second copy of them:
 //   - dependents (direct / transitive, with a zone breakdown) — reverse reachability over the
@@ -23,7 +23,7 @@ import {
   INTERACTION_DISPATCH_PATHS,
   type InteractionPathId,
 } from '@agent-device/contracts/interaction-guarantees';
-import { DAEMON_COMMAND_DESCRIPTORS } from '../../src/daemon/daemon-command-registry.ts';
+import { DAEMON_COMMAND_DESCRIPTORS } from '@agent-device/daemon/daemon-command-registry';
 import { parseArgs } from 'node:util';
 import { selectChecks, type CheckPlan } from '../check-affected/model.ts';
 import {
@@ -48,7 +48,7 @@ const USAGE =
   '  --json    unbounded machine-readable output\n' +
   '  --limit   entries per list in text output (default 10)\n';
 
-const HANDLER_CHAIN_FILE = 'src/daemon/request-handler-chain.ts';
+const HANDLER_CHAIN_FILE = 'packages/daemon/src/sessions/request-handler-chain.ts';
 
 /**
  * The live iOS coverage manifest (#1408) is consumed through the narrowest shape this query
diff --git a/scripts/depgraph/affected.test.ts b/scripts/depgraph/affected.test.ts
index 48789de5c9..d63aa6d8dc 100644
--- a/scripts/depgraph/affected.test.ts
+++ b/scripts/depgraph/affected.test.ts
@@ -69,11 +69,11 @@ test('collectDependents ignores type-only and dynamic dependents, which are coun
 
 test('zoneBreakdown and rankByFanIn order by weight, then name', () => {
   const nodes = nodesOf({
-    'src/daemon/a.ts': { zone: 'daemon-server', fanIn: 3 },
-    'src/daemon/b.ts': { zone: 'daemon-server', fanIn: 9 },
+    'packages/daemon/src/a.ts': { zone: 'daemon-server', fanIn: 3 },
+    'packages/daemon/src/b.ts': { zone: 'daemon-server', fanIn: 9 },
     'src/core/c.ts': { zone: 'core', fanIn: 9 },
   });
-  const files = ['src/daemon/a.ts', 'src/daemon/b.ts', 'src/core/c.ts'];
+  const files = ['packages/daemon/src/a.ts', 'packages/daemon/src/b.ts', 'src/core/c.ts'];
 
   assert.deepEqual(zoneBreakdown(files, nodes), [
     { zone: 'daemon-server', count: 2 },
@@ -81,25 +81,29 @@ test('zoneBreakdown and rankByFanIn order by weight, then name', () => {
   ]);
   assert.deepEqual(
     rankByFanIn(files, nodes).map((entry) => entry.file),
-    ['src/core/c.ts', 'src/daemon/b.ts', 'src/daemon/a.ts'],
+    ['packages/daemon/src/b.ts', 'src/core/c.ts', 'packages/daemon/src/a.ts'],
   );
 });
 
 test('commandsReaching follows the dynamic import a route uses to load its handler', () => {
   // These are in-memory arbitrary paths for graph traversal, not repository ownership metadata.
   const edges = edgesOf({
-    'src/daemon/handlers/session.ts':
-      "import { helper } from '../../utils/helper.ts';\nexport const h = helper;",
-    'src/daemon/interaction/index.ts': 'export const f = 1;',
+    'packages/daemon/src/sessions/handlers/session.ts':
+      "import { helper } from '../../../../../src/utils/helper.ts';\nexport const h = helper;",
+    'packages/daemon/src/execution/interaction/index.ts': 'export const f = 1;',
     'src/utils/helper.ts': 'export const helper = 1;',
-    'src/daemon/chain.ts': [
-      "export const routes = { session: () => import('./handlers/session.ts'),",
-      "  find: () => import('./interaction/index.ts') };",
+    'packages/daemon/src/chain.ts': [
+      "export const routes = { session: () => import('./sessions/handlers/session.ts'),",
+      "  find: () => import('./execution/interaction/index.ts') };",
     ].join('\n'),
   });
   const chains = [
-    { command: 'open', route: 'session', entry: 'src/daemon/handlers/session.ts' },
-    { command: 'find', route: 'find', entry: 'src/daemon/interaction/index.ts' },
+    {
+      command: 'open',
+      route: 'session',
+      entry: 'packages/daemon/src/sessions/handlers/session.ts',
+    },
+    { command: 'find', route: 'find', entry: 'packages/daemon/src/execution/interaction/index.ts' },
   ];
 
   assert.deepEqual(
@@ -108,7 +112,7 @@ test('commandsReaching follows the dynamic import a route uses to load its handl
   );
   // The entry module itself counts as part of its own chain.
   assert.deepEqual(
-    commandsReaching('src/daemon/interaction/index.ts', chains, edges).map(
+    commandsReaching('packages/daemon/src/execution/interaction/index.ts', chains, edges).map(
       (chain) => chain.command,
     ),
     ['find'],
@@ -153,14 +157,14 @@ test('bounded lists disclose what they hid', () => {
 });
 
 test('every daemon route in the real route table resolves to a handler entry', () => {
-  const chainFile = 'src/daemon/request-handler-chain.ts';
+  const chainFile = 'packages/daemon/src/sessions/request-handler-chain.ts';
   const source = readFileSync(path.join(repoRoot, chainFile), 'utf8');
   const entries = parseRouteEntries(source, chainFile);
   const declared = [...source.matchAll(/(\w+): defineDaemonRoute\(/g)].map((match) => match[1]!);
 
   assert.ok(declared.length > 0, 'route table shape changed: no defineDaemonRoute entries found');
   assert.deepEqual([...entries.keys()].sort(), [...declared].sort());
-  assert.equal(entries.get('generic'), 'src/daemon/request-generic-dispatch.ts');
+  assert.equal(entries.get('generic'), 'packages/daemon/src/execution/request-generic-dispatch.ts');
 });
 
 test('the real guarantee matrix contributes module-qualified rows', () => {
@@ -209,7 +213,9 @@ test('text output bounds every list and says what it hid', () => {
         weakDirect: { type: 2, dynamic: 1 },
       },
       gates: { checks: ['lint', 'typecheck'], failOpen: false },
-      commands: [{ command: 'click', route: 'interaction', entry: 'src/daemon/handlers/x.ts' }],
+      commands: [
+        { command: 'click', route: 'interaction', entry: 'packages/daemon/src/handlers/x.ts' },
+      ],
       liveOwners: { manifest: 'test/…/coverage-manifest.ts', present: false, owners: [] },
       guaranteeRows: [],
     },
diff --git a/scripts/depgraph/affected.ts b/scripts/depgraph/affected.ts
index 7dd5c77c71..2055955019 100644
--- a/scripts/depgraph/affected.ts
+++ b/scripts/depgraph/affected.ts
@@ -96,7 +96,7 @@ export function rankByFanIn(
 
 export type CommandChain = {
   command: string;
-  /** Daemon route that owns the command (`src/daemon/daemon-command-registry.ts`). */
+  /** Daemon route that owns the command (`packages/daemon/src/core/daemon-command-registry.ts`). */
   route: string;
   /** Handler entry module the route loads. */
   entry: string;
diff --git a/scripts/depgraph/import-graph.ts b/scripts/depgraph/import-graph.ts
index e17a9ea826..f9702345cb 100644
--- a/scripts/depgraph/import-graph.ts
+++ b/scripts/depgraph/import-graph.ts
@@ -11,7 +11,7 @@ export const VALUE_EDGES: ReadonlySet<EdgeKind> = new Set(['value']);
 
 /**
  * What a module can actually run: value imports plus dynamic ones. The daemon loads every
- * command handler through `import()` (`src/daemon/request-handler-chain.ts`), so dropping
+ * command handler through `import()` (`packages/daemon/src/sessions/request-handler-chain.ts`), so dropping
  * dynamic edges would cut every handler chain at its root.
  */
 export const EXECUTABLE_EDGES: ReadonlySet<EdgeKind> = new Set(['value', 'dynamic']);
diff --git a/scripts/depgraph/model.test.ts b/scripts/depgraph/model.test.ts
index a9ca7deac4..54eb77f96d 100644
--- a/scripts/depgraph/model.test.ts
+++ b/scripts/depgraph/model.test.ts
@@ -38,31 +38,33 @@ function authorityFixture(): Map<string, string> {
       "import type { ReplayShape } from '@agent-device/contracts/replay';",
       "import type { ProgressShape } from '@agent-device/contracts/progress';",
     ].join('\n'),
-    'src/daemon/capability-consumer.ts': [
-      "import { createRequestRuntimeBindings } from './request-runtime-binding.ts';",
-      "import { isSessionRecording } from './session-script-publication-capability.ts';",
+    'packages/daemon/src/capability-consumer.ts': [
+      "import { createRequestRuntimeBindings } from './core/request-runtime-binding.ts';",
+      "import { isSessionRecording } from './core/session-script-publication-capability.ts';",
     ].join('\n'),
-    'src/daemon/state-consumer.ts': [
-      "import type { SessionState } from './session-state.ts';",
-      "import { SessionStore } from './session-store.ts';",
+    'packages/daemon/src/state-consumer.ts': [
+      "import type { SessionState } from './core/session-state.ts';",
+      "import { SessionStore } from './core/session-store.ts';",
     ].join('\n'),
-    'src/daemon/type-consumer.ts': "import type { SessionStore } from './session-store.ts';\n",
+    'packages/daemon/src/type-consumer.ts':
+      "import type { SessionStore } from './core/session-store.ts';\n",
     'packages/capture-kit/src/snapshot/policy-consumer.ts': [
-      "import type { SessionState } from '../../../../src/daemon/session-state.ts';",
-      "import type { SessionRef } from '../../../../src/daemon/session-state.ts';",
+      "import type { SessionState } from '../../../../packages/daemon/src/core/session-state.ts';",
+      "import type { SessionRef } from '../../../../packages/daemon/src/core/session-state.ts';",
       "import './ordinary-target.ts';",
     ].join('\n'),
-    'src/daemon/ordinary-consumer.ts': [
+    'packages/daemon/src/ordinary-consumer.ts': [
       "import { SessionState } from './session-state-store.ts';",
-      "import { createRequestRuntimeBindingsExtra } from './request-runtime-binding.ts';",
+      "import { createRequestRuntimeBindingsExtra } from './core/request-runtime-binding.ts';",
     ].join('\n'),
-    'src/daemon/session-state.ts':
+    'packages/daemon/src/core/session-state.ts':
       'export type SessionState = { name: string };\nexport type SessionRef = unknown;\n',
-    'src/daemon/session-store.ts': 'export class SessionStore {}\n',
-    'src/daemon/request-runtime-binding.ts': 'export function createRequestRuntimeBindings() {}\n',
-    'src/daemon/session-script-publication-capability.ts':
+    'packages/daemon/src/core/session-store.ts': 'export class SessionStore {}\n',
+    'packages/daemon/src/core/request-runtime-binding.ts':
+      'export function createRequestRuntimeBindings() {}\n',
+    'packages/daemon/src/core/session-script-publication-capability.ts':
       'export function isSessionRecording() {}\n',
-    'src/daemon/session-state-store.ts': 'export const SessionState = 1;\n',
+    'packages/daemon/src/session-state-store.ts': 'export const SessionState = 1;\n',
     'packages/capture-kit/src/snapshot/ordinary-target.ts': 'export const ordinary = 1;\n',
     'packages/contracts/src/facades/client.ts': 'export type ClientShape = string;\n',
     'packages/contracts/src/facades/capture.ts': 'export type CaptureShape = string;\n',
@@ -90,24 +92,43 @@ test('authority overlay uses declared roots and symbols, keeps kind separate, an
     { kind: 'type', labels: ['vocabulary'] },
   );
   assert.deepEqual(
-    graphEdge(graph, 'src/daemon/capability-consumer.ts', 'src/daemon/request-runtime-binding.ts'),
+    graphEdge(
+      graph,
+      'packages/daemon/src/capability-consumer.ts',
+      'packages/daemon/src/core/request-runtime-binding.ts',
+    ),
     { kind: 'value', labels: ['capability'] },
   );
   assert.deepEqual(
-    graphEdge(graph, 'src/daemon/state-consumer.ts', 'src/daemon/session-state.ts'),
+    graphEdge(
+      graph,
+      'packages/daemon/src/state-consumer.ts',
+      'packages/daemon/src/core/session-state.ts',
+    ),
     {
       kind: 'type',
       labels: ['live-state-shape'],
     },
   );
   assert.deepEqual(
-    graphEdge(graph, 'src/daemon/state-consumer.ts', 'src/daemon/session-store.ts'),
+    graphEdge(
+      graph,
+      'packages/daemon/src/state-consumer.ts',
+      'packages/daemon/src/core/session-store.ts',
+    ),
     { kind: 'value', labels: ['live-state-authority'] },
   );
-  assert.deepEqual(graphEdge(graph, 'src/daemon/type-consumer.ts', 'src/daemon/session-store.ts'), {
-    kind: 'type',
-    labels: ['live-state-authority'],
-  });
+  assert.deepEqual(
+    graphEdge(
+      graph,
+      'packages/daemon/src/type-consumer.ts',
+      'packages/daemon/src/core/session-store.ts',
+    ),
+    {
+      kind: 'type',
+      labels: ['live-state-authority'],
+    },
+  );
   assert.deepEqual(
     graphEdge(
       graph,
@@ -117,25 +138,33 @@ test('authority overlay uses declared roots and symbols, keeps kind separate, an
     { kind: 'value', labels: ['executable-policy'] },
   );
   assert.deepEqual(
-    graphEdge(graph, 'src/daemon/ordinary-consumer.ts', 'src/daemon/session-state-store.ts'),
+    graphEdge(
+      graph,
+      'packages/daemon/src/ordinary-consumer.ts',
+      'packages/daemon/src/session-state-store.ts',
+    ),
     { kind: 'value', labels: ['ordinary'] },
   );
   assert.deepEqual(
-    graphEdge(graph, 'src/daemon/ordinary-consumer.ts', 'src/daemon/request-runtime-binding.ts'),
+    graphEdge(
+      graph,
+      'packages/daemon/src/ordinary-consumer.ts',
+      'packages/daemon/src/core/request-runtime-binding.ts',
+    ),
     { kind: 'value', labels: ['ordinary'] },
   );
 
   const stateEdges = resolveImportEdges(files, authorityWorkspaceTargets()).filter(
     (edge) =>
       edge.file === 'packages/capture-kit/src/snapshot/policy-consumer.ts' &&
-      edge.target === 'src/daemon/session-state.ts',
+      edge.target === 'packages/daemon/src/core/session-state.ts',
   );
   assert.equal(stateEdges.length, 2, 'the fixture must exercise raw same-pair imports');
   assert.deepEqual(
     graphEdge(
       graph,
       'packages/capture-kit/src/snapshot/policy-consumer.ts',
-      'src/daemon/session-state.ts',
+      'packages/daemon/src/core/session-state.ts',
     ),
     {
       kind: 'type',
@@ -179,7 +208,7 @@ test('live-state labels follow shared declarations and reject lookalike targets'
   assert.deepEqual(
     authorityLabelsForEdge({
       file: 'src/core/live-state-consumer.ts',
-      target: 'src/daemon/session-state-store.ts',
+      target: 'packages/daemon/src/session-state-store.ts',
       spec: './session-state-store.ts',
       dynamic: false,
       typeOnly: true,
diff --git a/scripts/depgraph/structure-summary.test.ts b/scripts/depgraph/structure-summary.test.ts
index ab2160daa7..e28be8cced 100644
--- a/scripts/depgraph/structure-summary.test.ts
+++ b/scripts/depgraph/structure-summary.test.ts
@@ -67,8 +67,8 @@ test('computeZoneSccSummary finds a zone-level cycle built from value edges acro
   // file than the first edge's source.
   const files = sources({
     'src/commands/x1.ts': "import { y } from '../core/y.ts';",
-    'src/core/y.ts': "import { z } from '../daemon/z.ts';",
-    'src/daemon/z.ts': "import { x2 } from '../commands/x2.ts';",
+    'src/core/y.ts': "import { z } from '../../packages/daemon/src/z.ts';",
+    'packages/daemon/src/z.ts': "import { x2 } from '../../../src/commands/x2.ts';",
     'src/commands/x2.ts': 'export const x2 = 1;',
   });
   const graph = buildGraph(files, resolveImportEdges(files));
diff --git a/scripts/di-seams/check.ts b/scripts/di-seams/check.ts
index 916d9dd484..bd4f61df6f 100644
--- a/scripts/di-seams/check.ts
+++ b/scripts/di-seams/check.ts
@@ -15,7 +15,12 @@ const repoRoot = execFileSync('git', ['rev-parse', '--show-toplevel'], {
 }).trim();
 
 function listProductionSourceFiles(): string[] {
-  const out = execFileSync('git', ['ls-files', '--', 'src'], { cwd: repoRoot, encoding: 'utf8' });
+  // The daemon server moved to packages/daemon (#3352); its DI seams need the same guard.
+  // Other packages stay out of scope for this guard's current claim.
+  const out = execFileSync('git', ['ls-files', '--', 'src', 'packages/daemon'], {
+    cwd: repoRoot,
+    encoding: 'utf8',
+  });
   return out
     .split('\n')
     .filter(Boolean)
@@ -37,7 +42,7 @@ export function main(): number {
 
   if (violations.length === 0) {
     process.stdout.write(
-      `DI-seam guard: OK — ${files.length} production src/ files scanned, ` +
+      `DI-seam guard: OK — ${files.length} production src/ and daemon-package files scanned, ` +
         `${approved.length} approved seam(s) found, no unapproved seams.\n`,
     );
     return 0;
diff --git a/scripts/explain-command.ts b/scripts/explain-command.ts
index e0d5a4e279..52e334e629 100644
--- a/scripts/explain-command.ts
+++ b/scripts/explain-command.ts
@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { explainCommand, formatCommandExplanation } from '../src/cli/command-explain.ts';
-import { getDaemonRouteOwnerFiles } from '../src/daemon/route-owner-files.ts';
+import { getDaemonRouteOwnerFiles } from '@agent-device/daemon/route-owner-files';
 
 const repoRoot = path.resolve(import.meta.dirname, '..');
 export type ExplainCommandCliResult = {
diff --git a/scripts/help-conformance-sample-outputs.mjs b/scripts/help-conformance-sample-outputs.mjs
index db109ec6de..3f53547f30 100644
--- a/scripts/help-conformance-sample-outputs.mjs
+++ b/scripts/help-conformance-sample-outputs.mjs
@@ -83,7 +83,7 @@ Detected an overly complex or slow accessibility tree. Fell back to the private-
 };
 
 // DEVICE_IN_USE from buildDeviceInUseBySessionError
-// (src/daemon/session-recovery-hints.ts) — the parity test drives that exact producer.
+// (packages/daemon/src/core/session-recovery-hints.ts) — the parity test drives that exact producer.
 export const DEVICE_IN_USE_SAMPLE = {
   command: `agent-device press 'label="Place order"' --settle`,
   output: `Error (DEVICE_IN_USE): Device is already in use by session "checkout".
@@ -91,7 +91,7 @@ Hint: Run agent-device session list to inspect active sessions. To reuse this de
 };
 
 // Enforced cross-daemon device claim conflict from
-// src/daemon/device/device-claim-conflict.ts. This path is deliberately non-retriable:
+// packages/daemon/src/resources/device/device-claim-conflict.ts. This path is deliberately non-retriable:
 // the exact status command is the only safe next step while ownership is live.
 export const DEVICE_CLAIM_IN_USE_SAMPLE = {
   command: 'agent-device open Demo --platform android --serial emulator-5554',
@@ -100,7 +100,7 @@ Hint: Inspect the owner with: agent-device device status --platform android --se
 };
 
 // ADR 0014 mutation rejection from
-// src/daemon/interaction/index.ts: a pinned ref minted from a
+// packages/daemon/src/execution/interaction/index.ts: a pinned ref minted from a
 // superseded generation is rejected before dispatch. The daemon strips the
 // `~s5` pin at the boundary (interaction-touch-targets.ts), so the message
 // names the plain ref; the hint is the precise resolveRefStalenessWarning.
@@ -110,7 +110,7 @@ export const STALE_REF_SAMPLE = {
 Hint: Ref @e12 was minted from snapshot s5 but the session's ref frame is now s7 — re-run snapshot -i.`,
 };
 
-// AMBIGUOUS_MATCH from buildAmbiguousMatchError (src/daemon/selector-match-errors.ts)
+// AMBIGUOUS_MATCH from buildAmbiguousMatchError (packages/daemon/src/execution/selector-match-errors.ts)
 // — the parity test drives that exact producer. The by-design rejection
 // instead of silent disambiguation: #1597 made the candidate refs (ref, role,
 // label/identifier — the same compact rendering as snapshot -i) print
diff --git a/scripts/integration-progress-model.ts b/scripts/integration-progress-model.ts
index a40956f3b6..78146bde38 100644
--- a/scripts/integration-progress-model.ts
+++ b/scripts/integration-progress-model.ts
@@ -10,14 +10,19 @@ const EMPTY_STATEMENT_COVERAGE = { covered: 0, pct: 0, total: 0 };
 
 export function buildIntegrationProgressModel({ root = process.cwd() } = {}) {
   const coverageSummary = path.join(root, 'coverage/coverage-summary.json');
-  const handlerTestDir = path.join(root, 'src/daemon/handlers/__tests__');
+  const handlerTestDirs = [
+    path.join(root, 'packages/daemon/src/sessions/handlers/__tests__'),
+    path.join(root, 'packages/daemon/src/execution/handlers/__tests__'),
+  ];
   const providerScenarioDir = path.join(root, 'test/integration/provider-scenarios');
   const commandContractFiles = walkFiles(path.join(root, 'src/commands'), (file) =>
     isCommandContractSource(file),
   );
   const clientCommandMethods = readClientCommandMethods(commandContractFiles);
 
-  const handlerTests = walkFiles(handlerTestDir, (file) => file.endsWith('.test.ts'));
+  const handlerTests = handlerTestDirs.flatMap((dir) =>
+    walkFiles(dir, (file) => file.endsWith('.test.ts')),
+  );
   const providerScenarioTests = walkFiles(providerScenarioDir, (file) => file.endsWith('.test.ts'));
   const providerScenarioSources = walkFiles(providerScenarioDir, (file) => file.endsWith('.ts'));
   const providerScenarioSupportSources = providerScenarioSources.filter(
diff --git a/scripts/layering/architecture-ownership.ts b/scripts/layering/architecture-ownership.ts
index 42704c05c6..7c5f0e2113 100644
--- a/scripts/layering/architecture-ownership.ts
+++ b/scripts/layering/architecture-ownership.ts
@@ -1,3 +1,5 @@
+import { DAEMON_SOURCE_ROOT } from './tracked-sources.ts';
+
 type FacadeDeclaration = Readonly<{
   root: string;
   exports: readonly string[];
@@ -12,7 +14,7 @@ export type LogicalModulePolicy = Readonly<{
 }>;
 
 const DAEMON_SESSION_LIFECYCLE_FACADE = {
-  root: 'src/daemon/session-lifecycle/index.ts',
+  root: 'packages/daemon/src/sessions/session-lifecycle/index.ts',
   exports: [
     'SessionCloseCommandInput',
     'SessionInventoryCommandInput',
@@ -24,52 +26,52 @@ const DAEMON_SESSION_LIFECYCLE_FACADE = {
 } as const;
 
 const DAEMON_SESSION_OBSERVABILITY_FACADE = {
-  root: 'src/daemon/session-observability/index.ts',
+  root: 'packages/daemon/src/sessions/session-observability/index.ts',
   exports: ['SessionObservabilityCommandInput', 'handleSessionObservabilityCommands'],
 } as const;
 
 export const SESSION_LIFECYCLE_RETIRED_HANDLER_PATHS = [
-  'src/daemon/handlers/session-device-utils.ts',
-  'src/daemon/handlers/session-runtime-admission.ts',
-  'src/daemon/handlers/session-open.ts',
-  'src/daemon/handlers/session-open-prepare.ts',
-  'src/daemon/handlers/session-open-execution.ts',
-  'src/daemon/handlers/session-open-foreground.ts',
-  'src/daemon/handlers/session-open-surface.ts',
-  'src/daemon/handlers/session-startup-metrics.ts',
+  'packages/daemon/src/handlers/session-device-utils.ts',
+  'packages/daemon/src/handlers/session-runtime-admission.ts',
+  'packages/daemon/src/handlers/session-open.ts',
+  'packages/daemon/src/handlers/session-open-prepare.ts',
+  'packages/daemon/src/handlers/session-open-execution.ts',
+  'packages/daemon/src/handlers/session-open-foreground.ts',
+  'packages/daemon/src/handlers/session-open-surface.ts',
+  'packages/daemon/src/handlers/session-startup-metrics.ts',
 ] as const;
 
 export const INTERACTION_RETIRED_HANDLER_PATHS = [
-  'src/daemon/handlers/find.ts',
-  'src/daemon/handlers/find-match-ranking.ts',
-  'src/daemon/handlers/find-match-resolution.ts',
-  'src/daemon/handlers/find-target-capture.ts',
-  'src/daemon/handlers/interaction.ts',
-  'src/daemon/handlers/interaction-android-escape.ts',
-  'src/daemon/handlers/interaction-gesture.ts',
-  'src/daemon/handlers/interaction-gesture-response.ts',
-  'src/daemon/handlers/interaction-ios-tap-outcome.ts',
-  'src/daemon/handlers/interaction-targeting.ts',
-  'src/daemon/handlers/interaction-touch.ts',
-  'src/daemon/handlers/interaction-touch-android-freshness.ts',
-  'src/daemon/handlers/interaction-touch-android-readiness.ts',
-  'src/daemon/handlers/interaction-touch-direct-ios-eligibility.ts',
-  'src/daemon/handlers/interaction-touch-direct-ios.ts',
-  'src/daemon/handlers/interaction-touch-fill.ts',
-  'src/daemon/handlers/interaction-touch-payload.ts',
-  'src/daemon/handlers/interaction-touch-policy.ts',
-  'src/daemon/handlers/interaction-touch-prepare.ts',
-  'src/daemon/handlers/interaction-touch-press-admission.ts',
-  'src/daemon/handlers/interaction-touch-press.ts',
-  'src/daemon/handlers/interaction-touch-reference-frame.ts',
-  'src/daemon/handlers/interaction-touch-response.ts',
-  'src/daemon/handlers/interaction-touch-runtime.ts',
-  'src/daemon/handlers/interaction-touch-targets.ts',
-  'src/daemon/handlers/system-surface-disclosure.ts',
+  'packages/daemon/src/handlers/find.ts',
+  'packages/daemon/src/handlers/find-match-ranking.ts',
+  'packages/daemon/src/handlers/find-match-resolution.ts',
+  'packages/daemon/src/handlers/find-target-capture.ts',
+  'packages/daemon/src/handlers/interaction.ts',
+  'packages/daemon/src/handlers/interaction-android-escape.ts',
+  'packages/daemon/src/handlers/interaction-gesture.ts',
+  'packages/daemon/src/handlers/interaction-gesture-response.ts',
+  'packages/daemon/src/handlers/interaction-ios-tap-outcome.ts',
+  'packages/daemon/src/handlers/interaction-targeting.ts',
+  'packages/daemon/src/handlers/interaction-touch.ts',
+  'packages/daemon/src/handlers/interaction-touch-android-freshness.ts',
+  'packages/daemon/src/handlers/interaction-touch-android-readiness.ts',
+  'packages/daemon/src/handlers/interaction-touch-direct-ios-eligibility.ts',
+  'packages/daemon/src/handlers/interaction-touch-direct-ios.ts',
+  'packages/daemon/src/handlers/interaction-touch-fill.ts',
+  'packages/daemon/src/handlers/interaction-touch-payload.ts',
+  'packages/daemon/src/handlers/interaction-touch-policy.ts',
+  'packages/daemon/src/handlers/interaction-touch-prepare.ts',
+  'packages/daemon/src/handlers/interaction-touch-press-admission.ts',
+  'packages/daemon/src/handlers/interaction-touch-press.ts',
+  'packages/daemon/src/handlers/interaction-touch-reference-frame.ts',
+  'packages/daemon/src/handlers/interaction-touch-response.ts',
+  'packages/daemon/src/handlers/interaction-touch-runtime.ts',
+  'packages/daemon/src/handlers/interaction-touch-targets.ts',
+  'packages/daemon/src/handlers/system-surface-disclosure.ts',
 ] as const;
 
 const DAEMON_INTERACTION_FACADE = {
-  root: 'src/daemon/interaction/index.ts',
+  root: 'packages/daemon/src/execution/interaction/index.ts',
   exports: [
     'FindRouteInput',
     'InteractionRouteInput',
@@ -86,16 +88,16 @@ const DAEMON_INTERACTION_FACADE = {
 } as const;
 
 export const SESSION_OBSERVABILITY_RETIRED_HANDLER_PATHS = [
-  'src/daemon/handlers/session-observability.ts',
-  'src/daemon/handlers/session-perf-runtime.ts',
-  'src/daemon/handlers/session-network.ts',
-  'src/daemon/handlers/session-audio.ts',
+  'packages/daemon/src/handlers/session-observability.ts',
+  'packages/daemon/src/handlers/session-perf-runtime.ts',
+  'packages/daemon/src/handlers/session-network.ts',
+  'packages/daemon/src/handlers/session-audio.ts',
 ] as const;
 
 export const SNAPSHOT_EXECUTION_RETIRED_HANDLER_PATHS = [
-  'src/daemon/handlers/snapshot-capture.ts',
-  'src/daemon/handlers/snapshot-interactor-capture.ts',
-  'src/daemon/handlers/snapshot-session.ts',
+  'packages/daemon/src/handlers/snapshot-capture.ts',
+  'packages/daemon/src/handlers/snapshot-interactor-capture.ts',
+  'packages/daemon/src/handlers/snapshot-session.ts',
 ] as const;
 
 export const LOGICAL_MODULE_POLICIES = [
@@ -103,7 +105,7 @@ export const LOGICAL_MODULE_POLICIES = [
     name: 'ad-replay',
     roots: ['packages/ad-replay/src/'],
     forbiddenTargetRoots: [
-      'src/daemon/',
+      DAEMON_SOURCE_ROOT,
       'src/providers/',
       'src/compat/',
       'packages/maestro/',
@@ -114,7 +116,7 @@ export const LOGICAL_MODULE_POLICIES = [
     name: 'maestro',
     roots: ['packages/maestro/src/'],
     forbiddenTargetRoots: [
-      'src/daemon/',
+      DAEMON_SOURCE_ROOT,
       'src/providers/',
       'packages/ad-replay/',
       'packages/replay-port/',
@@ -124,7 +126,7 @@ export const LOGICAL_MODULE_POLICIES = [
     name: 'replay-test',
     roots: ['packages/replay-test/src/'],
     forbiddenTargetRoots: [
-      'src/daemon/',
+      DAEMON_SOURCE_ROOT,
       'src/providers/',
       'src/request/',
       'src/compat/',
@@ -136,25 +138,34 @@ export const LOGICAL_MODULE_POLICIES = [
   {
     name: 'replay-port',
     roots: ['packages/replay-port/src/'],
-    forbiddenTargetRoots: ['src/daemon/', 'src/providers/', 'src/compat/'],
+    forbiddenTargetRoots: [DAEMON_SOURCE_ROOT, 'src/providers/', 'src/compat/'],
   },
   {
     name: 'daemon-session-lifecycle',
-    roots: ['src/daemon/session-lifecycle/'],
-    forbiddenTargetRoots: ['src/daemon/handlers/'],
+    roots: ['packages/daemon/src/sessions/session-lifecycle/'],
+    forbiddenTargetRoots: [
+      'packages/daemon/src/sessions/handlers/',
+      'packages/daemon/src/execution/handlers/',
+    ],
     facade: DAEMON_SESSION_LIFECYCLE_FACADE,
   },
   {
     name: 'daemon-interaction',
-    roots: ['src/daemon/interaction/'],
+    roots: ['packages/daemon/src/execution/interaction/'],
     forbiddenTargetRoots: [],
-    internalForbiddenTargetRoots: ['src/daemon/handlers/'],
+    internalForbiddenTargetRoots: [
+      'packages/daemon/src/sessions/handlers/',
+      'packages/daemon/src/execution/handlers/',
+    ],
     facade: DAEMON_INTERACTION_FACADE,
   },
   {
     name: 'daemon-session-observability',
-    roots: ['src/daemon/session-observability/'],
-    forbiddenTargetRoots: ['src/daemon/handlers/'],
+    roots: ['packages/daemon/src/sessions/session-observability/'],
+    forbiddenTargetRoots: [
+      'packages/daemon/src/sessions/handlers/',
+      'packages/daemon/src/execution/handlers/',
+    ],
     facade: DAEMON_SESSION_OBSERVABILITY_FACADE,
   },
 ] as const satisfies readonly LogicalModulePolicy[];
@@ -190,7 +201,7 @@ export const ARCHITECTURE_OWNERSHIP = {
     {
       name: 'request-runtime-binding',
       kind: 'capability',
-      root: 'src/daemon/request-runtime-binding.ts',
+      root: 'packages/daemon/src/core/request-runtime-binding.ts',
       exports: [
         'BindDeviceRuntime',
         'BindExactDeviceRuntime',
@@ -205,7 +216,7 @@ export const ARCHITECTURE_OWNERSHIP = {
     {
       name: 'session-script-publication',
       kind: 'capability',
-      root: 'src/daemon/session-script-publication-capability.ts',
+      root: 'packages/daemon/src/core/session-script-publication-capability.ts',
       exports: [
         'abortAuthoringOnSecondOpen',
         'applyRecordedSaveScriptFlags',
@@ -224,13 +235,13 @@ export const ARCHITECTURE_OWNERSHIP = {
     {
       name: 'session-state-shape',
       kind: 'live-state-shape',
-      root: 'src/daemon/session-state.ts',
+      root: 'packages/daemon/src/core/session-state.ts',
       exports: ['SessionState'],
     },
     {
       name: 'session-store-authority',
       kind: 'live-state-authority',
-      root: 'src/daemon/session-store.ts',
+      root: 'packages/daemon/src/core/session-store.ts',
       exports: ['SessionStore'],
     },
   ],
@@ -239,7 +250,7 @@ export const ARCHITECTURE_OWNERSHIP = {
       name: 'snapshot-policy',
       kind: 'executable-policy',
       roots: ['packages/capture-kit/src/snapshot/'],
-      forbiddenTargetRoots: ['src/daemon/'],
+      forbiddenTargetRoots: [DAEMON_SOURCE_ROOT],
     },
   ],
 } as const;
diff --git a/scripts/layering/check.ts b/scripts/layering/check.ts
index d60ab64d9c..00f5860c8b 100644
--- a/scripts/layering/check.ts
+++ b/scripts/layering/check.ts
@@ -54,9 +54,11 @@
 //     brand casts inside those two modules, so a udid never runs outside the set that holds it.
 //   - Over REQUEST-BOUND RUNTIME EXECUTION: facts remain the only admission authority and daemon
 //     code cannot manufacture or repair a narrowed runtime proof (R66).
-//   - Over THE DAEMON'S INTERIOR: every production file under src/daemon/ is owned by exactly one
-//     layer of the manifest in scripts/layering/daemon-layers.ts, and no static edge reads up the
-//     daemon-local order core < resources < execution < sessions < server (R81). The global spine
+//   - Over THE DAEMON'S INTERIOR: every production file under the daemon root (DAEMON_ROOT) sits
+//     under one of the five layer folders — the first path segment under the daemon root is its
+//     layer — and no
+//     static edge reads up the daemon-local order core < resources < execution < sessions <
+//     server (R81). The global spine
 //     ranks all five layers at daemon-server's rank, so R5/R6/R80 are blind inside the zone.
 //   - Over CONTRACTS PRODUCTION SOURCE: contracts owns vocabulary only — host, process, and timer
 //     mechanics belong in capture-kit or an adapter (R18).
@@ -131,9 +133,10 @@ import { recordRuntimeDaemonMechanicsViolations } from './record-runtime-mechani
 import { checkDaemonPlatformBoundary } from './daemon-platform-boundary.ts';
 import { checkDaemonPlatformRuntimeInventory } from './daemon-platform-runtime-inventory.ts';
 import { checkDaemonClientEntry } from './daemon-client-entry.ts';
-import { checkDaemonLayers, readDaemonLayerManifest } from './daemon-layers.ts';
+import { checkDaemonLayers, DAEMON_ROOT } from './daemon-layers.ts';
 import { checkSessionAuthorityOverlay, handlerOwnedOverlay } from './session-authority-overlay.ts';
 import {
+  DAEMON_SOURCE_ROOT,
   listTrackedPlatformZoneFiles,
   listTrackedProductionSources,
   listTrackedSrcUtilsFiles,
@@ -281,7 +284,7 @@ function checkSessionStateOwnership(sources: ReadonlyMap<string, string>): Layer
     return [
       {
         rule: 'R7 session-state-ownership',
-        file: 'src/daemon/session-state.ts',
+        file: `${DAEMON_ROOT}/core/session-state.ts`,
         line: 1,
         message: 'no daemon module declares SessionState, so its ownership cannot be checked.',
       },
@@ -426,15 +429,16 @@ function report(
         `${ratchets.largestTypeCycle.length} files (R9); ${daemonModularitySummary(reference)}; ` +
         `${packageBoundariesSummary(repoRoot)}; ${platformPackagePolicySummary()}; ` +
         `runtime facts remain the only device-command admission authority and daemon code cannot ` +
-        `manufacture narrowed runtime proof (R66); R65 keeps production src/daemon free of ` +
+        `manufacture narrowed runtime proof (R66); R65 keeps production packages/daemon/src ` +
+        `free of ` +
         `concrete platform imports in every executable and type-only form; ` +
         `no production daemon file reaches the root platform-runtime family or a hub that ` +
         `does (R76); and the handler-owned SessionState/SessionStore ` +
         `authority overlay holds at or under the merge-base (R75, ` +
         `${handlerOwnedShapeFiles} shape / ${handlerOwnedAuthorityFiles} authority files); and ` +
-        `every production daemon file is owned by one layer with no upward static edges across ` +
-        `core < resources < execution < sessions < server (R81; dynamic cross-layer edges are ` +
-        `reported above when present).\n`,
+        `every production daemon file lives under a layer folder with no upward static edges ` +
+        `across core < resources < execution < sessions < server (R81; dynamic cross-layer edges ` +
+        `are reported above when present).\n`,
     );
     return 0;
   }
@@ -584,9 +588,8 @@ export const LAYERING_RULES: Readonly<Record<LayeringRuleId, LayeringRule>> = {
     ),
   'daemon-layers': (context) =>
     checkDaemonLayers(
-      context.sourceFiles.filter((file) => file.startsWith('src/daemon/')),
+      context.sourceFiles.filter((file) => file.startsWith(DAEMON_SOURCE_ROOT)),
       context.edges,
-      readDaemonLayerManifest(repoRoot),
     ),
 };
 
diff --git a/scripts/layering/daemon-client-entry.test.ts b/scripts/layering/daemon-client-entry.test.ts
index 63bb752d0e..19091b8ce3 100644
--- a/scripts/layering/daemon-client-entry.test.ts
+++ b/scripts/layering/daemon-client-entry.test.ts
@@ -49,18 +49,29 @@ test('a client import of a non-daemon module is not daemon-client entry surface'
 test('a planted runtime import of daemon internals by the client is red', () => {
   const violations = checkDaemonClientEntry([
     ...recordedWireEdges(),
-    clientEdge('src/daemon-client/daemon-client-metadata.ts', 'src/daemon/config.ts', 'value'),
+    clientEdge(
+      'src/daemon-client/daemon-client-metadata.ts',
+      'packages/daemon/src/core/config.ts',
+      'value',
+    ),
   ]);
   assert.equal(violations.length, 1);
   assert.equal(violations[0]!.rule, DAEMON_CLIENT_ENTRY_RULE);
   assert.match(violations[0]!.message, /value-imports daemon internals/);
-  assert.match(violations[0]!.message, /daemon-client-metadata\.ts -> src\/daemon\/config\.ts/);
+  assert.match(
+    violations[0]!.message,
+    /daemon-client-metadata\.ts -> packages\/daemon\/src\/core\/config\.ts/,
+  );
 });
 
 test('a planted dynamic import of daemon internals by the client is red', () => {
   const violations = checkDaemonClientEntry([
     ...recordedWireEdges(),
-    clientEdge('src/daemon-client/daemon-client-progress.ts', 'src/daemon/config.ts', 'dynamic'),
+    clientEdge(
+      'src/daemon-client/daemon-client-progress.ts',
+      'packages/daemon/src/core/config.ts',
+      'dynamic',
+    ),
   ]);
   assert.equal(violations.length, 1);
   assert.match(violations[0]!.message, /dynamic-imports daemon internals/);
@@ -69,7 +80,11 @@ test('a planted dynamic import of daemon internals by the client is red', () =>
 test('a runtime import is red even when the same pair is a recorded type edge', () => {
   const violations = checkDaemonClientEntry([
     ...recordedWireEdges(),
-    clientEdge('src/daemon-client/daemon-client-rpc.ts', 'src/daemon/daemon-request.ts', 'value'),
+    clientEdge(
+      'src/daemon-client/daemon-client-rpc.ts',
+      'packages/daemon/src/core/daemon-request.ts',
+      'value',
+    ),
   ]);
   assert.equal(violations.length, 1);
   assert.match(violations[0]!.message, /value-imports daemon internals/);
@@ -78,17 +93,23 @@ test('a runtime import is red even when the same pair is a recorded type edge',
 test('an unrecorded type import of daemon internals is red', () => {
   const violations = checkDaemonClientEntry([
     ...recordedWireEdges(),
-    clientEdge('src/daemon-client/daemon-launch-spec.ts', 'src/daemon/daemon-request.ts'),
+    clientEdge(
+      'src/daemon-client/daemon-launch-spec.ts',
+      'packages/daemon/src/core/daemon-request.ts',
+    ),
   ]);
   assert.equal(violations.length, 1);
   assert.match(violations[0]!.message, /unclassified daemon-client import of daemon internals/);
-  assert.match(violations[0]!.message, /daemon-launch-spec\.ts -> src\/daemon\/daemon-request\.ts/);
+  assert.match(
+    violations[0]!.message,
+    /daemon-launch-spec\.ts -> packages\/daemon\/src\/core\/daemon-request\.ts/,
+  );
 });
 
 test('a type import of a daemon module other than the recorded type is red', () => {
   const recorded = DAEMON_CLIENT_ENTRY_EDGES.map((edge) =>
     edge.file === 'src/daemon-client/daemon-client.ts'
-      ? clientEdge(edge.file, 'src/daemon/session-state.ts', 'type')
+      ? clientEdge(edge.file, 'packages/daemon/src/core/session-state.ts', 'type')
       : clientEdge(edge.file, edge.target, 'type'),
   );
   const violations = checkDaemonClientEntry(recorded);
diff --git a/scripts/layering/daemon-client-entry.ts b/scripts/layering/daemon-client-entry.ts
index 1b04c923e7..4e5f5516ec 100644
--- a/scripts/layering/daemon-client-entry.ts
+++ b/scripts/layering/daemon-client-entry.ts
@@ -1,11 +1,12 @@
 import type { LayeringViolation, ResolvedImportEdge } from './model.ts';
+import { DAEMON_SOURCE_ROOT } from './tracked-sources.ts';
 
 // The declared daemon-entry surface for the client (#2559). `src/daemon-client/**` composes the
 // daemon over the network, not over its module graph, so it is NOT an entry point into daemon
 // internals: the process root composition is. Every on-disk or protocol contract the client shares
 // with the daemon (state-dir/transport resolution, pidfile liveness, the repair tombstone, the
 // progress framing) therefore lives below both sides — since the daemon-contracts extraction, in
-// `packages/daemon-contracts` — not under `src/daemon/`, and the client
+// `packages/daemon-contracts` — not under `packages/daemon/src/`, and the client
 // reaches it there. What remains is the client reading the daemon's request/response vocabulary —
 // the `DaemonRequest`/`DaemonResponse` types that anchor the ADR 0006 wire surface — recorded here,
 // per measured `file -> target` edge, and only as a type-only import. A runtime (value or dynamic)
@@ -36,37 +37,37 @@ export type DaemonClientEntryEdge = Readonly<{
 export const DAEMON_CLIENT_ENTRY_EDGES: readonly DaemonClientEntryEdge[] = [
   {
     file: 'src/daemon-client/daemon-client.ts',
-    target: 'src/daemon/daemon-request.ts',
+    target: 'packages/daemon/src/core/daemon-request.ts',
     rationale: REQUEST_RATIONALE,
   },
   {
     file: 'src/daemon-client/daemon-client-lifecycle.ts',
-    target: 'src/daemon/daemon-request.ts',
+    target: 'packages/daemon/src/core/daemon-request.ts',
     rationale: REQUEST_RATIONALE,
   },
   {
     file: 'src/daemon-client/daemon-client-lease-beat.ts',
-    target: 'src/daemon/daemon-request.ts',
+    target: 'packages/daemon/src/core/daemon-request.ts',
     rationale: REQUEST_RATIONALE,
   },
   {
     file: 'src/daemon-client/daemon-client-liveness-probe.ts',
-    target: 'src/daemon/daemon-request.ts',
+    target: 'packages/daemon/src/core/daemon-request.ts',
     rationale: REQUEST_RATIONALE,
   },
   {
     file: 'src/daemon-client/daemon-client-progress.ts',
-    target: 'src/daemon/daemon-request.ts',
+    target: 'packages/daemon/src/core/daemon-request.ts',
     rationale: REQUEST_RATIONALE,
   },
   {
     file: 'src/daemon-client/daemon-client-rpc.ts',
-    target: 'src/daemon/daemon-request.ts',
+    target: 'packages/daemon/src/core/daemon-request.ts',
     rationale: REQUEST_RATIONALE,
   },
   {
     file: 'src/daemon-client/daemon-client-transport.ts',
-    target: 'src/daemon/daemon-request.ts',
+    target: 'packages/daemon/src/core/daemon-request.ts',
     rationale: REQUEST_RATIONALE,
   },
 ] as const;
@@ -94,7 +95,7 @@ export function checkDaemonClientEntry(edges: readonly ResolvedImportEdge[]): La
   const measured = new Map<string, MeasuredEdge>();
   for (const edge of edges) {
     if (!edge.file.startsWith('src/daemon-client/')) continue;
-    if (!edge.target.startsWith('src/daemon/')) continue;
+    if (!edge.target.startsWith(DAEMON_SOURCE_ROOT)) continue;
     const key = keyOf(edge.file, edge.target);
     const entry = measured.get(key) ?? {
       file: edge.file,
@@ -122,7 +123,7 @@ export function checkDaemonClientEntry(edges: readonly ResolvedImportEdge[]): La
           `the daemon client ${entry.runtimeKind} daemon internals: ${key}. The client composes the ` +
           `daemon over the network, not its module graph. Move the shared contract to ` +
           `packages/daemon-contracts (or read the DaemonRequest/DaemonResponse types in ` +
-          `src/daemon/daemon-request.ts as a type).`,
+          `packages/daemon/src/core/daemon-request.ts as a type).`,
       });
       seen.add(key);
       continue;
diff --git a/scripts/layering/daemon-layer-manifest.json b/scripts/layering/daemon-layer-manifest.json
deleted file mode 100644
index 98971eb8cf..0000000000
--- a/scripts/layering/daemon-layer-manifest.json
+++ /dev/null
@@ -1,305 +0,0 @@
-{
-  "daemon-core": [
-    "src/daemon/capture-disclosure.ts",
-    "src/daemon/config.ts",
-    "src/daemon/context.ts",
-    "src/daemon/daemon-command-registry.ts",
-    "src/daemon/daemon-policy.ts",
-    "src/daemon/daemon-request.ts",
-    "src/daemon/deferred-interaction-outcome.ts",
-    "src/daemon/device/device-ready.ts",
-    "src/daemon/device/device-selector-intent.ts",
-    "src/daemon/direct-ios-selector.ts",
-    "src/daemon/dispatch-context.ts",
-    "src/daemon/execution-plan.ts",
-    "src/daemon/fill-backend-result.ts",
-    "src/daemon/generic-leaf-execution.ts",
-    "src/daemon/gesture-runtime.ts",
-    "src/daemon/interaction-surface-signature.ts",
-    "src/daemon/interaction/internal/interaction-touch-direct-ios-eligibility.ts",
-    "src/daemon/interaction/internal/types.ts",
-    "src/daemon/interactor-resolution.ts",
-    "src/daemon/ios-app-session-hint.ts",
-    "src/daemon/lease-context.ts",
-    "src/daemon/managed-session-artifact-path.ts",
-    "src/daemon/platform-owner-lifecycle.ts",
-    "src/daemon/platform-resource-cleanup.ts",
-    "src/daemon/platform-services.ts",
-    "src/daemon/provider-device-admission.ts",
-    "src/daemon/recording-gesture-events.ts",
-    "src/daemon/recording-gestures.ts",
-    "src/daemon/recording-timing.ts",
-    "src/daemon/recording-values.ts",
-    "src/daemon/ref-frame-slot.ts",
-    "src/daemon/ref-frame.ts",
-    "src/daemon/request-dispatch-ledger.ts",
-    "src/daemon/request-runtime-binding.ts",
-    "src/daemon/runtime-admission.ts",
-    "src/daemon/runtime-operation-effects.ts",
-    "src/daemon/runtime-session.ts",
-    "src/daemon/selector-operation-binding.ts",
-    "src/daemon/selector-recording.ts",
-    "src/daemon/session-action-recorder.ts",
-    "src/daemon/session-artifact-paths.ts",
-    "src/daemon/session-capture-binding.ts",
-    "src/daemon/session-idle-tombstone.ts",
-    "src/daemon/session-recovery-hints.ts",
-    "src/daemon/session-replay-transaction.ts",
-    "src/daemon/session-runtime-admission.ts",
-    "src/daemon/session-script-active-publication.ts",
-    "src/daemon/session-script-publication-capability.ts",
-    "src/daemon/session-script-publication-state.ts",
-    "src/daemon/session-script-writer.ts",
-    "src/daemon/session-selector.ts",
-    "src/daemon/session-snapshot-freshness.ts",
-    "src/daemon/session-state.ts",
-    "src/daemon/session-store.ts",
-    "src/daemon/session-tenant-scope.ts",
-    "src/daemon/settle-observation-capture.ts",
-    "src/daemon/snapshot-capture.ts",
-    "src/daemon/snapshot-interactor-capture.ts",
-    "src/daemon/snapshot-runtime-binding.ts",
-    "src/daemon/snapshot-runtime-capture-input.ts",
-    "src/daemon/snapshot-session.ts",
-    "src/daemon/tenant-owned-entry.ts",
-    "src/daemon/touch-runtime.ts"
-  ],
-  "daemon-resources": [
-    "src/daemon/app-log-admission-ledger.ts",
-    "src/daemon/app-log-files.ts",
-    "src/daemon/app-log-resource-recovery.ts",
-    "src/daemon/app-log-resource-store.ts",
-    "src/daemon/app-log-session-resource.ts",
-    "src/daemon/app-log-start-preflight.ts",
-    "src/daemon/app-log.ts",
-    "src/daemon/artifact-tracking.ts",
-    "src/daemon/device/claim-recovery-gateway.ts",
-    "src/daemon/device/device-claim-admission.ts",
-    "src/daemon/device/device-claim-conflict.ts",
-    "src/daemon/device/device-claim-inspection.ts",
-    "src/daemon/device/device-claim-paths.ts",
-    "src/daemon/device/device-claim-reboot.ts",
-    "src/daemon/device/device-claim-record.ts",
-    "src/daemon/device/device-claim-rule.ts",
-    "src/daemon/device/device-claim-settlement.ts",
-    "src/daemon/device/device-claim-store.ts",
-    "src/daemon/device/device-claims.ts",
-    "src/daemon/device/device-mutation-drain.ts",
-    "src/daemon/human-control-contract.ts",
-    "src/daemon/lease-in-flight-work.ts",
-    "src/daemon/lease-registry-scope.ts",
-    "src/daemon/lease-registry.ts",
-    "src/daemon/macos-app-lease.ts",
-    "src/daemon/provider-session-ownership.ts",
-    "src/daemon/session-device-resolution.ts"
-  ],
-  "daemon-execution": [
-    "src/daemon/android-foreground-surface.ts",
-    "src/daemon/android-snapshot-timeout-evidence.ts",
-    "src/daemon/android-system-dialog.ts",
-    "src/daemon/app-event-runtime.ts",
-    "src/daemon/app-events.ts",
-    "src/daemon/apps-runtime.ts",
-    "src/daemon/back-runtime.ts",
-    "src/daemon/focus-runtime.ts",
-    "src/daemon/fold-runtime.ts",
-    "src/daemon/generic-runtime-execution.ts",
-    "src/daemon/generic-settle.ts",
-    "src/daemon/handlers/react-native.ts",
-    "src/daemon/handlers/session-clipboard.ts",
-    "src/daemon/handlers/session-selector-dispatch.ts",
-    "src/daemon/handlers/snapshot-alert.ts",
-    "src/daemon/handlers/snapshot-settings.ts",
-    "src/daemon/interaction/index.ts",
-    "src/daemon/interaction/internal/find-match-ranking.ts",
-    "src/daemon/interaction/internal/find-match-resolution.ts",
-    "src/daemon/interaction/internal/find-target-capture.ts",
-    "src/daemon/interaction/internal/find.ts",
-    "src/daemon/interaction/internal/interaction-android-escape.ts",
-    "src/daemon/interaction/internal/interaction-common.ts",
-    "src/daemon/interaction/internal/interaction-flags.ts",
-    "src/daemon/interaction/internal/interaction-gesture-response.ts",
-    "src/daemon/interaction/internal/interaction-gesture.ts",
-    "src/daemon/interaction/internal/interaction-ios-tap-outcome.ts",
-    "src/daemon/interaction/internal/interaction-recorded-input.ts",
-    "src/daemon/interaction/internal/interaction-ref-policy.ts",
-    "src/daemon/interaction/internal/interaction-response-data-transform.ts",
-    "src/daemon/interaction/internal/interaction-response.ts",
-    "src/daemon/interaction/internal/interaction-runtime.ts",
-    "src/daemon/interaction/internal/interaction-session.ts",
-    "src/daemon/interaction/internal/interaction-snapshot.ts",
-    "src/daemon/interaction/internal/interaction-targeting.ts",
-    "src/daemon/interaction/internal/interaction-touch-android-freshness.ts",
-    "src/daemon/interaction/internal/interaction-touch-android-readiness.ts",
-    "src/daemon/interaction/internal/interaction-touch-direct-ios.ts",
-    "src/daemon/interaction/internal/interaction-touch-fill.ts",
-    "src/daemon/interaction/internal/interaction-touch-payload.ts",
-    "src/daemon/interaction/internal/interaction-touch-policy.ts",
-    "src/daemon/interaction/internal/interaction-touch-prepare.ts",
-    "src/daemon/interaction/internal/interaction-touch-press-admission.ts",
-    "src/daemon/interaction/internal/interaction-touch-press.ts",
-    "src/daemon/interaction/internal/interaction-touch-reference-frame.ts",
-    "src/daemon/interaction/internal/interaction-touch-response.ts",
-    "src/daemon/interaction/internal/interaction-touch-runtime.ts",
-    "src/daemon/interaction/internal/interaction-touch-targets.ts",
-    "src/daemon/interaction/internal/interaction.ts",
-    "src/daemon/internal-observation.ts",
-    "src/daemon/keyboard-runtime.ts",
-    "src/daemon/offscreen-target-probe.ts",
-    "src/daemon/orientation-runtime.ts",
-    "src/daemon/ref-positionals.ts",
-    "src/daemon/ref-snapshot-flag-policy.ts",
-    "src/daemon/request-dispatch-disclosure.ts",
-    "src/daemon/request-generic-dispatch.ts",
-    "src/daemon/runtime-artifacts.ts",
-    "src/daemon/runtime-policy.ts",
-    "src/daemon/screenshot-crop-target.ts",
-    "src/daemon/screenshot-crop.ts",
-    "src/daemon/screenshot-runtime-binding.ts",
-    "src/daemon/screenshot-runtime.ts",
-    "src/daemon/scroll-movement.ts",
-    "src/daemon/scroll-runtime.ts",
-    "src/daemon/scroll-until.ts",
-    "src/daemon/selector-capture-binding.ts",
-    "src/daemon/selector-capture-runtime.ts",
-    "src/daemon/selector-match-errors.ts",
-    "src/daemon/selector-runtime-backend.ts",
-    "src/daemon/selector-runtime.ts",
-    "src/daemon/selector-text-runtime.ts",
-    "src/daemon/session-snapshot.ts",
-    "src/daemon/snapshot-timeout-evidence.ts",
-    "src/daemon/sparse-fallback-screenshot.ts",
-    "src/daemon/system-button-runtime.ts",
-    "src/daemon/tv-remote-runtime.ts",
-    "src/daemon/type-target-warning.ts",
-    "src/daemon/type-text-runtime.ts",
-    "src/daemon/viewport-runtime.ts",
-    "src/daemon/wait-current-surface.ts",
-    "src/daemon/wait-runtime.ts"
-  ],
-  "daemon-sessions": [
-    "src/daemon/application-lifecycle-execution.ts",
-    "src/daemon/device/device-claim-reconciliation.ts",
-    "src/daemon/device/device-targets.ts",
-    "src/daemon/dispatch-payload.ts",
-    "src/daemon/handlers/human-control.ts",
-    "src/daemon/handlers/lease.ts",
-    "src/daemon/handlers/record-runtime-request.ts",
-    "src/daemon/handlers/record-runtime-response.ts",
-    "src/daemon/handlers/record-runtime.ts",
-    "src/daemon/handlers/record-trace.ts",
-    "src/daemon/handlers/session-app-deployment-route.ts",
-    "src/daemon/handlers/session-app-deployment.ts",
-    "src/daemon/handlers/session-app-source-deployment.ts",
-    "src/daemon/handlers/session-batch.ts",
-    "src/daemon/handlers/session-appstate-apple-session.ts",
-    "src/daemon/handlers/session-appstate-device-runtime.ts",
-    "src/daemon/handlers/session-appstate.ts",
-    "src/daemon/handlers/session-boot.ts",
-    "src/daemon/handlers/session-command-input.ts",
-    "src/daemon/handlers/session-device-status-response.ts",
-    "src/daemon/handlers/session-doctor-app.ts",
-    "src/daemon/handlers/session-doctor-device.ts",
-    "src/daemon/handlers/session-doctor-metro.ts",
-    "src/daemon/handlers/session-doctor-options.ts",
-    "src/daemon/handlers/session-doctor-output.ts",
-    "src/daemon/handlers/session-doctor-types.ts",
-    "src/daemon/handlers/session-doctor.ts",
-    "src/daemon/handlers/session-prepare.ts",
-    "src/daemon/handlers/session-replay-command.ts",
-    "src/daemon/handlers/session-replay-video-owner.ts",
-    "src/daemon/handlers/session-runtime-command.ts",
-    "src/daemon/handlers/session-runtime-port-reverse.ts",
-    "src/daemon/handlers/session-script-publication.ts",
-    "src/daemon/handlers/session-shutdown.ts",
-    "src/daemon/handlers/session.ts",
-    "src/daemon/handlers/snapshot.ts",
-    "src/daemon/handlers/trace-runtime.ts",
-    "src/daemon/install-source-resolution.ts",
-    "src/daemon/lease-lifecycle.ts",
-    "src/daemon/materialized-path-registry.ts",
-    "src/daemon/open-device-contention-wait.ts",
-    "src/daemon/payload-input.ts",
-    "src/daemon/request-admission.ts",
-    "src/daemon/request-handler-chain.ts",
-    "src/daemon/request-recording-health.ts",
-    "src/daemon/route-owner-files.ts",
-    "src/daemon/server/daemon-idle-reap.ts",
-    "src/daemon/session-lifecycle/index.ts",
-    "src/daemon/session-lifecycle/internal/inventory.ts",
-    "src/daemon/session-lifecycle/internal/session-close-lifecycle-teardown.ts",
-    "src/daemon/session-lifecycle/internal/session-close-runtime-admission.ts",
-    "src/daemon/session-lifecycle/internal/session-close-script.ts",
-    "src/daemon/session-lifecycle/internal/session-close.ts",
-    "src/daemon/session-lifecycle/internal/session-open-execution.ts",
-    "src/daemon/session-lifecycle/internal/session-open-foreground.ts",
-    "src/daemon/session-lifecycle/internal/session-open-prepare.ts",
-    "src/daemon/session-lifecycle/internal/session-open-state.ts",
-    "src/daemon/session-lifecycle/internal/session-open-surface.ts",
-    "src/daemon/session-lifecycle/internal/session-open-warnings.ts",
-    "src/daemon/session-lifecycle/internal/session-open.ts",
-    "src/daemon/session-lifecycle/internal/session-startup-metrics.ts",
-    "src/daemon/session-observability/index.ts",
-    "src/daemon/session-observability/internal/session-audio.ts",
-    "src/daemon/session-observability/internal/session-network.ts",
-    "src/daemon/session-observability/internal/session-observability.ts",
-    "src/daemon/session-observability/internal/session-perf-runtime.ts",
-    "src/daemon/session-replay-coordinator.ts",
-    "src/daemon/session-routing.ts",
-    "src/daemon/session-runtime.ts",
-    "src/daemon/session-teardown-budget.ts",
-    "src/daemon/session-teardown.ts",
-    "src/daemon/snapshot-command-runtime.ts",
-    "src/daemon/snapshot-diff-runtime.ts",
-    "src/daemon/snapshot-quality-latch.ts",
-    "src/daemon/snapshot-runtime.ts",
-    "src/daemon/startup-deadline.ts",
-    "src/daemon/web-session-names.ts"
-  ],
-  "daemon-server": [
-    "src/daemon/application-lifecycle-recovery.ts",
-    "src/daemon/artifact-archive.ts",
-    "src/daemon/artifact-download.ts",
-    "src/daemon/daemon-stop.ts",
-    "src/daemon/device/device-claim-owner-recovery.ts",
-    "src/daemon/downloadable-artifact-http.ts",
-    "src/daemon/host-lease-http.ts",
-    "src/daemon/http-errors.ts",
-    "src/daemon/http-request-target.ts",
-    "src/daemon/human-control-http.ts",
-    "src/daemon/platform-request-scope.ts",
-    "src/daemon/provider-lease-expiry.ts",
-    "src/daemon/replay-device-selection.ts",
-    "src/daemon/request-binding.ts",
-    "src/daemon/request-diagnostics-http.ts",
-    "src/daemon/request-execution-locks.ts",
-    "src/daemon/request-execution-scope.ts",
-    "src/daemon/request-finalization.ts",
-    "src/daemon/request-lease-work.ts",
-    "src/daemon/request-lock-policy.ts",
-    "src/daemon/request-platform-provider-context.ts",
-    "src/daemon/request-router.ts",
-    "src/daemon/request-save-script-policy.ts",
-    "src/daemon/response-views.ts",
-    "src/daemon/resumable-upload-range.ts",
-    "src/daemon/resumable-upload-transfer.ts",
-    "src/daemon/resumable-upload.ts",
-    "src/daemon/server/daemon-lease-finalizer.ts",
-    "src/daemon/server/daemon-metadata-loss.ts",
-    "src/daemon/server/daemon-runtime.ts",
-    "src/daemon/server/daemon-session-idle-expiry.ts",
-    "src/daemon/server/daemon-shutdown-claims.ts",
-    "src/daemon/server/http-authorization.ts",
-    "src/daemon/server/http-instance-precondition.ts",
-    "src/daemon/server/http-rpc-envelope.ts",
-    "src/daemon/server/http-rpc-methods.ts",
-    "src/daemon/server/http-server.ts",
-    "src/daemon/server/server-lifecycle.ts",
-    "src/daemon/server/server-shutdown.ts",
-    "src/daemon/server/tenant-trust.ts",
-    "src/daemon/server/transport.ts",
-    "src/daemon/session-idle-expiry.ts",
-    "src/daemon/upload-http.ts",
-    "src/daemon/upload.ts"
-  ]
-}
diff --git a/scripts/layering/daemon-layers.test.ts b/scripts/layering/daemon-layers.test.ts
index 2e27eca044..9d5fff33af 100644
--- a/scripts/layering/daemon-layers.test.ts
+++ b/scripts/layering/daemon-layers.test.ts
@@ -7,51 +7,43 @@ import { listSourceFiles } from './check.ts';
 import { resolveImportEdges, type ResolvedImportEdge } from './model.ts';
 import {
   checkDaemonLayers,
-  daemonLayerManifestDrift,
   DAEMON_LAYER_ORDER,
-  readDaemonLayerManifest,
+  DAEMON_ROOT,
+  daemonLayerOf,
 } from './daemon-layers.ts';
 
 const repoRoot = execFileSync('git', ['rev-parse', '--show-toplevel'], {
   encoding: 'utf8',
 }).trim();
 
-// Fixtures sit at the real daemon paths so the layer lookup treats them like production files;
-// `listSourceFiles()` keeps the manifest half honest against the tracked tree.
-const FIXTURE_MANIFEST = {
-  'daemon-core': ['src/daemon/core.ts'],
-  'daemon-resources': ['src/daemon/resources.ts'],
-  'daemon-execution': ['src/daemon/execution.ts'],
-  'daemon-sessions': ['src/daemon/sessions.ts'],
-  'daemon-server': ['src/daemon/server.ts'],
-};
-const FIXTURE_FILES = Object.values(FIXTURE_MANIFEST).flat();
+// Fixtures sit at the real layer folders so the folder-derived lookup treats them like
+// production files; `listSourceFiles()` keeps the tree half honest against the tracked tree.
+const FIXTURE_FILES = DAEMON_LAYER_ORDER.map((layer) => `${DAEMON_ROOT}/${layer}/index.ts`);
 
 function fixtureEdges(sources: ReadonlyMap<string, string>): ResolvedImportEdge[] {
   const empty = new Map(FIXTURE_FILES.map((file) => [file, ''] as const));
   return resolveImportEdges(new Map([...empty, ...sources]));
 }
 
-function driftFor(
-  manifest: Record<string, readonly string[]>,
-  files: readonly string[] = FIXTURE_FILES,
-) {
-  return daemonLayerManifestDrift(files, manifest);
-}
+const core = `${DAEMON_ROOT}/core/index.ts`;
+const resources = `${DAEMON_ROOT}/resources/index.ts`;
+const server = `${DAEMON_ROOT}/server/index.ts`;
+const sessions = `${DAEMON_ROOT}/sessions/index.ts`;
 
-test('the manifest owns every tracked daemon file exactly once, and no static edge reads upward', () => {
-  const daemonFiles = listSourceFiles().filter((file) => file.startsWith('src/daemon/'));
+test('every tracked daemon production file resolves to a layer folder, and no static edge reads upward', () => {
+  const daemonFiles = listSourceFiles().filter((file) => file.startsWith(`${DAEMON_ROOT}/`));
   assert.ok(daemonFiles.length > 0, 'expected daemon production files to scan');
-  const manifest = readDaemonLayerManifest(repoRoot);
-  assert.deepEqual(Object.keys(manifest).sort(), [...DAEMON_LAYER_ORDER].sort());
-  assert.deepEqual(daemonLayerManifestDrift(daemonFiles, manifest), []);
+  assert.deepEqual(
+    daemonFiles.filter((file) => daemonLayerOf(file) === null),
+    [],
+  );
 
-  // End-to-end over the real daemon subgraph: every edge whose two ends are manifest files.
+  // End-to-end over the real daemon subgraph: every edge whose two ends are layer-folder files.
   const sources = new Map(
     daemonFiles.map((file) => [file, fs.readFileSync(path.join(repoRoot, file), 'utf8')]),
   );
   const reported: string[] = [];
-  const violations = checkDaemonLayers(daemonFiles, resolveImportEdges(sources), manifest, (line) =>
+  const violations = checkDaemonLayers(daemonFiles, resolveImportEdges(sources), (line) =>
     reported.push(line),
   );
   assert.deepEqual(violations, []);
@@ -63,39 +55,50 @@ test('the manifest owns every tracked daemon file exactly once, and no static ed
 test('an upward value import fails the layer order', () => {
   const violations = checkDaemonLayers(
     FIXTURE_FILES,
-    fixtureEdges(new Map([['src/daemon/core.ts', "import { thing } from './resources.ts';"]])),
-    FIXTURE_MANIFEST,
+    fixtureEdges(new Map([[core, `import { thing } from '../resources/index.ts';`]])),
     () => {},
   );
   assert.equal(violations.length, 1);
   assert.equal(violations[0]!.rule, 'R81 daemon-layers');
-  assert.equal(violations[0]!.file, 'src/daemon/core.ts');
+  assert.equal(violations[0]!.file, core);
   assert.match(violations[0]!.message, /value import reads up the daemon layer order/);
 });
 
 test('an upward type-only import fails the layer order too', () => {
   const violations = checkDaemonLayers(
     FIXTURE_FILES,
-    fixtureEdges(
-      new Map([['src/daemon/resources.ts', "import type { Thing } from './sessions.ts';"]]),
-    ),
-    FIXTURE_MANIFEST,
+    fixtureEdges(new Map([[resources, `import type { Thing } from '../sessions/index.ts';`]])),
     () => {},
   );
   assert.equal(violations.length, 1);
   assert.match(violations[0]!.message, /type-only import reads up the daemon layer order/);
 });
 
+test('a nested file reads up from its layer folder and fails', () => {
+  const nested = `${DAEMON_ROOT}/core/device/ready.ts`;
+  const violations = checkDaemonLayers(
+    [...FIXTURE_FILES, nested],
+    resolveImportEdges(
+      new Map([
+        [nested, `import { thing } from '../../server/index.ts';`],
+        ...FIXTURE_FILES.map((file) => [file, ''] as const),
+      ]),
+    ),
+    () => {},
+  );
+  assert.equal(violations.length, 1);
+  assert.match(violations[0]!.message, /\(core\) imports .+ \(server\)/);
+});
+
 test('downward and same-layer static edges stay silent', () => {
   const violations = checkDaemonLayers(
     FIXTURE_FILES,
     fixtureEdges(
       new Map([
-        ['src/daemon/server.ts', "import { thing } from './core.ts';"],
-        ['src/daemon/sessions.ts', "import type { CoreThing } from './core.ts';"],
+        [server, `import { thing } from '../core/index.ts';`],
+        [sessions, `import type { CoreThing } from '../core/index.ts';`],
       ]),
     ),
-    FIXTURE_MANIFEST,
     () => {},
   );
   assert.deepEqual(violations, []);
@@ -105,8 +108,7 @@ test('a dynamic cross-layer edge is reported, not rejected', () => {
   const reported: string[] = [];
   const violations = checkDaemonLayers(
     FIXTURE_FILES,
-    fixtureEdges(new Map([['src/daemon/sessions.ts', "void import('./server.ts');"]])),
-    FIXTURE_MANIFEST,
+    fixtureEdges(new Map([[sessions, `void import('../server/index.ts');`]])),
     (line) => reported.push(line),
   );
   assert.deepEqual(violations, []);
@@ -114,81 +116,43 @@ test('a dynamic cross-layer edge is reported, not rejected', () => {
   assert.match(reported.join(''), /1 dynamic cross-layer daemon edge/);
   assert.match(
     reported.join(''),
-    /src\/daemon\/sessions\.ts \(daemon-sessions\) -> src\/daemon\/server\.ts \(daemon-server\) \[upward, reported only\]/,
+    new RegExp(
+      `${DAEMON_ROOT}/sessions/index\\.ts \\(sessions\\) -> ` +
+        `${DAEMON_ROOT}/server/index\\.ts \\(server\\) \\[upward, reported only\\]`,
+    ),
   );
 });
 
-test('a production daemon file missing from the manifest fails', () => {
-  const violations = driftFor(FIXTURE_MANIFEST, [...FIXTURE_FILES, 'src/daemon/server2.ts']);
-  assert.equal(violations.length, 1);
-  assert.equal(violations[0]!.file, 'src/daemon/server2.ts');
-  assert.match(violations[0]!.message, /production daemon file is in no layer/);
-});
-
-test('a file claimed by two layers fails', () => {
-  const manifest = {
-    ...FIXTURE_MANIFEST,
-    'daemon-resources': ['src/daemon/resources.ts', 'src/daemon/core.ts'],
-  };
-  const violations = driftFor(manifest);
-  assert.equal(violations.length, 1);
-  assert.match(violations[0]!.message, /"src\/daemon\/core\.ts" is claimed by more than one layer/);
-});
-
-test('a manifest entry that is not a tracked production file fails', () => {
-  const manifest = {
-    ...FIXTURE_MANIFEST,
-    'daemon-core': ['src/daemon/core.ts', 'src/daemon/gone.ts'],
-  };
-  const violations = driftFor(manifest);
+test('an empty daemon file set fails: a stale scan filter must not pass the rule silently', () => {
+  // The caller filters sourceFiles by DAEMON_ROOT; a call site that hardcodes a stale root
+  // hands the rule nothing. That must be a violation, not a green run.
+  const violations = checkDaemonLayers([], [], () => {});
   assert.equal(violations.length, 1);
-  assert.match(
-    violations[0]!.message,
-    /"src\/daemon\/gone\.ts" is owned by "daemon-core" but is not a tracked production file/,
-  );
+  assert.equal(violations[0]!.rule, 'R81 daemon-layers');
+  assert.match(violations[0]!.message, /received no tracked production files/);
 });
 
-test('a test, fixture, or foreign path in the manifest fails as a non-production entry', () => {
-  const manifest = {
-    ...FIXTURE_MANIFEST,
-    'daemon-core': [
-      'src/daemon/core.ts',
-      'src/daemon/__tests__/core.test.ts',
-      'src/core/helper.ts',
-    ],
-  };
-  const violations = driftFor(manifest);
+test('a production file at the daemon root fails: the folder is the declaration', () => {
+  const orphans = [`${DAEMON_ROOT}/stray.ts`, `${DAEMON_ROOT}/newzone/thing.ts`];
+  const violations = checkDaemonLayers([...FIXTURE_FILES, ...orphans], [], () => {});
   assert.equal(violations.length, 2);
-  for (const violation of violations) {
-    assert.match(violation.message, /is not a production path under src\/daemon\/\./);
-  }
-});
-
-test('an unknown layer key fails, naming the declared order', () => {
-  const violations = driftFor({
-    ...FIXTURE_MANIFEST,
-    'daemon-cache': [],
-  });
-  assert.equal(violations.length, 1);
-  assert.match(violations[0]!.message, /unknown daemon layer "daemon-cache"/);
-});
-
-test('a layer key missing from the manifest fails even when no file is orphaned', () => {
-  const manifest = { ...FIXTURE_MANIFEST } as Record<string, readonly string[]>;
-  delete manifest['daemon-resources'];
-  const violations = driftFor(
-    manifest,
-    FIXTURE_FILES.filter((file) => file !== 'src/daemon/resources.ts'),
+  assert.deepEqual(
+    violations.map((violation) => violation.file),
+    orphans,
   );
-  assert.equal(violations.length, 1);
-  assert.match(violations[0]!.message, /layer "daemon-resources" is missing from the manifest/);
+  assert.match(violations[0]!.message, /is not under a layer folder/);
+  assert.match(violations[1]!.message, /does not start with one/);
 });
 
-test('a declared layer whose array is empty fails, so it cannot linger after its last file moves', () => {
-  const violations = driftFor(
-    { ...FIXTURE_MANIFEST, 'daemon-resources': [] },
-    FIXTURE_FILES.filter((file) => file !== 'src/daemon/resources.ts'),
+test('tests and test support carry no layer and never trip the folder claim', () => {
+  const testSide = [
+    `${DAEMON_ROOT}/core/__tests__/thing.test.ts`,
+    `${DAEMON_ROOT}/__tests__/support/store-factory.ts`,
+    `${DAEMON_ROOT}/stray-territory/thing.test.ts`,
+  ];
+  assert.deepEqual(
+    checkDaemonLayers(testSide, [], () => {}),
+    [],
   );
-  assert.equal(violations.length, 1);
-  assert.match(violations[0]!.message, /layer "daemon-resources" owns no files/);
+  for (const file of testSide) assert.equal(daemonLayerOf(file), null);
 });
diff --git a/scripts/layering/daemon-layers.ts b/scripts/layering/daemon-layers.ts
index cbd440c715..c0e45a59ca 100644
--- a/scripts/layering/daemon-layers.ts
+++ b/scripts/layering/daemon-layers.ts
@@ -1,220 +1,117 @@
-// Catches: the daemon's internal layering drifting silently — a production file under `src/daemon/`
-//   that no layer owns, an owned file that moved or disappeared, a file claimed by two layers, or a
-//   static import that reads UP the daemon-local order (core < resources < execution < sessions <
-//   server). The global spine ranks all five at daemon-server's rank 4, so R5/R6 cannot see any
+// Catches: the daemon's internal layering drifting silently — a production file under the daemon
+//   root that no layer folder owns, or a static import that reads UP the daemon-local order
+//   (core < resources < execution < sessions < server). The folder is the declaration: the layer
+//   is the first path segment under the daemon root, the way `topFolder` derives zones in
+//   root-module-zones. The manifest that PR #3391 carried until the folders landed is retired;
+//   its drift check retired with it, because a file's ownership now moves with the file itself.
+//   The global spine ranks all five layers at daemon-server's rank 4, so R5/R6 cannot see any
 //   edge inside the daemon, and R80 cannot see a cycle inside the zone either; this rule is the
 //   only direction claim over the daemon's interior. Dynamic imports crossing layers are reported
 //   explicitly, never rejected: the route loaders in `request-handler-chain.ts` defer exactly the
 //   handlers the eager closure must not carry, and R5 made the same dynamic-vs-static decision
-//   (#3280). Omitted, duplicated, and unknown manifest entries fail so the manifest cannot decay
-//   into fiction while the edge rule keeps passing.
-// Evidence: #3391 landed this partition; measured against the c2c09d476 graph it holds zero
-//   upward static value or type edges, which the manifest reproduces and this verifier re-checks.
+//   (#3280). An unknown first segment (or a production file sitting at the daemon root) fails,
+//   so a new file cannot enter the zone without picking a layer.
+// Evidence: #3391 landed the partition; PR 10 moved each layer into its folder and re-measured
+//   the zero upward static value-or-type edge claim against the moved graph.
 // Cost: attributed to the R81 rule registration in check.ts; not a standalone CI job.
-// Kill criterion: once each layer lives in its own folder under the daemon and the folder derives
-//   the layer the way `topFolder` derives zones, the file list retires and the edge rule stays.
 
-import fs from 'node:fs';
 import path from 'node:path';
 import type { LayeringViolation, ResolvedImportEdge } from './model.ts';
-import { isProductionSourceFile } from './tracked-sources.ts';
+import { DAEMON_SOURCE_ROOT, isProductionSourceFile } from './tracked-sources.ts';
 
 export const DAEMON_LAYER_RULE = 'R81 daemon-layers';
 
+/** The daemon zone root without its trailing slash, from the one scan constant (#3546). */
+export const DAEMON_ROOT = DAEMON_SOURCE_ROOT.slice(0, -1);
+
 /** The daemon-local order, lowest first. The global spine rank stays 4 for all five layers. */
-export const DAEMON_LAYER_ORDER = [
-  'daemon-core',
-  'daemon-resources',
-  'daemon-execution',
-  'daemon-sessions',
-  'daemon-server',
-] as const;
+export const DAEMON_LAYER_ORDER = ['core', 'resources', 'execution', 'sessions', 'server'] as const;
 
 export type DaemonLayer = (typeof DAEMON_LAYER_ORDER)[number];
 
-/** The manifest shape: each declared layer claims the production files it owns. */
-export type DaemonLayerManifest = Readonly<Record<string, readonly string[]>>;
-
-const MANIFEST_RELPATH = 'scripts/layering/daemon-layer-manifest.json';
-
-export function isDaemonLayer(layer: string): layer is DaemonLayer {
-  return (DAEMON_LAYER_ORDER as readonly string[]).includes(layer);
+function isDaemonLayer(segment: string): segment is DaemonLayer {
+  return (DAEMON_LAYER_ORDER as readonly string[]).includes(segment);
 }
 
-export function daemonLayerRank(layer: DaemonLayer): number {
+function daemonLayerRank(layer: DaemonLayer): number {
   return DAEMON_LAYER_ORDER.indexOf(layer);
 }
 
-/**
- * The exhaustive `{layer: sourcePaths}` claim over every production file under `src/daemon/`,
- * committed next to this verifier so moving a file into its layer's folder carries its ownership
- * with it.
- */
-export function readDaemonLayerManifest(repoRoot: string): DaemonLayerManifest {
-  return JSON.parse(
-    fs.readFileSync(path.join(repoRoot, MANIFEST_RELPATH), 'utf8'),
-  ) as DaemonLayerManifest;
-}
-
-/** `src/daemon/<…>.ts` and not a test or fixture path — the only entries the manifest may name. */
+/** Files under the daemon root that are not tests or fixtures. */
 function isDaemonProductionPath(file: string): boolean {
-  return file.startsWith('src/daemon/') && isProductionSourceFile(file);
+  return file.startsWith(DAEMON_SOURCE_ROOT) && isProductionSourceFile(file);
 }
 
-/** The partition flattened to one lookup; a path in two layers keeps its first claim. */
-export function daemonLayerByFile(
-  manifest: DaemonLayerManifest,
-): ReadonlyMap<string, DaemonLayer | string> {
-  const byFile = new Map<string, DaemonLayer | string>();
-  for (const [layer, files] of Object.entries(manifest)) {
-    for (const file of files) {
-      if (!byFile.has(file)) byFile.set(file, layer);
-    }
-  }
-  return byFile;
-}
-
-function manifestFileViolation(message: string): LayeringViolation {
-  return { rule: DAEMON_LAYER_RULE, file: MANIFEST_RELPATH, line: 1, message };
+/**
+ * The folder-derived layer: the first path segment under the daemon root, for production files
+ * only. Tests and test support mirror their source module by convention and carry no layer,
+ * matching how the other daemon rules treat them; the top-level `__tests__/support/` tree rides
+ * with them. Returns null for anything the folders do not own.
+ */
+export function daemonLayerOf(file: string): DaemonLayer | null {
+  if (!isDaemonProductionPath(file)) return null;
+  const segment = path.relative(DAEMON_ROOT, file).split(path.sep)[0];
+  return isDaemonLayer(segment) ? segment : null;
 }
 
 /**
- * Manifest-vs-tree drift: production daemon files the manifest omits, entries that name a path
- * which is not a tracked production daemon file, a path claimed by two layers, and layer keys
- * outside the declared order.
+ * The registered R81 check. `trackedDaemonProductionFiles` is the daemon half of the context's
+ * production scan. Every one of them must sit under a declared layer folder, and no static edge
+ * may read up the order.
  */
-export function daemonLayerManifestDrift(
+export function checkDaemonLayers(
   trackedDaemonProductionFiles: readonly string[],
-  manifest: DaemonLayerManifest,
+  edges: readonly ResolvedImportEdge[],
+  report: (line: string) => void = (line) => process.stdout.write(line),
 ): LayeringViolation[] {
   const violations: LayeringViolation[] = [];
 
-  for (const layer of Object.keys(manifest)) {
-    if (!isDaemonLayer(layer)) {
-      violations.push(
-        manifestFileViolation(
-          `unknown daemon layer "${layer}". Declared layers: ${DAEMON_LAYER_ORDER.join(', ')}.`,
-        ),
-      );
-    }
-  }
-  for (const layer of DAEMON_LAYER_ORDER) {
-    const owned = manifest[layer];
-    if (owned === undefined) {
-      violations.push(
-        manifestFileViolation(
-          `layer "${layer}" is missing from the manifest. Every declared layer must own files or leave the order.`,
-        ),
-      );
-    } else if (owned.length === 0) {
-      violations.push(
-        manifestFileViolation(
-          `layer "${layer}" owns no files. A layer that lost its last file leaves the order; an empty entry keeps a phantom position in it.`,
-        ),
-      );
-    }
-  }
-
-  const tracked = new Set(trackedDaemonProductionFiles);
-  const claimed = new Set<string>();
-  for (const [layer, files] of Object.entries(manifest)) {
-    for (const file of files) {
-      if (!isDaemonProductionPath(file)) {
-        violations.push(
-          manifestFileViolation(
-            `entry "${file}" is not a production path under src/daemon/. Test files, fixtures, and paths outside the daemon carry no layer.`,
-          ),
-        );
-        continue;
-      }
-      if (claimed.has(file)) {
-        violations.push(
-          manifestFileViolation(
-            `"${file}" is claimed by more than one layer, again under "${layer}". A file belongs to exactly one layer.`,
-          ),
-        );
-        continue;
-      }
-      claimed.add(file);
-      if (!tracked.has(file)) {
-        violations.push(
-          manifestFileViolation(
-            `"${file}" is owned by "${layer}" but is not a tracked production file. Move the entry with the file, in the same change.`,
-          ),
-        );
-      }
-    }
+  // An empty input set means the caller's scan no longer reaches this tree — the same wiring
+  // drift a stale DAEMON_SOURCE_ROOT literal at a call site produces. A rule that measures
+  // nothing proves nothing, so it fails instead of passing silently.
+  if (trackedDaemonProductionFiles.length === 0) {
+    return [
+      {
+        rule: DAEMON_LAYER_RULE,
+        file: DAEMON_SOURCE_ROOT,
+        line: 1,
+        message:
+          `R81 received no tracked production files under ${DAEMON_SOURCE_ROOT}. The scan filter ` +
+          `and the daemon root have diverged, or the daemon root moved; the layer claim would ` +
+          `pass without measuring anything.`,
+      },
+    ];
   }
 
-  for (const file of [...tracked].sort()) {
-    if (!claimed.has(file)) {
+  for (const file of trackedDaemonProductionFiles) {
+    // The context's scan names every tracked TS file in the zone; tests and test support mirror
+    // their source module by convention and carry no folder claim.
+    if (!isProductionSourceFile(file)) continue;
+    if (daemonLayerOf(file) === null) {
+      const rest = path.relative(DAEMON_ROOT, file);
       violations.push({
         rule: DAEMON_LAYER_RULE,
         file,
         line: 1,
         message:
-          `production daemon file is in no layer. Assign it in ${MANIFEST_RELPATH}; ` +
-          'defaulting it silently hides its position in the order.',
+          `production daemon file is not under a layer folder. The layer is the first segment ` +
+          `under ${DAEMON_SOURCE_ROOT} (${DAEMON_LAYER_ORDER.join(' < ')}); "${rest}" does not ` +
+          `start with one. A new file must pick its layer, not linger at the zone root or hide ` +
+          `behind an invented folder.`,
       });
     }
   }
-  return violations;
-}
-
-function rankedLayerPair(
-  edge: ResolvedImportEdge,
-  layerByFile: ReadonlyMap<string, string>,
-): Readonly<{ from: DaemonLayer; to: DaemonLayer }> | null {
-  const from = layerByFile.get(edge.file);
-  const to = layerByFile.get(edge.target);
-  if (from === undefined || to === undefined || !isDaemonLayer(from) || !isDaemonLayer(to)) {
-    return null;
-  }
-  return { from, to };
-}
 
-/** Static value or type-only edges that read up the daemon-local order. */
-export function upwardDaemonLayerEdges(
-  edges: readonly ResolvedImportEdge[],
-  layerByFile: ReadonlyMap<string, string>,
-): ResolvedImportEdge[] {
-  return edges.filter((edge) => {
-    if (edge.dynamic) return false;
-    const pair = rankedLayerPair(edge, layerByFile);
-    return pair !== null && daemonLayerRank(pair.from) < daemonLayerRank(pair.to);
-  });
-}
+  const rankedPair = (edge: ResolvedImportEdge) => {
+    const from = daemonLayerOf(edge.file);
+    const to = daemonLayerOf(edge.target);
+    return from !== null && to !== null ? { from, to } : null;
+  };
 
-/**
- * Dynamic imports whose target sits in a different daemon layer. Reported on the check's stdout,
- * never failed — the report keeps the lazy seams visible while the layer folders land.
- */
-export function dynamicCrossLayerDaemonEdges(
-  edges: readonly ResolvedImportEdge[],
-  layerByFile: ReadonlyMap<string, string>,
-): ResolvedImportEdge[] {
-  return edges.filter((edge) => {
-    if (!edge.dynamic) return false;
-    const pair = rankedLayerPair(edge, layerByFile);
-    return pair !== null && pair.from !== pair.to;
-  });
-}
-
-/**
- * The registered R81 check. `trackedDaemonProductionFiles` is the daemon half of the context's
- * production scan, so tests and fixtures carry no layer, matching how the other daemon rules
- * treat them.
- */
-export function checkDaemonLayers(
-  trackedDaemonProductionFiles: readonly string[],
-  edges: readonly ResolvedImportEdge[],
-  manifest: DaemonLayerManifest,
-  report: (line: string) => void = (line) => process.stdout.write(line),
-): LayeringViolation[] {
-  const violations = daemonLayerManifestDrift(trackedDaemonProductionFiles, manifest);
-  const layerByFile = daemonLayerByFile(manifest);
-  for (const edge of upwardDaemonLayerEdges(edges, layerByFile)) {
-    const pair = rankedLayerPair(edge, layerByFile)!;
+  for (const edge of edges) {
+    if (edge.dynamic) continue;
+    const pair = rankedPair(edge);
+    if (pair === null || daemonLayerRank(pair.from) >= daemonLayerRank(pair.to)) continue;
     violations.push({
       rule: DAEMON_LAYER_RULE,
       file: edge.file,
@@ -226,14 +123,19 @@ export function checkDaemonLayers(
         `lower layer's owner instead of reading upward.`,
     });
   }
-  const dynamic = dynamicCrossLayerDaemonEdges(edges, layerByFile);
+
+  const dynamic = edges.filter((edge) => {
+    if (!edge.dynamic) return false;
+    const pair = rankedPair(edge);
+    return pair !== null && pair.from !== pair.to;
+  });
   if (dynamic.length > 0) {
     report(
       `Layering guard: R81 reports ${dynamic.length} dynamic cross-layer daemon edge(s) ` +
         `(reported, not rejected; see scripts/layering/daemon-layers.ts):\n`,
     );
     for (const edge of dynamic) {
-      const pair = rankedLayerPair(edge, layerByFile)!;
+      const pair = rankedPair(edge)!;
       const upward =
         daemonLayerRank(pair.from) < daemonLayerRank(pair.to) ? ' [upward, reported only]' : '';
       report(`  ${edge.file} (${pair.from}) -> ${edge.target} (${pair.to})${upward}\n`);
diff --git a/scripts/layering/daemon-modularity.test.ts b/scripts/layering/daemon-modularity.test.ts
index 3767f369e8..0b8ee816f0 100644
--- a/scripts/layering/daemon-modularity.test.ts
+++ b/scripts/layering/daemon-modularity.test.ts
@@ -27,7 +27,7 @@ function importEdge(file: string, target: string): ResolvedImportEdge {
 
 function baselineDaemonTypesEdges(): ResolvedImportEdge[] {
   return DAEMON_MODULARITY_BASELINE.externalDaemonTypesImporters.map((file) =>
-    importEdge(file, 'src/daemon/daemon-request.ts'),
+    importEdge(file, 'packages/daemon/src/core/daemon-request.ts'),
   );
 }
 
@@ -39,7 +39,7 @@ function baselineEdges(): ResolvedImportEdge[] {
 /** Where a member of `zone` lives, so a zone count can be turned back into file paths. */
 const ZONE_DIRECTORY: Readonly<Record<string, string>> = {
   '(root)': 'src/',
-  'daemon-server': 'src/daemon/',
+  'daemon-server': 'packages/daemon/src/',
   'ad-replay': 'packages/ad-replay/src/',
   'provider-webdriver': 'packages/provider-webdriver/src/',
 };
@@ -110,9 +110,9 @@ test('external daemon request/session-state importer membership changes require
     new Map([
       [
         'src/client/new-importer.ts',
-        "import type { SessionState } from '../daemon/session-state.ts';",
+        "import type { SessionState } from '../../packages/daemon/src/core/session-state.ts';",
       ],
-      ['src/daemon/session-state.ts', 'export type SessionState = { name: string };'],
+      ['packages/daemon/src/core/session-state.ts', 'export type SessionState = { name: string };'],
     ]),
   );
 
@@ -215,7 +215,10 @@ test('replay-test may still import its own files inside the package', () => {
 test('internal trees reject deep imports globally, including from daemon', () => {
   const edges = resolveImportEdges(
     new Map([
-      ['src/daemon/adapter.ts', "import type { Plan } from '@agent-device/maestro/internal/plan';"],
+      [
+        'packages/daemon/src/adapter.ts',
+        "import type { Plan } from '@agent-device/maestro/internal/plan';",
+      ],
       ['packages/maestro/src/internal/plan.ts', 'export type Plan = { steps: number };'],
     ]),
   );
@@ -234,18 +237,21 @@ test('replay-port rejects daemon source imports and engine back edges', () => {
     new Map([
       [
         'packages/replay-port/src/daemon-port/test-command.ts',
-        "import { handleSessionCloseCommands } from '../../../../src/daemon/session-lifecycle/index.ts';",
+        "import { handleSessionCloseCommands } from '../../../../packages/daemon/src/sessions/session-lifecycle/index.ts';",
       ],
       [
         'packages/replay-port/src/daemon-port/native-command.ts',
-        "import { SessionStore } from '../../../../src/daemon/session-store.ts';",
+        "import { SessionStore } from '../../../../packages/daemon/src/core/session-store.ts';",
       ],
       [
         'packages/ad-replay/src/internal/step-loop.ts',
         "import { runReplayCommand } from '../../../replay-port/src/daemon-port/native-command.ts';",
       ],
-      ['src/daemon/session-lifecycle/index.ts', 'export function handleSessionCloseCommands() {}'],
-      ['src/daemon/session-store.ts', 'export class SessionStore {}'],
+      [
+        'packages/daemon/src/sessions/session-lifecycle/index.ts',
+        'export function handleSessionCloseCommands() {}',
+      ],
+      ['packages/daemon/src/core/session-store.ts', 'export class SessionStore {}'],
     ]),
   );
 
@@ -259,11 +265,12 @@ test('replay-port rejects daemon source imports and engine back edges', () => {
     [
       {
         file: 'packages/replay-port/src/daemon-port/test-command.ts',
-        message: 'replay-port must not import src/daemon/session-lifecycle/index.ts',
+        message:
+          'replay-port must not import packages/daemon/src/sessions/session-lifecycle/index.ts',
       },
       {
         file: 'packages/replay-port/src/daemon-port/native-command.ts',
-        message: 'replay-port must not import src/daemon/session-store.ts',
+        message: 'replay-port must not import packages/daemon/src/core/session-store.ts',
       },
       {
         file: 'packages/ad-replay/src/internal/step-loop.ts',
@@ -277,19 +284,19 @@ test('session lifecycle rejects handler deep imports in both directions', () =>
   const edges = resolveImportEdges(
     new Map([
       [
-        'src/daemon/handlers/session.ts',
+        'packages/daemon/src/sessions/handlers/session.ts',
         "import { handleSessionInventoryCommands } from '../session-lifecycle/internal/inventory.ts';\nexport function handleSessionCommands() {}",
       ],
       [
-        'src/daemon/session-lifecycle/internal/inventory.ts',
+        'packages/daemon/src/sessions/session-lifecycle/internal/inventory.ts',
         "import { handleSessionCommands } from '../../handlers/session.ts';\nexport function handleSessionInventoryCommands() {}",
       ],
       [
-        'src/daemon/session-lifecycle/internal/session-close.ts',
+        'packages/daemon/src/sessions/session-lifecycle/internal/session-close.ts',
         "import { handleSessionCommands } from '../../handlers/session.ts';",
       ],
       [
-        'src/daemon/session-lifecycle/index.ts',
+        'packages/daemon/src/sessions/session-lifecycle/index.ts',
         'export function handleSessionInventoryCommands() {}',
       ],
     ]),
@@ -308,20 +315,22 @@ test('session lifecycle rejects handler deep imports in both directions', () =>
     })),
     [
       {
-        file: 'src/daemon/handlers/session.ts',
+        file: 'packages/daemon/src/sessions/handlers/session.ts',
         line: 1,
         message:
-          "src/daemon/handlers/session.ts must not import daemon-session-lifecycle's internal tree (src/daemon/session-lifecycle/internal/inventory.ts)",
+          "packages/daemon/src/sessions/handlers/session.ts must not import daemon-session-lifecycle's internal tree (packages/daemon/src/sessions/session-lifecycle/internal/inventory.ts)",
       },
       {
-        file: 'src/daemon/session-lifecycle/internal/inventory.ts',
+        file: 'packages/daemon/src/sessions/session-lifecycle/internal/inventory.ts',
         line: 1,
-        message: 'daemon-session-lifecycle must not import src/daemon/handlers/session.ts',
+        message:
+          'daemon-session-lifecycle must not import packages/daemon/src/sessions/handlers/session.ts',
       },
       {
-        file: 'src/daemon/session-lifecycle/internal/session-close.ts',
+        file: 'packages/daemon/src/sessions/session-lifecycle/internal/session-close.ts',
         line: 1,
-        message: 'daemon-session-lifecycle must not import src/daemon/handlers/session.ts',
+        message:
+          'daemon-session-lifecycle must not import packages/daemon/src/sessions/handlers/session.ts',
       },
     ],
   );
@@ -331,31 +340,31 @@ test('interaction rejects handler crossings and deep imports around its facade',
   const edges = resolveImportEdges(
     new Map([
       [
-        'src/daemon/handlers/react-native.ts',
+        'packages/daemon/src/execution/handlers/react-native.ts',
         "import { refSnapshotFlagGuardResponse } from '../interaction/internal/interaction-flags.ts';\nexport function handleReactNativeCommands() {}",
       ],
       [
-        'src/daemon/interaction/internal/interaction-runtime.ts',
+        'packages/daemon/src/execution/interaction/internal/interaction-runtime.ts',
         "import { handleReactNativeCommands } from '../../handlers/react-native.ts';\nexport function createInteractionRuntime() {}",
       ],
       [
-        'src/daemon/generic-settle.ts',
+        'packages/daemon/src/execution/generic-settle.ts',
         "import { createInteractionRuntime } from './interaction/internal/interaction-runtime.ts';",
       ],
       [
-        'src/daemon/selector-runtime.ts',
+        'packages/daemon/src/execution/selector-runtime.ts',
         "import { refSnapshotFlagGuardResponse } from './interaction/internal/interaction-flags.ts';",
       ],
       [
-        'src/daemon/selector-runtime-backend.ts',
+        'packages/daemon/src/execution/selector-runtime-backend.ts',
         "import { readTextForNode } from './interaction/internal/interaction-ref-policy.ts';",
       ],
       [
-        'src/daemon/interaction/internal/interaction-flags.ts',
+        'packages/daemon/src/execution/interaction/internal/interaction-flags.ts',
         'export function refSnapshotFlagGuardResponse() {}',
       ],
       [
-        'src/daemon/interaction/internal/interaction-ref-policy.ts',
+        'packages/daemon/src/execution/interaction/internal/interaction-ref-policy.ts',
         'export function readTextForNode() {}',
       ],
     ]),
@@ -370,14 +379,14 @@ test('interaction rejects handler crossings and deep imports around its facade',
   assert.ok(
     violations.some(({ message }) =>
       message.includes(
-        "src/daemon/handlers/react-native.ts must not import daemon-interaction's internal tree",
+        "packages/daemon/src/execution/handlers/react-native.ts must not import daemon-interaction's internal tree",
       ),
     ),
   );
   assert.ok(
     violations.some(({ message }) =>
       message.includes(
-        "src/daemon/interaction/internal/interaction-runtime.ts must not import src/daemon/handlers/react-native.ts from daemon-interaction's internal tree",
+        "packages/daemon/src/execution/interaction/internal/interaction-runtime.ts must not import packages/daemon/src/execution/handlers/react-native.ts from daemon-interaction's internal tree",
       ),
     ),
   );
@@ -393,15 +402,15 @@ test('session observability rejects handler deep imports in both directions', ()
   const edges = resolveImportEdges(
     new Map([
       [
-        'src/daemon/handlers/session.ts',
+        'packages/daemon/src/sessions/handlers/session.ts',
         "import { handleSessionObservabilityCommands } from '../session-observability/internal/session-observability.ts';\nexport function handleSessionCommands() {}",
       ],
       [
-        'src/daemon/session-observability/internal/session-observability.ts',
+        'packages/daemon/src/sessions/session-observability/internal/session-observability.ts',
         "import { handleSessionCommands } from '../../handlers/session.ts';\nexport function handleSessionObservabilityCommands() {}",
       ],
       [
-        'src/daemon/session-observability/index.ts',
+        'packages/daemon/src/sessions/session-observability/index.ts',
         'export function handleSessionObservabilityCommands() {}',
       ],
     ]),
@@ -420,15 +429,16 @@ test('session observability rejects handler deep imports in both directions', ()
     })),
     [
       {
-        file: 'src/daemon/handlers/session.ts',
+        file: 'packages/daemon/src/sessions/handlers/session.ts',
         line: 1,
         message:
-          "src/daemon/handlers/session.ts must not import daemon-session-observability's internal tree (src/daemon/session-observability/internal/session-observability.ts)",
+          "packages/daemon/src/sessions/handlers/session.ts must not import daemon-session-observability's internal tree (packages/daemon/src/sessions/session-observability/internal/session-observability.ts)",
       },
       {
-        file: 'src/daemon/session-observability/internal/session-observability.ts',
+        file: 'packages/daemon/src/sessions/session-observability/internal/session-observability.ts',
         line: 1,
-        message: 'daemon-session-observability must not import src/daemon/handlers/session.ts',
+        message:
+          'daemon-session-observability must not import packages/daemon/src/sessions/handlers/session.ts',
       },
     ],
   );
@@ -436,9 +446,9 @@ test('session observability rejects handler deep imports in both directions', ()
 
 test('snapshot execution cannot return to handler-owned support paths', () => {
   const restored = [
-    'src/daemon/handlers/snapshot-capture.ts',
-    'src/daemon/handlers/snapshot-interactor-capture.ts',
-    'src/daemon/handlers/snapshot-session.ts',
+    'packages/daemon/src/handlers/snapshot-capture.ts',
+    'packages/daemon/src/handlers/snapshot-interactor-capture.ts',
+    'packages/daemon/src/handlers/snapshot-session.ts',
   ];
 
   assert.deepEqual(
@@ -450,64 +460,67 @@ test('snapshot execution cannot return to handler-owned support paths', () => {
         'Reuse the daemon-owned snapshot execution module instead of restoring shared mechanics beneath a route adapter.',
     })),
   );
-  assert.deepEqual(checkRetiredSnapshotExecutionPaths(['src/daemon/handlers/snapshot.ts']), []);
+  assert.deepEqual(
+    checkRetiredSnapshotExecutionPaths(['packages/daemon/src/sessions/handlers/snapshot.ts']),
+    [],
+  );
 });
 
 test('session lifecycle rejects restored neutral helper paths', () => {
   const violations = checkRetiredSessionLifecyclePaths([
-    'src/daemon/session-device-resolution.ts',
-    'src/daemon/handlers/session-device-utils.ts',
-    'src/daemon/handlers/session-runtime-admission.ts',
-    'src/daemon/handlers/session-close-script.ts',
-    'src/daemon/handlers/session-close.ts',
+    'packages/daemon/src/resources/session-device-resolution.ts',
+    'packages/daemon/src/handlers/session-device-utils.ts',
+    'packages/daemon/src/handlers/session-runtime-admission.ts',
+    'packages/daemon/src/handlers/session-close-script.ts',
+    'packages/daemon/src/handlers/session-close.ts',
   ]);
 
   assert.deepEqual(
     violations.map(({ message }) => message),
     [
-      'retired session lifecycle path was restored: src/daemon/handlers/session-device-utils.ts. Keep the neutral seam at its daemon owner instead of rebuilding a handler grab-bag.',
-      'retired session lifecycle path was restored: src/daemon/handlers/session-runtime-admission.ts. Keep the neutral seam at its daemon owner instead of rebuilding a handler grab-bag.',
-      'retired session lifecycle path was restored: src/daemon/handlers/session-close-script.ts. Keep the neutral seam at its daemon owner instead of rebuilding a handler grab-bag.',
-      'retired session lifecycle path was restored: src/daemon/handlers/session-close.ts. Keep the neutral seam at its daemon owner instead of rebuilding a handler grab-bag.',
+      'retired session lifecycle path was restored: packages/daemon/src/handlers/session-device-utils.ts. Keep the neutral seam at its daemon owner instead of rebuilding a handler grab-bag.',
+      'retired session lifecycle path was restored: packages/daemon/src/handlers/session-runtime-admission.ts. Keep the neutral seam at its daemon owner instead of rebuilding a handler grab-bag.',
+      'retired session lifecycle path was restored: packages/daemon/src/handlers/session-close-script.ts. Keep the neutral seam at its daemon owner instead of rebuilding a handler grab-bag.',
+      'retired session lifecycle path was restored: packages/daemon/src/handlers/session-close.ts. Keep the neutral seam at its daemon owner instead of rebuilding a handler grab-bag.',
     ],
   );
 });
 
 test('interaction rejects restored handler implementation paths', () => {
   const violations = checkRetiredInteractionPaths([
-    'src/daemon/interaction/internal/interaction.ts',
-    'src/daemon/handlers/interaction-touch.ts',
+    'packages/daemon/src/execution/interaction/internal/interaction.ts',
+    'packages/daemon/src/handlers/interaction-touch.ts',
   ]);
 
   assert.deepEqual(violations, [
     {
       rule: 'R10 daemon-modularity',
-      file: 'src/daemon/handlers/interaction-touch.ts',
+      file: 'packages/daemon/src/handlers/interaction-touch.ts',
       line: 1,
       message:
-        'retired interaction handler path was restored: src/daemon/handlers/interaction-touch.ts. Keep route implementations behind src/daemon/interaction/index.ts instead of rebuilding a handler-owned interaction surface.',
+        'retired interaction handler path was restored: packages/daemon/src/handlers/interaction-touch.ts. Keep route implementations behind packages/daemon/src/execution/interaction/index.ts instead of rebuilding a handler-owned interaction surface.',
     },
   ]);
 });
 
 test('interaction rejects renamed handler implementation paths', () => {
   const violations = checkRetiredInteractionPaths([
-    'src/daemon/handlers/interaction-touch-v2.ts',
-    'src/daemon/handlers/find-next.ts',
+    'packages/daemon/src/handlers/interaction-touch-v2.ts',
+    'packages/daemon/src/handlers/find-next.ts',
   ]);
 
   assert.deepEqual(
     violations.map(({ file, message }) => ({ file, message })),
     [
       {
-        file: 'src/daemon/handlers/interaction-touch-v2.ts',
+        file: 'packages/daemon/src/handlers/interaction-touch-v2.ts',
         message:
-          'retired interaction handler path was restored: src/daemon/handlers/interaction-touch-v2.ts. Keep route implementations behind src/daemon/interaction/index.ts instead of rebuilding a handler-owned interaction surface.',
+          'retired interaction handler path was restored: packages/daemon/src/handlers/interaction-touch-v2.ts. Keep route implementations behind packages/daemon/src/execution/interaction/index.ts instead of rebuilding a handler-owned interaction surface.',
       },
       {
-        file: 'src/daemon/handlers/find-next.ts',
+        file: 'packages/daemon/src/handlers/find-next.ts',
         message:
-          'retired interaction handler path was restored: src/daemon/handlers/find-next.ts. Keep route implementations behind src/daemon/interaction/index.ts instead of rebuilding a handler-owned interaction surface.',
+          'retired interaction handler path was restored: packages/daemon/src/handlers/find-next.ts. Keep route implementations behind packages/daemon/src/execution/interaction/index.ts instead of rebuilding a handler-owned interaction surface.',
       },
     ],
   );
@@ -515,8 +528,8 @@ test('interaction rejects renamed handler implementation paths', () => {
 
 test('session lifecycle rejects any restored open or close handler path', () => {
   const violations = checkRetiredSessionLifecyclePaths([
-    'src/daemon/handlers/session-open-regressed.ts',
-    'src/daemon/handlers/session-close-regressed.ts',
+    'packages/daemon/src/handlers/session-open-regressed.ts',
+    'packages/daemon/src/handlers/session-close-regressed.ts',
   ]);
 
   assert.deepEqual(
@@ -529,17 +542,17 @@ test('session lifecycle rejects any restored open or close handler path', () =>
     [
       {
         rule: 'R10 daemon-modularity',
-        file: 'src/daemon/handlers/session-open-regressed.ts',
+        file: 'packages/daemon/src/handlers/session-open-regressed.ts',
         line: 1,
         message:
-          'retired session lifecycle path was restored: src/daemon/handlers/session-open-regressed.ts. Keep the neutral seam at its daemon owner instead of rebuilding a handler grab-bag.',
+          'retired session lifecycle path was restored: packages/daemon/src/handlers/session-open-regressed.ts. Keep the neutral seam at its daemon owner instead of rebuilding a handler grab-bag.',
       },
       {
         rule: 'R10 daemon-modularity',
-        file: 'src/daemon/handlers/session-close-regressed.ts',
+        file: 'packages/daemon/src/handlers/session-close-regressed.ts',
         line: 1,
         message:
-          'retired session lifecycle path was restored: src/daemon/handlers/session-close-regressed.ts. Keep the neutral seam at its daemon owner instead of rebuilding a handler grab-bag.',
+          'retired session lifecycle path was restored: packages/daemon/src/handlers/session-close-regressed.ts. Keep the neutral seam at its daemon owner instead of rebuilding a handler grab-bag.',
       },
     ],
   );
@@ -547,14 +560,14 @@ test('session lifecycle rejects any restored open or close handler path', () =>
 
 test('session observability rejects restored handler paths', () => {
   const restoredPaths = [
-    'src/daemon/handlers/session-observability.ts',
-    'src/daemon/handlers/session-perf-runtime.ts',
-    'src/daemon/handlers/session-network.ts',
-    'src/daemon/handlers/session-audio.ts',
-    'src/daemon/handlers/session-network-regressed.ts',
-    'src/daemon/handlers/session-perf.ts',
-    'src/daemon/handlers/session-logs.ts',
-    'src/daemon/handlers/session-events.ts',
+    'packages/daemon/src/handlers/session-observability.ts',
+    'packages/daemon/src/handlers/session-perf-runtime.ts',
+    'packages/daemon/src/handlers/session-network.ts',
+    'packages/daemon/src/handlers/session-audio.ts',
+    'packages/daemon/src/handlers/session-network-regressed.ts',
+    'packages/daemon/src/handlers/session-perf.ts',
+    'packages/daemon/src/handlers/session-logs.ts',
+    'packages/daemon/src/handlers/session-events.ts',
   ] as const;
   const violations = checkRetiredSessionObservabilityPaths(restoredPaths);
 
@@ -595,7 +608,7 @@ test('R9 holds each zone to the merge-base and keeps engine files outside the co
 // The merge-base carries membership, so the message names exactly the files that joined.
 test('R10 zone overflow names the member that joined the cycle', () => {
   // Sorts after the provider-webdriver probes: a first-member pick could not name it by luck.
-  const joined = 'src/daemon/snapshot-interactor-capture.ts';
+  const joined = 'packages/daemon/src/core/snapshot-interactor-capture.ts';
   const members = [...typeCycleMembers({ 'provider-webdriver': 5 }), joined].sort();
 
   const violations = checkDaemonModularityRatchets(
diff --git a/scripts/layering/daemon-modularity.ts b/scripts/layering/daemon-modularity.ts
index 37349b2b36..0e84926461 100644
--- a/scripts/layering/daemon-modularity.ts
+++ b/scripts/layering/daemon-modularity.ts
@@ -1,4 +1,5 @@
 import path from 'node:path';
+import { DAEMON_SOURCE_ROOT } from './tracked-sources.ts';
 import {
   INTERACTION_RETIRED_HANDLER_PATHS,
   LOGICAL_MODULE_POLICIES,
@@ -31,8 +32,8 @@ export const DAEMON_MODULARITY_BASELINE = {
 // `@agent-device/contracts/command` as `DaemonWireRequest`). Both are ratcheted
 // together, so moving a symbol between them cannot reopen the boundary to a new outside zone.
 const DAEMON_TYPE_MODULES: readonly string[] = [
-  'src/daemon/daemon-request.ts',
-  'src/daemon/session-state.ts',
+  'packages/daemon/src/core/daemon-request.ts',
+  'packages/daemon/src/core/session-state.ts',
 ];
 
 const ENGINE_FILE_PREFIXES = [
@@ -75,7 +76,7 @@ export function checkRetiredSessionLifecyclePaths(
   return checkRetiredHandlerPaths(
     sourceFiles,
     SESSION_LIFECYCLE_RETIRED_HANDLER_PATHS,
-    /^src\/daemon\/handlers\/session-(?:open|close)(?:-[^/]+)?\.ts$/,
+    /^packages\/daemon\/src\/handlers\/session-(?:open|close)(?:-[^/]+)?\.ts$/,
     'session lifecycle',
   );
 }
@@ -86,7 +87,7 @@ export function checkRetiredSessionObservabilityPaths(
   return checkRetiredHandlerPaths(
     sourceFiles,
     SESSION_OBSERVABILITY_RETIRED_HANDLER_PATHS,
-    /^src\/daemon\/handlers\/session-(?:observability|perf|logs|events|network|audio)(?:-[^/]+)?\.ts$/,
+    /^packages\/daemon\/src\/handlers\/session-(?:observability|perf|logs|events|network|audio)(?:-[^/]+)?\.ts$/,
     'session observability',
   );
 }
@@ -124,9 +125,9 @@ export function checkRetiredInteractionPaths(sourceFiles: readonly string[]): La
   return checkRetiredHandlerPaths(
     sourceFiles,
     INTERACTION_RETIRED_HANDLER_PATHS,
-    /^src\/daemon\/handlers\/(?:find|interaction)(?:-[^/]+)?\.ts$/,
+    /^packages\/daemon\/src\/handlers\/(?:find|interaction)(?:-[^/]+)?\.ts$/,
     'interaction handler',
-    'Keep route implementations behind src/daemon/interaction/index.ts instead of rebuilding a handler-owned interaction surface.',
+    'Keep route implementations behind packages/daemon/src/execution/interaction/index.ts instead of rebuilding a handler-owned interaction surface.',
   );
 }
 
@@ -218,7 +219,8 @@ function checkDaemonTypesImporters(edges: readonly ResolvedImportEdge[]): Layeri
   const allowed = new Set<string>(DAEMON_MODULARITY_BASELINE.externalDaemonTypesImporters);
   const importers = new Map<string, ResolvedImportEdge>();
   for (const edge of edges) {
-    if (!DAEMON_TYPE_MODULES.includes(edge.target) || edge.file.startsWith('src/daemon/')) continue;
+    if (!DAEMON_TYPE_MODULES.includes(edge.target) || edge.file.startsWith(DAEMON_SOURCE_ROOT))
+      continue;
     // #2559: the client's daemon-request/session-state reads are owned by the stricter
     // R78 `daemon-client-entry` gate, which also bans runtime imports and names each edge.
     if (edge.file.startsWith('src/daemon-client/')) continue;
diff --git a/scripts/layering/daemon-platform-boundary.test.ts b/scripts/layering/daemon-platform-boundary.test.ts
index f90c0836fa..13bd814f79 100644
--- a/scripts/layering/daemon-platform-boundary.test.ts
+++ b/scripts/layering/daemon-platform-boundary.test.ts
@@ -6,7 +6,7 @@ import {
   findDaemonPlatformDependencies,
 } from './daemon-platform-boundary.ts';
 
-const daemonFile = 'src/daemon/terminal-boundary-fixture.ts';
+const daemonFile = 'packages/daemon/src/terminal-boundary-fixture.ts';
 
 function dependencies(source: string, file = daemonFile) {
   return findDaemonPlatformDependencies([{ path: file, source }]);
@@ -18,11 +18,11 @@ function violations(source: string, file = daemonFile) {
 
 test('R65 rejects static, type-only, dynamic, type, and re-export dependencies with source lines', () => {
   const source = [
-    "import { old } from '../platforms/android/old.ts';",
-    "import type { OldType } from '../platforms/android/types.ts';",
-    "const lazy = import('../platforms/android/lazy.ts');",
-    "type ImportedType = import('../platforms/android/type.ts').ImportedType;",
-    "export { old } from '../platforms/android/re-export.ts';",
+    "import { old } from '../../../src/platforms/android/old.ts';",
+    "import type { OldType } from '../../../src/platforms/android/types.ts';",
+    "const lazy = import('../../../src/platforms/android/lazy.ts');",
+    "type ImportedType = import('../../../src/platforms/android/type.ts').ImportedType;",
+    "export { old } from '../../../src/platforms/android/re-export.ts';",
     "export type { OldType } from '@agent-device/platform-android/types';",
     "export * from '@agent-device/platform-apple';",
   ].join('\n');
@@ -32,31 +32,31 @@ test('R65 rejects static, type-only, dynamic, type, and re-export dependencies w
     [
       {
         kind: 'static import',
-        spec: '../platforms/android/old.ts',
+        spec: '../../../src/platforms/android/old.ts',
         line: 1,
         target: 'src/platforms/android/old.ts',
       },
       {
         kind: 'type-only import',
-        spec: '../platforms/android/types.ts',
+        spec: '../../../src/platforms/android/types.ts',
         line: 2,
         target: 'src/platforms/android/types.ts',
       },
       {
         kind: 'dynamic import',
-        spec: '../platforms/android/lazy.ts',
+        spec: '../../../src/platforms/android/lazy.ts',
         line: 3,
         target: 'src/platforms/android/lazy.ts',
       },
       {
         kind: 'type import',
-        spec: '../platforms/android/type.ts',
+        spec: '../../../src/platforms/android/type.ts',
         line: 4,
         target: 'src/platforms/android/type.ts',
       },
       {
         kind: 're-export',
-        spec: '../platforms/android/re-export.ts',
+        spec: '../../../src/platforms/android/re-export.ts',
         line: 5,
         target: 'src/platforms/android/re-export.ts',
       },
@@ -87,22 +87,24 @@ test('R65 rejects static, type-only, dynamic, type, and re-export dependencies w
 
 test('R65 recognizes side-effect and aliased imports, including nested daemon paths', () => {
   const source = [
-    "import '../../platforms/web/runtime.ts';",
+    "import '../../../../../src/platforms/web/runtime.ts';",
     "import { runtime as platformRuntime } from '@agent-device/platform-web/runtime';",
   ].join('\n');
 
   assert.deepEqual(
-    dependencies(source, 'src/daemon/handlers/terminal-boundary-fixture.ts').map((found) => ({
-      kind: found.kind,
-      line: found.line,
-      spec: found.spec,
-      target: found.target,
-    })),
+    dependencies(source, 'packages/daemon/src/sessions/handlers/terminal-boundary-fixture.ts').map(
+      (found) => ({
+        kind: found.kind,
+        line: found.line,
+        spec: found.spec,
+        target: found.target,
+      }),
+    ),
     [
       {
         kind: 'static import',
         line: 1,
-        spec: '../../platforms/web/runtime.ts',
+        spec: '../../../../../src/platforms/web/runtime.ts',
         target: 'src/platforms/web/runtime.ts',
       },
       {
@@ -117,12 +119,12 @@ test('R65 recognizes side-effect and aliased imports, including nested daemon pa
 
 test('R65 ignores comments, ordinary strings, unresolved dynamic imports, and lookalike names', () => {
   const source = [
-    'const documentation = "import(\'../platforms/android/comment.ts\'); @agent-device/platform-android";',
-    "// import { ignored } from '../platforms/android/comment.ts';",
+    'const documentation = "import(\'../../../src/platforms/android/comment.ts\'); @agent-device/platform-android";',
+    "// import { ignored } from '../../../src/platforms/android/comment.ts';",
     "const packageName = '@agent-device/platform-android';",
-    "const relativeName = '../platforms/android/not-an-import.ts';",
+    "const relativeName = '../../../src/platforms/android/not-an-import.ts';",
     'const computed = import(platformSpecifier);',
-    "import '../platforms-sibling/not-platform.ts';",
+    "import '../../../src/platforms-sibling/not-platform.ts';",
     "import '@agent-device/platforms';",
     "import '@agent-device/platform';",
   ].join('\n');
@@ -133,20 +135,20 @@ test('R65 ignores comments, ordinary strings, unresolved dynamic imports, and lo
 test('R65 rejects require, import-equals, and template-literal type imports', () => {
   const source = [
     "const android = require('@agent-device/platform-android');",
-    'const runtime = require(`../platforms/android/runtime.ts`);',
+    'const runtime = require(`../../../src/platforms/android/runtime.ts`);',
     "import web = require('@agent-device/platform-web');",
     'type Apple = import(`@agent-device/platform-apple`).Apple;',
-    'type Android = import(`../platforms/android/types.ts`).Android;',
+    'type Android = import(`../../../src/platforms/android/types.ts`).Android;',
   ].join('\n');
 
   assert.deepEqual(
     dependencies(source).map(({ kind, spec, line }) => ({ kind, spec, line })),
     [
       { kind: 'require', spec: '@agent-device/platform-android', line: 1 },
-      { kind: 'require', spec: '../platforms/android/runtime.ts', line: 2 },
+      { kind: 'require', spec: '../../../src/platforms/android/runtime.ts', line: 2 },
       { kind: 'import equals', spec: '@agent-device/platform-web', line: 3 },
       { kind: 'type import', spec: '@agent-device/platform-apple', line: 4 },
-      { kind: 'type import', spec: '../platforms/android/types.ts', line: 5 },
+      { kind: 'type import', spec: '../../../src/platforms/android/types.ts', line: 5 },
     ],
   );
 });
@@ -154,7 +156,7 @@ test('R65 rejects require, import-equals, and template-literal type imports', ()
 test('R65 folds statically constructed dynamic platform specifiers', () => {
   const source = [
     "const apple = import('@agent-device/' + 'platform-apple');",
-    'const android = import(`../platforms/${"android"}/runtime.ts`);',
+    'const android = import(`../../../src/platforms/${"android"}/runtime.ts`);',
     "const wrapped = import((('@agent-device/' + 'platform-android')));",
     'const required = require((`@agent-device/platform-web`));',
   ].join('\n');
@@ -163,7 +165,7 @@ test('R65 folds statically constructed dynamic platform specifiers', () => {
     dependencies(source).map(({ kind, spec, line }) => ({ kind, spec, line })),
     [
       { kind: 'dynamic import', spec: '@agent-device/platform-apple', line: 1 },
-      { kind: 'dynamic import', spec: '../platforms/android/runtime.ts', line: 2 },
+      { kind: 'dynamic import', spec: '../../../src/platforms/android/runtime.ts', line: 2 },
       { kind: 'dynamic import', spec: '@agent-device/platform-android', line: 3 },
       { kind: 'require', spec: '@agent-device/platform-web', line: 4 },
     ],
@@ -174,7 +176,7 @@ test('R65 unwraps erased TypeScript expressions around executable specifiers', (
   const source = [
     "void import('@agent-device/platform-android' as string);",
     "require('@agent-device/platform-web' satisfies string);",
-    "void import(<string>'../platforms/apple/runtime.ts');",
+    "void import(<string>'../../../src/platforms/apple/runtime.ts');",
   ].join('\n');
 
   assert.deepEqual(
@@ -182,7 +184,7 @@ test('R65 unwraps erased TypeScript expressions around executable specifiers', (
     [
       { kind: 'dynamic import', spec: '@agent-device/platform-android', line: 1 },
       { kind: 'require', spec: '@agent-device/platform-web', line: 2 },
-      { kind: 'dynamic import', spec: '../platforms/apple/runtime.ts', line: 3 },
+      { kind: 'dynamic import', spec: '../../../src/platforms/apple/runtime.ts', line: 3 },
     ],
   );
 });
@@ -195,7 +197,7 @@ test('R65 follows common createRequire and require aliases', () => {
     'const load = makeRequire(import.meta.url);',
     'const loadAgain = load;',
     "loadAgain('@agent-device/platform-android');",
-    "makeRequire(import.meta.url)('../platforms/web/runtime.ts');",
+    "makeRequire(import.meta.url)('../../../src/platforms/web/runtime.ts');",
     "moduleApi.createRequire(import.meta.url)('@agent-device/platform-apple');",
     "moduleDefault.createRequire(import.meta.url)('@agent-device/platform-web');",
     'const loadAlias = require;',
@@ -209,7 +211,7 @@ test('R65 follows common createRequire and require aliases', () => {
     dependencies(source).map(({ spec, line }) => ({ spec, line })),
     [
       { spec: '@agent-device/platform-android', line: 6 },
-      { spec: '../platforms/web/runtime.ts', line: 7 },
+      { spec: '../../../src/platforms/web/runtime.ts', line: 7 },
       { spec: '@agent-device/platform-apple', line: 8 },
       { spec: '@agent-device/platform-web', line: 9 },
       { spec: '@agent-device/platform-linux', line: 11 },
@@ -222,7 +224,7 @@ test('R65 follows common createRequire and require aliases', () => {
 test('R65 rejects triple-slash concrete-platform type references', () => {
   const source = [
     '/// <reference types="@agent-device/platform-android" />',
-    '/// <reference path = "../platforms/apple/types.ts" />',
+    '/// <reference path = "../../../src/platforms/apple/types.ts" />',
     '/*',
     '/// <reference types="@agent-device/platform-web" />',
     '*/',
@@ -232,7 +234,7 @@ test('R65 rejects triple-slash concrete-platform type references', () => {
     dependencies(source).map(({ kind, spec, line }) => ({ kind, spec, line })),
     [
       { kind: 'type import', spec: '@agent-device/platform-android', line: 1 },
-      { kind: 'type import', spec: '../platforms/apple/types.ts', line: 2 },
+      { kind: 'type import', spec: '../../../src/platforms/apple/types.ts', line: 2 },
     ],
   );
 });
@@ -240,50 +242,56 @@ test('R65 rejects triple-slash concrete-platform type references', () => {
 test('R65 rejects platform selection inside cleanup orchestrators', () => {
   const direct = violations(
     "export const cleanup = (session: any) => session.device.platform === 'android';",
-    'src/daemon/session-teardown.ts',
+    'packages/daemon/src/sessions/session-teardown.ts',
   );
   assert.match(direct[0]?.message ?? '', /may not select a concrete platform/);
 
   const predicate = violations(
     'export const cleanup = (device: any) => isIosFamily(device);',
-    'src/daemon/snapshot-session.ts',
+    'packages/daemon/src/core/snapshot-session.ts',
   );
   assert.match(predicate[0]?.message ?? '', /typed root-composed cleanup capability/);
 
   const destructured = violations(
     "export const cleanup = (session: any) => { const { platform } = session.device; return platform === 'android'; };",
-    'src/daemon/session-lifecycle/internal/session-close-lifecycle-teardown.ts',
+    'packages/daemon/src/sessions/session-lifecycle/internal/session-close-lifecycle-teardown.ts',
   );
   assert.match(destructured[0]?.message ?? '', /may not select a concrete platform/);
 
   assert.deepEqual(
     violations(
       'export const cleanup = (owner: any, device: any) => owner.cleanupSessionlessExecutionHost(device);',
-      'src/daemon/snapshot-session.ts',
+      'packages/daemon/src/core/snapshot-session.ts',
     ),
     [],
   );
 });
 
 test('R65 ignores non-daemon and test-shaped records even when their syntax is red', () => {
-  const source = "import { platform } from '../platforms/android/runtime.ts';";
+  const source = "import { platform } from '../../../src/platforms/android/runtime.ts';";
   assert.deepEqual(dependencies(source, 'src/core/terminal-boundary-fixture.ts'), []);
-  assert.deepEqual(dependencies(source, 'src/daemon/terminal-boundary-fixture.test.ts'), []);
-  assert.deepEqual(dependencies(source, 'src/daemon/__tests__/terminal-boundary-fixture.ts'), []);
+  assert.deepEqual(
+    dependencies(source, 'packages/daemon/src/terminal-boundary-fixture.test.ts'),
+    [],
+  );
+  assert.deepEqual(
+    dependencies(source, 'packages/daemon/src/__tests__/terminal-boundary-fixture.ts'),
+    [],
+  );
 });
 
 test('R65 treats a relative specifier as legacy platform code only after path resolution', () => {
   const source = [
-    "import { platform } from '../../platforms/android/runtime.ts';",
-    "import { sibling } from '../platforms-sibling/runtime.ts';",
-    "import { exact } from '../platforms';",
+    "import { platform } from '../../../../src/platforms/android/runtime.ts';",
+    "import { sibling } from '../../../src/platforms-sibling/runtime.ts';",
+    "import { exact } from '../../../src/platforms';",
   ].join('\n');
 
   assert.deepEqual(
     dependencies(source).map(({ spec, target, line }) => ({ spec, target, line })),
     [
       {
-        spec: '../platforms',
+        spec: '../../../src/platforms',
         target: 'src/platforms',
         line: 3,
       },
diff --git a/scripts/layering/daemon-platform-boundary.ts b/scripts/layering/daemon-platform-boundary.ts
index 4220fda7c8..89e0eb2898 100644
--- a/scripts/layering/daemon-platform-boundary.ts
+++ b/scripts/layering/daemon-platform-boundary.ts
@@ -1,6 +1,6 @@
 import path from 'node:path';
 import { parseSync } from 'oxc-parser';
-import { isProductionSourceFile } from './tracked-sources.ts';
+import { DAEMON_SOURCE_ROOT, isProductionSourceFile } from './tracked-sources.ts';
 import type { LayeringViolation } from './model.ts';
 
 /**
@@ -330,12 +330,12 @@ function tripleSlashDependencies(file: string, source: string): DaemonPlatformDe
 function dependencyMessage(dependency: DaemonPlatformDependency): string {
   return (
     `${dependency.kind} '${dependency.spec}' resolves to concrete platform code ` +
-    `(${dependency.target}); production src/daemon/ must use the request-bound runtime contract`
+    `(${dependency.target}); production packages/daemon/src/ must use the request-bound runtime contract`
   );
 }
 
 /**
- * Find every concrete platform dependency in tracked production `src/daemon/**` sources.
+ * Find every concrete platform dependency in tracked production `packages/daemon/src/**` sources.
  *
  * The input is intentionally source records rather than a filesystem walk. Callers use the
  * canonical tracked-production enumerator, while synthetic tests can plant one edge at a time
@@ -345,7 +345,7 @@ export function findDaemonPlatformDependencies(
   sources: readonly ProductionSource[],
 ): DaemonPlatformDependency[] {
   return sources
-    .filter(({ path: file }) => file.startsWith('src/daemon/') && isProductionSourceFile(file))
+    .filter(({ path: file }) => file.startsWith(DAEMON_SOURCE_ROOT) && isProductionSourceFile(file))
     .flatMap(({ path: file, source }) => [
       ...staticDependencies(file, source),
       ...dynamicDependencies(file, source),
@@ -373,9 +373,9 @@ export function daemonPlatformBoundaryViolations(
 }
 
 const CLEANUP_ORCHESTRATORS = new Set([
-  'src/daemon/session-teardown.ts',
-  'src/daemon/session-lifecycle/internal/session-close-lifecycle-teardown.ts',
-  'src/daemon/snapshot-session.ts',
+  'packages/daemon/src/sessions/session-teardown.ts',
+  'packages/daemon/src/sessions/session-lifecycle/internal/session-close-lifecycle-teardown.ts',
+  'packages/daemon/src/core/snapshot-session.ts',
 ]);
 
 function cleanupDispatchViolations(sources: readonly ProductionSource[]): LayeringViolation[] {
diff --git a/scripts/layering/daemon-platform-runtime-inventory.test.ts b/scripts/layering/daemon-platform-runtime-inventory.test.ts
index b0c04338dd..a79e3b65ba 100644
--- a/scripts/layering/daemon-platform-runtime-inventory.test.ts
+++ b/scripts/layering/daemon-platform-runtime-inventory.test.ts
@@ -11,7 +11,7 @@ import {
 // inventory carried, retired by #3430. Under the ban it is a violation like any other.
 const RETIRED_TARGET = 'src/platform-runtime-apple-resources.ts';
 const RETIRED_STUB = 'export const queryAppleRuntimeSelector = () => ({});\n';
-const RETIRED_IMPORTER = 'src/daemon/direct-ios-selector.ts';
+const RETIRED_IMPORTER = 'packages/daemon/src/core/direct-ios-selector.ts';
 
 function violations(sources: Record<string, string>): LayeringViolation[] {
   return checkDaemonPlatformRuntimeInventory(resolveImportEdges(new Map(Object.entries(sources))));
@@ -25,7 +25,7 @@ test('R76 rejects the direct-iOS selector edge the retired inventory classified'
   const sources = {
     [RETIRED_TARGET]: RETIRED_STUB,
     [RETIRED_IMPORTER]:
-      "import { queryAppleRuntimeSelector } from '../platform-runtime-apple-resources.ts';\n" +
+      "import { queryAppleRuntimeSelector } from '../../../../src/platform-runtime-apple-resources.ts';\n" +
       'void queryAppleRuntimeSelector;\n',
   };
   const found = edgeViolations(sources, RETIRED_IMPORTER);
@@ -34,7 +34,7 @@ test('R76 rejects the direct-iOS selector edge the retired inventory classified'
   assert.match(found[0]!.message, /daemon coupling to root platform mechanics is banned/);
   assert.match(
     found[0]!.message,
-    /src\/daemon\/direct-ios-selector\.ts -> src\/platform-runtime-apple-resources\.ts/,
+    /packages\/daemon\/src\/core\/direct-ios-selector\.ts -> src\/platform-runtime-apple-resources\.ts/,
   );
 });
 
@@ -44,10 +44,10 @@ for (const [file, target, symbol] of [
   ['ios-app-session-hint', 'open-target', 'resolveSoleForegroundIosApp'],
 ]) {
   test(`R76 rejects retired observation mechanics in ${file}`, () => {
-    const importer = `src/daemon/${file}.ts`;
+    const importer = `packages/daemon/src/${file}.ts`;
     const sources = {
       [`src/platform-runtime-${target}.ts`]: `export function ${symbol}() {}\n`,
-      [importer]: `import { ${symbol} } from '../platform-runtime-${target}.ts';\nvoid ${symbol};\n`,
+      [importer]: `import { ${symbol} } from '../../../src/platform-runtime-${target}.ts';\nvoid ${symbol};\n`,
     };
     const found = edgeViolations(sources, importer);
     assert.equal(found.length, 1);
@@ -59,18 +59,18 @@ for (const [file, target, symbol] of [
 test('R76 rejects an edge with the pair and its line', () => {
   const sources = {
     'src/platform-runtime-android-tool-host.ts': 'export function createAndroidToolHost() {}\n',
-    'src/daemon/fixture.ts':
-      "import { createAndroidToolHost } from '../platform-runtime-android-tool-host.ts';\n" +
+    'packages/daemon/src/fixture.ts':
+      "import { createAndroidToolHost } from '../../../src/platform-runtime-android-tool-host.ts';\n" +
       'void createAndroidToolHost;\n',
   };
-  const found = edgeViolations(sources, 'src/daemon/fixture.ts');
+  const found = edgeViolations(sources, 'packages/daemon/src/fixture.ts');
   assert.equal(found.length, 1);
   assert.equal(found[0]!.rule, DAEMON_PLATFORM_RUNTIME_RULE);
   assert.equal(found[0]!.line, 1);
   assert.match(found[0]!.message, /daemon coupling to root platform mechanics is banned/);
   assert.match(
     found[0]!.message,
-    /src\/daemon\/fixture\.ts -> src\/platform-runtime-android-tool-host\.ts/,
+    /packages\/daemon\/src\/fixture\.ts -> src\/platform-runtime-android-tool-host\.ts/,
   );
 });
 
@@ -78,8 +78,8 @@ test('R76 reports an import and re-export of one pair as a single violation', ()
   const sources = {
     [RETIRED_TARGET]: RETIRED_STUB,
     [RETIRED_IMPORTER]:
-      "import { queryAppleRuntimeSelector } from '../platform-runtime-apple-resources.ts';\n" +
-      "export { queryAppleRuntimeSelector } from '../platform-runtime-apple-resources.ts';\n" +
+      "import { queryAppleRuntimeSelector } from '../../../../src/platform-runtime-apple-resources.ts';\n" +
+      "export { queryAppleRuntimeSelector } from '../../../../src/platform-runtime-apple-resources.ts';\n" +
       'void queryAppleRuntimeSelector;\n',
   };
   assert.equal(edgeViolations(sources, RETIRED_IMPORTER).length, 1);
@@ -89,7 +89,7 @@ test('R76 rejects a destructured dynamic import of the root platform-runtime fam
   const sources = {
     [RETIRED_TARGET]: RETIRED_STUB,
     [RETIRED_IMPORTER]:
-      "const { queryAppleRuntimeSelector } = await import('../platform-runtime-apple-resources.ts');\n" +
+      "const { queryAppleRuntimeSelector } = await import('../../../../src/platform-runtime-apple-resources.ts');\n" +
       'void queryAppleRuntimeSelector;\n',
   };
   assert.equal(edgeViolations(sources, RETIRED_IMPORTER).length, 1);
@@ -99,7 +99,7 @@ test('R76 rejects a dynamic namespace import of a root platform-runtime module',
   const sources = {
     [RETIRED_TARGET]: RETIRED_STUB,
     [RETIRED_IMPORTER]:
-      "const appleResources = await import('../platform-runtime-apple-resources.ts');\n" +
+      "const appleResources = await import('../../../../src/platform-runtime-apple-resources.ts');\n" +
       'void appleResources;\n',
   };
   const found = edgeViolations(sources, RETIRED_IMPORTER);
@@ -107,15 +107,15 @@ test('R76 rejects a dynamic namespace import of a root platform-runtime module',
   assert.equal(found[0]!.rule, DAEMON_PLATFORM_RUNTIME_RULE);
   assert.match(
     found[0]!.message,
-    /src\/daemon\/direct-ios-selector\.ts -> src\/platform-runtime-apple-resources\.ts/,
+    /packages\/daemon\/src\/core\/direct-ios-selector\.ts -> src\/platform-runtime-apple-resources\.ts/,
   );
 });
 
 test('R76 ignores test-shaped and non-daemon importers', () => {
   const sources = {
     'src/platform-runtime-android-tool-host.ts': 'export function createAndroidToolHost() {}\n',
-    'src/daemon/__tests__/fixture.test.ts':
-      "import { createAndroidToolHost } from '../platform-runtime-android-tool-host.ts';\n" +
+    'packages/daemon/src/__tests__/fixture.test.ts':
+      "import { createAndroidToolHost } from '../../../src/platform-runtime-android-tool-host.ts';\n" +
       'void createAndroidToolHost;\n',
     'src/cli.ts':
       "import { createAndroidToolHost } from './platform-runtime-android-tool-host.ts';\n" +
@@ -127,9 +127,10 @@ test('R76 ignores test-shaped and non-daemon importers', () => {
 test('R76 ignores retired-zone targets, which R65 owns', () => {
   const sources = {
     'src/platforms/android.ts': 'export const legacy = 1;\n',
-    'src/daemon/fixture.ts': 'import { legacy } from "../platforms/android.ts";\nvoid legacy;\n',
+    'packages/daemon/src/fixture.ts':
+      'import { legacy } from "../../../src/platforms/android.ts";\nvoid legacy;\n',
   };
-  assert.deepEqual(edgeViolations(sources, 'src/daemon/fixture.ts'), []);
+  assert.deepEqual(edgeViolations(sources, 'packages/daemon/src/fixture.ts'), []);
 });
 
 test('the root composition family is src/platform-runtime.ts plus src/platform-runtime-*.ts only', () => {
@@ -139,7 +140,7 @@ test('the root composition family is src/platform-runtime.ts plus src/platform-r
   assert.equal(isRootPlatformRuntimeTarget('src/platform-runtime-android.tsx'), false);
   assert.equal(isRootPlatformRuntimeTarget('src/platform-runtime.ts.bak'), false);
   assert.equal(isRootPlatformRuntimeTarget('src/platforms/runtime.ts'), false);
-  assert.equal(isRootPlatformRuntimeTarget('src/daemon/platform-runtime.ts'), false);
+  assert.equal(isRootPlatformRuntimeTarget('packages/daemon/src/platform-runtime.ts'), false);
 });
 
 const ROOT_PLATFORM_STUB = 'export const gateway = 1;\nvoid gateway;\n';
@@ -149,24 +150,26 @@ test('R76 catches a daemon import of a root hub that reaches the platform family
     'src/hub-runtime.ts':
       "import { gateway } from './platform-runtime.ts';\nvoid gateway;\n" +
       'export function hubFact() {}\n',
-    'src/daemon/fixture.ts': "import { hubFact } from '../hub-runtime.ts';\nvoid hubFact;\n",
+    'packages/daemon/src/fixture.ts':
+      "import { hubFact } from '../../../src/hub-runtime.ts';\nvoid hubFact;\n",
   };
-  const found = edgeViolations(sources, 'src/daemon/fixture.ts');
+  const found = edgeViolations(sources, 'packages/daemon/src/fixture.ts');
   assert.equal(found.length, 1);
   assert.equal(found[0]!.rule, DAEMON_PLATFORM_RUNTIME_RULE);
-  assert.match(found[0]!.message, /src\/daemon\/fixture\.ts -> src\/hub-runtime\.ts/);
+  assert.match(found[0]!.message, /packages\/daemon\/src\/fixture\.ts -> src\/hub-runtime\.ts/);
 });
 
 test('R76 does not turn an intra-daemon hop into a hub edge', () => {
   const sources = {
     'src/platform-runtime.ts': ROOT_PLATFORM_STUB,
-    'src/daemon/dispatch.ts':
-      "import { gateway } from '../platform-runtime.ts';\nvoid gateway;\nexport function dispatch() {}\n",
-    'src/daemon/handler.ts': "import { dispatch } from './dispatch.ts';\nvoid dispatch;\n",
+    'packages/daemon/src/dispatch.ts':
+      "import { gateway } from '../../../src/platform-runtime.ts';\nvoid gateway;\nexport function dispatch() {}\n",
+    'packages/daemon/src/handler.ts': "import { dispatch } from './dispatch.ts';\nvoid dispatch;\n",
   };
-  assert.deepEqual(edgeViolations(sources, 'src/daemon/handler.ts'), []);
+  assert.deepEqual(edgeViolations(sources, 'packages/daemon/src/handler.ts'), []);
   assert.equal(
-    violations(sources).filter((violation) => violation.file === 'src/daemon/dispatch.ts').length,
+    violations(sources).filter((violation) => violation.file === 'packages/daemon/src/dispatch.ts')
+      .length,
     1,
   );
 });
diff --git a/scripts/layering/daemon-platform-runtime-inventory.ts b/scripts/layering/daemon-platform-runtime-inventory.ts
index 60a7e2d55e..2cba916f5e 100644
--- a/scripts/layering/daemon-platform-runtime-inventory.ts
+++ b/scripts/layering/daemon-platform-runtime-inventory.ts
@@ -1,5 +1,5 @@
 import { genDFS } from '@statelyai/graph';
-import { isProductionSourceFile } from './tracked-sources.ts';
+import { DAEMON_SOURCE_ROOT, isProductionSourceFile } from './tracked-sources.ts';
 import type { LayeringViolation, ResolvedImportEdge } from './model.ts';
 import { ALL_EDGES, importGraphFromResolvedEdges } from '../depgraph/import-graph.ts';
 
@@ -33,7 +33,7 @@ export function computePlatformMechanicsHubs(
   const hubs = new Set<string>();
   const graph = importGraphFromResolvedEdges(edges, ALL_EDGES, roots);
   for (const { id: importer } of genDFS(graph, { from: roots, direction: 'incoming' })) {
-    if (!importer.startsWith('src/daemon/')) hubs.add(importer);
+    if (!importer.startsWith(DAEMON_SOURCE_ROOT)) hubs.add(importer);
   }
   return hubs;
 }
@@ -60,7 +60,7 @@ export function checkDaemonPlatformRuntimeInventory(
   const violations: LayeringViolation[] = [];
   const reported = new Set<string>();
   for (const edge of edges) {
-    if (!edge.file.startsWith('src/daemon/')) continue;
+    if (!edge.file.startsWith(DAEMON_SOURCE_ROOT)) continue;
     if (!isProductionSourceFile(edge.file)) continue;
     if (!hubs.has(edge.target)) continue;
     const key = `${edge.file} -> ${edge.target}`;
diff --git a/scripts/layering/model.test.ts b/scripts/layering/model.test.ts
index d27f4e6542..1ccdf44885 100644
--- a/scripts/layering/model.test.ts
+++ b/scripts/layering/model.test.ts
@@ -182,37 +182,37 @@ const RECORDED_IMPORT_TYPE_CASES = [
     'RunnerStartAdmission',
   ],
   [
-    'src/daemon/interaction/index.ts',
-    'src/daemon/gesture-runtime.ts',
-    '../gesture-runtime.ts',
+    'packages/daemon/src/execution/interaction/index.ts',
+    'packages/daemon/src/core/gesture-runtime.ts',
+    '../../core/gesture-runtime.ts',
     'BoundGestureExecutor',
   ],
   [
-    'src/daemon/interaction/index.ts',
-    'src/daemon/touch-runtime.ts',
-    '../touch-runtime.ts',
+    'packages/daemon/src/execution/interaction/index.ts',
+    'packages/daemon/src/core/touch-runtime.ts',
+    '../../core/touch-runtime.ts',
     'BoundTouchExecutor',
   ],
   [
-    'src/daemon/interaction/internal/interaction.ts',
+    'packages/daemon/src/execution/interaction/internal/interaction.ts',
     'packages/contracts/src/android-observation.ts',
     '@agent-device/contracts/android-observation',
     'AndroidObservationAdapter',
   ],
   [
-    'src/daemon/snapshot-runtime-binding.ts',
+    'packages/daemon/src/core/snapshot-runtime-binding.ts',
     'packages/contracts/src/focus-runtime.ts',
     '@agent-device/contracts/focus-runtime',
     'FocusPointInput',
   ],
   [
-    'src/daemon/snapshot-runtime-binding.ts',
+    'packages/daemon/src/core/snapshot-runtime-binding.ts',
     'packages/contracts/src/interactor-types.ts',
     '@agent-device/contracts/interactor-types',
     'TypeTextBackendResult',
   ],
   [
-    'src/daemon/snapshot-runtime-binding.ts',
+    'packages/daemon/src/core/snapshot-runtime-binding.ts',
     'packages/contracts/src/type-text-runtime.ts',
     '@agent-device/contracts/type-text-runtime',
     'TypeTextInput',
@@ -574,27 +574,39 @@ test('SessionState field names come from the declaration, not a hand-kept list',
 test('session-state writes are found by field, and non-daemon or undeclared names are not', () => {
   const writes = findSessionStateWrites(
     new Map([
-      ['src/daemon/ref-frame.ts', "session.refFrame = 'active';"],
-      ['src/daemon/session-snapshot.ts', 'session.snapshotGeneration += 1;'],
+      ['packages/daemon/src/core/ref-frame.ts', "session.refFrame = 'active';"],
+      ['packages/daemon/src/execution/session-snapshot.ts', 'session.snapshotGeneration += 1;'],
       // the store owns the record and may write anything on it
-      ['src/daemon/session-store.ts', "session.refFrame = 'expired';"],
+      ['packages/daemon/src/core/session-store.ts', "session.refFrame = 'expired';"],
       // a runner session outside the daemon is a different type that happens to share a name
       ['src/platforms/apple/runner-session.ts', 'session.refFrame = 1;'],
       // a local that is not a declared SessionState field
-      ['src/daemon/session-observability/internal/session-audio.ts', 'session.somethingElse = 1;'],
+      [
+        'packages/daemon/src/sessions/session-observability/internal/session-audio.ts',
+        'session.somethingElse = 1;',
+      ],
       // reads and comparisons are not writes
-      ['src/daemon/interaction/internal/find.ts', "if (session.refFrame === 'active') return;"],
+      [
+        'packages/daemon/src/execution/interaction/internal/find.ts',
+        "if (session.refFrame === 'active') return;",
+      ],
       // a write into a sub-object is not a write to the field itself
-      ['src/daemon/handlers/session-probe.ts', 'session.refFrame.inner = 1;'],
+      ['packages/daemon/src/sessions/handlers/session-probe.ts', 'session.refFrame.inner = 1;'],
       // a different binding that happens to have a matching property
-      ['src/daemon/session-lifecycle/internal/session-close.ts', "other.refFrame = 'expired';"],
+      [
+        'packages/daemon/src/sessions/session-lifecycle/internal/session-close.ts',
+        "other.refFrame = 'expired';",
+      ],
     ]),
     ['refFrame', 'snapshotGeneration'],
   );
 
   assert.deepEqual(
     writes.map(({ file, field }) => `${file}:${field}`),
-    ['src/daemon/ref-frame.ts:refFrame', 'src/daemon/session-snapshot.ts:snapshotGeneration'],
+    [
+      'packages/daemon/src/core/ref-frame.ts:refFrame',
+      'packages/daemon/src/execution/session-snapshot.ts:snapshotGeneration',
+    ],
   );
 });
 
@@ -613,7 +625,9 @@ test('every assignment form is a write, including the ones a regex forgets', ()
     'session\n  .refFrame = 1;',
   ];
   for (const form of forms) {
-    const writes = findSessionStateWrites(new Map([['src/daemon/probe.ts', form]]), ['refFrame']);
+    const writes = findSessionStateWrites(new Map([['packages/daemon/src/probe.ts', form]]), [
+      'refFrame',
+    ]);
     assert.deepEqual(
       writes.map(({ field }) => field),
       ['refFrame'],
@@ -624,7 +638,7 @@ test('every assignment form is a write, including the ones a regex forgets', ()
 
 test('a computed session write is reported rather than silently unattributed', () => {
   const writes = findSessionStateWrites(
-    new Map([['src/daemon/probe.ts', 'session[key] = 1;\nsession[`refFrame`] = 2;']]),
+    new Map([['packages/daemon/src/probe.ts', 'session[key] = 1;\nsession[`refFrame`] = 2;']]),
     ['refFrame'],
   );
   // `[computed]` has no entry in SESSION_STATE_FIELD_OWNERS, so R7 fails on it by
@@ -636,13 +650,13 @@ test('a computed session write is reported rather than silently unattributed', (
   assert.equal(SESSION_STATE_FIELD_OWNERS['[computed]'], undefined);
 });
 
-test('every declared session-state owner is a real file path under src/daemon', () => {
+test('every declared session-state owner is a real file path under packages/daemon', () => {
   for (const [field, owners] of Object.entries(SESSION_STATE_FIELD_OWNERS)) {
     assert.ok(owners.length > 0, `${field} must name at least one owner`);
     for (const owner of owners) {
       assert.match(
         owner,
-        /^src\/daemon\/.+\.ts$/,
+        /^packages\/daemon\/src\/.+\.ts$/,
         `${field} owner ${owner} must be a daemon module`,
       );
     }
@@ -658,7 +672,7 @@ test('a session write counts through an aliased binding, not only one named `ses
   const writes = findSessionStateWrites(
     new Map([
       [
-        'src/daemon/probe.ts',
+        'packages/daemon/src/probe.ts',
         [
           'nextSession.snapshotGeneration = 3;',
           'preEntrySession.refFrame = "active";',
@@ -682,7 +696,10 @@ test('every SessionState field is classified exactly once', () => {
   // R7 by being invisible to the scan, and the rule would silently stop covering part of the
   // type it claims to cover.
   const fields = sessionStateFields(
-    readFileSync(path.resolve(import.meta.dirname, '../../src/daemon/session-state.ts'), 'utf8'),
+    readFileSync(
+      path.resolve(import.meta.dirname, '../../packages/daemon/src/core/session-state.ts'),
+      'utf8',
+    ),
   );
   assert.deepEqual(fieldClassificationDrift(fields), []);
   assert.equal(
@@ -693,7 +710,10 @@ test('every SessionState field is classified exactly once', () => {
 
 test('classification drift is reported in all three directions', () => {
   const declared = sessionStateFields(
-    readFileSync(path.resolve(import.meta.dirname, '../../src/daemon/session-state.ts'), 'utf8'),
+    readFileSync(
+      path.resolve(import.meta.dirname, '../../packages/daemon/src/core/session-state.ts'),
+      'utf8',
+    ),
   );
 
   // Unclassified: a field added to SessionState and to neither table. This is the case the
diff --git a/scripts/layering/model.ts b/scripts/layering/model.ts
index 7208703bc5..61962c80e4 100644
--- a/scripts/layering/model.ts
+++ b/scripts/layering/model.ts
@@ -1,4 +1,5 @@
 import path from 'node:path';
+import { DAEMON_SOURCE_ROOT } from './tracked-sources.ts';
 import { PLATFORMS } from '@agent-device/kernel/device';
 import { createGraph, genDFS, getStronglyConnectedComponents, getSubgraph } from '@statelyai/graph';
 import { parseSync } from 'oxc-parser';
@@ -306,8 +307,8 @@ export function topFolder(file: string): string {
 
 export function targetDagZone(file: string): string {
   // #2342 relocated the daemon client to its own `src/daemon-client/` folder, so the
-  // client zone now falls out of the folder itself; `src/daemon/` is server-only.
-  if (file.startsWith('src/daemon/')) return 'daemon-server';
+  // client zone now falls out of the folder itself; `packages/daemon/src/` is server-only.
+  if (file.startsWith(DAEMON_SOURCE_ROOT)) return 'daemon-server';
   return declaredRootModuleZone(file) ?? topFolder(file);
 }
 
@@ -330,6 +331,39 @@ export function unclassifiedZones(files: readonly string[]): string[] {
 // a sibling file — unresolved and invisible to the value-cycle and reverse-reachability graphs).
 const PACKAGE_SRC_PREFIX = /^packages\/[^/]+\/src\//;
 
+/**
+ * Resolve a workspace specifier against an exports-derived targets map, mirroring
+ * Node's exports semantics: exact keys first, then `*` pattern entries with the
+ * longest matching prefix winning and the matched suffix filling the target's
+ * `*`. The map keeps a pattern entry as its literal key
+ * (`@agent-device/daemon/testing/handlers/__tests__/*`), so a plain `get` misses
+ * every concrete import of it — which is how the layering edges, the depgraph,
+ * mutation ownership, and R11's named-surface check each started resolving
+ * pattern-exported specifiers to nothing (#3546 review). This is the single
+ * semantics every in-repo consumer applies: `resolveTargetFile`, `namedByExports`,
+ * and — by ordering its Vite first-match list to this rule — `workspaceSourceAliases`.
+ */
+export function resolveWorkspaceSpecifier(
+  specifier: string,
+  targets: ReadonlyMap<string, string>,
+): string | undefined {
+  const exact = targets.get(specifier);
+  if (exact !== undefined) return exact;
+  let best: { prefix: string; target: string } | undefined;
+  for (const [key, target] of targets) {
+    if (!key.endsWith('*') || !target.includes('*')) continue;
+    const prefix = key.slice(0, -1);
+    if (!specifier.startsWith(prefix)) continue;
+    if (best && best.prefix.length >= prefix.length) continue;
+    best = { prefix, target };
+  }
+  if (!best) return undefined;
+  const star = best.target.indexOf('*');
+  return (
+    best.target.slice(0, star) + specifier.slice(best.prefix.length) + best.target.slice(star + 1)
+  );
+}
+
 function resolveTargetFile(
   fromFile: string,
   spec: string,
@@ -339,11 +373,12 @@ function resolveTargetFile(
   if (spec.startsWith('@agent-device/')) {
     // Workspace specifier (#1490 W0). Real runs pass the exports-derived map
     // (workspaceSpecifierTargets), which is authoritative — it handles '.'
-    // facade exports and any source layout. The positional fallback exists
-    // only for map-less fixtures (the P0-pinned depgraph contract) and cannot
-    // resolve a bare facade specifier by construction.
+    // facade exports, `*` pattern entries, and any source layout. The
+    // positional fallback exists only for map-less fixtures (the P0-pinned
+    // depgraph contract) and cannot resolve a bare facade specifier by
+    // construction.
     if (workspaceExportTargets) {
-      const target = workspaceExportTargets.get(spec);
+      const target = resolveWorkspaceSpecifier(spec, workspaceExportTargets);
       return target !== undefined && sourceFiles.has(target) ? target : null;
     }
     const [name, ...subParts] = spec.slice('@agent-device/'.length).split('/');
diff --git a/scripts/layering/package-boundaries-facade.test.ts b/scripts/layering/package-boundaries-facade.test.ts
new file mode 100644
index 0000000000..b14c1c3232
--- /dev/null
+++ b/scripts/layering/package-boundaries-facade.test.ts
@@ -0,0 +1,197 @@
+// R11's ./testing/ façade rule bites: test data stays behind the package's
+// `./testing/` namespace — named `./testing/<fixture>` entries and per-folder
+// `./testing/<dir>/*` patterns — that only test files may import (owner review
+// #3546). Compact sibling of package-boundaries.test.ts, which sits at its size
+// ratchet.
+
+import assert from 'node:assert/strict';
+import { test } from 'node:test';
+import {
+  checkPackageInternalSites,
+  checkRootSites,
+  isTestConsumerFile,
+  specifierSites,
+  workspacePackagesFromManifests,
+} from './package-boundaries.ts';
+
+const daemonManifest = JSON.stringify({
+  name: '@agent-device/daemon',
+  private: true,
+  exports: {
+    './session-store': { types: './src/session-store.ts', default: './src/session-store.ts' },
+    './testing/__tests__/store-factory': {
+      types: './src/__tests__/store-factory.ts',
+      default: './src/__tests__/store-factory.ts',
+    },
+    './testing/handlers/__tests__/*': {
+      types: './src/handlers/__tests__/*.ts',
+      default: './src/handlers/__tests__/*.ts',
+    },
+  },
+});
+const [daemon] = workspacePackagesFromManifests(
+  new Map([['packages/daemon/package.json', daemonManifest]]),
+);
+
+function sites(file: string, specifier: string) {
+  return [{ file, line: 1, specifier }];
+}
+const PROD = new Set(['@agent-device/daemon']);
+
+test('a production root file importing the ./testing/ namespace is refused', () => {
+  const violations = checkRootSites(
+    sites('src/commands/something.ts', '@agent-device/daemon/testing/__tests__/store-factory'),
+    [daemon],
+    PROD,
+    true,
+  );
+  assert.equal(violations.length, 1);
+  assert.match(violations[0]!.message, /publishes test data to test files only/);
+});
+
+test('a test root file importing ./testing/ passes, and a named entry stays open to all', () => {
+  assert.deepEqual(
+    checkRootSites(
+      sites(
+        'src/__tests__/daemon-composition/anything.test.ts',
+        '@agent-device/daemon/testing/__tests__/store-factory',
+      ),
+      [daemon],
+      PROD,
+      true,
+    ),
+    [],
+  );
+  // The exact spelling the fixture manifest names. A compiled site skips
+  // resolution, so `[]` there would pass even for a specifier no entry exports;
+  // the uncompiled pass reports "not named" for exactly that, so asserting []
+  // in both modes is what proves this specifier resolves through the named entry.
+  for (const compiled of [true, false]) {
+    assert.deepEqual(
+      checkRootSites(
+        sites('src/cli.ts', '@agent-device/daemon/session-store'),
+        [daemon],
+        PROD,
+        compiled,
+      ),
+      [],
+    );
+  }
+});
+
+test('the ./testing/ refusal bites inside packages and through the vi.mock scan', () => {
+  const planted = "vi.mock('@agent-device/daemon/testing/__tests__/store-factory', () => ({}));";
+  assert.deepEqual(
+    checkPackageInternalSites(
+      daemon,
+      sites(
+        'packages/daemon/src/sessions/handlers/production.ts',
+        '@agent-device/daemon/testing/__tests__/store-factory',
+      ),
+      [daemon],
+      true,
+    ).length,
+    1,
+  );
+  assert.equal(
+    checkRootSites(
+      specifierSites('src/platform-runtime-something.ts', planted),
+      [daemon],
+      PROD,
+      true,
+    ).length,
+    1,
+  );
+});
+
+test('a package-local test/ tree is a test consumer, its src/ tree is not', () => {
+  // The file vocabulary TEST_ONLY_FIXTURE_SUBPATHS' predicate uses: a package's
+  // own harness tree (`packages/<pkg>/test/`) imports fixtures just like the
+  // root `test/` tree does; the same file under src/ does not (#3546 review).
+  const consumer = workspacePackagesFromManifests(
+    new Map([
+      [
+        'packages/daemon-side/package.json',
+        JSON.stringify({
+          name: '@agent-device/daemon-side',
+          private: true,
+          exports: { '.': './src/index.ts' },
+          dependencies: { '@agent-device/daemon': 'workspace:*' },
+        }),
+      ],
+    ]),
+  )[0]!;
+  const fixture = '@agent-device/daemon/testing/__tests__/store-factory';
+  assert.deepEqual(
+    checkPackageInternalSites(
+      consumer,
+      sites('packages/daemon-side/test/harness.ts', fixture),
+      [daemon, consumer],
+      true,
+    ),
+    [],
+  );
+  const denied = checkPackageInternalSites(
+    consumer,
+    sites('packages/daemon-side/src/harness.ts', fixture),
+    [daemon, consumer],
+    true,
+  );
+  assert.equal(denied.length, 1);
+  assert.match(denied[0]!.message, /publishes test data to test files only/);
+});
+
+test('isTestConsumerFile accepts the test vocabulary and denies production files', () => {
+  // One spelling serves both test-data gates (the ./testing/ façade check and the
+  // TEST_ONLY_FIXTURE_SUBPATHS predicate), so the vocabulary itself is pinned here:
+  // every accepted shape forwards to both gates, and the shapes that once spelled
+  // differently across the two copies (.test.tsx, .mts, a root __tests__/ tree) are
+  // in the accepted set (#3546 review).
+  for (const file of [
+    'test/integration/consumer.ts',
+    'packages/daemon-side/test/harness.ts',
+    'src/daemon/__tests__/consumer.ts',
+    '__tests__/root-consumer.ts',
+    'scripts/layering/daemon-layers.test.tsx',
+    'src/daemon/session-store.test.mts',
+    'src/foo.test.js',
+    'src/foo.test.cjs',
+  ]) {
+    assert.equal(isTestConsumerFile(file), true, file);
+  }
+  for (const file of [
+    'src/commands/inventory.ts',
+    'packages/kernel/src/errors.ts',
+    'scripts/layering/package-boundaries.ts',
+    'testbed/notes.ts',
+    'docs/writing/tests.ts',
+    'src/foo.ts',
+  ]) {
+    assert.equal(isTestConsumerFile(file), false, file);
+  }
+});
+
+test('a pattern entry matches deep specifiers, and an unnamed one is refused in scripts/', () => {
+  // uncompiled sites resolve through the pattern rather than report "not named",
+  // and a spelling no entry names still reports.
+  assert.deepEqual(
+    checkRootSites(
+      sites(
+        'src/__tests__/x/y.test.ts',
+        '@agent-device/daemon/testing/handlers/__tests__/session-test-harness',
+      ),
+      [daemon],
+      PROD,
+      false,
+    ),
+    [],
+  );
+  const unnamed = checkRootSites(
+    sites('src/__tests__/x/y.test.ts', '@agent-device/daemon/testing/support/whatever'),
+    [daemon],
+    PROD,
+    false,
+  );
+  assert.equal(unnamed.length, 1);
+  assert.match(unnamed[0]!.message, /not named by/);
+});
diff --git a/scripts/layering/package-boundaries.test.ts b/scripts/layering/package-boundaries.test.ts
index 87ff27dfe7..7eaca8f078 100644
--- a/scripts/layering/package-boundaries.test.ts
+++ b/scripts/layering/package-boundaries.test.ts
@@ -236,6 +236,42 @@ test('double-quoted and re-export routes into packages are not invisible to R11'
   assert.equal(checkPackageInternalSites(kernel, packageEscape, ALL, false).length, 1);
 });
 
+test('a package vi.mock route into root src is an R11 escape, and a sibling route needs its declaration', () => {
+  // `vi.mock('./x')` is a call expression the AST import parser never visits, yet the loader
+  // resolves its specifier and instantiates that module — the same double-instance route the
+  // tunnels above name. Planted red: delete the scan in `specifierSites` and every assertion.
+  const kernelViolations = (compiled: boolean, source: string) =>
+    checkPackageInternalSites(
+      kernel,
+      specifierSites('packages/kernel/src/internal/thing.test.ts', source),
+      ALL,
+      compiled,
+    );
+  const rootMock = kernelViolations(true, "vi.mock('../../../../src/utils/exec.ts', () => ({}));");
+  assert.equal(rootMock.length, 1);
+  assert.match(rootMock[0]!.message, /escapes packages\/kernel/);
+  assert.equal(kernelViolations(true, "vi.doMock('../../../../src/utils/exec.ts');").length, 1);
+  assert.equal(
+    kernelViolations(true, 'vi.importActual("../../../../src/utils/exec.ts")').length,
+    1,
+  );
+
+  // Legitimate mock routes keep working: a declared sibling's exported subpath is not an
+  // escape, an undeclared sibling is still the undeclared-sibling branch, and a mock of the
+  // package's own module stays silent, so the scan cannot be read as flagging all mocks.
+  const declaredMock = specifierSites(
+    'packages/contracts/src/internal/thing.test.ts',
+    "vi.mock('@agent-device/kernel/errors', () => ({}));",
+  );
+  assert.deepEqual(checkPackageInternalSites(contracts, declaredMock, ALL, true), []);
+  const undeclaredMock = specifierSites(
+    'packages/kernel/src/internal/thing.test.ts',
+    "vi.mock('@agent-device/contracts/interaction', () => ({}));",
+  );
+  assert.equal(rules(checkPackageInternalSites(kernel, undeclaredMock, ALL, false)).length, 1);
+  assert.deepEqual(kernelViolations(true, "vi.mock('./exec.ts', () => ({}));"), []);
+});
+
 // This `src/utils` path is another in-memory arbitrary parser fixture, not a live repository path.
 test('a package relative escape is R11-owned, compiled or not', () => {
   // #3289 maintainer review restored this branch after a planted `tsc -b` run showed the
diff --git a/scripts/layering/package-boundaries.ts b/scripts/layering/package-boundaries.ts
index 2ee38883b3..f3c97c7603 100644
--- a/scripts/layering/package-boundaries.ts
+++ b/scripts/layering/package-boundaries.ts
@@ -30,7 +30,7 @@
 
 import fs from 'node:fs';
 import path from 'node:path';
-import { parseImports } from './model.ts';
+import { parseImports, resolveWorkspaceSpecifier } from './model.ts';
 import { listTrackedPackageManifests, listTrackedProductionSources } from './tracked-sources.ts';
 
 export type PackageBoundaryViolation = {
@@ -65,9 +65,30 @@ export type SpecifierSite = {
  * layering model's own parser, so static/dynamic/side-effect/re-export sites
  * and both quote styles are covered by one scanner instead of a private regex
  * that silently missed double-quoted routes.
+ *
+ * `vi.mock`/`vi.doMock`/`vi.mockActual`/`vi.unmock`/`vi.importActual` join the sweep
+ * by literal scan: they are plain call expressions the AST import parser never
+ * visits, yet the loader resolves their specifier and instantiates that module under
+ * test — the same double-instance route a relative tunnel takes. `importOriginal
+ * <typeof import('...')>` needs no extra branch; the parser already sees it as a
+ * TSImportType.
  */
+const VI_MOCK_CALL_RE =
+  /\bvi\.(?:mock|doMock|mockActual|unmock|importActual)\(\s*(['"])([^'"\n]*)\1/g;
+
 export function specifierSites(file: string, source: string): SpecifierSite[] {
-  return parseImports(source).map((edge) => ({ file, line: edge.line, specifier: edge.spec }));
+  const sites: SpecifierSite[] = parseImports(source).map((edge) => ({
+    file,
+    line: edge.line,
+    specifier: edge.spec,
+  }));
+  for (const match of source.matchAll(VI_MOCK_CALL_RE)) {
+    const line = source.slice(0, match.index).split('\n').length;
+    const specifier = match[2]!;
+    if (!sites.some((site) => site.line === line && site.specifier === specifier))
+      sites.push({ file, line, specifier });
+  }
+  return sites.sort((a, b) => a.line - b.line);
 }
 
 /**
@@ -142,6 +163,57 @@ function packageByName(packages: readonly WorkspacePackage[], name: string) {
   return packages.find((pkg) => pkg.name === name);
 }
 
+/**
+ * A specifier is named by the exports map when it matches a named key or resolves
+ * through a `*` pattern entry. Delegates to `resolveWorkspaceSpecifier` so every
+ * consumer (this rule, the layering edges, the depgraph, mutation ownership, and
+ * the Stryker alias table) applies one Node-exports semantics, not a private scan.
+ */
+function namedByExports(target: WorkspacePackage, specifier: string): boolean {
+  return resolveWorkspaceSpecifier(specifier, target.exportTargets) !== undefined;
+}
+
+const TEST_CONSUMER_RE = /(^|\/)__tests__\/|\.test\.[cm]?[jt]sx?$|(?:^|\/)test\//;
+
+/**
+ * The one file vocabulary for "this file consumes test data": the root `test/` tree, a
+ * package-local `test/` harness tree, `*.test.*` files, and `__tests__/` trees (root or
+ * nested). Both test-data gates call this — the `./testing/` façade check and the
+ * TEST_ONLY_FIXTURE_SUBPATHS predicate — so what counts as a test consumer is one rule,
+ * not two spellings that drift. Pinned by an accept/deny table in
+ * `package-boundaries-facade.test.ts`.
+ */
+export function isTestConsumerFile(file: string): boolean {
+  return TEST_CONSUMER_RE.test(file);
+}
+
+/**
+ * Façade policy (ADR-0033 amendment): a package publishes test data only under its
+ * `./testing/` namespace — named `./testing/<fixture>` entries and per-folder
+ * `./testing/<dir>/*` patterns — and only test files may import it. The gate is the
+ * namespace, not a pattern entry: narrowing the surface to exact keys must not
+ * smuggle a fixture past the test-file rule. Production code that reaches a fixture
+ * through the package boundary is production code depending on a test double — it
+ * must inject the real port instead.
+ */
+function checkTestDataOnlySites(
+  site: SpecifierSite,
+  target: WorkspacePackage,
+): PackageBoundaryViolation | undefined {
+  if (!site.specifier.startsWith(`${target.name}/testing/`)) return undefined;
+  if (!namedByExports(target, site.specifier)) return undefined;
+  if (isTestConsumerFile(site.file)) return undefined;
+  return {
+    rule: 'R11 package-boundaries',
+    file: site.file,
+    line: site.line,
+    message:
+      `'${site.specifier}' resolves through ${target.dir}/package.json#exports './testing/' ` +
+      `namespace, which publishes test data to test files only. '${site.file}' is not a test ` +
+      `file: import a production subpath or inject the port.`,
+  };
+}
+
 function specifierPackageName(specifier: string): string | undefined {
   const match = /^(@[^/]+\/[^/]+)/.exec(specifier);
   return match?.[1];
@@ -184,11 +256,7 @@ export const TEST_ONLY_FIXTURE_SUBPATHS: ReadonlySet<string> = new Set([
 /** Consumer side of `TEST_ONLY_FIXTURE_SUBPATHS`, mirroring R13's non-production predicate. */
 function importsTestOnlyFixtureFromProduction(file: string, specifier: string): boolean {
   if (!TEST_ONLY_FIXTURE_SUBPATHS.has(specifier)) return false;
-  // Root `test/`, package-local `packages/*/test/`, *.test.ts, and __tests__ trees are all
-  // test consumers; anything else is production.
-  const isTestConsumer =
-    /(?:^|\/)test\//.test(file) || file.endsWith('.test.ts') || file.includes('/__tests__/');
-  return !isTestConsumer;
+  return !isTestConsumerFile(file);
 }
 
 /**
@@ -271,7 +339,12 @@ export function checkPackageInternalSites(
           `in ${pkg.dir}/package.json ${pkg.workspaceDependencyField}.`,
       });
     }
-    if (!compiled && !target.exportTargets.has(site.specifier)) {
+    const testDataOnly = checkTestDataOnlySites(site, target);
+    if (testDataOnly) {
+      violations.push(testDataOnly);
+      continue;
+    }
+    if (!compiled && !namedByExports(target, site.specifier)) {
       violations.push({
         rule: 'R11 package-boundaries',
         file: site.file,
@@ -352,7 +425,12 @@ export function checkRootSites(
           `package.json devDependencies.`,
       });
     }
-    if (!compiled && !target.exportTargets.has(site.specifier)) {
+    const testDataOnly = checkTestDataOnlySites(site, target);
+    if (testDataOnly) {
+      violations.push(testDataOnly);
+      continue;
+    }
+    if (!compiled && !namedByExports(target, site.specifier)) {
       violations.push({
         rule: 'R11 package-boundaries',
         file: site.file,
diff --git a/scripts/layering/platform-package-policy.test.ts b/scripts/layering/platform-package-policy.test.ts
index fb4c1270ee..fefc2773dd 100644
--- a/scripts/layering/platform-package-policy.test.ts
+++ b/scripts/layering/platform-package-policy.test.ts
@@ -171,7 +171,7 @@ test('composition policy does not pin local platform-module identifier spelling'
 test('external consumers use root facades with static imports only at the interactor seam', () => {
   const staticImport = validSources();
   staticImport.set(
-    'src/daemon/not-the-root.ts',
+    'packages/daemon/src/not-the-root.ts',
     "import { applePlatformMetadata } from '@agent-device/platform-apple';",
   );
   assert.match(
@@ -184,7 +184,7 @@ test('external consumers use root facades with static imports only at the intera
     "void import('@agent-device/platform-apple');",
   ]) {
     const sources = validSources();
-    sources.set('src/daemon/not-the-root.ts', statement);
+    sources.set('packages/daemon/src/not-the-root.ts', statement);
     assert.match(
       messages(sources).join('\n'),
       /production static imports of '@agent-device\/platform-apple' are limited to/,
@@ -231,7 +231,7 @@ test('external consumers use root facades with static imports only at the intera
 
   const reExport = validSources();
   reExport.set(
-    'src/daemon/not-the-root.ts',
+    'packages/daemon/src/not-the-root.ts',
     "export { applePlatformMetadata } from '@agent-device/platform-apple';",
   );
   assert.match(
@@ -241,7 +241,7 @@ test('external consumers use root facades with static imports only at the intera
 
   const deep = validSources();
   deep.set(
-    'src/daemon/not-the-root.ts',
+    'packages/daemon/src/not-the-root.ts',
     "import { implementation } from '@agent-device/platform-apple/internal';",
   );
   assert.match(
@@ -267,8 +267,8 @@ test('only the canonical composition root may import the private provider compos
   assert.deepEqual(checkPlatformPackagePolicy(sources, declarations()), []);
 
   sources.set(
-    'src/daemon/request-router.ts',
-    "import { providerScope } from '../platform-runtime/request-providers.ts';",
+    'packages/daemon/src/server/request-router.ts',
+    "import { providerScope } from '../../../../src/platform-runtime/request-providers.ts';",
   );
   assert.match(
     messages(sources).join('\n'),
@@ -280,7 +280,7 @@ test('the apple runner mechanics facet subpaths are the enumerated exception', (
   // The façade subpath is the facet's consumer seam: root code may import it.
   const sources = validSources();
   sources.set(
-    'src/daemon/selector-runtime.ts',
+    'packages/daemon/src/execution/selector-runtime.ts',
     "import type { RunnerCommand } from '@agent-device/platform-apple/runner';",
   );
   assert.deepEqual(checkPlatformPackagePolicy(sources, declarations()), []);
@@ -392,7 +392,7 @@ test('the Android mechanics facet is the named consumer seam and adb host wiring
   const allowed = validSources();
   allowed.set('src/core/interactors/android.ts', mechanicsImport);
   allowed.set('src/sdk/android-adb.ts', mechanicsImport);
-  allowed.set('src/daemon/handlers/session.test.ts', mechanicsImport);
+  allowed.set('packages/daemon/src/sessions/handlers/__tests__/session.test.ts', mechanicsImport);
   allowed.set('src/platform-runtime-android-adb-host.ts', hostImport);
   assert.deepEqual(
     messages(allowed).filter((message) => message.includes('may import')),
@@ -400,14 +400,14 @@ test('the Android mechanics facet is the named consumer seam and adb host wiring
   );
 
   const denied = validSources();
-  denied.set('src/daemon/handlers/session.ts', mechanicsImport);
+  denied.set('packages/daemon/src/sessions/handlers/session.ts', mechanicsImport);
   assert.match(
     messages(denied).join('\n'),
     /only src\/platform-runtime\.ts or its governed request-provider composition submodule may import '@agent-device\/platform-android\/mechanics'/,
   );
 
   const deniedHost = validSources();
-  deniedHost.set('src/daemon/handlers/session.ts', hostImport);
+  deniedHost.set('packages/daemon/src/sessions/handlers/session.ts', hostImport);
   assert.match(
     messages(deniedHost).join('\n'),
     /only src\/platform-runtime\.ts or its governed request-provider composition submodule may import '@agent-device\/platform-android\/adb-host'/,
@@ -435,7 +435,10 @@ test('the Android test-only fixture subpaths accept test consumers and deny prod
     "import { createAndroidSnapshotCapture } from '@agent-device/platform-android/snapshot-capture-fixtures';";
   const allowed = validSources();
   allowed.set('src/__tests__/android-ui-hierarchy.test.ts', fixtureImport);
-  allowed.set('src/daemon/__tests__/android-system-dialog-occlusion.test.ts', fixtureImport);
+  allowed.set(
+    'packages/daemon/src/execution/__tests__/android-system-dialog-occlusion.test.ts',
+    fixtureImport,
+  );
   allowed.set('test/integration/provider-scenarios/android.test.ts', fixtureImport);
   assert.deepEqual(
     messages(allowed).filter((message) => message.includes('may import')),
@@ -473,7 +476,10 @@ test('platform packages cannot escape to root, daemon, siblings, or raw process
   // spawning at runtime, so test files (which fake process primitives) and
   // type-only imports (the runner host port names ChildProcess) are exempt.
   const planted = [
-    ["import type { DaemonRequest } from '../../../src/daemon/types.ts';", 'probe.test.ts'],
+    [
+      "import type { DaemonRequest } from '../../../packages/daemon/src/types.ts';",
+      'probe.test.ts',
+    ],
     ["export { x } from '../../../src/core/x.ts';", 'probe.test.ts'],
     ["void import('@agent-device/platform-android');", 'probe.test.ts'],
     ["import { spawn } from 'node:child_process';", 'probe.ts'],
diff --git a/scripts/layering/platform-package-policy.ts b/scripts/layering/platform-package-policy.ts
index ed5bbb27ca..fde579d321 100644
--- a/scripts/layering/platform-package-policy.ts
+++ b/scripts/layering/platform-package-policy.ts
@@ -15,6 +15,7 @@
 //   into a sibling's src still compiles; project references are a build cache, not a boundary.
 
 import path from 'node:path';
+import { DAEMON_SOURCE_ROOT } from './tracked-sources.ts';
 import { PLATFORMS } from '@agent-device/kernel/device';
 import { parseImports, type LayeringViolation } from './model.ts';
 import { checkPlatformComposition } from './platform-composition-policy.ts';
@@ -113,7 +114,7 @@ function isAndroidFacetSubpathImport(file: string, specifier: string): boolean {
   // The named facets are the implementation seam for root/core/SDK consumers. Daemon production
   // code still reaches platform behavior through the request-bound runtime gateway; tests may
   // import a facet to exercise the package-owned mechanics directly.
-  return !file.startsWith('src/daemon/') || !isProductionSource(file);
+  return !file.startsWith(DAEMON_SOURCE_ROOT) || !isProductionSource(file);
 }
 
 function isAppleFacadeSubpathImport(specifier: string): boolean {
diff --git a/scripts/layering/ratchet-reference.test.ts b/scripts/layering/ratchet-reference.test.ts
index e27e79e53a..08d67ade7b 100644
--- a/scripts/layering/ratchet-reference.test.ts
+++ b/scripts/layering/ratchet-reference.test.ts
@@ -17,10 +17,13 @@ const SESSION_TYPES = [
 
 function tree(extra: Record<string, string> = {}) {
   return new Map<string, string>([
-    ['src/daemon/session-state.ts', SESSION_TYPES],
-    ['src/daemon/session-snapshot.ts', 'session.snapshot = "a"; nextSession.snapshot = "b";'],
-    ['src/daemon/ref-frame.ts', 'session.snapshot = undefined;'],
-    ['src/daemon/handlers/trace-runtime.ts', 'session.trace ??= "t";'],
+    ['packages/daemon/src/core/session-state.ts', SESSION_TYPES],
+    [
+      'packages/daemon/src/execution/session-snapshot.ts',
+      'session.snapshot = "a"; nextSession.snapshot = "b";',
+    ],
+    ['packages/daemon/src/core/ref-frame.ts', 'session.snapshot = undefined;'],
+    ['packages/daemon/src/sessions/handlers/trace-runtime.ts', 'session.trace ??= "t";'],
     ['src/client/client.ts', "import type { Loop } from '../commands/loop.ts';"],
     ['src/commands/loop.ts', "import type { Client } from '../client/client.ts';"],
     ...Object.entries(extra),
@@ -37,7 +40,7 @@ test('sessionStateWritePressure counts written fields and (field, writer) claims
     ownerFileClaims: 3,
   });
   assert.deepEqual(
-    sessionStateWritePressure(tree({ 'src/daemon/other.ts': 'session[key] = 1;' })),
+    sessionStateWritePressure(tree({ 'packages/daemon/src/other.ts': 'session[key] = 1;' })),
     {
       writerOwnedFields: 2,
       ownerFileClaims: 3,
@@ -58,16 +61,16 @@ test('measureRatchets reports all ratchets from one tree', () => {
     sessionAuthority: { shapeFiles: [], authorityFiles: [] },
   });
   const withAuthority = tree({
-    'src/daemon/handlers/fixture.ts':
-      "import type { SessionState } from '../session-state.ts';\n" +
-      "import { SessionStore } from '../session-store.ts';",
-    'src/daemon/session-store.ts': 'export class SessionStore {}',
+    'packages/daemon/src/sessions/handlers/fixture.ts':
+      "import type { SessionState } from '../../core/session-state.ts';\n" +
+      "import { SessionStore } from '../../core/session-store.ts';",
+    'packages/daemon/src/core/session-store.ts': 'export class SessionStore {}',
   });
   assert.deepEqual(
     measureRatchets(withAuthority, resolveImportEdges(withAuthority)).sessionAuthority,
     {
-      shapeFiles: ['src/daemon/handlers/fixture.ts'],
-      authorityFiles: ['src/daemon/handlers/fixture.ts'],
+      shapeFiles: ['packages/daemon/src/sessions/handlers/fixture.ts'],
+      authorityFiles: ['packages/daemon/src/sessions/handlers/fixture.ts'],
     },
   );
 });
diff --git a/scripts/layering/ratchet-reference.ts b/scripts/layering/ratchet-reference.ts
index 2fcc409144..5e2dd9e51c 100644
--- a/scripts/layering/ratchet-reference.ts
+++ b/scripts/layering/ratchet-reference.ts
@@ -7,11 +7,16 @@
 // The base tree is read through the shared committed-tree reader (one `git ls-tree`, one
 // `git cat-file --batch`), never a second checkout and never a read per file.
 
-import { mergeBaseWithMain, readCommittedSources } from '../__tests__/committed-source-tree.ts';
+import {
+  mergeBaseWithMain,
+  readCommittedSources,
+  renamedSince,
+} from '../__tests__/committed-source-tree.ts';
 import {
   largestTypeCycleMembers,
   memoizedImportParser,
   resolveImportEdges,
+  targetDagZone,
   typeInversionCounts,
   type ImportParser,
   type ResolvedImportEdge,
@@ -52,17 +57,38 @@ export function measureRatchets(
  * The reference measurement: the merge-base tree, enumerated and classified by the same reader
  * the eager-closure ratchet uses, then measured exactly like the working tree. A file whose text
  * is byte-identical at both ends costs no second parse, because `parse` memoizes by source text.
+ * `baseRef` overrides the merge-base with origin/main; it exists for the fixture-repo tests that
+ * measure a synthetic base tree without a fetched origin/main, not for production callers.
  */
 export function mergeBaseRatchets(
   repoRoot: string,
   parse: ImportParser = memoizedImportParser(),
+  baseRef?: string,
 ): MergeBaseRatchets {
-  const ref = mergeBaseWithMain(repoRoot);
+  const ref = baseRef ?? mergeBaseWithMain(repoRoot);
   const { sources, manifests } = readCommittedSources(repoRoot, ref);
-  const edges = resolveImportEdges(
+  // Measure the base tree in the working tree's coordinates: a `git mv` since the merge-base
+  // (the daemon's move to packages/daemon, 11b) would otherwise make rules keyed on current
+  // paths read the base as empty and accept any growth above a zero reference. Edges are
+  // resolved in base coordinates first — the base tree is internally consistent — and then
+  // the resolved endpoints are canonicalized base -> head, exactly like the eager-closure
+  // ratchet canonicalizes entries.
+  const baseToHead = new Map(
+    [...renamedSince(repoRoot, ref)].map(([headPath, basePath]) => [basePath, headPath]),
+  );
+  const toHead = (file: string) => baseToHead.get(file) ?? file;
+  const baseEdges = resolveImportEdges(
     sources,
     workspaceSpecifierTargetsFromManifests(manifests),
     parse,
   );
-  return { ref, ...measureRatchets(sources, edges) };
+  const edges = baseEdges.map((edge) => {
+    const file = toHead(edge.file);
+    const target = toHead(edge.target);
+    return file === edge.file && target === edge.target
+      ? edge
+      : { ...edge, file, target, fromZone: targetDagZone(file), toZone: targetDagZone(target) };
+  });
+  const canonical = new Map([...sources].map(([file, text]) => [toHead(file), text]));
+  return { ref, ...measureRatchets(canonical, edges) };
 }
diff --git a/scripts/layering/record-runtime-mechanics-policy.test.ts b/scripts/layering/record-runtime-mechanics-policy.test.ts
index 0e4bc2cd9a..9198bf9b3d 100644
--- a/scripts/layering/record-runtime-mechanics-policy.test.ts
+++ b/scripts/layering/record-runtime-mechanics-policy.test.ts
@@ -5,7 +5,7 @@ import { recordRuntimeDaemonMechanicsViolations } from './record-runtime-mechani
 test('R16 rejects native mechanics in the daemon record owner without scanning prose', () => {
   const violations = recordRuntimeDaemonMechanicsViolations([
     {
-      path: 'src/daemon/handlers/record-runtime.ts',
+      path: 'packages/daemon/src/sessions/handlers/record-runtime.ts',
       source: `
         import fs from 'node:fs';
         import { runCmdBackground } from '@agent-device/host-kit/command';
@@ -20,17 +20,17 @@ test('R16 rejects native mechanics in the daemon record owner without scanning p
     },
   ]);
   assert.deepEqual(violations, [
-    'src/daemon/handlers/record-runtime.ts: daemon record owner imports native mechanic node:fs',
-    'src/daemon/handlers/record-runtime.ts: daemon record owner imports native mechanic @agent-device/host-kit/command',
-    'src/daemon/handlers/record-runtime.ts: daemon record owner calls native mechanic setTimeout',
-    'src/daemon/handlers/record-runtime.ts: daemon record owner calls native mechanic runCmdBackground',
+    'packages/daemon/src/sessions/handlers/record-runtime.ts: daemon record owner imports native mechanic node:fs',
+    'packages/daemon/src/sessions/handlers/record-runtime.ts: daemon record owner imports native mechanic @agent-device/host-kit/command',
+    'packages/daemon/src/sessions/handlers/record-runtime.ts: daemon record owner calls native mechanic setTimeout',
+    'packages/daemon/src/sessions/handlers/record-runtime.ts: daemon record owner calls native mechanic runCmdBackground',
   ]);
 });
 
 test('R16 rejects child termination and platform branching in daemon record owners', () => {
   const violations = recordRuntimeDaemonMechanicsViolations([
     {
-      path: 'src/daemon/handlers/record-runtime.ts',
+      path: 'packages/daemon/src/sessions/handlers/record-runtime.ts',
       source: `
         // child.kill(), process.kill(), and device.platform === 'apple' are prose.
         const prose = 'switch (device.platform)';
diff --git a/scripts/layering/record-runtime-mechanics-policy.ts b/scripts/layering/record-runtime-mechanics-policy.ts
index cf80728d1a..03a8516d56 100644
--- a/scripts/layering/record-runtime-mechanics-policy.ts
+++ b/scripts/layering/record-runtime-mechanics-policy.ts
@@ -69,7 +69,9 @@ export function recordRuntimeDaemonMechanicsViolations(
 }
 
 function isDaemonRecordOwner(filePath: string): boolean {
-  return /^src\/daemon\/handlers\/record-runtime(?:-[^/]+)?\.ts$/.test(filePath);
+  return /^packages\/daemon\/src\/sessions\/handlers\/record-runtime(?:-[^/]+)?\.ts$/.test(
+    filePath,
+  );
 }
 
 function isDaemonRecordMechanicImport(imported: string): boolean {
diff --git a/scripts/layering/retired-paths-policy.test.ts b/scripts/layering/retired-paths-policy.test.ts
index 67a1be18ea..b26442aa9f 100644
--- a/scripts/layering/retired-paths-policy.test.ts
+++ b/scripts/layering/retired-paths-policy.test.ts
@@ -97,7 +97,7 @@ test('R71 accepts the current replay owners and ignores the src/utils zone', ()
     retiredPathRuleViolations('R71', [
       'packages/replay-port/src/script-source-bundle.ts',
       'src/cli/replay-test/reporting.ts',
-      'src/daemon/replay-script-source.ts',
+      'packages/daemon/src/replay-script-source.ts',
       'src/replay-next.ts',
       'src/utils/regrown.ts',
     ]),
diff --git a/scripts/layering/root-module-zones.ts b/scripts/layering/root-module-zones.ts
index 032f4d448b..40e119875e 100644
--- a/scripts/layering/root-module-zones.ts
+++ b/scripts/layering/root-module-zones.ts
@@ -28,7 +28,7 @@ export const ROOT_MODULE_ZONES: Readonly<Record<string, readonly string[]>> = {
   // The platform composition the daemon, CLI and SDK import eagerly. It shares the zone with its
   // private `src/platform-runtime/` submodule, and with the daemon runtime's dependency
   // construction, which names these same runtime families and keeps the same value-free direction
-  // toward `src/daemon/` (PR 6 of #3276's daemon extraction).
+  // toward `packages/daemon/src/` (PR 6 of #3276's daemon extraction).
   'platform-runtime': [
     'src/daemon-composition.ts',
     'src/platform-runtime-android-mechanics.ts',
diff --git a/scripts/layering/runtime-execution-policy.test.ts b/scripts/layering/runtime-execution-policy.test.ts
index d530a46fb4..743b28731e 100644
--- a/scripts/layering/runtime-execution-policy.test.ts
+++ b/scripts/layering/runtime-execution-policy.test.ts
@@ -3,7 +3,7 @@ import { test } from 'node:test';
 import { runtimeExecutionIntegrityViolations } from './runtime-execution-policy.ts';
 
 const REGISTRY = 'packages/command-registry/src/registry.ts';
-const ADMISSION = 'src/daemon/runtime-admission.ts';
+const ADMISSION = 'packages/daemon/src/core/runtime-admission.ts';
 
 function sources(entries: readonly (readonly [string, string])[]): ReadonlyMap<string, string> {
   return new Map(entries);
@@ -36,7 +36,7 @@ test('the permanent runtime policy accepts facts-only admission and typed operat
         `),
       ],
       [
-        'src/daemon/handler.ts',
+        'packages/daemon/src/handler.ts',
         `async function run(runtime) { return runtime.operations.focusPoint(input); }`,
       ],
     ]),
@@ -56,7 +56,7 @@ test('a descriptor capability bucket and legacy admission call are rejected glob
         `requireFactsInspection(request.inspectFacts); requireDeviceBinding(request.bindDevice);`,
       ),
     ],
-    ['src/daemon/planted.ts', `requireCommandSupported('focus', device);`],
+    ['packages/daemon/src/planted.ts', `requireCommandSupported('focus', device);`],
   ]);
   assert.deepEqual(found, [
     'command descriptors may not restore capability-bucket admission',
@@ -74,7 +74,7 @@ test('daemon code cannot cast, assert, or bracket its way around runtime narrowi
       ),
     ],
     [
-      'src/daemon/planted.ts',
+      'packages/daemon/src/planted.ts',
       `
         const forged = value as BoundDeviceRuntime<typeof use>;
         runtime.operations.focusPoint!;
@@ -103,7 +103,7 @@ test('dynamic operation iteration used by admission remains legal', () => {
           `requireFactsInspection(request.inspectFacts); requireDeviceBinding(request.bindDevice);`,
         ),
       ],
-      ['src/daemon/planted.ts', `const fact = facts.operations[operation];`],
+      ['packages/daemon/src/planted.ts', `const fact = facts.operations[operation];`],
     ]),
     [],
   );
diff --git a/scripts/layering/runtime-execution-policy.ts b/scripts/layering/runtime-execution-policy.ts
index 4c6573a384..e9be31255c 100644
--- a/scripts/layering/runtime-execution-policy.ts
+++ b/scripts/layering/runtime-execution-policy.ts
@@ -11,6 +11,7 @@
 //   token is a type, so an `as` cast or narrowing to it type-checks from any module.
 
 import { parseSync } from 'oxc-parser';
+import { DAEMON_SOURCE_ROOT } from './tracked-sources.ts';
 import { memberName, propertyName, visitAst } from './layering-ast.ts';
 import type { LayeringViolation } from './model.ts';
 
@@ -19,7 +20,7 @@ type AstNode = Record<string, unknown>;
 export const RUNTIME_EXECUTION_INTEGRITY_RULE = 'R66 runtime-execution-integrity';
 
 const COMMAND_DESCRIPTOR_MODULE = 'packages/command-registry/src/registry.ts';
-const RUNTIME_ADMISSION_MODULE = 'src/daemon/runtime-admission.ts';
+const RUNTIME_ADMISSION_MODULE = 'packages/daemon/src/core/runtime-admission.ts';
 const RUNTIME_PROOF_TYPES = new Set(['AdmittedRuntimePlan', 'BoundDeviceRuntime']);
 
 /** Facts are the only admission authority, and daemon code must consume narrowed runtime proofs. */
@@ -40,7 +41,7 @@ export function runtimeExecutionIntegrityViolations(
           at(file, source, node, 'runtime facts are the only device-command admission authority'),
         );
       }
-      if (!file.startsWith('src/daemon/')) return;
+      if (!file.startsWith(DAEMON_SOURCE_ROOT)) return;
       if (isManufacturedRuntimeProof(node)) {
         violations.push(
           at(file, source, node, 'daemon code may not manufacture a narrowed runtime proof'),
diff --git a/scripts/layering/selector-pipeline-ownership.test.ts b/scripts/layering/selector-pipeline-ownership.test.ts
index f77e83c00d..86d746f84a 100644
--- a/scripts/layering/selector-pipeline-ownership.test.ts
+++ b/scripts/layering/selector-pipeline-ownership.test.ts
@@ -13,7 +13,10 @@ import {
  * `parseImports` the gate uses. That is the point of the shape: a bypass is
  * only refused in every import FORM if the check never looks at symbol names.
  */
-function violations(source: string, file = 'src/daemon/handlers/planted.ts'): string[] {
+function violations(
+  source: string,
+  file = 'packages/daemon/src/sessions/handlers/planted.ts',
+): string[] {
   const edges: ResolvedImportEdge[] = parseImports(source).map((edge) => ({
     ...edge,
     file,
diff --git a/scripts/layering/session-authority-overlay.test.ts b/scripts/layering/session-authority-overlay.test.ts
index 68af64910a..1f73771480 100644
--- a/scripts/layering/session-authority-overlay.test.ts
+++ b/scripts/layering/session-authority-overlay.test.ts
@@ -1,6 +1,12 @@
 import assert from 'node:assert/strict';
+import { execFileSync } from 'node:child_process';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
 import { test } from 'node:test';
 import { resolveImportEdges } from './model.ts';
+import { mergeBaseRatchets } from './ratchet-reference.ts';
+import { readCommittedSources } from '../__tests__/committed-source-tree.ts';
 import {
   checkSessionAuthorityOverlay,
   handlerOwnedOverlay,
@@ -23,21 +29,25 @@ function overlayOf(sources: Record<string, string>): SessionAuthorityOverlay {
 
 test('the overlay counts symbol-level production importers, not file-level importers', () => {
   const sources = {
-    'src/daemon/session-state.ts': STATE_STUB,
-    'src/daemon/session-store.ts': STORE_STUB,
-    'src/daemon/handlers/fixture.ts':
-      "import type { SessionState } from '../session-state.ts';\n" +
-      "import { SessionStore } from '../session-store.ts';\n",
-    'src/daemon/handlers/request-only.ts':
-      "import type { DaemonRequest } from '../session-state.ts';\n" +
-      "import { resolveDaemonStateDir } from '../session-store.ts';\n",
-    'src/daemon/non-handler.ts': "import type { SessionState } from './session-state.ts';\n",
-    'src/daemon/handlers/fixture.test.ts':
-      "import type { SessionState } from '../session-state.ts';\n",
+    'packages/daemon/src/core/session-state.ts': STATE_STUB,
+    'packages/daemon/src/core/session-store.ts': STORE_STUB,
+    'packages/daemon/src/sessions/handlers/fixture.ts':
+      "import type { SessionState } from '../../core/session-state.ts';\n" +
+      "import { SessionStore } from '../../core/session-store.ts';\n",
+    'packages/daemon/src/sessions/handlers/request-only.ts':
+      "import type { DaemonRequest } from '../../core/session-state.ts';\n" +
+      "import { resolveDaemonStateDir } from '../../core/session-store.ts';\n",
+    'packages/daemon/src/non-handler.ts':
+      "import type { SessionState } from './core/session-state.ts';\n",
+    'packages/daemon/src/sessions/handlers/fixture.test.ts':
+      "import type { SessionState } from '../../core/session-state.ts';\n",
   };
   assert.deepEqual(overlayOf(sources), {
-    shapeFiles: ['src/daemon/handlers/fixture.ts', 'src/daemon/non-handler.ts'],
-    authorityFiles: ['src/daemon/handlers/fixture.ts'],
+    shapeFiles: [
+      'packages/daemon/src/non-handler.ts',
+      'packages/daemon/src/sessions/handlers/fixture.ts',
+    ],
+    authorityFiles: ['packages/daemon/src/sessions/handlers/fixture.ts'],
   });
 });
 
@@ -45,49 +55,69 @@ test('the overlay follows the SessionState declaration to a moved path, not a re
   // Planted-red against a hardcoded src/daemon/types.ts target: #2346 moved the declaration to
   // session-state.ts, so importers point there, and the overlay must still count them.
   const sources = {
-    'src/daemon/types.ts': 'export type DaemonRequest = { x: number; };\n',
-    'src/daemon/session-state.ts': STATE_STUB,
-    'src/daemon/session-store.ts': STORE_STUB,
-    'src/daemon/handlers/fixture.ts': "import type { SessionState } from '../session-state.ts';\n",
-    'src/daemon/non-handler.ts': "import type { SessionState } from './session-state.ts';\n",
+    'packages/daemon/src/types.ts': 'export type DaemonRequest = { x: number; };\n',
+    'packages/daemon/src/core/session-state.ts': STATE_STUB,
+    'packages/daemon/src/core/session-store.ts': STORE_STUB,
+    'packages/daemon/src/sessions/handlers/fixture.ts':
+      "import type { SessionState } from '../../core/session-state.ts';\n",
+    'packages/daemon/src/non-handler.ts':
+      "import type { SessionState } from './core/session-state.ts';\n",
   };
   assert.deepEqual(overlayOf(sources), {
-    shapeFiles: ['src/daemon/handlers/fixture.ts', 'src/daemon/non-handler.ts'],
+    shapeFiles: [
+      'packages/daemon/src/non-handler.ts',
+      'packages/daemon/src/sessions/handlers/fixture.ts',
+    ],
     authorityFiles: [],
   });
 });
 
-test('the handler-owned subset is the flat handlers surface only', () => {
+test('the handler-owned subset is the two live handler folders only', () => {
   const overlay: SessionAuthorityOverlay = {
     shapeFiles: [
-      'src/daemon/handlers/fixture.ts',
-      'src/daemon/non-handler.ts',
-      'src/daemon/interaction/internal/interaction.ts',
+      'packages/daemon/src/sessions/handlers/fixture.ts',
+      'packages/daemon/src/execution/handlers/snapshot-handler.ts',
+      'packages/daemon/src/handlers/legacy.ts',
+      'packages/daemon/src/non-handler.ts',
+      'packages/daemon/src/execution/interaction/internal/interaction.ts',
+    ],
+    authorityFiles: [
+      'packages/daemon/src/sessions/handlers/fixture.ts',
+      'packages/daemon/src/execution/handlers/snapshot-handler.ts',
+      'packages/daemon/src/server/request-router.ts',
     ],
-    authorityFiles: ['src/daemon/handlers/fixture.ts', 'src/daemon/request-router.ts'],
   };
   assert.deepEqual(handlerOwnedOverlay(overlay), {
-    shapeFiles: ['src/daemon/handlers/fixture.ts'],
-    authorityFiles: ['src/daemon/handlers/fixture.ts'],
+    shapeFiles: [
+      'packages/daemon/src/sessions/handlers/fixture.ts',
+      'packages/daemon/src/execution/handlers/snapshot-handler.ts',
+    ],
+    authorityFiles: [
+      'packages/daemon/src/sessions/handlers/fixture.ts',
+      'packages/daemon/src/execution/handlers/snapshot-handler.ts',
+    ],
   });
 });
 
 test('R75 fails a handler file that gains a shape or authority edge beyond the merge-base', () => {
   const reference: SessionAuthorityOverlay = {
-    shapeFiles: ['src/daemon/handlers/kept.ts'],
-    authorityFiles: ['src/daemon/handlers/kept.ts'],
+    shapeFiles: ['packages/daemon/src/sessions/handlers/kept.ts'],
+    authorityFiles: ['packages/daemon/src/sessions/handlers/kept.ts'],
   };
   const measured: SessionAuthorityOverlay = {
-    shapeFiles: ['src/daemon/handlers/kept.ts', 'src/daemon/handlers/new-shape.ts'],
-    authorityFiles: ['src/daemon/handlers/new-authority.ts'],
+    shapeFiles: [
+      'packages/daemon/src/sessions/handlers/kept.ts',
+      'packages/daemon/src/sessions/handlers/new-shape.ts',
+    ],
+    authorityFiles: ['packages/daemon/src/sessions/handlers/new-authority.ts'],
   };
   const violations = checkSessionAuthorityOverlay(measured, reference);
   assert.equal(violations.length, 2);
   const shape = violations.find(
-    (violation) => violation.file === 'src/daemon/handlers/new-shape.ts',
+    (violation) => violation.file === 'packages/daemon/src/sessions/handlers/new-shape.ts',
   )!;
   const authority = violations.find(
-    (violation) => violation.file === 'src/daemon/handlers/new-authority.ts',
+    (violation) => violation.file === 'packages/daemon/src/sessions/handlers/new-authority.ts',
   )!;
   assert.equal(shape.rule, SESSION_AUTHORITY_OVERLAY_RULE);
   assert.equal(authority.rule, SESSION_AUTHORITY_OVERLAY_RULE);
@@ -97,11 +127,14 @@ test('R75 fails a handler file that gains a shape or authority edge beyond the m
 
 test('R75 passes when the handler-owned sets hold or shrink', () => {
   const reference: SessionAuthorityOverlay = {
-    shapeFiles: ['src/daemon/handlers/a.ts', 'src/daemon/handlers/b.ts'],
-    authorityFiles: ['src/daemon/handlers/a.ts'],
+    shapeFiles: [
+      'packages/daemon/src/sessions/handlers/a.ts',
+      'packages/daemon/src/sessions/handlers/b.ts',
+    ],
+    authorityFiles: ['packages/daemon/src/sessions/handlers/a.ts'],
   };
   const measured: SessionAuthorityOverlay = {
-    shapeFiles: ['src/daemon/handlers/a.ts'],
+    shapeFiles: ['packages/daemon/src/sessions/handlers/a.ts'],
     authorityFiles: [],
   };
   assert.deepEqual(checkSessionAuthorityOverlay(measured, reference), []);
@@ -109,8 +142,8 @@ test('R75 passes when the handler-owned sets hold or shrink', () => {
 
 test('R75 leaves new non-handler importers to the module declarations, not this ratchet', () => {
   const measured: SessionAuthorityOverlay = {
-    shapeFiles: ['src/daemon/new-module.ts'],
-    authorityFiles: ['src/daemon/server/new-module.ts'],
+    shapeFiles: ['packages/daemon/src/new-module.ts'],
+    authorityFiles: ['packages/daemon/src/server/new-module.ts'],
   };
   assert.deepEqual(
     checkSessionAuthorityOverlay(measured, { shapeFiles: [], authorityFiles: [] }),
@@ -120,38 +153,203 @@ test('R75 leaves new non-handler importers to the module declarations, not this
 
 test('the end-to-end measurement feeds the ratchet: a new handler importer is red, an existing one is not', () => {
   const base = {
-    'src/daemon/session-state.ts': STATE_STUB,
-    'src/daemon/session-store.ts': STORE_STUB,
-    'src/daemon/handlers/kept.ts': "import type { SessionState } from '../session-state.ts';\n",
+    'packages/daemon/src/core/session-state.ts': STATE_STUB,
+    'packages/daemon/src/core/session-store.ts': STORE_STUB,
+    'packages/daemon/src/sessions/handlers/kept.ts':
+      "import type { SessionState } from '../../core/session-state.ts';\n",
   };
   const reference = handlerOwnedOverlay(overlayOf(base));
   const grown = {
     ...base,
-    'src/daemon/handlers/new.ts': "import type { SessionState } from '../session-state.ts';\n",
+    'packages/daemon/src/sessions/handlers/new.ts':
+      "import type { SessionState } from '../../core/session-state.ts';\n",
   };
   const measured = handlerOwnedOverlay(overlayOf(grown));
   assert.deepEqual(checkSessionAuthorityOverlay(reference, reference), []);
   const violations = checkSessionAuthorityOverlay(measured, reference);
   assert.equal(violations.length, 1);
-  assert.equal(violations[0]!.file, 'src/daemon/handlers/new.ts');
+  assert.equal(violations[0]!.file, 'packages/daemon/src/sessions/handlers/new.ts');
+});
+
+test('the overlay classifies handler writes in both live handler roots, measured end to end', () => {
+  // A write planted in each live layer folder must land in the ratcheted subset; the pre-fold
+  // flat handlers/ spelling is dead in both trees (R10's retired-path guards own re-creation
+  // there), so a write there stays out of scope even though the raw measurement sees it.
+  const sources = {
+    'packages/daemon/src/core/session-state.ts': STATE_STUB,
+    'packages/daemon/src/core/session-store.ts': STORE_STUB,
+    'packages/daemon/src/sessions/handlers/session-runtime.ts':
+      "import { SessionStore } from '../../core/session-store.ts';\n",
+    'packages/daemon/src/execution/handlers/snapshot-route.ts':
+      "import type { SessionState } from '../../core/session-state.ts';\n",
+    'packages/daemon/src/handlers/legacy.ts':
+      "import type { SessionState } from '../core/session-state.ts';\n",
+  };
+  const measured = handlerOwnedOverlay(overlayOf(sources));
+  assert.deepEqual(measured, {
+    shapeFiles: ['packages/daemon/src/execution/handlers/snapshot-route.ts'],
+    authorityFiles: ['packages/daemon/src/sessions/handlers/session-runtime.ts'],
+  });
+  // The raw overlay sees the stale spelling, so the exclusion above is the root filter's doing.
+  assert.ok(overlayOf(sources).shapeFiles.includes('packages/daemon/src/handlers/legacy.ts'));
+});
+
+function commitAll(repo: string, message: string): void {
+  execFileSync('git', ['add', '-A'], { cwd: repo });
+  execFileSync('git', ['commit', '-qm', message], { cwd: repo });
+}
+
+/**
+ * A fixture repo whose base commit holds the pre-layer-folder daemon layout — a flat
+ * `packages/daemon/src/handlers/` root, the SessionState declaration and the SessionStore
+ * authority at the daemon root — and whose head commit is `git mv` into the layer folders.
+ * Proves the RULE, not the real history: mergeBaseRatchets canonicalizes every base path
+ * through renamedSince, so the handler-owned overlay arrives in head coordinates and no
+ * base handler member is dropped from the scoped set. Reading the real merge-base could
+ * only ever assert one repo state (this stack's, until main absorbs it), then rot.
+ */
+test('the merge-base overlay arrives in head coordinates through the rename mapping', () => {
+  const repo = fs.mkdtempSync(path.join(os.tmpdir(), 'session-authority-rename-'));
+  const write = (file: string, text: string) => {
+    const target = path.join(repo, file);
+    fs.mkdirSync(path.dirname(target), { recursive: true });
+    fs.writeFileSync(target, text);
+  };
+  execFileSync('git', ['init', '-q'], { cwd: repo });
+  execFileSync('git', ['config', 'user.name', 'Gate'], { cwd: repo });
+  execFileSync('git', ['config', 'user.email', 'gate@example.test'], { cwd: repo });
+  execFileSync('git', ['config', 'commit.gpgsign', 'false'], { cwd: repo });
+  write('packages/daemon/package.json', JSON.stringify({ name: '@agent-device/daemon' }));
+  write('packages/daemon/src/session-state.ts', STATE_STUB);
+  write('packages/daemon/src/session-store.ts', STORE_STUB);
+  write(
+    'packages/daemon/src/handlers/state-reader.ts',
+    "import type { SessionState } from '../session-state.ts';\nexport const read = (s: SessionState) => s.name;\n",
+  );
+  write(
+    'packages/daemon/src/handlers/store-user.ts',
+    "import { SessionStore } from '../session-store.ts';\nexport const store = new SessionStore();\n",
+  );
+  write(
+    'packages/daemon/src/session-snapshot.ts',
+    "import type { SessionState } from './session-state.ts';\nexport const snap = (s: SessionState) => s.name;\n",
+  );
+  // Pad the files whose import specifiers the move rewrites: a one-line rewrite of a two-line
+  // file is below git's rename-similarity threshold, and the fixture must pair the same
+  // git-mv-plus-small-edit shape the daemon move actually has (cf. eager-closure-budgets).
+  for (const file of ['session-state.ts', 'session-store.ts', 'session-snapshot.ts'])
+    fs.appendFileSync(
+      path.join(repo, 'packages/daemon/src', file),
+      Array.from({ length: 40 }, (_, i) => `export const pad${i} = ${i};`).join('\n') + '\n',
+    );
+  for (const handler of ['handlers/state-reader.ts', 'handlers/store-user.ts'])
+    fs.appendFileSync(
+      path.join(repo, 'packages/daemon/src', handler),
+      Array.from({ length: 40 }, (_, i) => `export const pad${i} = ${i};`).join('\n') + '\n',
+    );
+  commitAll(repo, 'base: flat daemon layout');
+  for (const dir of [
+    'packages/daemon/src/core',
+    'packages/daemon/src/sessions/handlers',
+    'packages/daemon/src/execution/handlers',
+    'packages/daemon/src/execution',
+  ])
+    fs.mkdirSync(path.join(repo, dir), { recursive: true });
+  const baseRef = execFileSync('git', ['rev-parse', 'HEAD'], {
+    cwd: repo,
+    encoding: 'utf8',
+  }).trim();
+  execFileSync(
+    'git',
+    ['mv', 'packages/daemon/src/session-state.ts', 'packages/daemon/src/core/session-state.ts'],
+    { cwd: repo },
+  );
+  execFileSync(
+    'git',
+    ['mv', 'packages/daemon/src/session-store.ts', 'packages/daemon/src/core/session-store.ts'],
+    { cwd: repo },
+  );
+  execFileSync(
+    'git',
+    [
+      'mv',
+      'packages/daemon/src/handlers/state-reader.ts',
+      'packages/daemon/src/sessions/handlers/state-reader.ts',
+    ],
+    { cwd: repo },
+  );
+  execFileSync(
+    'git',
+    [
+      'mv',
+      'packages/daemon/src/handlers/store-user.ts',
+      'packages/daemon/src/execution/handlers/store-user.ts',
+    ],
+    { cwd: repo },
+  );
+  execFileSync(
+    'git',
+    [
+      'mv',
+      'packages/daemon/src/session-snapshot.ts',
+      'packages/daemon/src/execution/session-snapshot.ts',
+    ],
+    { cwd: repo },
+  );
+  for (const handler of ['sessions/handlers/state-reader.ts', 'execution/handlers/store-user.ts'])
+    fs.appendFileSync(
+      path.join(repo, 'packages/daemon/src', handler),
+      '\nexport const touched = 1;\n',
+    );
+  commitAll(repo, 'head: layer folders');
+
+  const reference = mergeBaseRatchets(repo, undefined, baseRef);
+  assert.ok(
+    [...readCommittedSources(repo, baseRef).sources.keys()].some((file) =>
+      file.startsWith('packages/daemon/src/handlers/'),
+    ),
+    'the fixture base tree is expected to hold the pre-rename flat handlers/ root',
+  );
+  // Every base handler member survives the canonicalization: one shape edge under
+  // sessions/handlers/, one authority edge under execution/handlers/. A reference that
+  // silently lost them (an unpaired rename) would accept any future handler growth.
+  const scoped = handlerOwnedOverlay(reference.sessionAuthority);
+  assert.deepEqual(scoped.shapeFiles, ['packages/daemon/src/sessions/handlers/state-reader.ts']);
+  assert.deepEqual(scoped.authorityFiles, ['packages/daemon/src/execution/handlers/store-user.ts']);
+  for (const file of [...scoped.shapeFiles, ...scoped.authorityFiles]) {
+    assert.match(
+      file,
+      /^packages\/daemon\/src\/(?:sessions|execution)\/handlers\//,
+      `merge-base handler member left the live roots: ${file}`,
+    );
+  }
+  // The non-handler base importer keeps its full-scope membership and stays out of the
+  // handler-owned subset — canonicalization moved it, the scope filter kept it out.
+  assert.ok(
+    reference.sessionAuthority.shapeFiles.includes(
+      'packages/daemon/src/execution/session-snapshot.ts',
+    ),
+  );
+  assert.ok(!scoped.shapeFiles.includes('packages/daemon/src/execution/session-snapshot.ts'));
 });
 
 test('R75 catches a new handler shape edge expressed as an import type', () => {
   const base = {
-    'src/daemon/session-state.ts': STATE_STUB,
-    'src/daemon/session-store.ts': STORE_STUB,
+    'packages/daemon/src/core/session-state.ts': STATE_STUB,
+    'packages/daemon/src/core/session-store.ts': STORE_STUB,
   };
   const reference = handlerOwnedOverlay(overlayOf(base));
   const measured = handlerOwnedOverlay(
     overlayOf({
       ...base,
-      'src/daemon/handlers/new.ts': "type State = import('../session-state.ts').SessionState;\n",
+      'packages/daemon/src/sessions/handlers/new.ts':
+        "type State = import('../../core/session-state.ts').SessionState;\n",
     }),
   );
 
   const violations = checkSessionAuthorityOverlay(measured, reference);
   assert.equal(violations.length, 1);
   assert.equal(violations[0]!.rule, SESSION_AUTHORITY_OVERLAY_RULE);
-  assert.equal(violations[0]!.file, 'src/daemon/handlers/new.ts');
+  assert.equal(violations[0]!.file, 'packages/daemon/src/sessions/handlers/new.ts');
   assert.match(violations[0]!.message, /new handler-owned SessionState shape edge/);
 });
diff --git a/scripts/layering/session-authority-overlay.ts b/scripts/layering/session-authority-overlay.ts
index 3e4d3a78cc..ef9266ca79 100644
--- a/scripts/layering/session-authority-overlay.ts
+++ b/scripts/layering/session-authority-overlay.ts
@@ -1,28 +1,36 @@
-import { isProductionSourceFile } from './tracked-sources.ts';
+import { DAEMON_SOURCE_ROOT, isProductionSourceFile } from './tracked-sources.ts';
 import type { LayeringViolation, ResolvedImportEdge } from './model.ts';
 import { sessionStateDeclarationFile } from './session-state.ts';
 
 // The SessionState/SessionStore authority overlay (#2278, ADR 0022): which production files
 // import the SessionState shape from the module that declares it and the SessionStore authority
-// from src/daemon/session-store.ts, at symbol level so that a file importing only helper
+// from packages/daemon/src/core/session-store.ts, at symbol level so that a file importing only helper
 // functions from session-store.ts is not an authority edge. R7 already owns the write side
 // (field ownership); this overlay owns the read side. The shape target is found by the
 // declaration, not a recorded path: a path constant would silently measure zero shape importers
 // the moment the declaration moves (#2346 moved it from types.ts to session-state.ts). The
-// ratchet applies to the handler-owned subset — the flat src/daemon/handlers/ surface the
-// #2132 migration targeted — and is a membership ratchet against the merge-base: the set may
-// only shrink, so a handler file gaining state-shape or store authority fails instead of
-// silently regrowing the hotspot.
+// ratchet applies to the handler-owned subset — the handler surface the #2132 migration targeted
+// — and is a membership ratchet against the merge-base: the set may only shrink, so a handler
+// file gaining state-shape or store authority fails instead of silently regrowing the hotspot.
+// Both trees are measured in head coordinates: mergeBaseRatchets canonicalizes every merge-base
+// path through renamedSince, so the reference set names the same layer folders as the working
+// tree and membership compares paths directly.
 
 export const SESSION_AUTHORITY_OVERLAY_RULE = 'R75 session-authority-overlay';
 
-const SESSION_STORE_AUTHORITY_TARGET = 'src/daemon/session-store.ts';
-const HANDLER_ROOT = 'src/daemon/handlers/';
+/** The handler folders: the layer folders the pre-fold handlers/ tree split into. */
+const HANDLER_ROOTS = [
+  `${DAEMON_SOURCE_ROOT}sessions/handlers/`,
+  `${DAEMON_SOURCE_ROOT}execution/handlers/`,
+];
+
+/** The SessionStore authority module; the merge-base measurement canonicalizes onto this path. */
+const SESSION_STORE_AUTHORITY_TARGET = `${DAEMON_SOURCE_ROOT}core/session-store.ts`;
 
 export type SessionAuthorityOverlay = Readonly<{
   /** Production files importing the SessionState symbol from its declaring module, sorted. */
   shapeFiles: readonly string[];
-  /** Production files importing the SessionStore symbol from src/daemon/session-store.ts, sorted. */
+  /** Production files importing the SessionStore symbol from packages/daemon/src/core/session-store.ts, sorted. */
   authorityFiles: readonly string[];
 }>;
 
@@ -49,9 +57,9 @@ export function measureSessionAuthorityOverlay(
   return { shapeFiles: [...shape].sort(), authorityFiles: [...authority].sort() };
 }
 
-/** The ratcheted subset: the flat handler surface, the one #2132's migration drove down. */
+/** The ratcheted subset: the handler surface, the one #2132's migration drove down. */
 export function handlerOwnedOverlay(overlay: SessionAuthorityOverlay): SessionAuthorityOverlay {
-  const inHandlers = (file: string) => file.startsWith(HANDLER_ROOT);
+  const inHandlers = (file: string) => HANDLER_ROOTS.some((root) => file.startsWith(root));
   return {
     shapeFiles: overlay.shapeFiles.filter(inHandlers),
     authorityFiles: overlay.authorityFiles.filter(inHandlers),
@@ -60,7 +68,7 @@ export function handlerOwnedOverlay(overlay: SessionAuthorityOverlay): SessionAu
 
 /**
  * Catches: the handler-owned SessionState-shape / SessionStore-authority surface regrowing —
- *   a file under src/daemon/handlers/ importing either symbol that the merge-base does not
+ *   a file under the daemon handler folders importing either symbol that the merge-base does not
  *   already import it, which is exactly the deep-import the #2132 migration paid to delete.
  *   Both overlays are full-scope; the handler-owned subset is filtered here, at the single
  *   place the ratchet applies it, so the message can never name a file outside its scope.
diff --git a/scripts/layering/session-resource-ownership.test.ts b/scripts/layering/session-resource-ownership.test.ts
index 9f29c09f99..f9a2d238d7 100644
--- a/scripts/layering/session-resource-ownership.test.ts
+++ b/scripts/layering/session-resource-ownership.test.ts
@@ -12,7 +12,7 @@ test('session resources are constructed only by their durable domain owners', ()
   assert.deepEqual(
     summaries([
       [
-        'src/daemon/handlers/planted.ts',
+        'packages/daemon/src/sessions/handlers/planted.ts',
         `sessionStore.set(name, {
           ...session,
           appLog: log,
@@ -23,17 +23,17 @@ test('session resources are constructed only by their durable domain owners', ()
         });`,
       ],
       [
-        'src/daemon/app-log-session-resource.ts',
+        'packages/daemon/src/resources/app-log-session-resource.ts',
         `sessionStore.update(ref, { appLog: log, appLogFailure: undefined });`,
       ],
       [
-        'src/daemon/session-capture-binding.ts',
+        'packages/daemon/src/core/session-capture-binding.ts',
         `sessionStore.update(ref, { audioProbe: audio });
          sessionStore.update(ref, { perfCapture: perf });
          sessionStore.update(ref, { screenRecording: recording });`,
       ],
       [
-        'src/daemon/screen-recording-session-binding.ts',
+        'packages/daemon/src/screen-recording-session-binding.ts',
         `sessionStore.publish(address, { ...draft, screenRecording });`,
       ],
       [
@@ -46,12 +46,12 @@ test('session resources are constructed only by their durable domain owners', ()
       ],
     ]),
     [
-      'src/daemon/handlers/planted.ts: session appLog record constructed outside its owner',
-      'src/daemon/handlers/planted.ts: session appLogFailure record constructed outside its owner',
-      'src/daemon/handlers/planted.ts: session audioProbe record constructed outside its owner',
-      'src/daemon/handlers/planted.ts: session perfCapture record constructed outside its owner',
-      'src/daemon/handlers/planted.ts: session screenRecording record constructed outside its owner',
-      'src/daemon/screen-recording-session-binding.ts: session screenRecording record constructed outside its owner',
+      'packages/daemon/src/sessions/handlers/planted.ts: session appLog record constructed outside its owner',
+      'packages/daemon/src/sessions/handlers/planted.ts: session appLogFailure record constructed outside its owner',
+      'packages/daemon/src/sessions/handlers/planted.ts: session audioProbe record constructed outside its owner',
+      'packages/daemon/src/sessions/handlers/planted.ts: session perfCapture record constructed outside its owner',
+      'packages/daemon/src/sessions/handlers/planted.ts: session screenRecording record constructed outside its owner',
+      'packages/daemon/src/screen-recording-session-binding.ts: session screenRecording record constructed outside its owner',
       'packages/capture-kit/src/capture-admission/audio-probe-session-resource.ts: session audioProbe record constructed outside its owner',
       'packages/capture-kit/src/capture-admission/perf-capture-session-resource.ts: session perfCapture record constructed outside its owner',
     ],
@@ -76,12 +76,17 @@ test('teardown app-log discriminants are policy input rather than session constr
   assert.deepEqual(
     summaries([
       [
-        'src/daemon/session-teardown.ts',
+        'packages/daemon/src/sessions/session-teardown.ts',
         `teardownSessionResources({ appLog: 'run' });
          teardownSessionResources({ appLog: 'already-settled' });`,
       ],
-      ['src/daemon/handlers/planted.ts', `teardownSessionResources({ appLog: 'skip' });`],
+      [
+        'packages/daemon/src/sessions/handlers/planted.ts',
+        `teardownSessionResources({ appLog: 'skip' });`,
+      ],
     ]),
-    ['src/daemon/handlers/planted.ts: session appLog record constructed outside its owner'],
+    [
+      'packages/daemon/src/sessions/handlers/planted.ts: session appLog record constructed outside its owner',
+    ],
   );
 });
diff --git a/scripts/layering/session-resource-ownership.ts b/scripts/layering/session-resource-ownership.ts
index f9274f53e8..0b7a1b5191 100644
--- a/scripts/layering/session-resource-ownership.ts
+++ b/scripts/layering/session-resource-ownership.ts
@@ -10,6 +10,7 @@
 //   are plain mutable properties on the shared session record, so an outside write type-checks.
 
 import { parseSync } from 'oxc-parser';
+import { DAEMON_SOURCE_ROOT } from './tracked-sources.ts';
 import { propertyName, visitAst } from './layering-ast.ts';
 import type { LayeringViolation } from './model.ts';
 
@@ -22,17 +23,29 @@ export const SESSION_RESOURCE_OWNERSHIP_RULE = 'R68 session-resource-ownership';
  * `@agent-device/capture-kit`, so the scan covers that directory alongside the daemon: the rule
  * guards the field, not the folder it happens to live in.
  */
-const SCANNED_ROOTS = ['src/daemon/', 'packages/capture-kit/src/capture-admission/'] as const;
+const SCANNED_ROOTS = [DAEMON_SOURCE_ROOT, 'packages/capture-kit/src/capture-admission/'] as const;
 
 const RESOURCE_OWNERS: Readonly<Record<string, ReadonlySet<string>>> = {
-  appLog: new Set(['src/daemon/app-log-session-resource.ts', 'src/daemon/session-state.ts']),
-  appLogFailure: new Set(['src/daemon/app-log-session-resource.ts', 'src/daemon/session-state.ts']),
-  audioProbe: new Set(['src/daemon/session-capture-binding.ts', 'src/daemon/session-state.ts']),
+  appLog: new Set([
+    'packages/daemon/src/resources/app-log-session-resource.ts',
+    'packages/daemon/src/core/session-state.ts',
+  ]),
+  appLogFailure: new Set([
+    'packages/daemon/src/resources/app-log-session-resource.ts',
+    'packages/daemon/src/core/session-state.ts',
+  ]),
+  audioProbe: new Set([
+    'packages/daemon/src/core/session-capture-binding.ts',
+    'packages/daemon/src/core/session-state.ts',
+  ]),
   screenRecording: new Set([
-    'src/daemon/session-capture-binding.ts',
-    'src/daemon/session-state.ts',
+    'packages/daemon/src/core/session-capture-binding.ts',
+    'packages/daemon/src/core/session-state.ts',
+  ]),
+  perfCapture: new Set([
+    'packages/daemon/src/core/session-capture-binding.ts',
+    'packages/daemon/src/core/session-state.ts',
   ]),
-  perfCapture: new Set(['src/daemon/session-capture-binding.ts', 'src/daemon/session-state.ts']),
 };
 
 /** Durable session-resource records have one whole-record construction owner per domain. */
diff --git a/scripts/layering/session-state.test.ts b/scripts/layering/session-state.test.ts
index c2c12bdb12..bf0887e527 100644
--- a/scripts/layering/session-state.test.ts
+++ b/scripts/layering/session-state.test.ts
@@ -7,7 +7,7 @@ import {
   sessionStateWritePressure,
 } from './session-state.ts';
 
-const OWNER = 'src/daemon/app-log-session-resource.ts';
+const OWNER = 'packages/daemon/src/resources/app-log-session-resource.ts';
 const FIELDS = ['appLog', 'appLogFailure', 'lease', 'lastPerfProfile'];
 function scan(source: string, file = OWNER) {
   assert.deepEqual(parseSync(file, source).errors, [], `fixture must parse as a module: ${file}`);
@@ -28,7 +28,7 @@ test('explicit owner patches name their writes and retain direct assignment chec
   assert.ok(SESSION_STATE_FIELD_OWNERS.appLogFailure!.includes(OWNER));
   const foreign = scan(
     'sessionStore.update(ref, { appLogFailure: error });',
-    'src/daemon/handlers/probe.ts',
+    'packages/daemon/src/sessions/handlers/probe.ts',
   )[0]!;
   assert.equal(foreign.field, 'appLogFailure');
   assert.ok(!SESSION_STATE_FIELD_OWNERS[foreign.field]!.includes(foreign.file));
@@ -353,8 +353,8 @@ test('alias declarations and patch parameters are collected before checking writ
 
 test('draft exceptions cover only the declared constructors and fresh open publication', () => {
   for (const [file, constructor] of [
-    ['src/daemon/snapshot-session.ts', 'createSnapshotSession'],
-    ['src/daemon/handlers/record-runtime.ts', 'createRecordOnlySession'],
+    ['packages/daemon/src/core/snapshot-session.ts', 'createSnapshotSession'],
+    ['packages/daemon/src/sessions/handlers/record-runtime.ts', 'createRecordOnlySession'],
   ]) {
     assert.deepEqual(
       scan(
@@ -369,7 +369,7 @@ test('draft exceptions cover only the declared constructors and fresh open publi
       ),
     );
   }
-  const open = 'src/daemon/session-lifecycle/internal/session-open-state.ts';
+  const open = 'packages/daemon/src/sessions/session-lifecycle/internal/session-open-state.ts';
   assert.deepEqual(
     scan(
       'function publishOpenSession(session: SessionState) { return store.publish(address, { ...session }); }',
@@ -395,7 +395,7 @@ test('the owning store can merge records, while unrelated updates and platform s
   assert.deepEqual(
     scan(
       'sessionStore.update(ref, changes); session.appLogFailure = error;',
-      'src/daemon/session-store.ts',
+      'packages/daemon/src/core/session-store.ts',
     ),
     [],
   );
@@ -413,17 +413,17 @@ test('pressure counts capture-kit record replacement and daemon patches with the
   const declaration =
     'export type SessionState = {\n  appLogFailure?: Error;\n  lease?: object;\n};';
   const baseline = new Map([
-    ['src/daemon/session-state.ts', declaration],
-    ['src/daemon/owner.ts', 'session.appLogFailure = error;'],
+    ['packages/daemon/src/core/session-state.ts', declaration],
+    ['packages/daemon/src/owner.ts', 'session.appLogFailure = error;'],
     [
       'packages/capture-kit/src/capture-admission/owner.ts',
       'const next = { ...session, appLogFailure: error };',
     ],
   ]);
   const current = new Map([
-    ['src/daemon/session-state.ts', declaration],
+    ['packages/daemon/src/core/session-state.ts', declaration],
     [OWNER, 'store.update(ref, { appLogFailure: error });'],
-    ['src/daemon/invalid.ts', 'store.update(ref, changes);'],
+    ['packages/daemon/src/invalid.ts', 'store.update(ref, changes);'],
   ]);
   assert.deepEqual(sessionStateWritePressure(baseline), {
     writerOwnedFields: 1,
diff --git a/scripts/layering/session-state.ts b/scripts/layering/session-state.ts
index e3d97159d9..e39d833bdd 100644
--- a/scripts/layering/session-state.ts
+++ b/scripts/layering/session-state.ts
@@ -1,6 +1,7 @@
 /** SessionState field ownership for assignments, named patches and record copies. */
 
 import { parseSync } from 'oxc-parser';
+import { DAEMON_SOURCE_ROOT } from './tracked-sources.ts';
 import { memberName, memberPath, propertyName, visitAst } from './layering-ast.ts';
 import path from 'node:path';
 
@@ -21,17 +22,20 @@ export const SESSION_STATE_FIELD_OWNERS: Readonly<Record<string, readonly string
   // transitions replace it whole. The row stays because the type cannot judge a whole frame
   // moved unchanged: assigning `undefined` (a reset to the pristine frame) and assigning a
   // frame read off another session.
-  refFrame: ['src/daemon/ref-frame.ts'],
+  refFrame: ['packages/daemon/src/core/ref-frame.ts'],
   // Scoped-snapshot lineage is cleared at two distinct events: crossing a device side-effect
   // seam (ref-frame.ts) and replacing the stored observation (session-snapshot.ts).
-  snapshotScopeSource: ['src/daemon/ref-frame.ts', 'src/daemon/session-snapshot.ts'],
-  snapshot: ['src/daemon/session-snapshot.ts'],
-  snapshotGeneration: ['src/daemon/session-snapshot.ts'],
-  lastComparisonSafeSnapshot: ['src/daemon/session-snapshot.ts'],
-  androidSnapshotFreshness: ['src/daemon/session-snapshot-freshness.ts'],
+  snapshotScopeSource: [
+    'packages/daemon/src/core/ref-frame.ts',
+    'packages/daemon/src/execution/session-snapshot.ts',
+  ],
+  snapshot: ['packages/daemon/src/execution/session-snapshot.ts'],
+  snapshotGeneration: ['packages/daemon/src/execution/session-snapshot.ts'],
+  lastComparisonSafeSnapshot: ['packages/daemon/src/execution/session-snapshot.ts'],
+  androidSnapshotFreshness: ['packages/daemon/src/core/session-snapshot-freshness.ts'],
   // One-shot deferred-warning latch (#1587 follow-up): the transition function is the only
   // writer, so the latch's window semantics live in a single module.
-  recoveredSnapshotWarningLatch: ['src/daemon/snapshot-quality-latch.ts'],
+  recoveredSnapshotWarningLatch: ['packages/daemon/src/sessions/snapshot-quality-latch.ts'],
 
   // #1478 P4a script publication. The tagged aggregate replaced the eight co-resident
   // `saveScript*`/`scriptRecordingState`/`repair*` fields; its ONLY writers are the two
@@ -41,53 +45,55 @@ export const SESSION_STATE_FIELD_OWNERS: Readonly<Record<string, readonly string
   // recording without moving the lifecycle that authorized it (#1533). Recording is now derived
   // (`isRecordingPublication`), so there is no second field to keep in step.
   scriptPublication: [
-    'src/daemon/session-replay-transaction.ts',
-    'src/daemon/session-script-publication-capability.ts',
-    'src/daemon/session-script-writer.ts',
+    'packages/daemon/src/core/session-replay-transaction.ts',
+    'packages/daemon/src/core/session-script-publication-capability.ts',
+    'packages/daemon/src/core/session-script-writer.ts',
   ],
   // #1478 P4b: moved from `session-replay-resume.ts` into the `ReplayCoordinator`
   // (`session-replay-coordinator.ts`) — the one locked gateway a native replay request uses to
   // reach both this watermark and the P4a `scriptPublication` transitions above.
-  pendingRecordAndHeal: ['src/daemon/session-replay-coordinator.ts'],
+  pendingRecordAndHeal: ['packages/daemon/src/sessions/session-replay-coordinator.ts'],
 
-  trace: ['src/daemon/handlers/trace-runtime.ts'],
+  trace: ['packages/daemon/src/sessions/handlers/trace-runtime.ts'],
   // #3471 and #1542 share one field: what the session still owes after its last mutation. The two
   // variants are mutually exclusive, and every transition between them is owned by
   // `deferred-interaction-outcome.ts`, so neither mechanism can overwrite the other's claim.
-  deferredSurface: ['src/daemon/deferred-interaction-outcome.ts'],
+  deferredSurface: ['packages/daemon/src/core/deferred-interaction-outcome.ts'],
 
   // App identity follows open, deployment and observation through named patches.
   appName: [
-    'src/daemon/handlers/session-app-deployment.ts',
-    'src/daemon/session-lifecycle/internal/session-open-state.ts',
-    'src/daemon/snapshot-command-runtime.ts',
+    'packages/daemon/src/sessions/handlers/session-app-deployment.ts',
+    'packages/daemon/src/sessions/session-lifecycle/internal/session-open-state.ts',
+    'packages/daemon/src/sessions/snapshot-command-runtime.ts',
   ],
   appBundleId: [
-    'src/daemon/handlers/session-app-deployment.ts',
-    'src/daemon/handlers/session-selector-dispatch.ts',
-    'src/daemon/session-lifecycle/internal/session-open-state.ts',
+    'packages/daemon/src/execution/handlers/session-selector-dispatch.ts',
+    'packages/daemon/src/sessions/handlers/session-app-deployment.ts',
+    'packages/daemon/src/sessions/session-lifecycle/internal/session-open-state.ts',
+  ],
+  appLog: ['packages/daemon/src/resources/app-log-session-resource.ts'],
+  appLogFailure: ['packages/daemon/src/resources/app-log-session-resource.ts'],
+  audioProbe: ['packages/daemon/src/core/session-capture-binding.ts'],
+  perfCapture: ['packages/daemon/src/core/session-capture-binding.ts'],
+  screenRecording: ['packages/daemon/src/core/session-capture-binding.ts'],
+  lastPerfProfile: [
+    'packages/daemon/src/sessions/session-observability/internal/session-perf-runtime.ts',
   ],
-  appLog: ['src/daemon/app-log-session-resource.ts'],
-  appLogFailure: ['src/daemon/app-log-session-resource.ts'],
-  audioProbe: ['src/daemon/session-capture-binding.ts'],
-  perfCapture: ['src/daemon/session-capture-binding.ts'],
-  screenRecording: ['src/daemon/session-capture-binding.ts'],
-  lastPerfProfile: ['src/daemon/session-observability/internal/session-perf-runtime.ts'],
-  device: ['src/daemon/session-lifecycle/internal/session-open-state.ts'],
-  surface: ['src/daemon/session-lifecycle/internal/session-open-state.ts'],
+  device: ['packages/daemon/src/sessions/session-lifecycle/internal/session-open-state.ts'],
+  surface: ['packages/daemon/src/sessions/session-lifecycle/internal/session-open-state.ts'],
   // Open execution owns the paired lease/claim transition after the handler has admitted one
   // lifecycle binding. Keeping the records together prevents request-policy routing from gaining
   // a second durable owner as the execution seam stays package-bound.
   lease: [
-    'src/daemon/lease-lifecycle.ts',
-    'src/daemon/session-lifecycle/internal/session-open-state.ts',
+    'packages/daemon/src/sessions/lease-lifecycle.ts',
+    'packages/daemon/src/sessions/session-lifecycle/internal/session-open-state.ts',
   ],
-  deviceClaim: ['src/daemon/session-lifecycle/internal/session-open-state.ts'],
+  deviceClaim: ['packages/daemon/src/sessions/session-lifecycle/internal/session-open-state.ts'],
 
   // #1398 (ADR 0017 session-scoped echo protection amendment): the ephemeral
   // literal->placeholder registry is populated and consulted only at the
   // recorder's single choke point.
-  recordedFillLiterals: ['src/daemon/session-action-recorder.ts'],
+  recordedFillLiterals: ['packages/daemon/src/core/session-action-recorder.ts'],
 };
 
 /**
@@ -156,7 +162,7 @@ export function sessionStateDeclarationFile(
   sources: ReadonlyMap<string, string>,
 ): string | undefined {
   for (const [file, source] of sources) {
-    if (file.startsWith('src/daemon/') && SESSION_STATE_DECLARATION.test(source)) return file;
+    if (file.startsWith(DAEMON_SOURCE_ROOT) && SESSION_STATE_DECLARATION.test(source)) return file;
   }
   return undefined;
 }
@@ -407,11 +413,15 @@ function patchObjects(value: unknown): AstNode[] | undefined {
   return result?.type === 'ObjectExpression' ? [result] : undefined;
 }
 
-const SESSION_STATE_SCAN_ROOTS = ['src/daemon/', 'packages/capture-kit/src/capture-admission/'];
+const SESSION_STATE_SCAN_ROOTS = [
+  DAEMON_SOURCE_ROOT,
+  'packages/capture-kit/src/capture-admission/',
+];
 const SESSION_DRAFT_CONSTRUCTORS: Readonly<Record<string, string>> = {
-  'src/daemon/session-lifecycle/internal/session-open-state.ts': 'publishOpenSession',
-  'src/daemon/snapshot-session.ts': 'createSnapshotSession',
-  'src/daemon/handlers/record-runtime.ts': 'createRecordOnlySession',
+  'packages/daemon/src/sessions/session-lifecycle/internal/session-open-state.ts':
+    'publishOpenSession',
+  'packages/daemon/src/core/snapshot-session.ts': 'createSnapshotSession',
+  'packages/daemon/src/sessions/handlers/record-runtime.ts': 'createRecordOnlySession',
 };
 
 /** Assignments, named update keys and whole-record copies at the session ownership seam. */
diff --git a/scripts/layering/snapshot-assembly-presentation-policy.ts b/scripts/layering/snapshot-assembly-presentation-policy.ts
index b93f795933..679f1bbbf9 100644
--- a/scripts/layering/snapshot-assembly-presentation-policy.ts
+++ b/scripts/layering/snapshot-assembly-presentation-policy.ts
@@ -26,7 +26,7 @@ export const SNAPSHOT_ASSEMBLY_PRESENTATION_RULE = 'R74 snapshot-assembly-presen
  */
 export const SNAPSHOT_ASSEMBLY_FILES: readonly string[] = [
   'packages/capture-kit/src/snapshot-state.ts',
-  'src/daemon/snapshot-capture.ts',
+  'packages/daemon/src/core/snapshot-capture.ts',
 ];
 
 /** Producer adapters: they report acquisition facts and nothing else. */
diff --git a/scripts/layering/snapshot-presentation-boundary.test.ts b/scripts/layering/snapshot-presentation-boundary.test.ts
index ac87036c95..ffd859ad1e 100644
--- a/scripts/layering/snapshot-presentation-boundary.test.ts
+++ b/scripts/layering/snapshot-presentation-boundary.test.ts
@@ -11,7 +11,7 @@ const repoRoot = path.resolve(import.meta.dirname, '../..');
 
 /**
  * The `snapshot-policy` declaration owns presentation, freshness, timeout and overlay policy;
- * `src/daemon/` owns the assembly that orders them (#1983, ADR 0004). The dependency runs one way
+ * `packages/daemon/src/` owns the assembly that orders them (#1983, ADR 0004). The dependency runs one way
  * only, so a policy stays testable without standing up a session.
  *
  * The real tree is clean, which is exactly why the positive control below exists: a filter that
@@ -50,14 +50,14 @@ test('the snapshot facet cannot import daemon assembly', () => {
 
 test('the boundary reports a facet module that reaches back into the daemon', () => {
   const sources = new Map([
-    ['src/daemon/types.ts', 'export type SessionState = { id: string };\n'],
+    ['packages/daemon/src/types.ts', 'export type SessionState = { id: string };\n'],
     [
       'packages/capture-kit/src/snapshot/snapshot-freshness/android.ts',
-      "import type { SessionState } from '../../../../../src/daemon/types.ts';\nexport type X = SessionState;\n",
+      "import type { SessionState } from '../../../../../packages/daemon/src/types.ts';\nexport type X = SessionState;\n",
     ],
   ]);
 
   assert.deepEqual(daemonImportsFromSnapshotFacet(sources), [
-    'packages/capture-kit/src/snapshot/snapshot-freshness/android.ts:1 -> src/daemon/types.ts',
+    'packages/capture-kit/src/snapshot/snapshot-freshness/android.ts:1 -> packages/daemon/src/types.ts',
   ]);
 });
diff --git a/scripts/layering/tracked-sources.ts b/scripts/layering/tracked-sources.ts
index ebe3e81c6f..f33447c058 100644
--- a/scripts/layering/tracked-sources.ts
+++ b/scripts/layering/tracked-sources.ts
@@ -69,6 +69,12 @@ function listTrackedFiles(repoRoot: string, pathspecs: readonly string[]): strin
   return out.split('\0').filter(Boolean);
 }
 
+/**
+ * The daemon package's source root, as every layering filter sees it. One constant so a
+ * rule cannot filter on a stale path when the daemon moves again (#3546 review).
+ */
+export const DAEMON_SOURCE_ROOT = 'packages/daemon/src/';
+
 /** Production sources only: test files and `__tests__/` trees are not layering subjects. */
 export function isProductionSourceFile(file: string): boolean {
   return file.endsWith('.ts') && !/(?:^|\/)__tests__\//.test(file) && !/\.test\.ts$/.test(file);
diff --git a/scripts/layering/zone-value-dag.test.ts b/scripts/layering/zone-value-dag.test.ts
index b39c876ecc..2da9d1096d 100644
--- a/scripts/layering/zone-value-dag.test.ts
+++ b/scripts/layering/zone-value-dag.test.ts
@@ -6,11 +6,20 @@ import { checkZoneValueDag, zoneValueCycles } from './zone-value-dag.ts';
 test('two same-rank zones importing each other form a cycle no file-level or rank check sees', () => {
   const edges = resolveImportEdges(
     new Map([
-      ['src/daemon/lease.ts', "import { isTempPath } from '../remote/temp-path.ts';"],
-      ['src/daemon/capture.ts', "import { isTempPath } from '../remote/temp-path.ts';"],
+      [
+        'packages/daemon/src/lease.ts',
+        "import { isTempPath } from '../../../src/remote/temp-path.ts';",
+      ],
+      [
+        'packages/daemon/src/capture.ts',
+        "import { isTempPath } from '../../../src/remote/temp-path.ts';",
+      ],
       ['src/remote/temp-path.ts', 'export const isTempPath = true;'],
-      ['src/remote/diagnostics.ts', "import { logPath } from '../daemon/paths.ts';"],
-      ['src/daemon/paths.ts', 'export const logPath = 1;'],
+      [
+        'src/remote/diagnostics.ts',
+        "import { logPath } from '../../packages/daemon/src/paths.ts';",
+      ],
+      ['packages/daemon/src/paths.ts', 'export const logPath = 1;'],
     ]),
   );
 
@@ -19,12 +28,12 @@ test('two same-rank zones importing each other form a cycle no file-level or ran
   assert.deepEqual(checkZoneValueDag(edges), [
     {
       rule: 'R80 zone-value-dag',
-      file: 'src/daemon/capture.ts',
+      file: 'packages/daemon/src/capture.ts',
       line: 1,
       message:
         'zone-level value-import cycle: daemon-server -> remote -> daemon-server ' +
-        '(daemon-server -> remote: src/daemon/capture.ts -> src/remote/temp-path.ts; ' +
-        'remote -> daemon-server: src/remote/diagnostics.ts -> src/daemon/paths.ts). ' +
+        '(daemon-server -> remote: packages/daemon/src/capture.ts -> src/remote/temp-path.ts; ' +
+        'remote -> daemon-server: src/remote/diagnostics.ts -> packages/daemon/src/paths.ts). ' +
         'Move the contract both zones read below both of them.',
     },
   ]);
@@ -33,10 +42,16 @@ test('two same-rank zones importing each other form a cycle no file-level or ran
 test('type-only, dynamic and same-zone imports never close a zone cycle', () => {
   const edges = resolveImportEdges(
     new Map([
-      ['src/remote/diagnostics.ts', "import { logPath } from '../daemon/paths.ts';"],
-      ['src/daemon/paths.ts', "import type { TempPath } from '../remote/temp-path.ts';"],
-      ['src/daemon/lease.ts', "void import('../remote/temp-path.ts');"],
-      ['src/daemon/capture.ts', "import { logPath } from './paths.ts';"],
+      [
+        'src/remote/diagnostics.ts',
+        "import { logPath } from '../../packages/daemon/src/paths.ts';",
+      ],
+      [
+        'packages/daemon/src/paths.ts',
+        "import type { TempPath } from '../../../src/remote/temp-path.ts';",
+      ],
+      ['packages/daemon/src/lease.ts', "void import('../../../src/remote/temp-path.ts');"],
+      ['packages/daemon/src/capture.ts', "import { logPath } from './paths.ts';"],
       ['src/remote/temp-path.ts', 'export type TempPath = string;'],
     ]),
   );
diff --git a/scripts/mutation/modules.test.ts b/scripts/mutation/modules.test.ts
index 370296bd19..672564986f 100644
--- a/scripts/mutation/modules.test.ts
+++ b/scripts/mutation/modules.test.ts
@@ -28,7 +28,7 @@ test('every enumerated kernel path exists', () => {
 
 test('changed sources map onto the module that owns them', () => {
   assert.equal(moduleForFile('packages/kernel/src/errors.ts'), 'kernel-errors');
-  assert.equal(moduleForFile('./src/daemon/ref-frame.ts'), 'daemon-ref-frame');
+  assert.equal(moduleForFile('./packages/daemon/src/core/ref-frame.ts'), 'daemon-ref-frame');
   assert.equal(moduleForFile('packages/selectors/src/internal/parse.ts'), 'selectors');
   // Selector tests live under the owned prefix; every other kernel's tests are
   // attributed by ownership.ts, not by this path match.
@@ -89,12 +89,12 @@ test('a kernel test is reachable only under root or package src', () => {
   // `scripts/__tests__/` (explicitly included by `unit-core`) and this predicate keeps them out of
   // every mutation lane. Widening the pattern to scripts/ would silently pull them back in and
   // fail every dry run.
-  assert.ok(isKernelTestFile('src/daemon/__tests__/ref-frame.test.ts'));
+  assert.ok(isKernelTestFile('packages/daemon/src/core/__tests__/ref-frame.test.ts'));
   assert.ok(isKernelTestFile('packages/selectors/src/parse.test.ts'));
   assert.ok(!isKernelTestFile('scripts/__tests__/test-file-size-ratchet.test.ts'));
   assert.ok(!isKernelTestFile('scripts/__tests__/eager-closure-budgets.test.ts'));
   assert.ok(fs.existsSync(path.join(repoRoot, 'scripts/__tests__/eager-closure-budgets.test.ts')));
   assert.ok(!fs.existsSync(path.join(repoRoot, 'src/__tests__/eager-closure-budgets.test.ts')));
   assert.ok(!isKernelTestFile('test/integration/daemon.test.ts'));
-  assert.ok(!isKernelTestFile('src/daemon/ref-frame.ts'));
+  assert.ok(!isKernelTestFile('packages/daemon/src/core/ref-frame.ts'));
 });
diff --git a/scripts/mutation/modules.ts b/scripts/mutation/modules.ts
index 62962325ef..1e332a4fd5 100644
--- a/scripts/mutation/modules.ts
+++ b/scripts/mutation/modules.ts
@@ -50,8 +50,8 @@ export const KERNEL_MODULES: readonly KernelModule[] = [
   {
     id: 'daemon-ref-frame',
     label: 'Ref-frame admission matrix (ADR 0014)',
-    mutate: ['src/daemon/ref-frame.ts'],
-    owns: ['src/daemon/ref-frame.ts'],
+    mutate: ['packages/daemon/src/core/ref-frame.ts'],
+    owns: ['packages/daemon/src/core/ref-frame.ts'],
   },
   {
     id: 'interaction-settle',
diff --git a/scripts/mutation/ownership.test.ts b/scripts/mutation/ownership.test.ts
index 9d3299eb3b..0381431c4c 100644
--- a/scripts/mutation/ownership.test.ts
+++ b/scripts/mutation/ownership.test.ts
@@ -20,7 +20,9 @@ test('a kernel is owned by the mirrored test that imports it directly', () => {
     'kernel-errors',
   ]);
   assert.ok(
-    deriver.ownersOf('src/daemon/__tests__/ref-frame.test.ts').includes('daemon-ref-frame'),
+    deriver
+      .ownersOf('packages/daemon/src/core/__tests__/ref-frame.test.ts')
+      .includes('daemon-ref-frame'),
   );
   assert.ok(
     deriver
@@ -38,7 +40,9 @@ test('a kernel is owned by tests that reach it indirectly', () => {
     'daemon-error.test.ts exercises normalizeError but does not own kernel-errors',
   );
   assert.ok(
-    deriver.ownersOf('src/daemon/__tests__/back-runtime.test.ts').includes('scroll-edge-state'),
+    deriver
+      .ownersOf('packages/daemon/src/execution/__tests__/back-runtime.test.ts')
+      .includes('scroll-edge-state'),
     'back-runtime.test.ts exercises edge detection but does not own scroll-edge-state',
   );
 });
@@ -90,7 +94,7 @@ test('derived selection unions source ownership with test reachability', () => {
     derivedAffectedModules(
       [
         'packages/selectors/src/internal/parse.ts',
-        'src/daemon/__tests__/ref-frame.test.ts',
+        'packages/daemon/src/core/__tests__/ref-frame.test.ts',
         'docs/agents/testing.md',
       ],
       repoRoot,
diff --git a/scripts/mutation/test-scope.test.ts b/scripts/mutation/test-scope.test.ts
index 43d61ba3b8..33d4bbe995 100644
--- a/scripts/mutation/test-scope.test.ts
+++ b/scripts/mutation/test-scope.test.ts
@@ -31,7 +31,7 @@ test('the thread-hostile exclusion is derived from imports, not listed', () => {
   assert.ok(files.includes('src/__tests__/cli-help.test.ts'));
   assert.ok(files.includes('packages/capture-kit/src/png-worker.test.ts'));
   // A pure decision-kernel test is never excluded — that would hide survivors.
-  assert.ok(!files.includes('src/daemon/__tests__/ref-frame.test.ts'));
+  assert.ok(!files.includes('packages/daemon/src/core/__tests__/ref-frame.test.ts'));
   assert.ok(files.every((file) => file.endsWith('.test.ts')));
 });
 
diff --git a/scripts/mutation/workspace-aliases.test.ts b/scripts/mutation/workspace-aliases.test.ts
index 6940f4d3db..4daaf5889b 100644
--- a/scripts/mutation/workspace-aliases.test.ts
+++ b/scripts/mutation/workspace-aliases.test.ts
@@ -2,6 +2,7 @@ import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import path from 'node:path';
 import { test } from 'node:test';
+import { resolveWorkspaceSpecifier } from '../layering/model.ts';
 import { workspaceSpecifierTargets } from '../layering/package-boundaries.ts';
 import { workspaceSourceAliases } from './workspace-aliases.ts';
 
@@ -13,11 +14,24 @@ test('Stryker aliases every exported workspace subpath exactly', () => {
 
   for (const [specifier, target] of targets) {
     const matches = aliases.filter(({ find }) => find.test(specifier));
-    assert.deepEqual(
-      matches.map(({ replacement }) => replacement),
-      [path.join(repoRoot, target)],
-      `${specifier} must resolve to its own export instead of a package-root prefix`,
-    );
+    if (!specifier.endsWith('*')) {
+      assert.deepEqual(
+        matches.map(({ replacement }) => replacement),
+        [path.join(repoRoot, target)],
+        `${specifier} must resolve to its own export instead of a package-root prefix`,
+      );
+      continue;
+    }
+    // A pattern entry aliases through a capture group filling its target's `*`,
+    // so concrete imports resolve in the sandbox to the same module id as the
+    // exports map gives them outside it (#3546 review).
+    const pattern = matches.find(({ replacement }) => replacement.includes('$1'));
+    assert.ok(pattern, `${specifier} must alias as a capture-group pattern`);
+    const suffix = 'probe/nested';
+    const applied = `${specifier.slice(0, -1)}${suffix}`.replace(pattern.find, pattern.replacement);
+    const expected = path.join(repoRoot, target);
+    const star = expected.indexOf('*');
+    assert.equal(applied, expected.slice(0, star) + suffix + expected.slice(star + 1));
   }
 
   assert.equal(
@@ -26,6 +40,118 @@ test('Stryker aliases every exported workspace subpath exactly', () => {
   );
 });
 
+test('every exports map resolves through the alias table exactly as resolveWorkspaceSpecifier does', () => {
+  // One semantics, three consumers: the alias table Vite applies first-match,
+  // resolveWorkspaceSpecifier's longest-prefix rule, and Node's exports
+  // resolution must pick the same module id for every concrete specifier.
+  const targets = workspaceSpecifierTargets(repoRoot);
+  const aliases = workspaceSourceAliases(repoRoot, 'tracked-manifests');
+  for (const key of targets.keys()) {
+    const probe = key.endsWith('*') ? `${key.slice(0, -1)}probe/nested` : key;
+    const expected = resolveWorkspaceSpecifier(probe, targets);
+    assert.ok(expected, `${probe} must resolve through the exports map`);
+    const alias = aliases.find(({ find }) => find.test(probe));
+    assert.ok(alias, `${probe} must hit an alias`);
+    assert.equal(
+      probe.replace(alias.find, alias.replacement),
+      path.join(repoRoot, expected),
+      `${probe} must hit the alias for its longest-prefix export`,
+    );
+  }
+});
+
+test('a named alias wins over a pattern alias that also matches it', () => {
+  // Vite applies the first matching alias, so exact entries are ordered first;
+  // a named `./testing/x` under a `./testing/*` pattern keeps its own export.
+  const aliases = workspaceSourceAliases(repoRoot, 'tracked-manifests');
+  const firstExact = aliases.findIndex(
+    ({ find, replacement }) => !replacement.includes('$1') && find.source.includes('testing/'),
+  );
+  const lastPattern = aliases.findLastIndex(({ replacement }) => replacement.includes('$1'));
+  assert.ok(
+    firstExact === -1 || lastPattern === -1 || firstExact < lastPattern,
+    'every exact alias must precede every pattern alias',
+  );
+});
+
+test('overlapping patterns alias in longest-prefix order regardless of declaration order', () => {
+  // The real manifests may happen to declare patterns in the order that hides a
+  // missing sort, so plant the hostile order: `./testing/*` declared BEFORE
+  // `./testing/handlers/*`. Vite applies the first matching alias, so the table
+  // must still hand `testing/handlers/x` to the longer pattern — the same target
+  // resolveWorkspaceSpecifier picks by Node's longest-prefix rule (#3546 review).
+  fs.mkdirSync(path.join(repoRoot, '.tmp'), { recursive: true });
+  const sandboxRoot = fs.mkdtempSync(path.join(repoRoot, '.tmp', 'stryker-overlap-fixture-'));
+  try {
+    const packageDir = path.join(sandboxRoot, 'packages', 'demo');
+    fs.mkdirSync(path.join(packageDir, 'src'), { recursive: true });
+    fs.writeFileSync(
+      path.join(packageDir, 'package.json'),
+      JSON.stringify({
+        name: '@agent-device/demo',
+        // The targets must differ per pattern or the suffix fill would land both
+        // on the same file and the probe could not tell which alias fired.
+        exports: {
+          './testing/*': { default: './src/shadow/*.ts' },
+          './testing/handlers/*': { default: './src/handlers/*.ts' },
+        },
+      }),
+    );
+    const diskAliases = workspaceSourceAliases(sandboxRoot, 'disk-manifests');
+    const probe = '@agent-device/demo/testing/handlers/x';
+    const alias = diskAliases.find(({ find }) => find.test(probe));
+    assert.ok(alias, `${probe} must hit an alias`);
+    assert.equal(
+      probe.replace(alias.find, alias.replacement),
+      path.join(sandboxRoot, 'packages', 'demo', 'src', 'handlers', 'x.ts'),
+      `${probe} must alias through the longer pattern even though the shorter one was declared first`,
+    );
+    const targets = new Map([
+      ['@agent-device/demo/testing/*', 'packages/demo/src/shadow/*.ts'],
+      ['@agent-device/demo/testing/handlers/*', 'packages/demo/src/handlers/*.ts'],
+    ]);
+    assert.equal(
+      probe.replace(alias.find, alias.replacement),
+      path.join(sandboxRoot, resolveWorkspaceSpecifier(probe, targets)!),
+      'the first-matched alias must agree with resolveWorkspaceSpecifier on hostile declaration order too',
+    );
+  } finally {
+    fs.rmSync(sandboxRoot, { recursive: true, force: true });
+  }
+});
+
+test('a repo root containing replacement patterns survives the alias round-trip', () => {
+  // A checkout under a path like `/build/$1/app` is rare but legal. The pattern
+  // alias applies with a STRING replacement, so every `$` in the repo path must
+  // arrive doubled: with a plain `$$` string replace, `$$` means one `$` and
+  // each `$` survives UNescaped, letting `$&`/`$1` in the path expand to the
+  // match or the capture when Vite applies the alias (#3546 review).
+  fs.mkdirSync(path.join(repoRoot, '.tmp'), { recursive: true });
+  const sandboxRoot = fs.mkdtempSync(path.join(repoRoot, '.tmp', 'stryker-dollar-$&$1-fixture-'));
+  try {
+    const packageDir = path.join(sandboxRoot, 'packages', 'demo');
+    fs.mkdirSync(path.join(packageDir, 'src'), { recursive: true });
+    fs.writeFileSync(
+      path.join(packageDir, 'package.json'),
+      JSON.stringify({
+        name: '@agent-device/demo',
+        exports: { './testing/*': { default: './src/testing/*.ts' } },
+      }),
+    );
+    const alias = workspaceSourceAliases(sandboxRoot, 'disk-manifests').find(({ find }) =>
+      find.test('@agent-device/demo/testing/handlers/x'),
+    );
+    assert.ok(alias, 'the pattern export must produce an alias');
+    assert.equal(
+      '@agent-device/demo/testing/handlers/x'.replace(alias.find, alias.replacement),
+      path.join(sandboxRoot, 'packages', 'demo', 'src', 'testing', 'handlers', 'x.ts'),
+      'the $-bearing root must round-trip through the alias to its literal path',
+    );
+  } finally {
+    fs.rmSync(sandboxRoot, { recursive: true, force: true });
+  }
+});
+
 test('disk manifests alias an untracked sandbox copy the tracked reader cannot see', () => {
   fs.mkdirSync(path.join(repoRoot, '.tmp'), { recursive: true });
   const sandboxRoot = fs.mkdtempSync(path.join(repoRoot, '.tmp', 'stryker-sandbox-fixture-'));
diff --git a/scripts/mutation/workspace-aliases.ts b/scripts/mutation/workspace-aliases.ts
index 31e0167366..45f56ca07e 100644
--- a/scripts/mutation/workspace-aliases.ts
+++ b/scripts/mutation/workspace-aliases.ts
@@ -9,8 +9,40 @@ export type WorkspaceSourceAlias = {
 
 export type ManifestSource = 'tracked-manifests' | 'disk-manifests';
 
+function escapeRegExp(literal: string): string {
+  return literal.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`);
+}
+
 function exactSpecifier(specifier: string): RegExp {
-  return new RegExp(`^${specifier.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`)}$`);
+  return new RegExp(`^${escapeRegExp(specifier)}$`);
+}
+
+/**
+ * An alias pair for one exports entry: exact for a named subpath, and a capture-
+ * group pattern for a `*` pattern entry (ADR-0033's `./testing/<dir>/*`). Emitting
+ * the pattern key as a literal matches nothing, so every concrete import of a
+ * pattern-exported module would load the UNaliased path in the Stryker sandbox —
+ * a different module id than its `vi.mock` registers, and the mock silently misses
+ * (#3546 review). Vite substitutes `$1` into the target template the way Node
+ * fills the exports target's `*`.
+ */
+function aliasFor(specifier: string, target: string, repoRoot: string): WorkspaceSourceAlias {
+  if (specifier.endsWith('*') && target.includes('*')) {
+    // Node requires exactly one `*` in the target, so it splices at a known
+    // index; `$` in the repo path is escaped so Vite sees only the `$1` fill.
+    const template = path.join(repoRoot, target);
+    const star = template.indexOf('*');
+    // The callback form is load-bearing: in a string replacement `$$` IS one
+    // literal `$`, so a string '$$' would replace each `$` with itself and
+    // leave `$1`/`$&` in the repo path to be expanded when the alias applies.
+    const escapeDollar = (text: string) => text.replaceAll('$', () => '$$');
+    return {
+      find: new RegExp(`^${escapeRegExp(specifier.slice(0, -1))}(.*)$`),
+      replacement:
+        escapeDollar(template.slice(0, star)) + '$1' + escapeDollar(template.slice(star + 1)),
+    };
+  }
+  return { find: exactSpecifier(specifier), replacement: path.join(repoRoot, target) };
 }
 
 function specifierTargets(repoRoot: string, source: ManifestSource): ReadonlyMap<string, string> {
@@ -50,13 +82,24 @@ function* manifestSpecifierTargets(
   }
 }
 
-/** Exact exported workspace-package aliases for Vitest, from the declared manifest source. */
+/**
+ * Exported workspace-package aliases for Vitest, from the declared manifest source:
+ * one per exports entry, exact for named subpaths and capture-group patterns for
+ * `*` entries. Vite applies aliases in list order, so exact entries are emitted
+ * first — a named subpath under a pattern's prefix keeps its own export.
+ */
 export function workspaceSourceAliases(
   repoRoot: string,
   source: ManifestSource,
 ): WorkspaceSourceAlias[] {
-  return [...specifierTargets(repoRoot, source)].map(([specifier, target]) => ({
-    find: exactSpecifier(specifier),
-    replacement: path.join(repoRoot, target),
-  }));
+  const targets = [...specifierTargets(repoRoot, source)];
+  const patterns = targets.filter(([specifier]) => specifier.endsWith('*'));
+  // Vite applies the first matching alias, so exact entries lead (Node's exact
+  // precedence) and patterns follow sorted by prefix length descending (Node's
+  // longest-prefix rule) — the same order resolveWorkspaceSpecifier resolves in,
+  // so the sandbox never picks a different module id than the exports semantics.
+  patterns.sort(([a], [b]) => b.length - a.length);
+  return [...targets.filter(([specifier]) => !specifier.endsWith('*')), ...patterns].map(
+    ([specifier, target]) => aliasFor(specifier, target, repoRoot),
+  );
 }
diff --git a/scripts/wire-compat/model.test.ts b/scripts/wire-compat/model.test.ts
index eeb1a0a82f..4c169787dd 100644
--- a/scripts/wire-compat/model.test.ts
+++ b/scripts/wire-compat/model.test.ts
@@ -117,7 +117,7 @@ test('a removed wire declaration passes with a bump', () => {
 // unchanged is a file move, not a removal: a released peer still parses it,
 // so it must not force a protocol bump.
 test('a declaration moved to a new file unchanged is a move, not a removal', () => {
-  const movedFrom = 'src/daemon/http-contract.ts#buildDaemonHttpUrl';
+  const movedFrom = 'packages/daemon/src/http-contract.ts#buildDaemonHttpUrl';
   const movedTo = 'packages/contracts/src/daemon-http.ts#buildDaemonHttpUrl';
   const released = ledger({
     declarations: { [movedFrom]: 'sha256:ddd', [META]: 'sha256:bbb' },
@@ -140,7 +140,7 @@ test('a declaration moved to a new file unchanged is a move, not a removal', ()
 // CHANGE at the destination (ackable at the new digest) rather than the
 // bump-only removal the key-pair alone would suggest.
 test('a move that changes the shape is a change, acked at the path it moved to', () => {
-  const movedFrom = 'src/daemon/http-health.ts#buildDaemonHealthPayload';
+  const movedFrom = 'packages/daemon/src/http-health.ts#buildDaemonHealthPayload';
   const movedTo = 'packages/contracts/src/daemon-http.ts#buildDaemonHealthPayload';
   const released = ledger({ declarations: { [movedFrom]: 'sha256:old' } });
   const current = ledger({
@@ -171,8 +171,8 @@ test('a move that changes the shape is a change, acked at the path it moved to',
 // the name at its own path, a same-named declaration elsewhere cannot be
 // identified as a move of this one, so the baseline key stays a removal.
 test('a name still owned by the baseline is not a move, so it remains a removal', () => {
-  const serverSendJson = 'src/daemon/server/http-rpc-envelope.ts#sendJson';
-  const uploadSendJson = 'src/daemon/upload-http.ts#sendJson';
+  const serverSendJson = 'packages/daemon/src/server/server/http-rpc-envelope.ts#sendJson';
+  const uploadSendJson = 'packages/daemon/src/server/upload-http.ts#sendJson';
   const released = ledger({
     declarations: { [serverSendJson]: 'sha256:old', [uploadSendJson]: 'sha256:eee' },
   });
diff --git a/scripts/wire-compat/run.ts b/scripts/wire-compat/run.ts
index 93adef726c..633f0fdfff 100644
--- a/scripts/wire-compat/run.ts
+++ b/scripts/wire-compat/run.ts
@@ -20,6 +20,7 @@
 
 import path from 'node:path';
 import { repoGit, requireUnshallowHistory } from '../lib/repo-git.ts';
+import { renamedSince } from '../__tests__/committed-source-tree.ts';
 import { digestDeclaration } from '../../test/wire-compat/declaration-digest.ts';
 import {
   digestWireSurface,
@@ -71,9 +72,46 @@ if (!baseline) {
   process.exit(0);
 }
 
+/**
+ * Rename pairs from the baseline tag to HEAD, as `<file> -> <file>`. The ledger's
+ * move detection identifies a moved declaration by a sole same-name re-declaration;
+ * a bulk `git mv` of two files that share a declaration name (the daemon's two
+ * `sendJson` helpers) outruns that heuristic, because both destinations are claimed
+ * by candidates. Git's rename detection knows the truth for the whole tree at once,
+ * so the baseline's keys are canonicalized into HEAD coordinates before comparison.
+ * Digests travel unchanged: a pure move is not a wire change.
+ */
+function tagToHeadRenames(tag: string): Map<string, string> {
+  // head -> base at [tag, HEAD]; flipped into the base -> head direction the ledger needs.
+  const flipped = new Map<string, string>();
+  for (const [headPath, basePath] of renamedSince(repoRoot, tag, 'HEAD'))
+    flipped.set(basePath, headPath);
+  return flipped;
+}
+
+function canonicalizeLedgerRef(ref: string, renames: ReadonlyMap<string, string>): string {
+  const hash = ref.lastIndexOf('#');
+  const renamed = renames.get(ref.slice(0, hash));
+  return renamed === undefined ? ref : `${renamed}#${ref.slice(hash + 1)}`;
+}
+
+const releasedRenames = tagToHeadRenames(baseline.tag);
+const released = parseWireLedger(baseline.raw, `${baseline.tag}:${WIRE_LEDGER_PATH}`);
 const result = compareWireLedgers({
   baselineTag: baseline.tag,
-  released: parseWireLedger(baseline.raw, `${baseline.tag}:${WIRE_LEDGER_PATH}`),
+  released: {
+    ...released,
+    declarations: Object.fromEntries(
+      Object.entries(released.declarations).map(([ref, digest]) => [
+        canonicalizeLedgerRef(ref, releasedRenames),
+        digest,
+      ]),
+    ),
+    compatibleChanges: released.compatibleChanges.map((change) => ({
+      ...change,
+      declaration: canonicalizeLedgerRef(change.declaration, releasedRenames),
+    })),
+  },
   current: readWireLedger(repoRoot),
   digests: digestWireSurface(repoRoot, WIRE_DECLARATIONS, digestDeclaration),
 });
diff --git a/src/__tests__/cli-device-release.test.ts b/src/__tests__/cli-device-release.test.ts
index 40ea33d2ea..4391805f83 100644
--- a/src/__tests__/cli-device-release.test.ts
+++ b/src/__tests__/cli-device-release.test.ts
@@ -6,7 +6,7 @@ import { test, vi } from 'vitest';
 import { readCurrentOwnerIdentity } from '@agent-device/host-kit/process';
 import { createDurableResourceEnvelope } from '@agent-device/capture-kit';
 import { localRuntimeOwner } from '@agent-device/contracts/platform-runtime';
-import { appLogResourceStore } from '../daemon/app-log-resource-store.ts';
+import { appLogResourceStore } from '@agent-device/daemon/testing/app-log-resource-store';
 import { runStaleDeviceClaimRelease } from '../cli/commands/device-release.ts';
 import { runCliCapture } from './cli-capture.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
diff --git a/src/__tests__/cli-remote-diagnostics.test.ts b/src/__tests__/cli-remote-diagnostics.test.ts
index ef1712876b..155c35f7dc 100644
--- a/src/__tests__/cli-remote-diagnostics.test.ts
+++ b/src/__tests__/cli-remote-diagnostics.test.ts
@@ -10,10 +10,10 @@ import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import path from 'node:path';
 import { normalizeError, AppError } from '@agent-device/kernel/errors';
-import { createDaemonHttpServer } from '../daemon/server/http-server.ts';
-import { resolveSessionRequestLogPath } from '../daemon/session-artifact-paths.ts';
+import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
+import { resolveSessionRequestLogPath } from '@agent-device/daemon/session-artifact-paths';
 import { safeSessionName } from '@agent-device/host-kit/session-paths';
-import type { DaemonRequest, DaemonResponse } from '../daemon/daemon-request.ts';
+import type { DaemonRequest, DaemonResponse } from '@agent-device/daemon/daemon-request';
 import { runCliCapture, type CapturedCliRun } from './cli-capture.ts';
 import {
   closeLoopbackServer,
diff --git a/src/__tests__/command-descriptor-parity.test.ts b/src/__tests__/command-descriptor-parity.test.ts
index 954ea5eb77..84728493ae 100644
--- a/src/__tests__/command-descriptor-parity.test.ts
+++ b/src/__tests__/command-descriptor-parity.test.ts
@@ -6,7 +6,7 @@ import {
   listCliCommandNames,
   PUBLIC_COMMANDS,
 } from '@agent-device/command-registry/catalog';
-import { canRunReplayScopedAction } from '../daemon/daemon-command-registry.ts';
+import { canRunReplayScopedAction } from '@agent-device/daemon/daemon-command-registry';
 import {
   deriveDaemonCommandDescriptors,
   deriveStructuredBatchCommandNames,
diff --git a/src/__tests__/command-descriptor-ref-frame-effect.test.ts b/src/__tests__/command-descriptor-ref-frame-effect.test.ts
index 72ac075951..92a0bd56bf 100644
--- a/src/__tests__/command-descriptor-ref-frame-effect.test.ts
+++ b/src/__tests__/command-descriptor-ref-frame-effect.test.ts
@@ -5,8 +5,8 @@ import { PUBLIC_COMMANDS } from '@agent-device/command-registry/catalog';
 import {
   DAEMON_COMMAND_DESCRIPTORS,
   resolveRefFrameEffect,
-} from '../daemon/daemon-command-registry.ts';
-import type { DaemonRequest } from '../daemon/daemon-request.ts';
+} from '@agent-device/daemon/daemon-command-registry';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 
 // ADR 0014 migration step 2: the ref-frame-effect classification is an
 // honesty/completeness guard. Every command that reaches a session-owning daemon
diff --git a/src/__tests__/command-descriptor-shutdown-runtime-execution.test.ts b/src/__tests__/command-descriptor-shutdown-runtime-execution.test.ts
index 61f5e4975b..2a35dd3152 100644
--- a/src/__tests__/command-descriptor-shutdown-runtime-execution.test.ts
+++ b/src/__tests__/command-descriptor-shutdown-runtime-execution.test.ts
@@ -4,11 +4,14 @@ import { shutdownTargetUse } from '@agent-device/contracts/platform-runtime-oper
 import { commandDescriptors } from '@agent-device/command-registry/registry';
 
 const sessionShutdownSource = readFileSync(
-  new URL('../daemon/handlers/session-shutdown.ts', import.meta.url),
+  new URL('../../packages/daemon/src/sessions/handlers/session-shutdown.ts', import.meta.url),
   'utf8',
 );
 const sessionCloseSource = readFileSync(
-  new URL('../daemon/session-lifecycle/internal/session-close.ts', import.meta.url),
+  new URL(
+    '../../packages/daemon/src/sessions/session-lifecycle/internal/session-close.ts',
+    import.meta.url,
+  ),
   'utf8',
 );
 const appleLifecycleSource = readFileSync(
diff --git a/src/__tests__/daemon-client-progress.test.ts b/src/__tests__/daemon-client-progress.test.ts
index 212098b24e..6f14366a95 100644
--- a/src/__tests__/daemon-client-progress.test.ts
+++ b/src/__tests__/daemon-client-progress.test.ts
@@ -3,7 +3,7 @@ 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/daemon-request.ts';
+import type { DaemonRequest, DaemonResponse } from '@agent-device/daemon/daemon-request';
 import { readDaemonSocketProgressResponse } from '../daemon-client/daemon-client-progress.ts';
 import { beginStderrCapture } from './test-utils/stream-capture.ts';
 import { AppError } from '@agent-device/kernel/errors';
diff --git a/src/__tests__/daemon-composition-assembly.test.ts b/src/__tests__/daemon-composition-assembly.test.ts
index 2a0533f534..ba75e5eaa7 100644
--- a/src/__tests__/daemon-composition-assembly.test.ts
+++ b/src/__tests__/daemon-composition-assembly.test.ts
@@ -7,16 +7,17 @@ import { WEB_DESKTOP_DEVICE } from '@agent-device/test-kit/device-fixtures';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { createDaemonRuntimeDeps } from '../daemon-composition.ts';
 import { startDaemonRuntimeFixture } from './daemon-composition/daemon-runtime-fixture.ts';
-import type { DaemonRuntimeDepsInput } from '../daemon/server/daemon-runtime.ts';
+import type { DaemonRuntimeDepsInput } from '@agent-device/daemon/server/daemon-runtime';
 
 // The server builds its own store, so capture that instance the same way the shutdown tests do:
 // the proof is about the store the server hands to the composition callbacks, not one the test
 // fabricates.
 const storeProbe = vi.hoisted(() => ({
-  store: undefined as import('../daemon/session-store.ts').SessionStore | undefined,
+  store: undefined as import('@agent-device/daemon/testing/session-store').SessionStore | undefined,
 }));
-vi.mock('../daemon/session-store.ts', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../daemon/session-store.ts')>();
+vi.mock('@agent-device/daemon/testing/session-store', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('@agent-device/daemon/testing/session-store')>();
   return {
     ...actual,
     SessionStore: class extends actual.SessionStore {
diff --git a/src/__tests__/daemon-composition-web-cleanup.test.ts b/src/__tests__/daemon-composition-web-cleanup.test.ts
index 7186850bb4..cf0e8955c9 100644
--- a/src/__tests__/daemon-composition-web-cleanup.test.ts
+++ b/src/__tests__/daemon-composition-web-cleanup.test.ts
@@ -18,8 +18,8 @@ vi.mock('@agent-device/platform-web', async (importOriginal) => {
 });
 
 import { WEB_DESKTOP_DEVICE } from '@agent-device/test-kit/device-fixtures';
-import { SessionStore } from '../daemon/session-store.ts';
-import { openWebSessionNames } from '../daemon/web-session-names.ts';
+import { SessionStore } from '@agent-device/daemon/testing/session-store';
+import { openWebSessionNames } from '@agent-device/daemon/testing/web-session-names';
 import { cleanupWebBrowserOrphansForDaemonStartup } from '../daemon-composition.ts';
 
 const mockCleanupManagedAgentBrowserOrphans = vi.mocked(cleanupManagedAgentBrowserOrphansMock);
diff --git a/src/__tests__/daemon-composition/android-dialog-readiness.test.ts b/src/__tests__/daemon-composition/android-dialog-readiness.test.ts
index 124a46ef16..5a099cd3bd 100644
--- a/src/__tests__/daemon-composition/android-dialog-readiness.test.ts
+++ b/src/__tests__/daemon-composition/android-dialog-readiness.test.ts
@@ -32,13 +32,13 @@ vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
   };
 });
 
-import { makeAndroidSession } from '../../daemon/__tests__/support/session-factories.ts';
+import { makeAndroidSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
 import { withFakeAdb, type FakeAdbScript } from '../test-utils/fake-adb.ts';
 import {
   countDiagnosticEventsByPhase,
   withDiagnosticsScope,
 } from '@agent-device/host-kit/diagnostics';
-import { ensureAndroidBlockingSystemDialogReady as ensureOwnedAndroidBlockingSystemDialogReady } from '../../daemon/android-system-dialog.ts';
+import { ensureAndroidBlockingSystemDialogReady as ensureOwnedAndroidBlockingSystemDialogReady } from '@agent-device/daemon/testing/android-system-dialog';
 import { androidObservation } from '../../platform-runtime.ts';
 
 const ensureAndroidBlockingSystemDialogReady = (
diff --git a/src/__tests__/daemon-composition/app-event-delivery.test.ts b/src/__tests__/daemon-composition/app-event-delivery.test.ts
index 9425fd4425..2ca5afa435 100644
--- a/src/__tests__/daemon-composition/app-event-delivery.test.ts
+++ b/src/__tests__/daemon-composition/app-event-delivery.test.ts
@@ -4,7 +4,10 @@ import { promises as fs } from 'node:fs';
 import path from 'node:path';
 import { bindAdmittedLocalInteractorOperations } from '@agent-device/contracts/interactor-operation-catalog';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import { parseTriggerAppEventArgs, resolveAppEventUrl } from '../../daemon/app-events.ts';
+import {
+  parseTriggerAppEventArgs,
+  resolveAppEventUrl,
+} from '@agent-device/daemon/testing/app-events';
 import { getInteractor } from '../../core/interactors.ts';
 import { AppError } from '@agent-device/kernel/errors';
 import { ANDROID_EMULATOR, IOS_DEVICE, MACOS_DEVICE } from '@agent-device/test-kit/device-fixtures';
diff --git a/src/__tests__/daemon-composition/application-lifecycle-runtime-fixture.ts b/src/__tests__/daemon-composition/application-lifecycle-runtime-fixture.ts
index aac29db2ff..ce42361203 100644
--- a/src/__tests__/daemon-composition/application-lifecycle-runtime-fixture.ts
+++ b/src/__tests__/daemon-composition/application-lifecycle-runtime-fixture.ts
@@ -15,11 +15,11 @@ import { vi } from 'vitest';
 export {
   awaitFixtureReadiness,
   dispatchApplicationLifecycleEffect,
-} from '../../daemon/__tests__/application-lifecycle-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/application-lifecycle-runtime-fixture';
 import {
   applicationLifecycleFixtureInteractor,
   awaitFixtureReadiness,
-} from '../../daemon/__tests__/application-lifecycle-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/application-lifecycle-runtime-fixture';
 import type { Interactor, RunnerContext } from '@agent-device/contracts/interactor-types';
 import { createAndroidApplicationTools } from '../../platform-runtime-android-application-tools.ts';
 import { createAppleApplicationTools } from '../../platform-runtime-apple-application-tools.ts';
diff --git a/src/__tests__/daemon-composition/capture-disclosure.test.ts b/src/__tests__/daemon-composition/capture-disclosure.test.ts
index e8972a9630..0bf36a4971 100644
--- a/src/__tests__/daemon-composition/capture-disclosure.test.ts
+++ b/src/__tests__/daemon-composition/capture-disclosure.test.ts
@@ -1,18 +1,18 @@
 import { test, expect, vi, beforeEach } from 'vitest';
-import { legacyDispatchCapture } from '../../daemon/__tests__/legacy-snapshot-capture-fixture.ts';
-import { handleFindCommands } from '../../daemon/interaction/index.ts';
-import { getRuntimeBindings } from '../../daemon/__tests__/interaction-get-runtime-fixture.ts';
-import { dispatchFindReadOnlyViaRuntime } from '../../daemon/selector-runtime.ts';
-import { dispatchWaitViaRuntime } from '../../daemon/wait-runtime.ts';
-import type { DaemonRequest, DaemonResponse } from '../../daemon/daemon-request.ts';
+import { legacyDispatchCapture } from '@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture';
+import { handleFindCommands } from '@agent-device/daemon/testing/interaction/index';
+import { getRuntimeBindings } from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
+import { dispatchFindReadOnlyViaRuntime } from '@agent-device/daemon/testing/selector-runtime';
+import { dispatchWaitViaRuntime } from '@agent-device/daemon/testing/wait-runtime';
+import type { DaemonRequest, DaemonResponse } from '@agent-device/daemon/daemon-request';
 import { ANDROID_SYSTEM_SURFACE_DISCLOSURE } from '@agent-device/contracts/android-system-surface-disclosure';
 import { iosSystemSurfaceDisclosure } from '@agent-device/contracts/ios-system-surface';
-import { snapshotRuntimeFixture } from '../../daemon/__tests__/snapshot-runtime-fixture.ts';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
+import { snapshotRuntimeFixture } from '@agent-device/daemon/testing/__tests__/snapshot-runtime-fixture';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import {
   makeAndroidSession,
   makeIosSession,
-} from '../../daemon/__tests__/support/session-factories.ts';
+} from '@agent-device/daemon/testing/__tests__/support/session-factories';
 import { platformResourceCleanup } from '../../platform-runtime-resource-cleanup.ts';
 import { testCreateCommandSurface } from './command-surface-fixture.ts';
 
@@ -25,20 +25,21 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
   };
 });
 
-vi.mock('../../daemon/snapshot-interactor-capture.ts', async () => {
-  const fixture = await import('../../daemon/__tests__/legacy-snapshot-capture-fixture.ts');
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', async () => {
+  const fixture =
+    await import('@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture');
   return { captureSnapshotWithInteractor: fixture.captureSnapshotThroughLegacyDispatchFixture };
 });
 
-vi.mock('../../daemon/device/device-ready.ts', () => ({
+vi.mock('@agent-device/daemon/testing/device/device-ready', () => ({
   ensureDeviceReady: vi.fn(async () => {}),
 }));
 
 import { resolveTargetDevice } from '@agent-device/device-selection/dispatch-resolve';
 import { ANDROID_EMULATOR } from '@agent-device/test-kit/device-fixtures';
-import { withSystemSurfaceDisclosure } from '../../daemon/capture-disclosure.ts';
+import { withSystemSurfaceDisclosure } from '@agent-device/daemon/testing/capture-disclosure';
 import { iosTargetActivationDisclosure } from '@agent-device/contracts/ios-target-activation';
-import { TARGET_ACTIVATION_FACT } from '../../daemon/__tests__/capture-disclosure-target-activation-fact.ts';
+import { TARGET_ACTIVATION_FACT } from '@agent-device/daemon/testing/__tests__/capture-disclosure-target-activation-fact';
 
 // The occluding-shade capture every scenario below consumes: no application window content, one
 // active quick-settings surface. The Android capture route stamps systemSurfaceOnly on both the
diff --git a/src/__tests__/daemon-composition/daemon-runtime-fixture.ts b/src/__tests__/daemon-composition/daemon-runtime-fixture.ts
index 06b8c992c6..2c5770c56b 100644
--- a/src/__tests__/daemon-composition/daemon-runtime-fixture.ts
+++ b/src/__tests__/daemon-composition/daemon-runtime-fixture.ts
@@ -3,7 +3,7 @@ import {
   startDaemonRuntime,
   type ComposeDaemonRuntimeDeps,
   type DaemonRuntimeController,
-} from '../../daemon/server/daemon-runtime.ts';
+} from '@agent-device/daemon/server/daemon-runtime';
 
 type WritableOutput = { write: (chunk: string) => unknown };
 
diff --git a/src/__tests__/daemon-composition/device/device-ready.test.ts b/src/__tests__/daemon-composition/device/device-ready.test.ts
index 8432b5cc5e..1eef0280a0 100644
--- a/src/__tests__/daemon-composition/device/device-ready.test.ts
+++ b/src/__tests__/daemon-composition/device/device-ready.test.ts
@@ -31,7 +31,7 @@ import {
 import {
   DEVICE_READY_CACHE_TTL_MS,
   ensureDeviceReady,
-} from '../../../daemon/device/device-ready.ts';
+} from '@agent-device/daemon/testing/device/device-ready';
 
 const mockRunCmd = vi.mocked(runCmd);
 const mockEnsureBootedSimulator = vi.mocked(ensureBootedSimulator);
diff --git a/src/__tests__/daemon-composition/generic-settle.test.ts b/src/__tests__/daemon-composition/generic-settle.test.ts
index c216df04e0..a38a7f7986 100644
--- a/src/__tests__/daemon-composition/generic-settle.test.ts
+++ b/src/__tests__/daemon-composition/generic-settle.test.ts
@@ -8,15 +8,15 @@ import {
   iosSystemSurfaceTransitionDisclosure,
   type IosSystemSurfaceProvenance,
 } from '@agent-device/contracts/ios-system-surface';
-import { makeIosSession } from '../../daemon/__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
-import { activateCompleteRefFrame, refFrameState } from '../../daemon/ref-frame.ts';
-import { setSessionSnapshot } from '../../daemon/session-snapshot.ts';
-import type { SessionStore } from '../../daemon/session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../../daemon/daemon-request.ts';
-import type { SessionRef, SessionState } from '../../daemon/session-state.ts';
+import { makeIosSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { activateCompleteRefFrame, refFrameState } from '@agent-device/daemon/testing/ref-frame';
+import { setSessionSnapshot } from '@agent-device/daemon/testing/session-snapshot';
+import type { SessionStore } from '@agent-device/daemon/testing/session-store';
+import type { DaemonRequest, DaemonResponse } from '@agent-device/daemon/daemon-request';
+import type { SessionRef, SessionState } from '@agent-device/daemon/testing/session-state';
 import { buildSnapshotState } from '@agent-device/capture-kit/snapshot-state';
-import { selectorCaptureFixture } from '../../daemon/__tests__/selector-capture-fixture.ts';
+import { selectorCaptureFixture } from '@agent-device/daemon/testing/__tests__/selector-capture-fixture';
 import { testCreateCommandSurface } from './command-surface-fixture.ts';
 
 // #1638 `--settle` on the GENERIC daemon route (scroll/back): the settled diff,
@@ -25,8 +25,9 @@ import { testCreateCommandSurface } from './command-surface-fixture.ts';
 // a resolution, and the observation must run after the deferred-outcome
 // markers. Quiet windows are tuned down so no test waits real time.
 
-vi.mock('../../daemon/interaction/index.ts', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../../daemon/interaction/index.ts')>();
+vi.mock('@agent-device/daemon/testing/interaction/index', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('@agent-device/daemon/testing/interaction/index')>();
   return {
     ...actual,
     captureSnapshotForSession: vi.fn(async () => ({
@@ -38,9 +39,9 @@ vi.mock('../../daemon/interaction/index.ts', async (importOriginal) => {
   };
 });
 
-import { captureSnapshotForSession } from '../../daemon/interaction/index.ts';
-import { dispatchGenericCommand } from '../../daemon/request-generic-dispatch.ts';
-import { pendingSurfaceStabilization } from '../../daemon/deferred-interaction-outcome.ts';
+import { captureSnapshotForSession } from '@agent-device/daemon/testing/interaction/index';
+import { dispatchGenericCommand } from '@agent-device/daemon/testing/request-generic-dispatch';
+import { pendingSurfaceStabilization } from '@agent-device/daemon/testing/deferred-interaction-outcome';
 
 const mockCaptureSnapshotForSession = vi.mocked(captureSnapshotForSession);
 
diff --git a/src/__tests__/daemon-composition/gesture-admission-parity.test.ts b/src/__tests__/daemon-composition/gesture-admission-parity.test.ts
index 0217c1f6a1..1514ba6dab 100644
--- a/src/__tests__/daemon-composition/gesture-admission-parity.test.ts
+++ b/src/__tests__/daemon-composition/gesture-admission-parity.test.ts
@@ -10,9 +10,9 @@ import {
 } from '@agent-device/contracts/gesture-normalization';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import { createPlatformRuntimeGateway } from '../../platform-runtime.ts';
-import { createRequestRuntimeBindings } from '../../daemon/request-runtime-binding.ts';
-import { createRequestDispatchLedger } from '../../daemon/request-dispatch-ledger.ts';
-import { resolveBoundGestureRuntime } from '../../daemon/gesture-runtime.ts';
+import { createRequestRuntimeBindings } from '@agent-device/daemon/testing/request-runtime-binding';
+import { createRequestDispatchLedger } from '@agent-device/daemon/testing/request-dispatch-ledger';
+import { resolveBoundGestureRuntime } from '@agent-device/daemon/testing/gesture-runtime';
 
 /**
  * The parity artifact for R42/R44 (ADR 0019 §6).
diff --git a/src/__tests__/daemon-composition/handlers/lease-provider-credentials.test.ts b/src/__tests__/daemon-composition/handlers/lease-provider-credentials.test.ts
index c7ef858510..986be0065a 100644
--- a/src/__tests__/daemon-composition/handlers/lease-provider-credentials.test.ts
+++ b/src/__tests__/daemon-composition/handlers/lease-provider-credentials.test.ts
@@ -2,10 +2,10 @@ import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import path from 'node:path';
 import { test } from 'vitest';
-import { handleLeaseCommands } from '../../../daemon/handlers/lease.ts';
-import { LeaseRegistry } from '../../../daemon/lease-registry.ts';
-import type { DaemonRequest } from '../../../daemon/daemon-request.ts';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
+import { handleLeaseCommands } from '@agent-device/daemon/testing/handlers/lease';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import { AppError } from '@agent-device/kernel/errors';
 import {
   providerCredentialFingerprint,
diff --git a/src/__tests__/daemon-composition/handlers/session-close-runner-retention.test.ts b/src/__tests__/daemon-composition/handlers/session-close-runner-retention.test.ts
index 08ed51dd7b..58df3d58a6 100644
--- a/src/__tests__/daemon-composition/handlers/session-close-runner-retention.test.ts
+++ b/src/__tests__/daemon-composition/handlers/session-close-runner-retention.test.ts
@@ -1,12 +1,12 @@
 import { test, expect, vi, beforeEach } from 'vitest';
 import * as path from 'node:path';
-import { LeaseRegistry } from '../../../daemon/lease-registry.ts';
-import { fakeCreateCommandSurface } from '../../../daemon/__tests__/support/command-surface-fake.ts';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
+import { fakeCreateCommandSurface } from '@agent-device/daemon/testing/__tests__/support/command-surface-fake';
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
-import { makeSession } from '../../../daemon/__tests__/support/session-factories.ts';
-import { getResolveTargetDeviceMock } from '../../../daemon/__tests__/request-router-dispatch-mocks.ts';
-import type { DaemonRequest } from '../../../daemon/daemon-request.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { makeSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { getResolveTargetDeviceMock } from '@agent-device/daemon/testing/__tests__/request-router-dispatch-mocks';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 import { platformResourceCleanup } from '../../../platform-runtime-resource-cleanup.ts';
 
 // The runner-retention decision is the real `PlatformResourceCleanup` rule (a booted simulator
@@ -17,7 +17,7 @@ vi.mock('node:timers/promises', async (importOriginal) => {
   const actual = await importOriginal<typeof import('node:timers/promises')>();
   return { ...actual, setTimeout: vi.fn(async () => undefined) };
 });
-vi.mock('../../../daemon/device/device-ready.ts', () => ({
+vi.mock('@agent-device/daemon/testing/device/device-ready', () => ({
   ensureDeviceReady: vi.fn(async () => {}),
 }));
 vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal) => {
@@ -51,7 +51,7 @@ vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
   return { ...actual, resolveAndroidPackageForOpen: vi.fn(async () => undefined) };
 });
 
-import { createRequestHandler } from '../../../daemon/__tests__/test-device-runtime-gateway.ts';
+import { createRequestHandler } from '@agent-device/daemon/testing/__tests__/test-device-runtime-gateway';
 import { realLifecycleDeviceRuntimeGateway } from '../lifecycle-runtime-gateway.ts';
 import {
   dispatchApplicationLifecycleEffect,
diff --git a/src/__tests__/daemon-composition/handlers/session-device-claims-cancellation.test.ts b/src/__tests__/daemon-composition/handlers/session-device-claims-cancellation.test.ts
index dc00848a5f..eb46602059 100644
--- a/src/__tests__/daemon-composition/handlers/session-device-claims-cancellation.test.ts
+++ b/src/__tests__/daemon-composition/handlers/session-device-claims-cancellation.test.ts
@@ -3,13 +3,13 @@ import assert from 'node:assert/strict';
 import path from 'node:path';
 import { afterEach, test, vi } from 'vitest';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from '../../../daemon/__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '@agent-device/daemon/testing/__tests__/support/command-surface-fake';
 
 vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal) => {
   const actual =
     await importOriginal<typeof import('@agent-device/device-selection/dispatch-resolve')>();
   const { selectionFromResolveTargetDevice } =
-    await import('../../../daemon/__tests__/device-selection-stub.ts');
+    await import('@agent-device/daemon/testing/__tests__/device-selection-stub');
   const resolveTargetDevice = vi.fn();
   return {
     ...actual,
@@ -17,7 +17,7 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
     resolveTargetDeviceSelection: vi.fn(selectionFromResolveTargetDevice(resolveTargetDevice)),
   };
 });
-vi.mock('../../../daemon/device/device-ready.ts', () => ({
+vi.mock('@agent-device/daemon/testing/device/device-ready', () => ({
   ensureDeviceReady: vi.fn(async () => {}),
 }));
 vi.mock('@agent-device/platform-android/mechanics', () => ({
@@ -34,28 +34,28 @@ vi.mock('@agent-device/host-kit/process', async (importOriginal) =>
 );
 
 import { resolveTargetDevice } from '@agent-device/device-selection/dispatch-resolve';
-import { ensureDeviceReady } from '../../../daemon/device/device-ready.ts';
+import { ensureDeviceReady } from '@agent-device/daemon/testing/device/device-ready';
 import {
   activateAndroidTestIme,
   resolveAndroidPackageForOpen,
 } from '@agent-device/platform-android/mechanics';
 import { clearRequestCanceled, markRequestCanceled } from '@agent-device/host-kit/request';
-import { inspectDeviceClaims } from '../../../daemon/device/device-claim-inspection.ts';
+import { inspectDeviceClaims } from '@agent-device/daemon/device/device-claim-inspection';
 import {
   localRuntimeOwner,
   narrowDeviceBinding,
   type DeviceBinding,
 } from '@agent-device/contracts/platform-runtime';
 import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform-runtime-operations';
-import type { BindDeviceRuntime } from '../../../daemon/request-runtime-binding.ts';
+import type { BindDeviceRuntime } from '@agent-device/daemon/testing/request-runtime-binding';
 import {
   applicationLifecycleRuntimeFixture,
   dispatchApplicationLifecycleEffect,
 } from '../application-lifecycle-runtime-fixture.ts';
-import { SessionStore } from '../../../daemon/session-store.ts';
-import { handleSessionOpenCommands as handleProductionOpenCommand } from '../../../daemon/session-lifecycle/index.ts';
+import { SessionStore } from '@agent-device/daemon/testing/session-store';
+import { handleSessionOpenCommands as handleProductionOpenCommand } from '@agent-device/daemon/testing/session-lifecycle/index';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import { inspectLifecycleRuntimeFacts } from '../../../daemon/__tests__/application-lifecycle-runtime-harness.ts';
+import { inspectLifecycleRuntimeFacts } from '@agent-device/daemon/testing/__tests__/application-lifecycle-runtime-harness';
 
 const mockDispatch = vi.mocked(dispatchApplicationLifecycleEffect);
 const mockResolveTargetDevice = vi.mocked(resolveTargetDevice);
diff --git a/src/__tests__/daemon-composition/handlers/session-doctor-warmup.test.ts b/src/__tests__/daemon-composition/handlers/session-doctor-warmup.test.ts
index e40a30178a..0cef4c405d 100644
--- a/src/__tests__/daemon-composition/handlers/session-doctor-warmup.test.ts
+++ b/src/__tests__/daemon-composition/handlers/session-doctor-warmup.test.ts
@@ -1,11 +1,11 @@
 import { beforeEach, expect, test, vi } from 'vitest';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import { isActiveProviderDevice } from '../../../daemon/provider-device-admission.ts';
-import { handleDoctorCommand } from '../../../daemon/handlers/session-doctor.ts';
+import { isActiveProviderDevice } from '@agent-device/daemon/testing/provider-device-admission';
+import { handleDoctorCommand } from '@agent-device/daemon/testing/handlers/session-doctor';
 import { createHostDiagnostics } from '../../../platform-runtime-host-diagnostics.ts';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import { withTestDeviceInventory } from '@agent-device/device-selection/inventory-gateways-fixtures';
-import type { DaemonResponse } from '../../../daemon/daemon-request.ts';
+import type { DaemonResponse } from '@agent-device/daemon/daemon-request';
 
 const { mockAppleRunnerWarmupCheck } = vi.hoisted(() => ({
   mockAppleRunnerWarmupCheck: vi.fn(),
@@ -15,13 +15,13 @@ vi.mock('@agent-device/platform-apple/doctor', async (importOriginal) => ({
   ...(await importOriginal<typeof import('@agent-device/platform-apple/doctor')>()),
   appleRunnerWarmupCheck: mockAppleRunnerWarmupCheck,
 }));
-vi.mock('../../../daemon/handlers/session-doctor-app.ts', () => ({
+vi.mock('@agent-device/daemon/testing/handlers/session-doctor-app', () => ({
   appendAppChecks: vi.fn(async () => {}),
 }));
-vi.mock('../../../daemon/handlers/session-doctor-metro.ts', () => ({
+vi.mock('@agent-device/daemon/testing/handlers/session-doctor-metro', () => ({
   probeMetro: vi.fn(async () => ({ id: 'metro', status: 'pass', summary: 'mocked' })),
 }));
-vi.mock('../../../daemon/provider-device-admission.ts', () => ({
+vi.mock('@agent-device/daemon/testing/provider-device-admission', () => ({
   isActiveProviderDevice: vi.fn(() => false),
 }));
 
diff --git a/src/__tests__/daemon-composition/handlers/session-relaunch-close.test.ts b/src/__tests__/daemon-composition/handlers/session-relaunch-close.test.ts
index 680a1d8dfb..fd2d0f9434 100644
--- a/src/__tests__/daemon-composition/handlers/session-relaunch-close.test.ts
+++ b/src/__tests__/daemon-composition/handlers/session-relaunch-close.test.ts
@@ -1,23 +1,23 @@
 import { test, expect, vi, beforeEach } from 'vitest';
 import * as path from 'node:path';
-import { LeaseRegistry } from '../../../daemon/lease-registry.ts';
-import { providerDeviceAdmissionFixture } from '../../../daemon/__tests__/support/provider-device-admission-fixture.ts';
-import { fakeCreateCommandSurface } from '../../../daemon/__tests__/support/command-surface-fake.ts';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
+import { providerDeviceAdmissionFixture } from '@agent-device/daemon/testing/__tests__/support/provider-device-admission-fixture';
+import { fakeCreateCommandSurface } from '@agent-device/daemon/testing/__tests__/support/command-surface-fake';
 
 // The daemon reads provider ownership through its own typed admission seam; these suites
 // install the seam over runtime fakes, the way root composition installs the real one.
 const providerAdmission = providerDeviceAdmissionFixture();
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
-import { makeSession } from '../../../daemon/__tests__/support/session-factories.ts';
-import { getResolveTargetDeviceMock } from '../../../daemon/__tests__/request-router-dispatch-mocks.ts';
-import type { DaemonRequest } from '../../../daemon/daemon-request.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { makeSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { getResolveTargetDeviceMock } from '@agent-device/daemon/testing/__tests__/request-router-dispatch-mocks';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 
 vi.mock('node:timers/promises', async (importOriginal) => {
   const actual = await importOriginal<typeof import('node:timers/promises')>();
   return { ...actual, setTimeout: vi.fn(async () => undefined) };
 });
-vi.mock('../../../daemon/device/device-ready.ts', () => ({
+vi.mock('@agent-device/daemon/testing/device/device-ready', () => ({
   ensureDeviceReady: vi.fn(async () => {}),
 }));
 vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal) => {
@@ -57,7 +57,7 @@ vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
   return { ...actual, resolveAndroidPackageForOpen: vi.fn(async () => undefined) };
 });
 
-import { createRequestHandler } from '../../../daemon/__tests__/test-device-runtime-gateway.ts';
+import { createRequestHandler } from '@agent-device/daemon/testing/__tests__/test-device-runtime-gateway';
 import { realLifecycleDeviceRuntimeGateway } from '../lifecycle-runtime-gateway.ts';
 import { platformResourceCleanup } from '../../../platform-runtime-resource-cleanup.ts';
 import {
@@ -65,7 +65,7 @@ import {
   awaitFixtureReadiness,
   discoverReadyAndroidEmulators,
 } from '../application-lifecycle-runtime-fixture.ts';
-import { ensureDeviceReady } from '../../../daemon/device/device-ready.ts';
+import { ensureDeviceReady } from '@agent-device/daemon/testing/device/device-ready';
 import {
   prewarmIosRunnerSession,
   notifyIosRunnerAppRelaunched,
@@ -73,7 +73,7 @@ import {
   releaseIosRunnerOnClose,
 } from '@agent-device/platform-apple/runner/operations';
 import { runMacOsAlertAction } from '@agent-device/platform-apple/macos';
-import { refFrameState } from '../../../daemon/ref-frame.ts';
+import { refFrameState } from '@agent-device/daemon/testing/ref-frame';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
 const mockResolveTargetDevice = vi.mocked(getResolveTargetDeviceMock());
diff --git a/src/__tests__/daemon-composition/handlers/session-relaunch-guards.test.ts b/src/__tests__/daemon-composition/handlers/session-relaunch-guards.test.ts
index d6a7efc6e7..6a7ebefebd 100644
--- a/src/__tests__/daemon-composition/handlers/session-relaunch-guards.test.ts
+++ b/src/__tests__/daemon-composition/handlers/session-relaunch-guards.test.ts
@@ -6,10 +6,10 @@ import {
   makeSession,
   noopInvoke,
   assertInvalidArgsMessage,
-} from '../../../daemon/handlers/__tests__/session-test-harness.ts';
-import { handleSessionCommands } from '../../../daemon/handlers/__tests__/session-command-harness.ts';
+} from '@agent-device/daemon/testing/handlers/__tests__/session-test-harness';
+import { handleSessionCommands } from '@agent-device/daemon/testing/handlers/__tests__/session-command-harness';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from '../../../daemon/__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '@agent-device/daemon/testing/__tests__/support/command-surface-fake';
 import { daemonPlatformServicesFixture } from '../platform-services-fixture.ts';
 
 // These relaunch cases pin the REAL open-target validation rules (the URL-target refusal and the
diff --git a/src/__tests__/daemon-composition/handlers/snapshot-handler-freshness.test.ts b/src/__tests__/daemon-composition/handlers/snapshot-handler-freshness.test.ts
index 9ac56b6af1..5c9bb668ec 100644
--- a/src/__tests__/daemon-composition/handlers/snapshot-handler-freshness.test.ts
+++ b/src/__tests__/daemon-composition/handlers/snapshot-handler-freshness.test.ts
@@ -1,15 +1,15 @@
 import { daemonPlatformServicesFixture } from '../platform-services-fixture.ts';
 import { test, expect, vi, afterEach, beforeEach } from 'vitest';
-import { legacyDispatchCapture } from '../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts';
-import { resetGetRuntimeFixture } from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
+import { legacyDispatchCapture } from '@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture';
+import { resetGetRuntimeFixture } from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
 import fs from 'node:fs';
-import { captureSnapshot } from '../../../daemon/snapshot-capture.ts';
-import { SessionStore } from '../../../daemon/session-store.ts';
+import { captureSnapshot } from '@agent-device/daemon/testing/snapshot-capture';
+import { SessionStore } from '@agent-device/daemon/testing/session-store';
 import {
   isActiveProviderDevice,
   setActiveProviderDeviceRuntimes,
 } from '../../../provider-device-runtime.ts';
-import { installProviderDeviceAdmission } from '../../../daemon/provider-device-admission.ts';
+import { installProviderDeviceAdmission } from '@agent-device/daemon/testing/provider-device-admission';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
 // The daemon reads provider ownership through its own typed admission seam; production
@@ -23,7 +23,7 @@ import { buildNodes } from '@agent-device/test-kit/snapshot-builders';
 import {
   fixtureScreenshotCaptures,
   resetSnapshotRuntimeFixture,
-} from '../../../daemon/__tests__/snapshot-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/snapshot-runtime-fixture';
 import {
   androidCapture,
   androidDevice,
@@ -36,10 +36,11 @@ import {
   makeSession,
   makeSessionStore,
   snapshotRequest,
-} from '../../../daemon/handlers/__tests__/snapshot-handler.fixtures.ts';
+} from '@agent-device/daemon/testing/handlers/__tests__/snapshot-handler.fixtures';
 
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', async () => {
-  const fixture = await import('../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts');
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', async () => {
+  const fixture =
+    await import('@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture');
   return { captureSnapshotWithInteractor: fixture.captureSnapshotThroughLegacyDispatchFixture };
 });
 vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal) => {
@@ -52,12 +53,12 @@ vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal)
 // unambiguous environment; that live-probe logic is covered by
 // ios-app-session-hint.test.ts. Stubbed here so this suite stays hermetic and
 // fast — defaults to "no enrichment", matching the current-behavior fallback.
-vi.mock('../../../daemon/ios-app-session-hint.ts', () => ({
+vi.mock('@agent-device/daemon/testing/ios-app-session-hint', () => ({
   buildIosOpenCommandHint: vi.fn(async () => undefined),
 }));
 
 import { runAppleRunnerCommand } from '@agent-device/platform-apple/runner/operations';
-import { buildIosOpenCommandHint } from '../../../daemon/ios-app-session-hint.ts';
+import { buildIosOpenCommandHint } from '@agent-device/daemon/testing/ios-app-session-hint';
 
 const mockRunnerCommand = vi.mocked(runAppleRunnerCommand);
 const mockBuildIosOpenCommandHint = vi.mocked(buildIosOpenCommandHint);
diff --git a/src/__tests__/daemon-composition/handlers/snapshot-handler-wait.test.ts b/src/__tests__/daemon-composition/handlers/snapshot-handler-wait.test.ts
index f8ac888679..3275a825bb 100644
--- a/src/__tests__/daemon-composition/handlers/snapshot-handler-wait.test.ts
+++ b/src/__tests__/daemon-composition/handlers/snapshot-handler-wait.test.ts
@@ -1,22 +1,22 @@
 import { test, expect, vi, afterEach, beforeEach } from 'vitest';
-import { legacyDispatchCapture } from '../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts';
-import { resetGetRuntimeFixture } from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
+import { legacyDispatchCapture } from '@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture';
+import { resetGetRuntimeFixture } from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
 import {
   isActiveProviderDevice,
   setActiveProviderDeviceRuntimes,
 } from '../../../provider-device-runtime.ts';
-import { installProviderDeviceAdmission } from '../../../daemon/provider-device-admission.ts';
+import { installProviderDeviceAdmission } from '@agent-device/daemon/testing/provider-device-admission';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
 // The daemon reads provider ownership through its own typed admission seam; production
 // installs it from root composition, and these tests compose it the same way.
 installProviderDeviceAdmission({ isActive: isActiveProviderDevice });
-import type { SessionState } from '../../../daemon/session-state.ts';
+import type { SessionState } from '@agent-device/daemon/testing/session-state';
 import { buildSnapshotPresentationKey } from '@agent-device/kernel/snapshot';
 import {
   resetSnapshotRuntimeFixture,
   snapshotRuntimeFixture,
-} from '../../../daemon/__tests__/snapshot-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/snapshot-runtime-fixture';
 import {
   androidCapture,
   androidDevice,
@@ -31,10 +31,11 @@ import {
   makeSession,
   makeSessionStore,
   snapshotRequest,
-} from '../../../daemon/handlers/__tests__/snapshot-handler.fixtures.ts';
+} from '@agent-device/daemon/testing/handlers/__tests__/snapshot-handler.fixtures';
 
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', async () => {
-  const fixture = await import('../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts');
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', async () => {
+  const fixture =
+    await import('@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture');
   return { captureSnapshotWithInteractor: fixture.captureSnapshotThroughLegacyDispatchFixture };
 });
 vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal) => {
@@ -47,12 +48,12 @@ vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal)
 // unambiguous environment; that live-probe logic is covered by
 // ios-app-session-hint.test.ts. Stubbed here so this suite stays hermetic and
 // fast — defaults to "no enrichment", matching the current-behavior fallback.
-vi.mock('../../../daemon/ios-app-session-hint.ts', () => ({
+vi.mock('@agent-device/daemon/testing/ios-app-session-hint', () => ({
   buildIosOpenCommandHint: vi.fn(async () => undefined),
 }));
 
 import { runAppleRunnerCommand } from '@agent-device/platform-apple/runner/operations';
-import { buildIosOpenCommandHint } from '../../../daemon/ios-app-session-hint.ts';
+import { buildIosOpenCommandHint } from '@agent-device/daemon/testing/ios-app-session-hint';
 
 const mockRunnerCommand = vi.mocked(runAppleRunnerCommand);
 const mockBuildIosOpenCommandHint = vi.mocked(buildIosOpenCommandHint);
diff --git a/src/__tests__/daemon-composition/handlers/snapshot-handler.test.ts b/src/__tests__/daemon-composition/handlers/snapshot-handler.test.ts
index ff3ed1f6c6..b2282c7836 100644
--- a/src/__tests__/daemon-composition/handlers/snapshot-handler.test.ts
+++ b/src/__tests__/daemon-composition/handlers/snapshot-handler.test.ts
@@ -1,20 +1,20 @@
 import { daemonPlatformServicesFixture } from '../platform-services-fixture.ts';
 import { test, expect, vi, afterEach, beforeEach } from 'vitest';
-import { legacyDispatchCapture } from '../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts';
-import { resetGetRuntimeFixture } from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
-import { resetSnapshotRuntimeFixture } from '../../../daemon/__tests__/snapshot-runtime-fixture.ts';
+import { legacyDispatchCapture } from '@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture';
+import { resetGetRuntimeFixture } from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
+import { resetSnapshotRuntimeFixture } from '@agent-device/daemon/testing/__tests__/snapshot-runtime-fixture';
 import {
   isActiveProviderDevice,
   setActiveProviderDeviceRuntimes,
 } from '../../../provider-device-runtime.ts';
-import { installProviderDeviceAdmission } from '../../../daemon/provider-device-admission.ts';
+import { installProviderDeviceAdmission } from '@agent-device/daemon/testing/provider-device-admission';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
 // The daemon reads provider ownership through its own typed admission seam; production
 // installs it from root composition, and these tests compose it the same way.
 installProviderDeviceAdmission({ isActive: isActiveProviderDevice });
-import type { DaemonResponse } from '../../../daemon/daemon-request.ts';
-import type { SessionState } from '../../../daemon/session-state.ts';
+import type { DaemonResponse } from '@agent-device/daemon/daemon-request';
+import type { SessionState } from '@agent-device/daemon/testing/session-state';
 import {
   androidCapture,
   androidDevice,
@@ -26,10 +26,11 @@ import {
   makeSessionStore,
   providerIosDevice,
   snapshotRequest,
-} from '../../../daemon/handlers/__tests__/snapshot-handler.fixtures.ts';
+} from '@agent-device/daemon/testing/handlers/__tests__/snapshot-handler.fixtures';
 
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', async () => {
-  const fixture = await import('../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts');
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', async () => {
+  const fixture =
+    await import('@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture');
   return { captureSnapshotWithInteractor: fixture.captureSnapshotThroughLegacyDispatchFixture };
 });
 vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal) => {
@@ -42,18 +43,18 @@ vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal)
 // unambiguous environment; that live-probe logic is covered by
 // ios-app-session-hint.test.ts. Stubbed here so this suite stays hermetic and
 // fast — defaults to "no enrichment", matching the current-behavior fallback.
-vi.mock('../../../daemon/ios-app-session-hint.ts', () => ({
+vi.mock('@agent-device/daemon/testing/ios-app-session-hint', () => ({
   buildIosOpenCommandHint: vi.fn(async () => undefined),
 }));
 
 import { runAppleRunnerCommand } from '@agent-device/platform-apple/runner/operations';
-import { buildIosOpenCommandHint } from '../../../daemon/ios-app-session-hint.ts';
+import { buildIosOpenCommandHint } from '@agent-device/daemon/testing/ios-app-session-hint';
 import {
   expireRefFrame,
   refFrame,
   refFrameState,
   refFrameTree,
-} from '../../../daemon/ref-frame.ts';
+} from '@agent-device/daemon/testing/ref-frame';
 
 const mockRunnerCommand = vi.mocked(runAppleRunnerCommand);
 const mockBuildIosOpenCommandHint = vi.mocked(buildIosOpenCommandHint);
diff --git a/src/__tests__/daemon-composition/handlers/snapshot-scoped-refs.test.ts b/src/__tests__/daemon-composition/handlers/snapshot-scoped-refs.test.ts
index b8c02f6c65..996500da12 100644
--- a/src/__tests__/daemon-composition/handlers/snapshot-scoped-refs.test.ts
+++ b/src/__tests__/daemon-composition/handlers/snapshot-scoped-refs.test.ts
@@ -1,11 +1,11 @@
 import { beforeEach, expect, test } from 'vitest';
-import { legacyDispatchCapture } from '../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts';
-import { handleSnapshotCommands as handleProductionSnapshotCommands } from '../../../daemon/handlers/snapshot.ts';
+import { legacyDispatchCapture } from '@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture';
+import { handleSnapshotCommands as handleProductionSnapshotCommands } from '@agent-device/daemon/testing/handlers/snapshot';
 import type { RawSnapshotNode, SnapshotState } from '@agent-device/kernel/snapshot';
-import { makeAndroidSession } from '../../../daemon/__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
-import { expireRefFrame } from '../../../daemon/ref-frame.ts';
-import { snapshotRuntimeFixture } from '../../../daemon/__tests__/snapshot-runtime-fixture.ts';
+import { makeAndroidSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { expireRefFrame } from '@agent-device/daemon/testing/ref-frame';
+import { snapshotRuntimeFixture } from '@agent-device/daemon/testing/__tests__/snapshot-runtime-fixture';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
 const ANDROID_SCRIPT_ERROR = 'Unable to load script. Make sure you are running Metro.';
diff --git a/src/__tests__/daemon-composition/handlers/snapshot-session-cleanup.test.ts b/src/__tests__/daemon-composition/handlers/snapshot-session-cleanup.test.ts
index 230644271e..fb688700bc 100644
--- a/src/__tests__/daemon-composition/handlers/snapshot-session-cleanup.test.ts
+++ b/src/__tests__/daemon-composition/handlers/snapshot-session-cleanup.test.ts
@@ -9,7 +9,7 @@ vi.mock('@agent-device/platform-apple/app-lifecycle', async (importOriginal) =>
   closeIosApp: vi.fn(async () => {}),
 }));
 
-import { withSessionlessRunnerCleanup } from '../../../daemon/snapshot-session.ts';
+import { withSessionlessRunnerCleanup } from '@agent-device/daemon/testing/snapshot-session';
 import { platformResourceCleanup } from '../../../platform-runtime-resource-cleanup.ts';
 import { closeIosApp } from '@agent-device/platform-apple/app-lifecycle';
 import { stopIosRunnerSession } from '@agent-device/platform-apple/runner/operations';
@@ -18,7 +18,7 @@ import {
   isActiveProviderDevice,
   setActiveProviderDeviceRuntimes,
 } from '../../../provider-device-runtime.ts';
-import { installProviderDeviceAdmission } from '../../../daemon/provider-device-admission.ts';
+import { installProviderDeviceAdmission } from '@agent-device/daemon/testing/provider-device-admission';
 
 // The daemon reads provider ownership through its own typed admission seam; production
 // installs it from root composition, and these tests compose it the same way.
diff --git a/src/__tests__/daemon-composition/handlers/wait-landmark-recording.test.ts b/src/__tests__/daemon-composition/handlers/wait-landmark-recording.test.ts
index 38e625ef8a..27ee6398c4 100644
--- a/src/__tests__/daemon-composition/handlers/wait-landmark-recording.test.ts
+++ b/src/__tests__/daemon-composition/handlers/wait-landmark-recording.test.ts
@@ -12,17 +12,17 @@
  * `WAIT_LANDMARK_MISMATCH_REASON` refusal.
  */
 import { test, expect, vi, beforeEach } from 'vitest';
-import { legacyDispatchCapture } from '../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts';
-import { dispatchWaitViaRuntime } from '../../../daemon/wait-runtime.ts';
-import type { DaemonRequest } from '../../../daemon/daemon-request.ts';
+import { legacyDispatchCapture } from '@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture';
+import { dispatchWaitViaRuntime } from '@agent-device/daemon/testing/wait-runtime';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 import { WAIT_LANDMARK_MISMATCH_REASON } from '@agent-device/contracts/replay';
 import type { TargetAnnotationV1 } from '@agent-device/contracts/replay';
-import { snapshotRuntimeFixture } from '../../../daemon/__tests__/snapshot-runtime-fixture.ts';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
+import { snapshotRuntimeFixture } from '@agent-device/daemon/testing/__tests__/snapshot-runtime-fixture';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import {
   makeAndroidSession,
   authoringPublication,
-} from '../../../daemon/__tests__/support/session-factories.ts';
+} from '@agent-device/daemon/testing/__tests__/support/session-factories';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
 vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal) => {
@@ -34,12 +34,13 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
   };
 });
 
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', async () => {
-  const fixture = await import('../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts');
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', async () => {
+  const fixture =
+    await import('@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture');
   return { captureSnapshotWithInteractor: fixture.captureSnapshotThroughLegacyDispatchFixture };
 });
 
-vi.mock('../../../daemon/device/device-ready.ts', () => ({
+vi.mock('@agent-device/daemon/testing/device/device-ready', () => ({
   ensureDeviceReady: vi.fn(async () => {}),
 }));
 
diff --git a/src/__tests__/daemon-composition/http-server-limrun-uploaded-apps.test.ts b/src/__tests__/daemon-composition/http-server-limrun-uploaded-apps.test.ts
index 742de15b8a..d42f3b0e43 100644
--- a/src/__tests__/daemon-composition/http-server-limrun-uploaded-apps.test.ts
+++ b/src/__tests__/daemon-composition/http-server-limrun-uploaded-apps.test.ts
@@ -10,15 +10,15 @@ import {
   listenOnLoopback,
   skipWhenLoopbackUnavailable,
 } from '@agent-device/test-kit/loopback';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import { limrunTestDependencies } from '../../platform-runtime-gateway.fixtures.ts';
 import {
   DAEMON_HTTP_NETWORK_ACCESS_HEADER,
   DAEMON_HTTP_PUBLIC_NETWORK_ACCESS,
 } from '@agent-device/contracts/daemon-http';
-import { LeaseRegistry } from '../../daemon/lease-registry.ts';
-import { createDaemonHttpServer } from '../../daemon/server/http-server.ts';
-import { createRequestHandler } from '../../daemon/__tests__/test-device-runtime-gateway.ts';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
+import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
+import { createRequestHandler } from '@agent-device/daemon/testing/__tests__/test-device-runtime-gateway';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { testCreateCommandSurface } from './command-surface-fixture.ts';
 
diff --git a/src/__tests__/daemon-composition/interaction-touch-android-readiness-spawns.test.ts b/src/__tests__/daemon-composition/interaction-touch-android-readiness-spawns.test.ts
index daafe00e2b..4a01cdd4ca 100644
--- a/src/__tests__/daemon-composition/interaction-touch-android-readiness-spawns.test.ts
+++ b/src/__tests__/daemon-composition/interaction-touch-android-readiness-spawns.test.ts
@@ -1,9 +1,9 @@
 import { expect, test } from 'vitest';
-import { makeAndroidSession } from '../../daemon/__tests__/support/session-factories.ts';
+import { makeAndroidSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
 import { withFakeAdb } from '../test-utils/fake-adb.ts';
-import { expireRefFrame } from '../../daemon/ref-frame.ts';
-import { runWithAndroidDialogReadinessCheck } from '../../daemon/interaction/internal/interaction-touch-android-readiness.ts';
-import { androidObservationPolicyFixture as androidObservation } from '../../daemon/__tests__/android-observation-fixture.ts';
+import { expireRefFrame } from '@agent-device/daemon/testing/ref-frame';
+import { runWithAndroidDialogReadinessCheck } from '@agent-device/daemon/testing/interaction/internal/interaction-touch-android-readiness';
+import { androidObservationPolicyFixture as androidObservation } from '@agent-device/daemon/testing/__tests__/android-observation-fixture';
 
 // What blocking-dialog readiness costs a run of taps, end to end. Every one of these `dumpsys`
 // spawns is a device round trip on the critical path of an interaction, so the budget is pinned
diff --git a/src/__tests__/daemon-composition/interaction/find-ambiguous-match.test.ts b/src/__tests__/daemon-composition/interaction/find-ambiguous-match.test.ts
index 3344438a1c..0dd8a3d508 100644
--- a/src/__tests__/daemon-composition/interaction/find-ambiguous-match.test.ts
+++ b/src/__tests__/daemon-composition/interaction/find-ambiguous-match.test.ts
@@ -7,17 +7,18 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
     resolveTargetDevice: actual.resolveTargetDevice,
   };
 });
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', async () => {
-  const fixture = await import('../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts');
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', async () => {
+  const fixture =
+    await import('@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture');
   return { captureSnapshotWithInteractor: fixture.captureSnapshotThroughLegacyDispatchFixture };
 });
 
 import {
   resetFindTouchRuntimeFixture,
   runFindClickScenario,
-} from '../../../daemon/interaction/internal/__tests__/find-touch-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/interaction/internal/__tests__/find-touch-runtime-fixture';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
-import { refFrameScope, refFrameState } from '../../../daemon/ref-frame.ts';
+import { refFrameScope, refFrameState } from '@agent-device/daemon/testing/ref-frame';
 
 beforeEach(() => {
   resetFindTouchRuntimeFixture();
diff --git a/src/__tests__/daemon-composition/interaction/find-production-route.test.ts b/src/__tests__/daemon-composition/interaction/find-production-route.test.ts
index c5352f6de8..a0c6ead9b8 100644
--- a/src/__tests__/daemon-composition/interaction/find-production-route.test.ts
+++ b/src/__tests__/daemon-composition/interaction/find-production-route.test.ts
@@ -1,9 +1,9 @@
 import { test, expect, vi, beforeEach } from 'vitest';
-import { handleInteractionCommands } from '../../../daemon/interaction/index.ts';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
 import type { CommandFlags } from '@agent-device/contracts/command';
-import type { DaemonRequest, DaemonResponse } from '../../../daemon/daemon-request.ts';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
-import { makeIosSession as makeSession } from '../../../daemon/__tests__/support/session-factories.ts';
+import type { DaemonRequest, DaemonResponse } from '@agent-device/daemon/daemon-request';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { makeIosSession as makeSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
 vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal) => {
@@ -13,8 +13,9 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
     resolveTargetDevice: actual.resolveTargetDevice,
   };
 });
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', async () => {
-  const fixture = await import('../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts');
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', async () => {
+  const fixture =
+    await import('@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture');
   return { captureSnapshotWithInteractor: fixture.captureSnapshotThroughLegacyDispatchFixture };
 });
 
@@ -22,8 +23,8 @@ import {
   findTouchRuntimeBindings,
   mockDispatch,
   resetFindTouchRuntimeFixture,
-} from '../../../daemon/interaction/internal/__tests__/find-touch-runtime-fixture.ts';
-import { invokeFindHandler } from '../../../daemon/interaction/internal/__tests__/find-handler-fixture.ts';
+} from '@agent-device/daemon/testing/interaction/internal/__tests__/find-touch-runtime-fixture';
+import { invokeFindHandler } from '@agent-device/daemon/testing/interaction/internal/__tests__/find-handler-fixture';
 
 beforeEach(() => {
   resetFindTouchRuntimeFixture();
diff --git a/src/__tests__/daemon-composition/interaction/find-read-only.test.ts b/src/__tests__/daemon-composition/interaction/find-read-only.test.ts
index 80cb0ea335..e55d556c7f 100644
--- a/src/__tests__/daemon-composition/interaction/find-read-only.test.ts
+++ b/src/__tests__/daemon-composition/interaction/find-read-only.test.ts
@@ -1,11 +1,11 @@
 import { test, expect, vi, beforeEach } from 'vitest';
-import type { SessionState } from '../../../daemon/session-state.ts';
+import type { SessionState } from '@agent-device/daemon/testing/session-state';
 import { buildSnapshotSignatures } from '@agent-device/capture-kit/snapshot-freshness';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import {
   makeAuthoringSession,
   makeIosSession as makeSession,
-} from '../../../daemon/__tests__/support/session-factories.ts';
+} from '@agent-device/daemon/testing/__tests__/support/session-factories';
 
 vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal) => {
   const actual = (await importOriginal()) as Record<string, unknown>;
@@ -14,8 +14,9 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
     resolveTargetDevice: actual.resolveTargetDevice,
   };
 });
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', async () => {
-  const fixture = await import('../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts');
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', async () => {
+  const fixture =
+    await import('@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture');
   return { captureSnapshotWithInteractor: fixture.captureSnapshotThroughLegacyDispatchFixture };
 });
 
@@ -23,9 +24,9 @@ import {
   mockDispatch,
   resetFindTouchRuntimeFixture,
   runFindClickScenario,
-} from '../../../daemon/interaction/internal/__tests__/find-touch-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/interaction/internal/__tests__/find-touch-runtime-fixture';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
-import { invokeFindHandler } from '../../../daemon/interaction/internal/__tests__/find-handler-fixture.ts';
+import { invokeFindHandler } from '@agent-device/daemon/testing/interaction/internal/__tests__/find-handler-fixture';
 
 beforeEach(() => {
   resetFindTouchRuntimeFixture();
diff --git a/src/__tests__/daemon-composition/interaction/interaction-capture-disclosure.test.ts b/src/__tests__/daemon-composition/interaction/interaction-capture-disclosure.test.ts
index 3be6ee7bfc..4067928d7f 100644
--- a/src/__tests__/daemon-composition/interaction/interaction-capture-disclosure.test.ts
+++ b/src/__tests__/daemon-composition/interaction/interaction-capture-disclosure.test.ts
@@ -6,20 +6,21 @@ import {
   type SnapshotState,
 } from '@agent-device/kernel/snapshot';
 import { iosTargetActivationDisclosure } from '@agent-device/contracts/ios-target-activation';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
-import { handleInteractionCommands } from '../../../daemon/interaction/index.ts';
-import { getRuntimeBindings } from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
+import { getRuntimeBindings } from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
 import {
   contextFromFlags,
   makeSession,
-} from '../../../daemon/interaction/internal/__tests__/interaction-touch-fixtures.ts';
-import { legacyDispatchCapture } from '../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts';
-import { markDeferredInteractionOutcome } from '../../../daemon/deferred-interaction-outcome.ts';
+} from '@agent-device/daemon/testing/interaction/internal/__tests__/interaction-touch-fixtures';
+import { legacyDispatchCapture } from '@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture';
+import { markDeferredInteractionOutcome } from '@agent-device/daemon/testing/deferred-interaction-outcome';
 import { formatPostGestureOutcomeWarning } from '@agent-device/capture-kit/post-gesture-stability';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', async () => {
-  const fixture = await import('../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts');
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', async () => {
+  const fixture =
+    await import('@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture');
   return { captureSnapshotWithInteractor: fixture.captureSnapshotThroughLegacyDispatchFixture };
 });
 
diff --git a/src/__tests__/daemon-composition/interaction/interaction-common.test.ts b/src/__tests__/daemon-composition/interaction/interaction-common.test.ts
index 4aea4698bf..f659e60046 100644
--- a/src/__tests__/daemon-composition/interaction/interaction-common.test.ts
+++ b/src/__tests__/daemon-composition/interaction/interaction-common.test.ts
@@ -1,23 +1,23 @@
 import type { CommandFlags } from '@agent-device/contracts/command';
-import { legacyDispatchCapture } from '../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts';
+import { legacyDispatchCapture } from '@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture';
 import { beforeEach, expect, test } from 'vitest';
 import {
   makeIosSession,
   makeAuthoringSession,
   authoringPublication,
-} from '../../../daemon/__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
+} from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import { attachRefs, type RawSnapshotNode } from '@agent-device/kernel/snapshot';
 import {
   finalizeTouchInteraction,
   handleInteractionCommands,
-} from '../../../daemon/interaction/index.ts';
+} from '@agent-device/daemon/testing/interaction/index';
 import { IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
 import {
   getRuntimeBindings,
   mockFillPoint,
   resetGetRuntimeFixture,
-} from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
 const contextFromFlags = (_flags: CommandFlags | undefined) => ({});
diff --git a/src/__tests__/daemon-composition/interaction/interaction-dispatch-disclosure.test.ts b/src/__tests__/daemon-composition/interaction/interaction-dispatch-disclosure.test.ts
index d7ff44e617..0af9983699 100644
--- a/src/__tests__/daemon-composition/interaction/interaction-dispatch-disclosure.test.ts
+++ b/src/__tests__/daemon-composition/interaction/interaction-dispatch-disclosure.test.ts
@@ -10,39 +10,39 @@ import {
   DISPATCH_DISCLOSURE_TABLE_PATH,
   dispatchDisclosureRowsOwnedBy,
 } from '@agent-device/contracts/dispatch-disclosure-fixtures';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
-import { makeAndroidSession } from '../../../daemon/__tests__/support/session-factories.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { makeAndroidSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
 import {
   getRuntimeBindings,
   mockFillPoint,
   mockTapPoint,
   resetGetRuntimeFixture,
-} from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
-import { captureSnapshotWithInteractor } from '../../../daemon/snapshot-interactor-capture.ts';
-import { discloseRequestDispatch } from '../../../daemon/request-dispatch-disclosure.ts';
+} from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
+import { captureSnapshotWithInteractor } from '@agent-device/daemon/testing/snapshot-interactor-capture';
+import { discloseRequestDispatch } from '@agent-device/daemon/testing/request-dispatch-disclosure';
 import {
   createRequestDispatchLedger,
   recordBoundMutations,
-} from '../../../daemon/request-dispatch-ledger.ts';
-import type { BindDeviceRuntime } from '../../../daemon/request-runtime-binding.ts';
-import { clearAndroidObservationFixture } from '../../../daemon/__tests__/android-observation-fixture.ts';
-import { activateCompleteRefFrame, expireRefFrame } from '../../../daemon/ref-frame.ts';
-import { handleInteractionCommands } from '../../../daemon/interaction/index.ts';
-import type { InteractionRouteInput } from '../../../daemon/interaction/internal/types.ts';
-import { assertAndroidPressStayedInApp } from '../../../daemon/interaction/internal/interaction-android-escape.ts';
-import { gestureRuntimeBindingsFixture } from '../../../daemon/interaction/internal/__tests__/gesture-runtime-bindings.fixtures.ts';
+} from '@agent-device/daemon/testing/request-dispatch-ledger';
+import type { BindDeviceRuntime } from '@agent-device/daemon/testing/request-runtime-binding';
+import { clearAndroidObservationFixture } from '@agent-device/daemon/testing/__tests__/android-observation-fixture';
+import { activateCompleteRefFrame, expireRefFrame } from '@agent-device/daemon/testing/ref-frame';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
+import type { InteractionRouteInput } from '@agent-device/daemon/testing/interaction/internal/types';
+import { assertAndroidPressStayedInApp } from '@agent-device/daemon/testing/interaction/internal/interaction-android-escape';
+import { gestureRuntimeBindingsFixture } from '@agent-device/daemon/testing/interaction/internal/__tests__/gesture-runtime-bindings.fixtures';
 import {
   contextFromFlags,
   makeSession,
   makeStaleRefSession,
-} from '../../../daemon/interaction/internal/__tests__/interaction-touch-fixtures.ts';
+} from '@agent-device/daemon/testing/interaction/internal/__tests__/interaction-touch-fixtures';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
 // contracts/fixtures/dispatch-disclosure.json, daemon and post-action guard rows: the daemon rows
 // drive a real `press` through the daemon interaction handler, inside the router's dispatch seam,
 // with only the device touch mocked; the guard row drives the guard itself.
 
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', () => ({
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
diff --git a/src/__tests__/daemon-composition/interaction/interaction-gesture-drag.test.ts b/src/__tests__/daemon-composition/interaction/interaction-gesture-drag.test.ts
index 8c9d1dc5f3..bc76aaa8b7 100644
--- a/src/__tests__/daemon-composition/interaction/interaction-gesture-drag.test.ts
+++ b/src/__tests__/daemon-composition/interaction/interaction-gesture-drag.test.ts
@@ -4,18 +4,18 @@ import { attachRefs } from '@agent-device/kernel/snapshot';
 import {
   makeIosSession,
   authoringPublication,
-} from '../../../daemon/__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
-import { activateCompleteRefFrame, refFrameState } from '../../../daemon/ref-frame.ts';
+} from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { activateCompleteRefFrame, refFrameState } from '@agent-device/daemon/testing/ref-frame';
 
-import { handleInteractionCommands } from '../../../daemon/interaction/index.ts';
-import { gestureRuntimeBindingsFixture } from '../../../daemon/interaction/internal/__tests__/gesture-runtime-bindings.fixtures.ts';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
+import { gestureRuntimeBindingsFixture } from '@agent-device/daemon/testing/interaction/internal/__tests__/gesture-runtime-bindings.fixtures';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
 const contextFromFlags = () => ({});
 const captureSnapshotForSession = async ({
   session,
-}: import('../../../daemon/session-state.ts').SessionRef) => session.snapshot!;
+}: import('@agent-device/daemon/testing/session-state').SessionRef) => session.snapshot!;
 let gestures = gestureRuntimeBindingsFixture();
 
 beforeEach(() => {
diff --git a/src/__tests__/daemon-composition/interaction/interaction-get.test.ts b/src/__tests__/daemon-composition/interaction/interaction-get.test.ts
index fce694bd3d..0694700b81 100644
--- a/src/__tests__/daemon-composition/interaction/interaction-get.test.ts
+++ b/src/__tests__/daemon-composition/interaction/interaction-get.test.ts
@@ -1,25 +1,25 @@
 import { test, expect, vi, beforeEach } from 'vitest';
-import { legacyDispatchCapture } from '../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts';
+import { legacyDispatchCapture } from '@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture';
 import { attachRefs } from '@agent-device/kernel/snapshot';
 import { WEB_DESKTOP_DEVICE } from '@agent-device/test-kit/device-fixtures';
 import {
   makeAndroidSession as makeBaseAndroidSession,
   makeIosSession,
-} from '../../../daemon/__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
-import { expireRefFrame } from '../../../daemon/ref-frame.ts';
+} from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { expireRefFrame } from '@agent-device/daemon/testing/ref-frame';
 import {
   setSessionSnapshot,
   STALE_SNAPSHOT_REFS_WARNING,
-} from '../../../daemon/session-snapshot.ts';
-import { handleInteractionCommands } from '../../../daemon/interaction/index.ts';
+} from '@agent-device/daemon/testing/session-snapshot';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
 import { buildSnapshotState } from '@agent-device/capture-kit/snapshot-state';
 import {
   contextFromFlags,
   makeSession,
   makeStaleRefSession,
   makeVisibleButtonSnapshot,
-} from '../../../daemon/interaction/internal/__tests__/interaction-touch-fixtures.ts';
+} from '@agent-device/daemon/testing/interaction/internal/__tests__/interaction-touch-fixtures';
 import { runInteraction } from './interaction-touch-runner.ts';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
@@ -30,8 +30,9 @@ const { mockRunAppleRunnerCommand } = vi.hoisted(() => ({
   mockRunAppleRunnerCommand: vi.fn(),
 }));
 
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', async () => {
-  const fixture = await import('../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts');
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', async () => {
+  const fixture =
+    await import('@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture');
   return { captureSnapshotWithInteractor: fixture.captureSnapshotThroughLegacyDispatchFixture };
 });
 
@@ -59,7 +60,7 @@ import {
   getRuntimeBindings,
   mockReadTextAtPoint,
   resetGetRuntimeFixture,
-} from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
 import {
   getAndroidAppState,
   getAndroidBlockingDialogObservation,
diff --git a/src/__tests__/daemon-composition/interaction/interaction-ios-tap-outcome.test.ts b/src/__tests__/daemon-composition/interaction/interaction-ios-tap-outcome.test.ts
index 2695a56e01..c960608bf2 100644
--- a/src/__tests__/daemon-composition/interaction/interaction-ios-tap-outcome.test.ts
+++ b/src/__tests__/daemon-composition/interaction/interaction-ios-tap-outcome.test.ts
@@ -1,5 +1,5 @@
 import type { CommandFlags } from '@agent-device/contracts/command';
-import { legacyDispatchCapture } from '../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts';
+import { legacyDispatchCapture } from '@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture';
 import { beforeEach, expect, test, vi } from 'vitest';
 import fs from 'node:fs';
 
@@ -7,40 +7,41 @@ import path from 'node:path';
 import { AppError } from '@agent-device/kernel/errors';
 import { buildSnapshotPresentationKey } from '@agent-device/kernel/snapshot';
 import { buildSnapshotState } from '@agent-device/capture-kit/snapshot-state';
-import { handleInteractionCommands } from '../../../daemon/interaction/index.ts';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
 import {
   makeIosSession,
   authoringPublication,
-} from '../../../daemon/__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
-import { SessionScriptWriter } from '../../../daemon/session-script-writer.ts';
-import { runReplayForTest } from '../../../daemon/__tests__/replay-runtime/replay-command-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { SessionScriptWriter } from '@agent-device/daemon/testing/session-script-writer';
+import { runReplayForTest } from '@agent-device/daemon/testing/__tests__/replay-runtime/replay-command-fixture';
 import { replayScriptSourceBundleFor } from '@agent-device/replay-port/replay-script-source-fixtures';
 import {
   imageViewerNodes,
   profileNodes,
   snapshot,
   snapshotPayload,
-} from '../../../daemon/interaction/internal/__tests__/interaction-ios-tap-outcome-fixtures.ts';
+} from '@agent-device/daemon/testing/interaction/internal/__tests__/interaction-ios-tap-outcome-fixtures';
 import {
   appCaptureComparisonIdentity,
   appCaptureComparisonKey,
   systemSurfaceCaptureComparisonKey,
-} from '../../../daemon/__tests__/ios-comparison-key-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/ios-comparison-key-fixture';
 import { IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
 import {
   getRuntimeBindings,
   mockTapPoint,
   resetGetRuntimeFixture,
-} from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
-import { captureSnapshotWithInteractor } from '../../../daemon/snapshot-interactor-capture.ts';
-import { corroborateIosTapFailure } from '../../../daemon/interaction/internal/interaction-ios-tap-outcome.ts';
-import { movingTargetBaseline } from '../../../daemon/deferred-interaction-outcome.ts';
+} from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
+import { captureSnapshotWithInteractor } from '@agent-device/daemon/testing/snapshot-interactor-capture';
+import { corroborateIosTapFailure } from '@agent-device/daemon/testing/interaction/internal/interaction-ios-tap-outcome';
+import { movingTargetBaseline } from '@agent-device/daemon/testing/deferred-interaction-outcome';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', async () => {
-  const fixture = await import('../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts');
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', async () => {
+  const fixture =
+    await import('@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture');
   return {
     captureSnapshotWithInteractor: vi.fn(fixture.captureSnapshotThroughLegacyDispatchFixture),
   };
diff --git a/src/__tests__/daemon-composition/interaction/interaction-settle-private-ax-route.test.ts b/src/__tests__/daemon-composition/interaction/interaction-settle-private-ax-route.test.ts
index 9171418dda..8a7b0ca9af 100644
--- a/src/__tests__/daemon-composition/interaction/interaction-settle-private-ax-route.test.ts
+++ b/src/__tests__/daemon-composition/interaction/interaction-settle-private-ax-route.test.ts
@@ -1,13 +1,13 @@
 import { beforeEach, expect, test, vi } from 'vitest';
 import { makeSnapshotState } from '@agent-device/selectors/snapshot-geometry-fixtures';
-import { makeIosSession } from '../../../daemon/__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
+import { makeIosSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import { withAppleRunnerProvider } from '@agent-device/platform-apple/runner';
-import { contextFromFlags as buildDaemonContext } from '../../../daemon/context.ts';
-import { handleInteractionCommands } from '../../../daemon/interaction/index.ts';
-import { getRuntimeBindings } from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
+import { contextFromFlags as buildDaemonContext } from '@agent-device/daemon/testing/context';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
+import { getRuntimeBindings } from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
 import { getInteractor } from '../../../core/interactors.ts';
-import { installInteractorResolution } from '../../../daemon/interactor-resolution.ts';
+import { installInteractorResolution } from '@agent-device/daemon/testing/interactor-resolution';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
 // Root composition hands the daemon its interactor resolution; this test drives the real
diff --git a/src/__tests__/daemon-composition/interaction/interaction-settle.test.ts b/src/__tests__/daemon-composition/interaction/interaction-settle.test.ts
index 0e346fd42d..448108b586 100644
--- a/src/__tests__/daemon-composition/interaction/interaction-settle.test.ts
+++ b/src/__tests__/daemon-composition/interaction/interaction-settle.test.ts
@@ -1,24 +1,24 @@
 import { daemonPlatformServicesFixture } from '../platform-services-fixture.ts';
 import type { CommandFlags } from '@agent-device/contracts/command';
-import { legacyDispatchCapture } from '../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts';
+import { legacyDispatchCapture } from '@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture';
 import { test, expect, vi, beforeEach } from 'vitest';
 import {
   createInteractionRuntime,
   handleInteractionCommands,
-} from '../../../daemon/interaction/index.ts';
-import type { SessionStore } from '../../../daemon/session-store.ts';
-import type { SessionRef, SessionState } from '../../../daemon/session-state.ts';
+} from '@agent-device/daemon/testing/interaction/index';
+import type { SessionStore } from '@agent-device/daemon/testing/session-store';
+import type { SessionRef, SessionState } from '@agent-device/daemon/testing/session-state';
 import { buildSnapshotState } from '@agent-device/capture-kit/snapshot-state';
-import { setSessionSnapshot } from '../../../daemon/session-snapshot.ts';
+import { setSessionSnapshot } from '@agent-device/daemon/testing/session-snapshot';
 import {
   activateCompleteRefFrame,
   expireRefFrame,
   refFrameState,
   refFrameTree,
-} from '../../../daemon/ref-frame.ts';
-import { captureSnapshotWithInteractor } from '../../../daemon/snapshot-interactor-capture.ts';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
-import { makeIosSession } from '../../../daemon/__tests__/support/session-factories.ts';
+} from '@agent-device/daemon/testing/ref-frame';
+import { captureSnapshotWithInteractor } from '@agent-device/daemon/testing/snapshot-interactor-capture';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { makeIosSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
 import {
   clearRequestAbortRegistration,
   registerRequestAbort,
@@ -29,7 +29,7 @@ import {
   mockFillPoint,
   mockTapPoint,
   resetGetRuntimeFixture,
-} from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
 // #1101 --settle daemon response shape: the settle payload (diff + settled +
@@ -39,7 +39,7 @@ import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 // beyond a few poll ticks.
 
 const mockCaptureSnapshotForSession = vi.hoisted(() => vi.fn());
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', () => ({
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 const nativeCapture = vi.mocked(captureSnapshotWithInteractor);
diff --git a/src/__tests__/daemon-composition/interaction/interaction-target-evidence.test.ts b/src/__tests__/daemon-composition/interaction/interaction-target-evidence.test.ts
index 9f58f7a4a7..57104a230b 100644
--- a/src/__tests__/daemon-composition/interaction/interaction-target-evidence.test.ts
+++ b/src/__tests__/daemon-composition/interaction/interaction-target-evidence.test.ts
@@ -1,18 +1,18 @@
 import type { CommandFlags } from '@agent-device/contracts/command';
-import { legacyDispatchCapture } from '../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts';
+import { legacyDispatchCapture } from '@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture';
 import { test, expect, vi, beforeEach } from 'vitest';
 import fs from 'node:fs';
 import path from 'node:path';
-import { handleInteractionCommands } from '../../../daemon/interaction/index.ts';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
 import { attachRefs, type RawSnapshotNode } from '@agent-device/kernel/snapshot';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import {
   makeIosSession,
   makeAuthoringSession,
   authoringPublication,
-} from '../../../daemon/__tests__/support/session-factories.ts';
-import { SessionScriptWriter } from '../../../daemon/session-script-writer.ts';
-import type { SessionState } from '../../../daemon/session-state.ts';
+} from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { SessionScriptWriter } from '@agent-device/daemon/testing/session-script-writer';
+import type { SessionState } from '@agent-device/daemon/testing/session-state';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
@@ -27,8 +27,9 @@ const { mockRunAppleRunnerCommand } = vi.hoisted(() => ({
   mockRunAppleRunnerCommand: vi.fn(),
 }));
 
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', async () => {
-  const fixture = await import('../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts');
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', async () => {
+  const fixture =
+    await import('@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture');
   return { captureSnapshotWithInteractor: fixture.captureSnapshotThroughLegacyDispatchFixture };
 });
 
@@ -44,7 +45,7 @@ vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal)
 import {
   getRuntimeBindings,
   resetGetRuntimeFixture,
-} from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
 const contextFromFlags = (_flags: CommandFlags | undefined) => ({});
 
 beforeEach(() => {
diff --git a/src/__tests__/daemon-composition/interaction/interaction-touch-android-freshness.test.ts b/src/__tests__/daemon-composition/interaction/interaction-touch-android-freshness.test.ts
index 298e4d9e12..c9329f67b1 100644
--- a/src/__tests__/daemon-composition/interaction/interaction-touch-android-freshness.test.ts
+++ b/src/__tests__/daemon-composition/interaction/interaction-touch-android-freshness.test.ts
@@ -1,16 +1,16 @@
 import { test, expect, vi, beforeEach } from 'vitest';
 import { attachRefs } from '@agent-device/kernel/snapshot';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
-import { handleInteractionCommands } from '../../../daemon/interaction/index.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
 import {
   getRuntimeBindings,
   mockTapPoint,
   resetGetRuntimeFixture,
-} from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
 import {
   contextFromFlags,
   makeAndroidSession,
-} from '../../../daemon/interaction/internal/__tests__/interaction-touch-fixtures.ts';
+} from '@agent-device/daemon/testing/interaction/internal/__tests__/interaction-touch-fixtures';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
 // The Android ref-refresh capture a @ref mutation takes before dispatch: when
@@ -31,7 +31,7 @@ vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
   };
 });
 
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', () => ({
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
@@ -46,8 +46,8 @@ import {
   getAndroidBlockingDialogObservation,
   getAndroidScreenSize,
 } from '@agent-device/platform-android/mechanics';
-import { captureSnapshotWithInteractor } from '../../../daemon/snapshot-interactor-capture.ts';
-import { activateCompleteRefFrame } from '../../../daemon/ref-frame.ts';
+import { captureSnapshotWithInteractor } from '@agent-device/daemon/testing/snapshot-interactor-capture';
+import { activateCompleteRefFrame } from '@agent-device/daemon/testing/ref-frame';
 const mockGetAndroidAppState = vi.mocked(getAndroidAppState);
 const mockGetAndroidBlockingDialogObservation = vi.mocked(getAndroidBlockingDialogObservation);
 const mockGetAndroidScreenSize = vi.mocked(getAndroidScreenSize);
diff --git a/src/__tests__/daemon-composition/interaction/interaction-touch-android-readiness.test.ts b/src/__tests__/daemon-composition/interaction/interaction-touch-android-readiness.test.ts
index 951b4d0cc9..e6a5fba15b 100644
--- a/src/__tests__/daemon-composition/interaction/interaction-touch-android-readiness.test.ts
+++ b/src/__tests__/daemon-composition/interaction/interaction-touch-android-readiness.test.ts
@@ -1,17 +1,17 @@
 import { test, expect, vi, beforeEach } from 'vitest';
 import { attachRefs } from '@agent-device/kernel/snapshot';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
-import { expireRefFrame } from '../../../daemon/ref-frame.ts';
-import { handleInteractionCommands } from '../../../daemon/interaction/index.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { expireRefFrame } from '@agent-device/daemon/testing/ref-frame';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
 import {
   getRuntimeBindings,
   mockTapPoint,
   resetGetRuntimeFixture,
-} from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
 import {
   contextFromFlags,
   makeAndroidSession,
-} from '../../../daemon/interaction/internal/__tests__/interaction-touch-fixtures.ts';
+} from '@agent-device/daemon/testing/interaction/internal/__tests__/interaction-touch-fixtures';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
 // The Android device state a dispatch has to survive: an escape to launcher or
@@ -19,7 +19,7 @@ import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 // blocking-dialog recovery aborts an admitted @ref rather than retargeting it.
 
 type EnsureAndroidBlockingSystemDialogReady =
-  typeof import('../../../daemon/android-system-dialog.ts').ensureAndroidBlockingSystemDialogReady;
+  typeof import('@agent-device/daemon/testing/android-system-dialog').ensureAndroidBlockingSystemDialogReady;
 
 const { androidDialogReadiness } = vi.hoisted(() => ({
   androidDialogReadiness: {
@@ -42,7 +42,7 @@ vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
   };
 });
 
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', () => ({
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
@@ -54,8 +54,9 @@ vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal)
 
 // The blocking-dialog readiness check runs for real (its focus probe is mocked
 // above); the recovery regression below swaps in a recovering implementation.
-vi.mock('../../../daemon/android-system-dialog.ts', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../../../daemon/android-system-dialog.ts')>();
+vi.mock('@agent-device/daemon/testing/android-system-dialog', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('@agent-device/daemon/testing/android-system-dialog')>();
   androidDialogReadiness.actual = actual.ensureAndroidBlockingSystemDialogReady;
   return { ...actual, ensureAndroidBlockingSystemDialogReady: androidDialogReadiness.spy };
 });
@@ -65,7 +66,7 @@ import {
   getAndroidBlockingDialogObservation,
   getAndroidScreenSize,
 } from '@agent-device/platform-android/mechanics';
-import { captureSnapshotWithInteractor } from '../../../daemon/snapshot-interactor-capture.ts';
+import { captureSnapshotWithInteractor } from '@agent-device/daemon/testing/snapshot-interactor-capture';
 const mockGetAndroidAppState = vi.mocked(getAndroidAppState);
 const mockGetAndroidBlockingDialogObservation = vi.mocked(getAndroidBlockingDialogObservation);
 const mockGetAndroidScreenSize = vi.mocked(getAndroidScreenSize);
diff --git a/src/__tests__/daemon-composition/interaction/interaction-touch-direct-ios-eligibility.test.ts b/src/__tests__/daemon-composition/interaction/interaction-touch-direct-ios-eligibility.test.ts
index f8c812eccc..37c14bb245 100644
--- a/src/__tests__/daemon-composition/interaction/interaction-touch-direct-ios-eligibility.test.ts
+++ b/src/__tests__/daemon-composition/interaction/interaction-touch-direct-ios-eligibility.test.ts
@@ -1,16 +1,16 @@
 import { test, expect, vi, beforeEach } from 'vitest';
 import { attachRefs } from '@agent-device/kernel/snapshot';
-import { makeIosSession } from '../../../daemon/__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
-import { handleInteractionCommands } from '../../../daemon/interaction/index.ts';
+import { makeIosSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
 import {
   getRuntimeBindings,
   mockFillPoint,
   mockTapElementSelector,
   mockTapPoint,
   resetGetRuntimeFixture,
-} from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
-import { contextFromFlags } from '../../../daemon/interaction/internal/__tests__/interaction-touch-fixtures.ts';
+} from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
+import { contextFromFlags } from '@agent-device/daemon/testing/interaction/internal/__tests__/interaction-touch-fixtures';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
 // Ordinary selectors stay capture-backed. Only the explicit Maestro
@@ -30,7 +30,7 @@ vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
   };
 });
 
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', () => ({
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
@@ -45,7 +45,7 @@ import {
   getAndroidBlockingDialogObservation,
   getAndroidScreenSize,
 } from '@agent-device/platform-android/mechanics';
-import { captureSnapshotWithInteractor } from '../../../daemon/snapshot-interactor-capture.ts';
+import { captureSnapshotWithInteractor } from '@agent-device/daemon/testing/snapshot-interactor-capture';
 const mockGetAndroidAppState = vi.mocked(getAndroidAppState);
 const mockGetAndroidBlockingDialogObservation = vi.mocked(getAndroidBlockingDialogObservation);
 const mockGetAndroidScreenSize = vi.mocked(getAndroidScreenSize);
diff --git a/src/__tests__/daemon-composition/interaction/interaction-touch-direct-ios.test.ts b/src/__tests__/daemon-composition/interaction/interaction-touch-direct-ios.test.ts
index 084cfd589d..49f4c5f381 100644
--- a/src/__tests__/daemon-composition/interaction/interaction-touch-direct-ios.test.ts
+++ b/src/__tests__/daemon-composition/interaction/interaction-touch-direct-ios.test.ts
@@ -7,23 +7,23 @@ import {
   dispatchDisclosureRowsOwnedBy,
 } from '@agent-device/contracts/dispatch-disclosure-fixtures';
 import { beforeEach, expect, test, vi } from 'vitest';
-import { makeIosSession } from '../../../daemon/__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
-import { handleInteractionCommands } from '../../../daemon/interaction/index.ts';
+import { makeIosSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
 import {
   getRuntimeBindings,
   mockTapElementSelector,
   mockTapPoint,
   resetGetRuntimeFixture,
-} from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
 import {
   contextFromFlags,
   makeStaleRefSession,
   makeTwoButtonNodes,
-} from '../../../daemon/interaction/internal/__tests__/interaction-touch-fixtures.ts';
+} from '@agent-device/daemon/testing/interaction/internal/__tests__/interaction-touch-fixtures';
 import { runInteraction } from './interaction-touch-runner.ts';
-import { refFrameState } from '../../../daemon/ref-frame.ts';
-import { captureSnapshotWithInteractor } from '../../../daemon/snapshot-interactor-capture.ts';
+import { refFrameState } from '@agent-device/daemon/testing/ref-frame';
+import { captureSnapshotWithInteractor } from '@agent-device/daemon/testing/snapshot-interactor-capture';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
 vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
@@ -36,7 +36,7 @@ vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
   };
 });
 
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', () => ({
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
diff --git a/src/__tests__/daemon-composition/interaction/interaction-touch-fill.test.ts b/src/__tests__/daemon-composition/interaction/interaction-touch-fill.test.ts
index ef4c38ff12..b9b3db30c5 100644
--- a/src/__tests__/daemon-composition/interaction/interaction-touch-fill.test.ts
+++ b/src/__tests__/daemon-composition/interaction/interaction-touch-fill.test.ts
@@ -1,20 +1,20 @@
 import { test, expect, vi, beforeEach } from 'vitest';
 import { attachRefs } from '@agent-device/kernel/snapshot';
 import { withAppleRunnerProvider } from '@agent-device/platform-apple/runner';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
-import { activateCompleteRefFrame, expireRefFrame } from '../../../daemon/ref-frame.ts';
-import { STALE_SNAPSHOT_REFS_WARNING } from '../../../daemon/session-snapshot.ts';
-import { handleInteractionCommands } from '../../../daemon/interaction/index.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { activateCompleteRefFrame, expireRefFrame } from '@agent-device/daemon/testing/ref-frame';
+import { STALE_SNAPSHOT_REFS_WARNING } from '@agent-device/daemon/testing/session-snapshot';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
 import {
   getRuntimeBindings,
   mockFillPoint,
   resetGetRuntimeFixture,
-} from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
 import {
   contextFromFlags,
   makeSession,
   makeStaleRefSession,
-} from '../../../daemon/interaction/internal/__tests__/interaction-touch-fixtures.ts';
+} from '@agent-device/daemon/testing/interaction/internal/__tests__/interaction-touch-fixtures';
 import { runInteraction } from './interaction-touch-runner.ts';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
@@ -39,7 +39,7 @@ vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
   };
 });
 
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', () => ({
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
@@ -54,7 +54,7 @@ import {
   getAndroidBlockingDialogObservation,
   getAndroidScreenSize,
 } from '@agent-device/platform-android/mechanics';
-import { captureSnapshotWithInteractor } from '../../../daemon/snapshot-interactor-capture.ts';
+import { captureSnapshotWithInteractor } from '@agent-device/daemon/testing/snapshot-interactor-capture';
 const mockGetAndroidAppState = vi.mocked(getAndroidAppState);
 const mockGetAndroidBlockingDialogObservation = vi.mocked(getAndroidBlockingDialogObservation);
 const mockGetAndroidScreenSize = vi.mocked(getAndroidScreenSize);
diff --git a/src/__tests__/daemon-composition/interaction/interaction-touch-payload.test.ts b/src/__tests__/daemon-composition/interaction/interaction-touch-payload.test.ts
index 83458c6226..ffbd8b9a8f 100644
--- a/src/__tests__/daemon-composition/interaction/interaction-touch-payload.test.ts
+++ b/src/__tests__/daemon-composition/interaction/interaction-touch-payload.test.ts
@@ -1,18 +1,18 @@
 import { test, expect, vi, beforeEach } from 'vitest';
 import { attachRefs } from '@agent-device/kernel/snapshot';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
-import { handleInteractionCommands } from '../../../daemon/interaction/index.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
 import {
   getRuntimeBindings,
   mockTapPoint,
   resetGetRuntimeFixture,
-} from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
 import {
   contextFromFlags,
   installTestScreenRecording,
   makeAndroidSession,
   makeSession,
-} from '../../../daemon/interaction/internal/__tests__/interaction-touch-fixtures.ts';
+} from '@agent-device/daemon/testing/interaction/internal/__tests__/interaction-touch-fixtures';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
 // What a built touch payload carries: the recorded action entry and touch
@@ -33,7 +33,7 @@ vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
   };
 });
 
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', () => ({
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
@@ -48,7 +48,7 @@ import {
   getAndroidBlockingDialogObservation,
   getAndroidScreenSize,
 } from '@agent-device/platform-android/mechanics';
-import { captureSnapshotWithInteractor } from '../../../daemon/snapshot-interactor-capture.ts';
+import { captureSnapshotWithInteractor } from '@agent-device/daemon/testing/snapshot-interactor-capture';
 const mockGetAndroidAppState = vi.mocked(getAndroidAppState);
 const mockGetAndroidBlockingDialogObservation = vi.mocked(getAndroidBlockingDialogObservation);
 const mockGetAndroidScreenSize = vi.mocked(getAndroidScreenSize);
diff --git a/src/__tests__/daemon-composition/interaction/interaction-touch-prepare.test.ts b/src/__tests__/daemon-composition/interaction/interaction-touch-prepare.test.ts
index d200ee305c..1e50852590 100644
--- a/src/__tests__/daemon-composition/interaction/interaction-touch-prepare.test.ts
+++ b/src/__tests__/daemon-composition/interaction/interaction-touch-prepare.test.ts
@@ -16,16 +16,16 @@ import {
 import { attachRefs, type RawSnapshotNode } from '@agent-device/kernel/snapshot';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import { createUnavailableRuntimeFactsForTest } from '@agent-device/test-kit/runtime-operation-facts';
-import { makeIosAppSession } from '../../../daemon/__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
+import { makeIosAppSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../../daemon/request-runtime-binding.ts';
-import { daemonPlatformServicesFixture } from '../../../daemon/__tests__/platform-services-fixture.ts';
+} from '@agent-device/daemon/testing/request-runtime-binding';
+import { daemonPlatformServicesFixture } from '@agent-device/daemon/testing/__tests__/platform-services-fixture';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
-import { handleInteractionCommands } from '../../../daemon/interaction/index.ts';
-import type { SessionStore } from '../../../daemon/session-store.ts';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
+import type { SessionStore } from '@agent-device/daemon/testing/session-store';
 
 // #3510: the capture an interaction's post-action observation polls. A coordinate-targeted press or
 // fill acts through a use that declares no capture, so before this its settle loop read the screen
@@ -56,7 +56,7 @@ const BRIDGE_PRODUCED = Object.freeze({
 });
 
 const mockInteractorCapture = vi.hoisted(() => vi.fn());
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', () => ({
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', () => ({
   captureSnapshotWithInteractor: mockInteractorCapture,
 }));
 
diff --git a/src/__tests__/daemon-composition/interaction/interaction-touch-press-admission.test.ts b/src/__tests__/daemon-composition/interaction/interaction-touch-press-admission.test.ts
index 52eeb5b0ae..db81737659 100644
--- a/src/__tests__/daemon-composition/interaction/interaction-touch-press-admission.test.ts
+++ b/src/__tests__/daemon-composition/interaction/interaction-touch-press-admission.test.ts
@@ -1,17 +1,17 @@
 import { test, expect, vi, beforeEach } from 'vitest';
 import { attachRefs } from '@agent-device/kernel/snapshot';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
-import { activateCompleteRefFrame, refFrameState } from '../../../daemon/ref-frame.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { activateCompleteRefFrame, refFrameState } from '@agent-device/daemon/testing/ref-frame';
 import {
   setSessionSnapshot,
   STALE_SNAPSHOT_REFS_WARNING,
-} from '../../../daemon/session-snapshot.ts';
-import { handleInteractionCommands } from '../../../daemon/interaction/index.ts';
+} from '@agent-device/daemon/testing/session-snapshot';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
 import {
   getRuntimeBindings,
   mockTapPoint,
   resetGetRuntimeFixture,
-} from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
 import {
   contextFromFlags,
   findResolvedTarget,
@@ -20,7 +20,7 @@ import {
   makeStaleRefSession,
   makeTwoButtonNodes,
   readPressPoint,
-} from '../../../daemon/interaction/internal/__tests__/interaction-touch-fixtures.ts';
+} from '@agent-device/daemon/testing/interaction/internal/__tests__/interaction-touch-fixtures';
 import { runFindInternalClick, runInteraction } from './interaction-touch-runner.ts';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
@@ -42,7 +42,7 @@ vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
   };
 });
 
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', () => ({
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
@@ -57,7 +57,7 @@ import {
   getAndroidBlockingDialogObservation,
   getAndroidScreenSize,
 } from '@agent-device/platform-android/mechanics';
-import { captureSnapshotWithInteractor } from '../../../daemon/snapshot-interactor-capture.ts';
+import { captureSnapshotWithInteractor } from '@agent-device/daemon/testing/snapshot-interactor-capture';
 const mockGetAndroidAppState = vi.mocked(getAndroidAppState);
 const mockGetAndroidBlockingDialogObservation = vi.mocked(getAndroidBlockingDialogObservation);
 const mockGetAndroidScreenSize = vi.mocked(getAndroidScreenSize);
diff --git a/src/__tests__/daemon-composition/interaction/interaction-touch-press.test.ts b/src/__tests__/daemon-composition/interaction/interaction-touch-press.test.ts
index ae57d07403..73666b524b 100644
--- a/src/__tests__/daemon-composition/interaction/interaction-touch-press.test.ts
+++ b/src/__tests__/daemon-composition/interaction/interaction-touch-press.test.ts
@@ -1,13 +1,13 @@
 import { test, expect, vi, beforeEach } from 'vitest';
 import { attachRefs } from '@agent-device/kernel/snapshot';
-import { makeIosSession } from '../../../daemon/__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
-import { handleInteractionCommands } from '../../../daemon/interaction/index.ts';
+import { makeIosSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
 import {
   getRuntimeBindings,
   mockTapPoint,
   resetGetRuntimeFixture,
-} from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
 import {
   contextFromFlags,
   findResolvedTarget,
@@ -16,7 +16,7 @@ import {
   makeSession,
   makeStaleRefSession,
   readPressPoint,
-} from '../../../daemon/interaction/internal/__tests__/interaction-touch-fixtures.ts';
+} from '@agent-device/daemon/testing/interaction/internal/__tests__/interaction-touch-fixtures';
 import { runFindInternalClick } from './interaction-touch-runner.ts';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
@@ -38,7 +38,7 @@ vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
   };
 });
 
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', () => ({
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
@@ -53,7 +53,7 @@ import {
   getAndroidBlockingDialogObservation,
   getAndroidScreenSize,
 } from '@agent-device/platform-android/mechanics';
-import { captureSnapshotWithInteractor } from '../../../daemon/snapshot-interactor-capture.ts';
+import { captureSnapshotWithInteractor } from '@agent-device/daemon/testing/snapshot-interactor-capture';
 const mockGetAndroidAppState = vi.mocked(getAndroidAppState);
 const mockGetAndroidBlockingDialogObservation = vi.mocked(getAndroidBlockingDialogObservation);
 const mockGetAndroidScreenSize = vi.mocked(getAndroidScreenSize);
diff --git a/src/__tests__/daemon-composition/interaction/interaction-touch-response.test.ts b/src/__tests__/daemon-composition/interaction/interaction-touch-response.test.ts
index d0f75322e9..55b01f4330 100644
--- a/src/__tests__/daemon-composition/interaction/interaction-touch-response.test.ts
+++ b/src/__tests__/daemon-composition/interaction/interaction-touch-response.test.ts
@@ -1,32 +1,18 @@
-import { daemonPlatformServicesFixture } from '../platform-services-fixture.ts';
-import fs from 'node:fs';
-import path from 'node:path';
-import {
-  withDiagnosticsScope,
-  flushDiagnosticsToSessionFile,
-} from '@agent-device/host-kit/diagnostics';
-import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { test, expect, vi, beforeEach } from 'vitest';
 import { attachRefs } from '@agent-device/kernel/snapshot';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
-import { handleInteractionCommands } from '../../../daemon/interaction/index.ts';
-import {
-  buildInteractionResponseData,
-  buildTargetedTouchResponsePayloads,
-  transformTouchResponseData,
-} from '../../../daemon/interaction/internal/interaction-touch-response.ts';
-import type { PressCommandResult } from '@agent-device/contracts/interaction';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
 import {
   getRuntimeBindings,
   mockFillPoint,
   mockTapPoint,
   resetGetRuntimeFixture,
-} from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
 import {
   contextFromFlags,
   installTestScreenRecording,
   makeSession,
-} from '../../../daemon/interaction/internal/__tests__/interaction-touch-fixtures.ts';
+} from '@agent-device/daemon/testing/interaction/internal/__tests__/interaction-touch-fixtures';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
 // The identity extras the one response site composes: --verify evidence rides
@@ -47,7 +33,7 @@ vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
   };
 });
 
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', () => ({
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
@@ -62,7 +48,7 @@ import {
   getAndroidBlockingDialogObservation,
   getAndroidScreenSize,
 } from '@agent-device/platform-android/mechanics';
-import { captureSnapshotWithInteractor } from '../../../daemon/snapshot-interactor-capture.ts';
+import { captureSnapshotWithInteractor } from '@agent-device/daemon/testing/snapshot-interactor-capture';
 const mockGetAndroidAppState = vi.mocked(getAndroidAppState);
 const mockGetAndroidBlockingDialogObservation = vi.mocked(getAndroidBlockingDialogObservation);
 const mockGetAndroidScreenSize = vi.mocked(getAndroidScreenSize);
@@ -81,209 +67,6 @@ beforeEach(() => {
   mockRunAppleRunnerCommand.mockResolvedValue({});
 });
 
-test('commandless longpress response omits internal interaction diagnostics', () => {
-  expect(
-    transformTouchResponseData({
-      flags: {},
-      data: {
-        currentUptimeMs: 900,
-        gestureStartUptimeMs: 100,
-        gestureEndUptimeMs: 800,
-        sequenceResults: [{ index: 0, success: true }],
-        completedSteps: 1,
-      },
-    }),
-  ).toEqual({ completedSteps: 1 });
-});
-
-function selectorResult(readiness?: { polls: number; waitedMs: number }): PressCommandResult {
-  return {
-    kind: 'selector',
-    point: { x: 10, y: 20 },
-    target: { kind: 'selector', selector: 'label=Continue' },
-    node: { ref: 'e1', index: 0, type: 'Button', label: 'Continue' },
-    selectorChain: ['label=Continue'],
-    warning: 'earlier warning',
-    ...(readiness ? { readiness } : {}),
-  };
-}
-
-const WAITED_SELECTOR_RESULT = selectorResult({ polls: 3, waitedMs: 400 });
-
-test.each([false, true])('selector-touch observation after retirement=%s', async (retired) => {
-  const sessionStore = makeSessionStore();
-  const address = 'cwd:selector-touch-response:default';
-  const session = makeSession('default');
-  session.snapshot = {
-    nodes: attachRefs([{ index: 0, type: 'Button', label: 'Continue' }]),
-    createdAt: Date.now(),
-    backend: 'xctest',
-  };
-  session.snapshotGeneration = 3;
-  const ref = sessionStore.publish(address, session);
-  const result: PressCommandResult = {
-    ...selectorResult(),
-    settle: {
-      settled: true,
-      waitedMs: 25,
-      captures: 2,
-      quietMs: 25,
-      timeoutMs: 2000,
-      diff: {
-        summary: { additions: 1, removals: 0, unchanged: 0 },
-        lines: [{ kind: 'added', text: 'Continue', ref: 'e1' }],
-      },
-    },
-  };
-  let successor;
-  if (retired) {
-    sessionStore.retire(ref);
-    successor = sessionStore.publish(address, makeSession('default'));
-  }
-  const payloads = await buildTargetedTouchResponsePayloads({
-    params: {
-      createCommandSurface: testCreateCommandSurface,
-      req: { token: 't', command: 'press', positionals: ['@e1'], session: 'default' },
-      sessionName: address,
-      sessionRef: ref,
-      sessionStore,
-      contextFromFlags,
-      platformServices: daemonPlatformServicesFixture(),
-      captureSnapshotForSession: vi.fn(),
-    },
-    result,
-    staleRefsWarning: undefined,
-    extra: {},
-  });
-  if (retired) {
-    expect(payloads.responseData.settle).toBeUndefined();
-    expect(payloads.result.settle).toBeUndefined();
-    expect(sessionStore.lookup(address)).toEqual(successor);
-    expect(successor?.session.snapshot).toBeUndefined();
-  } else {
-    expect(payloads.responseData.settle).toMatchObject({ refsGeneration: 3, settled: true });
-  }
-});
-
-test.each([
-  [false, false],
-  [false, true],
-  [true, false],
-  [true, true],
-])(
-  'point-touch publication after a held frame probe, retired=%s, fails=%s',
-  async (retired, fails) => {
-    const sessionStore = makeSessionStore();
-    const address = 'cwd:held-touch-response:default';
-    const session = makeSession('default');
-    session.snapshot = {
-      nodes: attachRefs([{ index: 0, type: 'Button', label: 'Continue' }]),
-      createdAt: Date.now(),
-      backend: 'xctest',
-    };
-    session.snapshotGeneration = 3;
-    installTestScreenRecording(session);
-    const ref = sessionStore.publish(address, session);
-    let startProbe!: () => void;
-    let releaseProbe!: () => void;
-    const probing = new Promise<void>((resolve) => {
-      startProbe = resolve;
-    });
-    const released = new Promise<void>((resolve) => {
-      releaseProbe = resolve;
-    });
-    const result: PressCommandResult = {
-      kind: 'point',
-      point: { x: 10, y: 20 },
-      settle: {
-        settled: true,
-        waitedMs: 25,
-        captures: 2,
-        quietMs: 25,
-        timeoutMs: 2000,
-        diff: {
-          summary: { additions: 1, removals: 0, unchanged: 0 },
-          lines: [{ kind: 'added', text: 'Continue', ref: 'e1' }],
-        },
-      },
-    };
-    const logPath = path.join(mkdtempForTestSync('held-point-'), 'request.log');
-    const running = withDiagnosticsScope(
-      { command: 'press', session: address, logPath, debug: true },
-      async () => {
-        const payloads = await buildTargetedTouchResponsePayloads({
-          params: {
-            createCommandSurface: testCreateCommandSurface,
-            req: {
-              token: 't',
-              command: 'press',
-              positionals: ['10', '20'],
-              session: 'default',
-              flags: {},
-            },
-            sessionName: address,
-            sessionRef: ref,
-            sessionStore,
-            contextFromFlags,
-            platformServices: daemonPlatformServicesFixture(),
-            captureSnapshotForSession: async () => {
-              startProbe();
-              await released;
-              if (fails) throw new Error('frame capture failed');
-              return sessionStore.requireCurrent(ref).snapshot!;
-            },
-          },
-          result,
-          staleRefsWarning: undefined,
-          extra: {},
-        });
-        flushDiagnosticsToSessionFile({ force: true });
-        return payloads;
-      },
-    );
-    await probing;
-    let successor;
-    if (retired) {
-      sessionStore.retire(ref);
-      successor = sessionStore.publish(address, makeSession('default'));
-    }
-    releaseProbe();
-    const payloads = await running;
-    const diagnostics = fs.existsSync(logPath) ? fs.readFileSync(logPath, 'utf8') : '';
-    expect(diagnostics.includes('touch_reference_frame_resolve_failed')).toBe(!retired && fails);
-    expect(payloads.responseData.x).toBe(10);
-    if (retired) {
-      expect(payloads.responseData.settle).toBeUndefined();
-      expect(payloads.result.settle).toBeUndefined();
-      expect(sessionStore.lookup(address)).toEqual(successor);
-      expect(successor?.session.snapshot).toBeUndefined();
-    } else {
-      expect(payloads.responseData.settle).toMatchObject({ refsGeneration: 3, settled: true });
-    }
-  },
-);
-
-test('the response builder reports the resolved wait and keeps the prior warning', () => {
-  const { responseData, result } = buildInteractionResponseData({
-    source: { kind: 'runtime', result: WAITED_SELECTOR_RESULT },
-    referenceFrame: undefined,
-    staleRefsWarning: 'stale refs',
-  });
-
-  expect(responseData.readiness).toEqual({ polls: 3, waitedMs: 400 });
-  expect(responseData.warning).toBe('earlier warning stale refs');
-  expect(result.readiness).toBeUndefined();
-});
-
-test('the response builder omits readiness when nothing waited', () => {
-  const { responseData } = buildInteractionResponseData({
-    source: { kind: 'runtime', result: selectorResult() },
-    referenceFrame: undefined,
-  });
-
-  expect('readiness' in responseData).toBe(false);
-});
-
 test('press @ref --verify surfaces evidence through the interactionResultExtra allowlist', async () => {
   const sessionStore = makeSessionStore();
   const sessionName = 'verify-press';
@@ -647,37 +430,3 @@ test('fill @ref preserves fallback coordinates for recording when platform resul
   expect(event?.x).toBe(60);
   expect(event?.y).toBe(40);
 });
-
-test('an already retired coordinate touch skips its frame probe without a warning', async () => {
-  const sessionStore = makeSessionStore();
-  const ref = sessionStore.publish('retired-point', makeSession('retired-point'));
-  sessionStore.retire(ref);
-  const capture = vi.fn();
-  const logPath = path.join(mkdtempForTestSync('retired-point-'), 'request.log');
-  await withDiagnosticsScope(
-    { command: 'click', session: ref.address, logPath, debug: true },
-    async () => {
-      const payloads = await buildTargetedTouchResponsePayloads({
-        params: {
-          createCommandSurface: testCreateCommandSurface,
-          req: { token: 't', command: 'click', positionals: ['1', '2'], session: ref.address },
-          sessionName: ref.address,
-          sessionRef: ref,
-          sessionStore,
-          contextFromFlags,
-          platformServices: daemonPlatformServicesFixture(),
-          captureSnapshotForSession: capture,
-        },
-        result: { kind: 'point', point: { x: 1, y: 2 } },
-        staleRefsWarning: undefined,
-        extra: {},
-      });
-      expect(payloads.responseData).toMatchObject({ x: 1, y: 2 });
-      flushDiagnosticsToSessionFile({ force: true });
-    },
-  );
-  expect(capture).not.toHaveBeenCalled();
-  expect(fs.existsSync(logPath) ? fs.readFileSync(logPath, 'utf8') : '').not.toContain(
-    'touch_reference_frame_resolve_failed',
-  );
-});
diff --git a/src/__tests__/daemon-composition/interaction/interaction-touch-runner.ts b/src/__tests__/daemon-composition/interaction/interaction-touch-runner.ts
index 2d36b3ab22..c540cc58ba 100644
--- a/src/__tests__/daemon-composition/interaction/interaction-touch-runner.ts
+++ b/src/__tests__/daemon-composition/interaction/interaction-touch-runner.ts
@@ -1,8 +1,8 @@
-import { handleInteractionCommands } from '../../../daemon/interaction/index.ts';
-import { getRuntimeBindings } from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
-import { contextFromFlags } from '../../../daemon/interaction/internal/__tests__/interaction-touch-fixtures.ts';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
+import { getRuntimeBindings } from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
+import { contextFromFlags } from '@agent-device/daemon/testing/interaction/internal/__tests__/interaction-touch-fixtures';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
-import type { SessionStore } from '../../../daemon/session-store.ts';
+import type { SessionStore } from '@agent-device/daemon/testing/session-store';
 
 /**
  * The real command-surface legs the relocated interaction suites drive through the handler.
diff --git a/src/__tests__/daemon-composition/interaction/interaction-touch-runtime.test.ts b/src/__tests__/daemon-composition/interaction/interaction-touch-runtime.test.ts
index 33073b078d..839ada4962 100644
--- a/src/__tests__/daemon-composition/interaction/interaction-touch-runtime.test.ts
+++ b/src/__tests__/daemon-composition/interaction/interaction-touch-runtime.test.ts
@@ -1,19 +1,19 @@
 import { test, expect, vi, beforeEach } from 'vitest';
 import { attachRefs } from '@agent-device/kernel/snapshot';
 import { withAppleRunnerProvider } from '@agent-device/platform-apple/runner';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
-import { handleInteractionCommands } from '../../../daemon/interaction/index.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
 import {
   elementReadFixtureState,
   getRuntimeBindings,
   mockQuerySelector,
   mockTapPoint,
   resetGetRuntimeFixture,
-} from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
 import {
   contextFromFlags,
   makeSession,
-} from '../../../daemon/interaction/internal/__tests__/interaction-touch-fixtures.ts';
+} from '@agent-device/daemon/testing/interaction/internal/__tests__/interaction-touch-fixtures';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
 // What the shared runtime dispatch does with the resolved target: refuse
@@ -38,7 +38,7 @@ vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
   };
 });
 
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', () => ({
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
@@ -53,7 +53,7 @@ import {
   getAndroidBlockingDialogObservation,
   getAndroidScreenSize,
 } from '@agent-device/platform-android/mechanics';
-import { captureSnapshotWithInteractor } from '../../../daemon/snapshot-interactor-capture.ts';
+import { captureSnapshotWithInteractor } from '@agent-device/daemon/testing/snapshot-interactor-capture';
 const mockGetAndroidAppState = vi.mocked(getAndroidAppState);
 const mockGetAndroidBlockingDialogObservation = vi.mocked(getAndroidBlockingDialogObservation);
 const mockGetAndroidScreenSize = vi.mocked(getAndroidScreenSize);
diff --git a/src/__tests__/daemon-composition/interaction/interaction-touch.test.ts b/src/__tests__/daemon-composition/interaction/interaction-touch.test.ts
index 2503449eda..8139f29792 100644
--- a/src/__tests__/daemon-composition/interaction/interaction-touch.test.ts
+++ b/src/__tests__/daemon-composition/interaction/interaction-touch.test.ts
@@ -1,8 +1,8 @@
 import { test, expect, vi, beforeEach } from 'vitest';
 import { attachRefs } from '@agent-device/kernel/snapshot';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import { WEB_DESKTOP_DEVICE } from '@agent-device/test-kit/device-fixtures';
-import { handleInteractionCommands } from '../../../daemon/interaction/index.ts';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
 import {
   getRuntimeBindings,
   mockHoverPoint,
@@ -11,13 +11,13 @@ import {
   mockTapPoint,
   resetGetRuntimeFixture,
   runtimeBindingSpies,
-} from '../../../daemon/__tests__/interaction-get-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
 import {
   contextFromFlags,
   makeMacOsDesktopSession,
   makeMacOsMenubarSession,
   makeSession,
-} from '../../../daemon/interaction/internal/__tests__/interaction-touch-fixtures.ts';
+} from '@agent-device/daemon/testing/interaction/internal/__tests__/interaction-touch-fixtures';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
 // Router ownership: one representative per touch command proves
@@ -37,7 +37,7 @@ vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
   };
 });
 
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', () => ({
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', () => ({
   captureSnapshotWithInteractor: vi.fn(),
 }));
 
@@ -52,7 +52,7 @@ import {
   getAndroidBlockingDialogObservation,
   getAndroidScreenSize,
 } from '@agent-device/platform-android/mechanics';
-import { captureSnapshotWithInteractor } from '../../../daemon/snapshot-interactor-capture.ts';
+import { captureSnapshotWithInteractor } from '@agent-device/daemon/testing/snapshot-interactor-capture';
 const mockGetAndroidAppState = vi.mocked(getAndroidAppState);
 const mockGetAndroidBlockingDialogObservation = vi.mocked(getAndroidBlockingDialogObservation);
 const mockGetAndroidScreenSize = vi.mocked(getAndroidScreenSize);
diff --git a/src/__tests__/daemon-composition/is-runtime.test.ts b/src/__tests__/daemon-composition/is-runtime.test.ts
index df9b5ab578..9328b1c5eb 100644
--- a/src/__tests__/daemon-composition/is-runtime.test.ts
+++ b/src/__tests__/daemon-composition/is-runtime.test.ts
@@ -7,14 +7,14 @@ import {
   makeAndroidSession,
   makeIosAppSession,
   makeIosSession,
-} from '../../daemon/__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
+} from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import { withTestDeviceInventory } from '@agent-device/device-selection/inventory-gateways-fixtures';
 import { makeSnapshotState } from '@agent-device/selectors/snapshot-geometry-fixtures';
 import type { PostGestureOutcome } from '@agent-device/kernel/snapshot';
-import type { DaemonRequest } from '../../daemon/daemon-request.ts';
-import { selectorCaptureFixture } from '../../daemon/__tests__/selector-capture-fixture.ts';
-import { markDeferredInteractionOutcome } from '../../daemon/deferred-interaction-outcome.ts';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
+import { selectorCaptureFixture } from '@agent-device/daemon/testing/__tests__/selector-capture-fixture';
+import { markDeferredInteractionOutcome } from '@agent-device/daemon/testing/deferred-interaction-outcome';
 import { formatPostGestureOutcomeWarning } from '@agent-device/capture-kit/post-gesture-stability';
 import { testCreateCommandSurface } from './command-surface-fixture.ts';
 
@@ -26,7 +26,7 @@ vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal)
   return { ...actual, runAppleRunnerCommand: mockRunAppleRunnerCommand };
 });
 
-import { dispatchIsViaRuntime } from '../../daemon/selector-runtime.ts';
+import { dispatchIsViaRuntime } from '@agent-device/daemon/testing/selector-runtime';
 
 beforeEach(() => {
   mockRunAppleRunnerCommand.mockReset();
diff --git a/src/__tests__/daemon-composition/lifecycle-runtime-gateway.ts b/src/__tests__/daemon-composition/lifecycle-runtime-gateway.ts
index 8233ef4fdb..47024cfdcf 100644
--- a/src/__tests__/daemon-composition/lifecycle-runtime-gateway.ts
+++ b/src/__tests__/daemon-composition/lifecycle-runtime-gateway.ts
@@ -1,7 +1,7 @@
 import {
   createLifecycleDeviceRuntimeGateway,
   createLifecycleDeviceRuntimeGatewaySpies,
-} from '../../daemon/__tests__/test-device-runtime-gateway.ts';
+} from '@agent-device/daemon/testing/__tests__/test-device-runtime-gateway';
 import { applicationLifecycleRuntimeFixture } from './application-lifecycle-runtime-fixture.ts';
 
 /**
diff --git a/src/__tests__/daemon-composition/perf-capture-session-resource.test.ts b/src/__tests__/daemon-composition/perf-capture-session-resource.test.ts
index 8c8cf0f8b0..6107ebb24e 100644
--- a/src/__tests__/daemon-composition/perf-capture-session-resource.test.ts
+++ b/src/__tests__/daemon-composition/perf-capture-session-resource.test.ts
@@ -1,9 +1,9 @@
-import { bindSessionPerfCapture } from '../../daemon/session-capture-binding.ts';
+import { bindSessionPerfCapture } from '@agent-device/daemon/testing/session-capture-binding';
 import { beforeEach, expect, test, vi } from 'vitest';
 import { localRuntimeOwner } from '@agent-device/contracts/platform-runtime';
 import { AppError } from '@agent-device/kernel/errors';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import { createPerfCaptureAdmissionLedger } from '@agent-device/capture-kit/perf-capture-admission-ledger';
 import { perfCaptureResourceStore } from '@agent-device/capture-kit/perf-capture-resource-store';
 import {
@@ -11,7 +11,7 @@ import {
   finishLivePerfCapture,
 } from '@agent-device/capture-kit/perf-capture-session-resource';
 import { startAndroidPerfCapture } from '../../platform-runtime-perf-capture-host.ts';
-import type { SessionState } from '../../daemon/session-state.ts';
+import type { SessionState } from '@agent-device/daemon/testing/session-state';
 
 const androidNative = vi.hoisted(() => ({
   startAndroidSimpleperfProfile: vi.fn(),
diff --git a/src/__tests__/daemon-composition/platform-services-fixture.ts b/src/__tests__/daemon-composition/platform-services-fixture.ts
index 88ac8cead0..2de508110b 100644
--- a/src/__tests__/daemon-composition/platform-services-fixture.ts
+++ b/src/__tests__/daemon-composition/platform-services-fixture.ts
@@ -1,7 +1,7 @@
 import { createDaemonPlatformServices } from '../../platform-runtime-daemon-services.ts';
 import { createClaimRecoveryGateway } from '../../platform-runtime-claim-recovery.ts';
-import type { DaemonPlatformServices } from '../../daemon/platform-services.ts';
-import type { ClaimRecoveryGatewayFactory } from '../../daemon/device/claim-recovery-gateway.ts';
+import type { DaemonPlatformServices } from '@agent-device/daemon/platform-services';
+import type { ClaimRecoveryGatewayFactory } from '@agent-device/daemon/device/claim-recovery-gateway';
 
 /**
  * The port the production composition root builds, handed to a test the same way the shared router
diff --git a/src/__tests__/daemon-composition/providers-plugin-routing-parity.test.ts b/src/__tests__/daemon-composition/providers-plugin-routing-parity.test.ts
index d7186bf522..c6dba82ab4 100644
--- a/src/__tests__/daemon-composition/providers-plugin-routing-parity.test.ts
+++ b/src/__tests__/daemon-composition/providers-plugin-routing-parity.test.ts
@@ -25,15 +25,15 @@ import {
   VISIONOS_SIMULATOR,
   WEB_DESKTOP_DEVICE,
 } from '@agent-device/test-kit/device-fixtures';
-import { makeSession } from '../../daemon/__tests__/support/session-factories.ts';
+import { makeSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
 import { getPlugin, tryGetPlugin } from '../../core/platform-plugin-registry.ts';
 import { registerBuiltinPlatformPlugins } from '../../core/interactors/register-builtins.ts';
 import {
   createRequestPlatformProviders,
   type PlatformProviderResolvers,
 } from '../../platform-runtime.ts';
-import { resolvePlatformProviderRequestContext } from '../../daemon/request-platform-provider-context.ts';
-import type { DaemonRequest } from '../../daemon/daemon-request.ts';
+import { resolvePlatformProviderRequestContext } from '@agent-device/daemon/testing/request-platform-provider-context';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 
 // Phase 3 step b.3 (issue #974) parity gate for the request-scope provider
 // facet. The per-platform GATE that each descriptor in the root-owned provider composition
diff --git a/src/__tests__/daemon-composition/replay-coordinator-ownership.test.ts b/src/__tests__/daemon-composition/replay-coordinator-ownership.test.ts
index 21bd581a4c..27c2fe94fc 100644
--- a/src/__tests__/daemon-composition/replay-coordinator-ownership.test.ts
+++ b/src/__tests__/daemon-composition/replay-coordinator-ownership.test.ts
@@ -24,11 +24,11 @@ import { parseSync } from 'oxc-parser';
  */
 
 const REPO_ROOT = fileURLToPath(new URL('../../../', import.meta.url));
-const COORDINATOR_MODULE = 'src/daemon/session-replay-coordinator.ts';
-const TRANSACTION_MODULE = 'src/daemon/session-replay-transaction.ts';
-const SESSION_STORE_MODULE = 'src/daemon/session-store.ts';
+const COORDINATOR_MODULE = 'packages/daemon/src/sessions/session-replay-coordinator.ts';
+const TRANSACTION_MODULE = 'packages/daemon/src/core/session-replay-transaction.ts';
+const SESSION_STORE_MODULE = 'packages/daemon/src/core/session-store.ts';
 
-const RUNTIME_FILE = 'src/daemon/handlers/session-replay-command.ts';
+const RUNTIME_FILE = 'packages/daemon/src/sessions/handlers/session-replay-command.ts';
 
 /** The divergence-report chain: never a second `ReplayCoordinator`, never a bare `SessionStore`. */
 const DIVERGENCE_CHAIN_FILES = [
@@ -50,7 +50,7 @@ type ImportSite = {
   declarationTypeOnly: boolean;
 };
 
-const PRODUCTION_ROOTS = ['src', 'packages/replay-port/src'] as const;
+const PRODUCTION_ROOTS = ['src', 'packages/daemon/src', 'packages/replay-port/src'] as const;
 
 function listProductionSourceFiles(): string[] {
   const out: string[] = [];
@@ -367,7 +367,7 @@ test('createReplayCoordinator has exactly one production call site', () => {
 });
 
 test('coordinator ownership scanning catches re-exports and unresolved dynamic imports', () => {
-  const probe = 'src/daemon/replay/internal/probe.ts';
+  const probe = 'packages/daemon/src/sessions/replay/internal/probe.ts';
   const source = `
     export { createReplayCoordinator } from '../../session-replay-coordinator.ts';
     export * from '../../session-replay-coordinator.ts';
@@ -395,9 +395,10 @@ test('coordinator ownership scanning catches aliases, namespaces, and dynamic im
     void import('../../session-replay-coordinator.ts');
   `;
   assert.deepEqual(
-    coordinatorConstructionSites('src/daemon/replay/internal/probe.ts', source).map(
-      ({ kind }) => kind,
-    ),
+    coordinatorConstructionSites(
+      'packages/daemon/src/sessions/replay/internal/probe.ts',
+      source,
+    ).map(({ kind }) => kind),
     ['call', 'call', 'dynamic-import'],
   );
 });
@@ -464,11 +465,11 @@ test('the divergence-report chain rejects unresolved dynamic imports', () => {
 
 test('SessionStore ownership scanning catches dynamic imports and re-exports', () => {
   const sites = collectImportSites(
-    'src/daemon/replay/internal/probe.ts',
+    'packages/daemon/src/sessions/replay/internal/probe.ts',
     [
-      "void import('../../session-store.ts');",
-      "export { SessionStore } from '../../session-store.ts';",
-      "export * from '../../session-store.ts';",
+      "void import('../../../core/session-store.ts');",
+      "export { SessionStore } from '../../../core/session-store.ts';",
+      "export * from '../../../core/session-store.ts';",
     ].join('\n'),
   );
   assert.equal(sites.filter((site) => importsAnyBinding(site, SESSION_STORE_MODULE)).length, 3);
diff --git a/src/__tests__/daemon-composition/replay-suite/session-test-suite-command-flag-policy.test.ts b/src/__tests__/daemon-composition/replay-suite/session-test-suite-command-flag-policy.test.ts
index 68c7b3cd58..06c44ce728 100644
--- a/src/__tests__/daemon-composition/replay-suite/session-test-suite-command-flag-policy.test.ts
+++ b/src/__tests__/daemon-composition/replay-suite/session-test-suite-command-flag-policy.test.ts
@@ -8,11 +8,11 @@ import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import path from 'node:path';
 import { test, vi } from 'vitest';
-import { SessionStore } from '../../../daemon/session-store.ts';
+import { SessionStore } from '@agent-device/daemon/testing/session-store';
 import {
   createReplaySession,
   replayDaemonDependencies,
-} from '../../../daemon/handlers/session-replay-command.ts';
+} from '@agent-device/daemon/testing/handlers/session-replay-command';
 import { runReplayTestCommand } from '@agent-device/replay-port/test-command';
 import {
   replayInvokeOverDispatch,
@@ -22,7 +22,7 @@ import type { ReplayTestCommand } from '@agent-device/replay-port/command-types'
 import { REPLAY_ONLY_TEST_FLAG_REJECTIONS } from '@agent-device/replay-port/session-replay-test-policy';
 import { replayCommandFamily } from '../../../commands/replay/index.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import type { DaemonInvokeFn, DaemonRequest } from '../../../daemon/daemon-request.ts';
+import type { DaemonInvokeFn, DaemonRequest } from '@agent-device/daemon/daemon-request';
 
 // --- ADR 0012 decision 4 / migration step 5: `--from` is replay-only ---
 
diff --git a/src/__tests__/daemon-composition/request-dispatch-disclosure.test.ts b/src/__tests__/daemon-composition/request-dispatch-disclosure.test.ts
index 47e143a0a9..0fe5e2f30d 100644
--- a/src/__tests__/daemon-composition/request-dispatch-disclosure.test.ts
+++ b/src/__tests__/daemon-composition/request-dispatch-disclosure.test.ts
@@ -10,7 +10,7 @@ vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal)
   return { ...actual, stopIosRunnerSession: vi.fn(async () => {}) };
 });
 
-vi.mock('../../daemon/device/device-ready.ts', () => ({
+vi.mock('@agent-device/daemon/testing/device/device-ready', () => ({
   ensureDeviceReady: vi.fn(async () => {}),
 }));
 
@@ -29,20 +29,20 @@ import {
   makeAndroidSession,
   makeIosAppSession,
   makeSession,
-} from '../../daemon/__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
+} from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import type { DaemonRequest } from '../../daemon/daemon-request.ts';
-import { discloseRequestDispatch } from '../../daemon/request-dispatch-disclosure.ts';
-import { createRequestDispatchLedger } from '../../daemon/request-dispatch-ledger.ts';
-import { LeaseRegistry } from '../../daemon/lease-registry.ts';
-import type { SessionState } from '../../daemon/session-state.ts';
-import { clearAndroidObservationFixture } from '../../daemon/__tests__/android-observation-fixture.ts';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
+import { discloseRequestDispatch } from '@agent-device/daemon/testing/request-dispatch-disclosure';
+import { createRequestDispatchLedger } from '@agent-device/daemon/testing/request-dispatch-ledger';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
+import type { SessionState } from '@agent-device/daemon/testing/session-state';
+import { clearAndroidObservationFixture } from '@agent-device/daemon/testing/__tests__/android-observation-fixture';
 import {
   createRequestHandler,
   gestureRuntimeSpies,
   lifecycleDeviceRuntimeGateway,
-} from '../../daemon/__tests__/test-device-runtime-gateway.ts';
+} from '@agent-device/daemon/testing/__tests__/test-device-runtime-gateway';
 
 // contracts/fixtures/dispatch-disclosure.json, daemon.route rows: each drives one request through
 // the real request router, with only the bound device operations faked.
diff --git a/src/__tests__/daemon-composition/request-handler-chain.test.ts b/src/__tests__/daemon-composition/request-handler-chain.test.ts
index c68106102f..1e4de04a8d 100644
--- a/src/__tests__/daemon-composition/request-handler-chain.test.ts
+++ b/src/__tests__/daemon-composition/request-handler-chain.test.ts
@@ -4,25 +4,28 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { test } from 'vitest';
 import { INTERNAL_COMMANDS } from '@agent-device/command-registry/catalog';
-import { LeaseRegistry } from '../../daemon/lease-registry.ts';
-import { runRequestHandlerChain } from '../../daemon/request-handler-chain.ts';
-import { getDaemonRouteOwnerFiles } from '../../daemon/route-owner-files.ts';
-import type { DaemonRequest, DaemonResponse } from '../../daemon/daemon-request.ts';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
+import { runRequestHandlerChain } from '@agent-device/daemon/testing/request-handler-chain';
+import { getDaemonRouteOwnerFiles } from '@agent-device/daemon/route-owner-files';
+import type { DaemonRequest, DaemonResponse } from '@agent-device/daemon/daemon-request';
 import { LINUX_DEVICE } from '@agent-device/test-kit/device-fixtures';
-import { makeIosSession, makeSession } from '../../daemon/__tests__/support/session-factories.ts';
+import {
+  makeIosSession,
+  makeSession,
+} from '@agent-device/daemon/testing/__tests__/support/session-factories';
 import { makeSnapshotState } from '@agent-device/selectors/snapshot-geometry-fixtures';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
-import { handleInteractionCommands } from '../../daemon/interaction/index.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
 import { createPlatformRuntimeGateway } from '../../platform-runtime.ts';
-import { createRequestRuntimeBindings } from '../../daemon/request-runtime-binding.ts';
-import { createRequestDispatchLedger } from '../../daemon/request-dispatch-ledger.ts';
+import { createRequestRuntimeBindings } from '@agent-device/daemon/testing/request-runtime-binding';
+import { createRequestDispatchLedger } from '@agent-device/daemon/testing/request-dispatch-ledger';
 import { createLocalLinuxToolProvider, withLinuxToolProvider } from '@agent-device/platform-linux';
 import {
   unavailableBindDevice,
   unavailableBindExactDevice,
   unavailableDeviceRuntimeGateway,
   unavailableInspectFacts,
-} from '../../daemon/__tests__/support/unavailable-device-runtime-gateway.ts';
+} from '@agent-device/daemon/testing/__tests__/support/unavailable-device-runtime-gateway';
 import { createAudioProbeAdmissionLedger } from '@agent-device/capture-kit/audio-probe-admission-ledger';
 import { createPerfCaptureAdmissionLedger } from '@agent-device/capture-kit/perf-capture-admission-ledger';
 import { createScreenRecordingAdmissionLedger } from '@agent-device/capture-kit/screen-recording-admission-ledger';
@@ -76,7 +79,7 @@ function makeChainParams(req: DaemonRequest) {
 
 test('route owner files match the production module loaders', () => {
   const source = fs.readFileSync(
-    new URL('../../daemon/request-handler-chain.ts', import.meta.url),
+    new URL('../../../packages/daemon/src/sessions/request-handler-chain.ts', import.meta.url),
     'utf8',
   );
   const definitions = [
@@ -92,12 +95,18 @@ test('route owner files match the production module loaders', () => {
     );
 
   assert.equal(definitions.length + 1, Object.keys(ownerFiles).length);
+  // The loaders are relative to the chain module, which lives in a layer folder; resolve them
+  // the same way the runtime does instead of assuming the package root.
+  const CHAIN_DIR = 'packages/daemon/src/sessions/';
   for (const [, route, modulePath] of definitions) {
     assert.ok(route && modulePath);
-    assert.equal(ownerFiles[route as keyof typeof ownerFiles], `src/daemon/${modulePath.slice(2)}`);
+    assert.equal(
+      ownerFiles[route as keyof typeof ownerFiles],
+      path.posix.normalize(`${CHAIN_DIR}${modulePath}`),
+    );
   }
   assert.ok(genericModulePath && genericRouteMatches);
-  assert.equal(ownerFiles.generic, `src/daemon/${genericModulePath.slice(2)}`);
+  assert.equal(ownerFiles.generic, path.posix.normalize(`${CHAIN_DIR}${genericModulePath}`));
 
   assert.ok(
     !/ownerFile/.test(source),
@@ -106,23 +115,34 @@ test('route owner files match the production module loaders', () => {
 });
 
 test('request handler chain keeps interaction routes out of its eager import closure', () => {
-  const chainFile = path.resolve(import.meta.dirname, '../../daemon/request-handler-chain.ts');
+  const chainFile = path.resolve(
+    import.meta.dirname,
+    '../../../packages/daemon/src/sessions/request-handler-chain.ts',
+  );
   const closure = eagerClosureOf(chainFile);
 
   assert.ok(closure.length > 20, 'eager closure walk must reach the request chain');
   assert.equal(
-    closure.includes(path.resolve(import.meta.dirname, '../../daemon/interaction/index.ts')),
+    closure.includes(
+      path.resolve(
+        import.meta.dirname,
+        '../../../packages/daemon/src/execution/interaction/index.ts',
+      ),
+    ),
     false,
     'interaction routes must stay behind the request chain lazy import',
   );
 });
 
 test('interaction facade keeps route implementations out of its eager import closure', () => {
-  const facadeFile = path.resolve(import.meta.dirname, '../../daemon/interaction/index.ts');
+  const facadeFile = path.resolve(
+    import.meta.dirname,
+    '../../../packages/daemon/src/execution/interaction/index.ts',
+  );
   const closure = eagerClosureOf(facadeFile);
   const snapshotComposition = path.resolve(
     import.meta.dirname,
-    '../../daemon/snapshot-runtime-capture-input.ts',
+    '../../../packages/daemon/src/core/snapshot-runtime-capture-input.ts',
   );
 
   assert.ok(
@@ -133,7 +153,7 @@ test('interaction facade keeps route implementations out of its eager import clo
   for (const routeModule of ['find.ts', 'interaction.ts']) {
     const routePath = path.resolve(
       import.meta.dirname,
-      `../../daemon/interaction/internal/${routeModule}`,
+      `../../../packages/daemon/src/execution/interaction/internal/${routeModule}`,
     );
     assert.equal(
       fs.existsSync(routePath),
diff --git a/src/__tests__/daemon-composition/request-platform-providers.test.ts b/src/__tests__/daemon-composition/request-platform-providers.test.ts
index 72043c1ce2..ee51de6a8a 100644
--- a/src/__tests__/daemon-composition/request-platform-providers.test.ts
+++ b/src/__tests__/daemon-composition/request-platform-providers.test.ts
@@ -11,7 +11,7 @@ import {
   makeIosSession,
   makeMacOsSession,
   makeSession,
-} from '../../daemon/__tests__/support/session-factories.ts';
+} from '@agent-device/daemon/testing/__tests__/support/session-factories';
 import { withTestDeviceInventoryProvider as withTargetDeviceResolutionScope } from '@agent-device/device-selection/inventory-gateways-fixtures';
 import { createLocalAppleToolProvider, runXcrun } from '@agent-device/platform-apple/tool-provider';
 import { buildSimctlArgsForDevice } from '@agent-device/platform-apple/simctl';
@@ -30,8 +30,8 @@ import type {
   RequestPlatformProviderScope,
   PlatformProviderRequestContext,
 } from '@agent-device/contracts/platform-providers';
-import { resolvePlatformProviderRequestContext } from '../../daemon/request-platform-provider-context.ts';
-import type { DaemonRequest } from '../../daemon/daemon-request.ts';
+import { resolvePlatformProviderRequestContext } from '@agent-device/daemon/testing/request-platform-provider-context';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 
 const OTHER_IOS_SIMULATOR: DeviceInfo = {
   platform: 'apple',
diff --git a/src/__tests__/daemon-composition/request-router-android-modal.test.ts b/src/__tests__/daemon-composition/request-router-android-modal.test.ts
index 3acd1fa2b6..a5941a99b6 100644
--- a/src/__tests__/daemon-composition/request-router-android-modal.test.ts
+++ b/src/__tests__/daemon-composition/request-router-android-modal.test.ts
@@ -13,21 +13,21 @@ import {
   createRequestHandler,
   gestureDeviceRuntimeGateway,
   gestureRuntimeSpies,
-} from '../../daemon/__tests__/test-device-runtime-gateway.ts';
-import type { SessionState } from '../../daemon/session-state.ts';
-import { LeaseRegistry } from '../../daemon/lease-registry.ts';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
+} from '@agent-device/daemon/testing/__tests__/test-device-runtime-gateway';
+import type { SessionState } from '@agent-device/daemon/testing/session-state';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import {
   createProviderDeviceRuntimeRequestProviders,
   isActiveProviderDevice,
 } from '../../provider-device-runtime.ts';
-import { installProviderDeviceAdmission } from '../../daemon/provider-device-admission.ts';
+import { installProviderDeviceAdmission } from '@agent-device/daemon/testing/provider-device-admission';
 
 // Root composition installs the daemon's provider-device admission; this test composes the
 // request providers the same way, so it installs the fact the same way.
 installProviderDeviceAdmission({ isActive: isActiveProviderDevice });
 import type { ProviderDeviceRuntime } from '@agent-device/contracts/device';
-import { makeTestScreenRecordingResource } from '../../daemon/__tests__/support/screen-recording-live-handle.ts';
+import { makeTestScreenRecordingResource } from '@agent-device/daemon/testing/__tests__/support/screen-recording-live-handle';
 import { androidObservation } from '../../platform-runtime.ts';
 import type { AndroidObservationAdapter } from '@agent-device/contracts/android-observation';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
diff --git a/src/__tests__/daemon-composition/request-router-android-perf.test.ts b/src/__tests__/daemon-composition/request-router-android-perf.test.ts
index 30a52c1dc1..08ff3cf155 100644
--- a/src/__tests__/daemon-composition/request-router-android-perf.test.ts
+++ b/src/__tests__/daemon-composition/request-router-android-perf.test.ts
@@ -1,8 +1,8 @@
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
 import { expect, test } from 'vitest';
-import { createRequestHandler } from '../../daemon/__tests__/test-device-runtime-gateway.ts';
-import { LeaseRegistry } from '../../daemon/lease-registry.ts';
-import { SessionStore } from '../../daemon/session-store.ts';
+import { createRequestHandler } from '@agent-device/daemon/testing/__tests__/test-device-runtime-gateway';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
+import { SessionStore } from '@agent-device/daemon/testing/session-store';
 import { AppError } from '@agent-device/kernel/errors';
 import type {
   AndroidAdbExecutor,
diff --git a/src/__tests__/daemon-composition/request-router-android-snapshot-helper.test.ts b/src/__tests__/daemon-composition/request-router-android-snapshot-helper.test.ts
index 7c6cc38fb4..be50b47ea0 100644
--- a/src/__tests__/daemon-composition/request-router-android-snapshot-helper.test.ts
+++ b/src/__tests__/daemon-composition/request-router-android-snapshot-helper.test.ts
@@ -1,8 +1,8 @@
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
 import { beforeEach, expect, test } from 'vitest';
-import { createRequestHandler } from '../../daemon/__tests__/test-device-runtime-gateway.ts';
-import { LeaseRegistry } from '../../daemon/lease-registry.ts';
-import { SessionStore } from '../../daemon/session-store.ts';
+import { createRequestHandler } from '@agent-device/daemon/testing/__tests__/test-device-runtime-gateway';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
+import { SessionStore } from '@agent-device/daemon/testing/session-store';
 import { AppError } from '@agent-device/kernel/errors';
 import { resetAndroidSnapshotHelperInstallCache } from '@agent-device/platform-android/mechanics';
 import { ANDROID_SNAPSHOT_HELPER_FIXTURE_ARTIFACT } from '../test-utils/android-snapshot-helper.ts';
diff --git a/src/__tests__/daemon-composition/request-router-fill-text-stdin.test.ts b/src/__tests__/daemon-composition/request-router-fill-text-stdin.test.ts
index 629b4e880f..6a611a10b7 100644
--- a/src/__tests__/daemon-composition/request-router-fill-text-stdin.test.ts
+++ b/src/__tests__/daemon-composition/request-router-fill-text-stdin.test.ts
@@ -9,15 +9,15 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
 import type { WebProvider } from '@agent-device/platform-web';
-import type { DaemonRequest } from '../../daemon/daemon-request.ts';
-import type { SessionState } from '../../daemon/session-state.ts';
-import { createRequestHandler } from '../../daemon/__tests__/test-device-runtime-gateway.ts';
-import { LeaseRegistry } from '../../daemon/lease-registry.ts';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
+import type { SessionState } from '@agent-device/daemon/testing/session-state';
+import { createRequestHandler } from '@agent-device/daemon/testing/__tests__/test-device-runtime-gateway';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import {
   makeAuthoringSession,
   makeSession,
-} from '../../daemon/__tests__/support/session-factories.ts';
+} from '@agent-device/daemon/testing/__tests__/support/session-factories';
 import { WEB_DESKTOP_DEVICE } from '@agent-device/test-kit/device-fixtures';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { testCreateCommandSurface } from './command-surface-fixture.ts';
diff --git a/src/__tests__/daemon-composition/request-router-lock-policy.test.ts b/src/__tests__/daemon-composition/request-router-lock-policy.test.ts
index 1c67eb48fb..338155f05a 100644
--- a/src/__tests__/daemon-composition/request-router-lock-policy.test.ts
+++ b/src/__tests__/daemon-composition/request-router-lock-policy.test.ts
@@ -3,7 +3,7 @@ import {
   createTestDeviceInventoryGatewaysFromProvider,
 } from '@agent-device/device-selection/inventory-gateways-fixtures';
 import { test, expect, vi, beforeEach } from 'vitest';
-import { legacyDispatchCapture } from '../../daemon/__tests__/legacy-snapshot-capture-fixture.ts';
+import { legacyDispatchCapture } from '@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture';
 import path from 'node:path';
 import { testCreateCommandSurface } from './command-surface-fixture.ts';
 
@@ -13,7 +13,7 @@ vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal)
   return { ...actual, stopIosRunnerSession: vi.fn(async () => {}) };
 });
 
-vi.mock('../../daemon/device/device-ready.ts', () => ({
+vi.mock('@agent-device/daemon/testing/device/device-ready', () => ({
   ensureDeviceReady: vi.fn(async () => {}),
 }));
 
@@ -21,11 +21,11 @@ import {
   createRequestHandler,
   lifecycleDeviceRuntimeGateway,
   systemRuntimeSpies,
-} from '../../daemon/__tests__/test-device-runtime-gateway.ts';
-import { snapshotRuntimeFixture } from '../../daemon/__tests__/snapshot-runtime-fixture.ts';
-import type { SessionState } from '../../daemon/session-state.ts';
-import { LeaseRegistry } from '../../daemon/lease-registry.ts';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
+} from '@agent-device/daemon/testing/__tests__/test-device-runtime-gateway';
+import { snapshotRuntimeFixture } from '@agent-device/daemon/testing/__tests__/snapshot-runtime-fixture';
+import type { SessionState } from '@agent-device/daemon/testing/session-state';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import type { DeviceRuntimeGateway } from '@agent-device/contracts/platform-runtime';
 import {
   type PlatformRuntimeOperations,
diff --git a/src/__tests__/daemon-composition/request-router-macos-app-lease.test.ts b/src/__tests__/daemon-composition/request-router-macos-app-lease.test.ts
index 02604ce4ff..feefc65631 100644
--- a/src/__tests__/daemon-composition/request-router-macos-app-lease.test.ts
+++ b/src/__tests__/daemon-composition/request-router-macos-app-lease.test.ts
@@ -2,13 +2,13 @@ import { afterEach, beforeEach, expect, test, vi } from 'vitest';
 import path from 'node:path';
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
 import { MACOS_DEVICE } from '@agent-device/test-kit/device-fixtures';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
-import { makeMacOsSession } from '../../daemon/__tests__/support/session-factories.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { makeMacOsSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import type { DaemonRequest, DaemonResponse } from '../../daemon/daemon-request.ts';
-import { LeaseRegistry } from '../../daemon/lease-registry.ts';
-import { createRequestHandler } from '../../daemon/__tests__/test-device-runtime-gateway.ts';
-import { screenshotRuntimeFixture } from '../../daemon/__tests__/screenshot-runtime-fixture.ts';
+import type { DaemonRequest, DaemonResponse } from '@agent-device/daemon/daemon-request';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
+import { createRequestHandler } from '@agent-device/daemon/testing/__tests__/test-device-runtime-gateway';
+import { screenshotRuntimeFixture } from '@agent-device/daemon/testing/__tests__/screenshot-runtime-fixture';
 import { testCreateCommandSurface } from './command-surface-fixture.ts';
 
 const BUNDLE_ID = 'com.example.leased';
diff --git a/src/__tests__/daemon-composition/request-router-open-claim-recovery.test.ts b/src/__tests__/daemon-composition/request-router-open-claim-recovery.test.ts
index 2a7d70cd8c..5efce25d47 100644
--- a/src/__tests__/daemon-composition/request-router-open-claim-recovery.test.ts
+++ b/src/__tests__/daemon-composition/request-router-open-claim-recovery.test.ts
@@ -3,21 +3,21 @@ import fs from 'node:fs';
 import path from 'node:path';
 import crypto from 'node:crypto';
 import { spawn } from 'node:child_process';
-import { fakeCreateCommandSurface } from '../../daemon/__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '@agent-device/daemon/testing/__tests__/support/command-surface-fake';
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
 import {
   daemonClaimRecoveryGatewayFixture,
   daemonPlatformServicesFixture,
 } from './platform-services-fixture.ts';
-import { getResolveTargetDeviceMock } from '../../daemon/__tests__/request-router-dispatch-mocks.ts';
-import { LeaseRegistry } from '../../daemon/lease-registry.ts';
+import { getResolveTargetDeviceMock } from '@agent-device/daemon/testing/__tests__/request-router-dispatch-mocks';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 
 // Open-time claim reconciliation runs on the root-composed claim-recovery gateway: the router
 // must hand the acquire path the OWNER-scoped reconciler, so a foreign dead owner's recording
 // recovery executes against that owner's state dir, never the daemon's own store (#2168).
 
-vi.mock('../../daemon/device/device-ready.ts', () => ({
+vi.mock('@agent-device/daemon/testing/device/device-ready', () => ({
   ensureDeviceReady: vi.fn(async () => {}),
 }));
 vi.mock('@agent-device/host-kit/process', async (importOriginal) => {
@@ -71,14 +71,14 @@ vi.mock('@agent-device/platform-apple/app-resolution', async (importOriginal) =>
 import {
   createRequestHandler,
   lifecycleDeviceRuntimeGateway,
-} from '../../daemon/__tests__/test-device-runtime-gateway.ts';
+} from '@agent-device/daemon/testing/__tests__/test-device-runtime-gateway';
 import {
   awaitFixtureReadiness,
   dispatchApplicationLifecycleEffect,
-} from '../../daemon/__tests__/application-lifecycle-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/application-lifecycle-runtime-fixture';
 import { discoverReadyAndroidEmulators } from './application-lifecycle-runtime-fixture.ts';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
-import { inspectDeviceClaims } from '../../daemon/device/device-claim-inspection.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { inspectDeviceClaims } from '@agent-device/daemon/device/device-claim-inspection';
 import {
   createOwnedProcessRecordStore,
   isProcessAlive,
@@ -88,7 +88,10 @@ import {
 import { createDurableResourceEnvelope } from '@agent-device/capture-kit';
 import { resolveDaemonPaths } from '@agent-device/daemon-contracts/daemon-resolution';
 import { screenRecordingDurableResource } from '@agent-device/capture-kit/screen-recording-session-resource';
-import { makeIosDevice, openRequest } from '../../daemon/__tests__/request-router-open-harness.ts';
+import {
+  makeIosDevice,
+  openRequest,
+} from '@agent-device/daemon/testing/__tests__/request-router-open-harness';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
 const mockResolveTargetDevice = vi.mocked(getResolveTargetDeviceMock());
diff --git a/src/__tests__/daemon-composition/request-router-provider-credentials.test.ts b/src/__tests__/daemon-composition/request-router-provider-credentials.test.ts
index fe5f0d00af..4c7bc35aef 100644
--- a/src/__tests__/daemon-composition/request-router-provider-credentials.test.ts
+++ b/src/__tests__/daemon-composition/request-router-provider-credentials.test.ts
@@ -1,14 +1,14 @@
 import path from 'node:path';
 import { expect, test } from 'vitest';
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import {
   providerCredentialFingerprint,
   readDaemonProviderCredentials,
 } from '../../provider-credential-fingerprint.ts';
-import { LeaseRegistry } from '../../daemon/lease-registry.ts';
-import { createRequestHandler } from '../../daemon/__tests__/test-device-runtime-gateway.ts';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
+import { createRequestHandler } from '@agent-device/daemon/testing/__tests__/test-device-runtime-gateway';
 import { testCreateCommandSurface } from './command-surface-fixture.ts';
 
 const DAEMON_ENV = { LIMRUN_API_KEY: 'lim-key' };
diff --git a/src/__tests__/daemon-composition/request-router-record-runtime-lock.test.ts b/src/__tests__/daemon-composition/request-router-record-runtime-lock.test.ts
index 96433041cd..faaade6e03 100644
--- a/src/__tests__/daemon-composition/request-router-record-runtime-lock.test.ts
+++ b/src/__tests__/daemon-composition/request-router-record-runtime-lock.test.ts
@@ -12,11 +12,11 @@ import { createDurableResourceEnvelope } from '@agent-device/capture-kit';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
 import { unavailableDeploymentSnapshotAndShutdownOperationFacts } from '@agent-device/test-kit/runtime-operation-facts';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { LeaseRegistry } from '../../daemon/lease-registry.ts';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
 import { createPlatformRuntimeGateway } from '../../platform-runtime.ts';
-import { createRequestHandler } from '../../daemon/__tests__/test-device-runtime-gateway.ts';
+import { createRequestHandler } from '@agent-device/daemon/testing/__tests__/test-device-runtime-gateway';
 import { testCreateCommandSurface } from './command-surface-fixture.ts';
 
 const DEVICE: DeviceInfo = {
@@ -32,7 +32,7 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
   return { ...actual, resolveTargetDevice: vi.fn(async () => DEVICE) };
 });
 
-vi.mock('../../daemon/device/device-ready.ts', () => ({
+vi.mock('@agent-device/daemon/testing/device/device-ready', () => ({
   ensureDeviceReady: vi.fn(async () => {}),
 }));
 
diff --git a/src/__tests__/daemon-composition/request-router-recording-health.test.ts b/src/__tests__/daemon-composition/request-router-recording-health.test.ts
index fc76800eb9..295869eb1c 100644
--- a/src/__tests__/daemon-composition/request-router-recording-health.test.ts
+++ b/src/__tests__/daemon-composition/request-router-recording-health.test.ts
@@ -1,5 +1,5 @@
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
-import { legacyDispatchCapture } from '../../daemon/__tests__/legacy-snapshot-capture-fixture.ts';
+import { legacyDispatchCapture } from '@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture';
 import { test, expect, vi, beforeEach } from 'vitest';
 
 import path from 'node:path';
@@ -10,11 +10,11 @@ import {
   createRequestHandler,
   gestureDeviceRuntimeGateway,
   gestureRuntimeSpies,
-} from '../../daemon/__tests__/test-device-runtime-gateway.ts';
-import type { SessionState } from '../../daemon/session-state.ts';
-import { LeaseRegistry } from '../../daemon/lease-registry.ts';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
-import { makeTestScreenRecordingResource } from '../../daemon/__tests__/support/screen-recording-live-handle.ts';
+} from '@agent-device/daemon/testing/__tests__/test-device-runtime-gateway';
+import type { SessionState } from '@agent-device/daemon/testing/session-state';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { makeTestScreenRecordingResource } from '@agent-device/daemon/testing/__tests__/support/screen-recording-live-handle';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
 // The observation spy hangs off the port the router composes with (ADR 0019 section 11), not off
diff --git a/src/__tests__/daemon-composition/request-router-replay-scope.test.ts b/src/__tests__/daemon-composition/request-router-replay-scope.test.ts
index 20ed0e0ee3..7e2b7e1d84 100644
--- a/src/__tests__/daemon-composition/request-router-replay-scope.test.ts
+++ b/src/__tests__/daemon-composition/request-router-replay-scope.test.ts
@@ -1,13 +1,13 @@
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
-import { legacyDispatchCapture } from '../../daemon/__tests__/legacy-snapshot-capture-fixture.ts';
+import { legacyDispatchCapture } from '@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture';
 import { beforeEach, expect, test, vi } from 'vitest';
 import fs from 'node:fs';
 
 import path from 'node:path';
-import { getResolveTargetDeviceMock } from '../../daemon/__tests__/request-router-dispatch-mocks.ts';
+import { getResolveTargetDeviceMock } from '@agent-device/daemon/testing/__tests__/request-router-dispatch-mocks';
 import { testCreateCommandSurface } from './command-surface-fixture.ts';
 
-vi.mock('../../daemon/device/device-ready.ts', () => ({
+vi.mock('@agent-device/daemon/testing/device/device-ready', () => ({
   ensureDeviceReady: vi.fn(async () => {}),
 }));
 
@@ -33,18 +33,18 @@ vi.mock('@agent-device/platform-apple/app-resolution', async (importOriginal) =>
 });
 
 import { IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
-import { makeIosSession } from '../../daemon/__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
-import { LeaseRegistry } from '../../daemon/lease-registry.ts';
+import { makeIosSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
 import {
   createRequestHandler,
   gestureRuntimeSpies,
   lifecycleDeviceRuntimeGateway,
   systemRuntimeSpies,
-} from '../../daemon/__tests__/test-device-runtime-gateway.ts';
-import { ensureDeviceReady } from '../../daemon/device/device-ready.ts';
+} from '@agent-device/daemon/testing/__tests__/test-device-runtime-gateway';
+import { ensureDeviceReady } from '@agent-device/daemon/testing/device/device-ready';
 // Readiness is package-owned; hold the open at the fixture's platform-neutral readiness gate.
-import { awaitFixtureReadiness } from '../../daemon/__tests__/application-lifecycle-runtime-fixture.ts';
+import { awaitFixtureReadiness } from '@agent-device/daemon/testing/__tests__/application-lifecycle-runtime-fixture';
 import { createRequestPlatformProviders } from '../../platform-runtime.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
diff --git a/src/__tests__/daemon-composition/request-router-replay-test-ime.test.ts b/src/__tests__/daemon-composition/request-router-replay-test-ime.test.ts
index f967106802..ea1019362b 100644
--- a/src/__tests__/daemon-composition/request-router-replay-test-ime.test.ts
+++ b/src/__tests__/daemon-composition/request-router-replay-test-ime.test.ts
@@ -10,10 +10,10 @@ import { beforeEach, expect, test, vi } from 'vitest';
 import fs from 'node:fs';
 
 import path from 'node:path';
-import { getResolveTargetDeviceMock } from '../../daemon/__tests__/request-router-dispatch-mocks.ts';
+import { getResolveTargetDeviceMock } from '@agent-device/daemon/testing/__tests__/request-router-dispatch-mocks';
 import { testCreateCommandSurface } from './command-surface-fixture.ts';
 
-vi.mock('../../daemon/device/device-ready.ts', () => ({
+vi.mock('@agent-device/daemon/testing/device/device-ready', () => ({
   ensureDeviceReady: vi.fn(async () => {}),
 }));
 
@@ -37,10 +37,10 @@ vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
 });
 
 import { ANDROID_DEVICE } from '@agent-device/test-kit/device-fixtures';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import { replayScriptSourceBundleFor } from '@agent-device/replay-port/replay-script-source-fixtures';
-import { LeaseRegistry } from '../../daemon/lease-registry.ts';
-import { createRequestHandler } from '../../daemon/__tests__/test-device-runtime-gateway.ts';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
+import { createRequestHandler } from '@agent-device/daemon/testing/__tests__/test-device-runtime-gateway';
 import { realLifecycleDeviceRuntimeGateway } from './lifecycle-runtime-gateway.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
diff --git a/src/__tests__/daemon-composition/request-router-screenshot.test.ts b/src/__tests__/daemon-composition/request-router-screenshot.test.ts
index 636187e1ca..56e14858db 100644
--- a/src/__tests__/daemon-composition/request-router-screenshot.test.ts
+++ b/src/__tests__/daemon-composition/request-router-screenshot.test.ts
@@ -1,5 +1,5 @@
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
-import { legacyDispatchCapture } from '../../daemon/__tests__/legacy-snapshot-capture-fixture.ts';
+import { legacyDispatchCapture } from '@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture';
 import { test, expect, vi, beforeEach } from 'vitest';
 import fs from 'node:fs';
 
@@ -16,21 +16,21 @@ vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
   };
 });
 
-import { createRequestHandler } from '../../daemon/__tests__/test-device-runtime-gateway.ts';
+import { createRequestHandler } from '@agent-device/daemon/testing/__tests__/test-device-runtime-gateway';
 import {
   screenshotRuntimeFixture,
   writeSolidPng,
   type ScreenshotRuntimeFixture,
   type ScreenshotRuntimeFixtureOptions,
-} from '../../daemon/__tests__/screenshot-runtime-fixture.ts';
-import type { DaemonRequest } from '../../daemon/daemon-request.ts';
-import type { SessionState } from '../../daemon/session-state.ts';
-import { LeaseRegistry } from '../../daemon/lease-registry.ts';
+} from '@agent-device/daemon/testing/__tests__/screenshot-runtime-fixture';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
+import type { SessionState } from '@agent-device/daemon/testing/session-state';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
 import { attachRefs } from '@agent-device/kernel/snapshot';
 import { PNG } from '@agent-device/capture-kit/png';
 import { ANDROID_EMULATOR, IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
-import { makeSession as makeBaseSession } from '../../daemon/__tests__/support/session-factories.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { makeSession as makeBaseSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
 function makeSession(name: string): SessionState {
diff --git a/src/__tests__/daemon-composition/screenshot-runtime.test.ts b/src/__tests__/daemon-composition/screenshot-runtime.test.ts
index 8c038268dc..6e8b8335c3 100644
--- a/src/__tests__/daemon-composition/screenshot-runtime.test.ts
+++ b/src/__tests__/daemon-composition/screenshot-runtime.test.ts
@@ -6,15 +6,15 @@ import { expect, test } from 'vitest';
 import { SCREENSHOT_CROP_REASONS } from '@agent-device/contracts/capture';
 import type { RawSnapshotNode } from '@agent-device/kernel/snapshot';
 import { ANDROID_EMULATOR, IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
-import { makeSession } from '../../daemon/__tests__/support/session-factories.ts';
-import type { GenericPlatformExecutionParams } from '../../daemon/generic-leaf-execution.ts';
-import { resolveScreenshotGenericExecution } from '../../daemon/screenshot-runtime.ts';
+import { makeSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import type { GenericPlatformExecutionParams } from '@agent-device/daemon/testing/generic-leaf-execution';
+import { resolveScreenshotGenericExecution } from '@agent-device/daemon/testing/screenshot-runtime';
 import {
   screenshotRuntimeFixture,
   writeSolidPng,
-} from '../../daemon/__tests__/screenshot-runtime-fixture.ts';
-import type { DaemonRequest } from '../../daemon/daemon-request.ts';
-import type { SessionState } from '../../daemon/session-state.ts';
+} from '@agent-device/daemon/testing/__tests__/screenshot-runtime-fixture';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
+import type { SessionState } from '@agent-device/daemon/testing/session-state';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { testCreateCommandSurface } from './command-surface-fixture.ts';
 
diff --git a/src/__tests__/daemon-composition/selector-runtime-ambiguity-issuance.test.ts b/src/__tests__/daemon-composition/selector-runtime-ambiguity-issuance.test.ts
index 86acfbd783..2a29f8bf89 100644
--- a/src/__tests__/daemon-composition/selector-runtime-ambiguity-issuance.test.ts
+++ b/src/__tests__/daemon-composition/selector-runtime-ambiguity-issuance.test.ts
@@ -1,23 +1,23 @@
 import { daemonPlatformServicesFixture } from './platform-services-fixture.ts';
 import { test, expect, vi, beforeEach } from 'vitest';
 import { attachRefs } from '@agent-device/kernel/snapshot';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
-import { selectorCaptureFixture } from '../../daemon/__tests__/selector-capture-fixture.ts';
-import { refFrameScope, refFrameState } from '../../daemon/ref-frame.ts';
-import type { DaemonRequest } from '../../daemon/daemon-request.ts';
-import { dispatchIsViaRuntime } from '../../daemon/selector-runtime.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { selectorCaptureFixture } from '@agent-device/daemon/testing/__tests__/selector-capture-fixture';
+import { refFrameScope, refFrameState } from '@agent-device/daemon/testing/ref-frame';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
+import { dispatchIsViaRuntime } from '@agent-device/daemon/testing/selector-runtime';
 import { IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
 import {
   getRuntimeBindings,
   mockTapPoint,
   resetGetRuntimeFixture,
-} from '../../daemon/__tests__/interaction-get-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/interaction-get-runtime-fixture';
 import {
   contextFromFlags,
   makeStaleRefSession,
   readPressPoint,
-} from '../../daemon/interaction/internal/__tests__/interaction-touch-fixtures.ts';
-import { handleInteractionCommands } from '../../daemon/interaction/index.ts';
+} from '@agent-device/daemon/testing/interaction/internal/__tests__/interaction-touch-fixtures';
+import { handleInteractionCommands } from '@agent-device/daemon/testing/interaction/index';
 import { testCreateCommandSurface } from './command-surface-fixture.ts';
 
 // #2870 review, the reviewer's pinned invariant: a response that prints
@@ -43,9 +43,11 @@ vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
   };
 });
 
-vi.mock('../../daemon/snapshot-interactor-capture.ts', async (importOriginal) => {
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', async (importOriginal) => {
   const actual =
-    await importOriginal<typeof import('../../daemon/snapshot-interactor-capture.ts')>();
+    await importOriginal<
+      typeof import('@agent-device/daemon/testing/snapshot-interactor-capture')
+    >();
   return { ...actual, captureSnapshotWithInteractor: mockCaptureSnapshotWithInteractor };
 });
 
diff --git a/src/__tests__/daemon-composition/selector-runtime-backend.test.ts b/src/__tests__/daemon-composition/selector-runtime-backend.test.ts
index 555a9bd984..d1ab64b6a0 100644
--- a/src/__tests__/daemon-composition/selector-runtime-backend.test.ts
+++ b/src/__tests__/daemon-composition/selector-runtime-backend.test.ts
@@ -5,9 +5,9 @@ import type {
   CaptureSnapshotInput,
   SnapshotResult,
 } from '@agent-device/contracts/snapshot-runtime';
-import { createSelectorRuntimeForDevice } from '../../daemon/selector-runtime-backend.ts';
-import { SessionStore } from '../../daemon/session-store.ts';
-import type { SessionState } from '../../daemon/session-state.ts';
+import { createSelectorRuntimeForDevice } from '@agent-device/daemon/testing/selector-runtime-backend';
+import { SessionStore } from '@agent-device/daemon/testing/session-store';
+import type { SessionState } from '@agent-device/daemon/testing/session-state';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { makeSnapshotState } from '@agent-device/selectors/snapshot-geometry-fixtures';
 import { testCreateCommandSurface } from './command-surface-fixture.ts';
diff --git a/src/__tests__/daemon-composition/selector-runtime.test.ts b/src/__tests__/daemon-composition/selector-runtime.test.ts
index dea473e801..336d5c302d 100644
--- a/src/__tests__/daemon-composition/selector-runtime.test.ts
+++ b/src/__tests__/daemon-composition/selector-runtime.test.ts
@@ -11,9 +11,9 @@ import {
   type SnapshotResult,
 } from '@agent-device/contracts/snapshot-runtime';
 import { createUnavailableRuntimeFactsForTest } from '@agent-device/test-kit/runtime-operation-facts';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
-import { makeSession as makeStoredSession } from '../../daemon/__tests__/support/session-factories.ts';
-import { dispatchGetViaRuntime } from '../../daemon/selector-runtime.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { makeSession as makeStoredSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { dispatchGetViaRuntime } from '@agent-device/daemon/testing/selector-runtime';
 import { testCreateCommandSurface } from './command-surface-fixture.ts';
 
 test.each(['rebuild', 'retire'] as const)(
diff --git a/src/__tests__/daemon-composition/server/daemon-runtime-idle-reap.test.ts b/src/__tests__/daemon-composition/server/daemon-runtime-idle-reap.test.ts
index 5e34891198..30444447e7 100644
--- a/src/__tests__/daemon-composition/server/daemon-runtime-idle-reap.test.ts
+++ b/src/__tests__/daemon-composition/server/daemon-runtime-idle-reap.test.ts
@@ -3,10 +3,11 @@ import fs from 'node:fs';
 import { afterEach, test, vi } from 'vitest';
 
 const leaseProbe = vi.hoisted(() => ({
-  registries: [] as import('../../../daemon/lease-registry.ts').LeaseRegistry[],
+  registries: [] as import('@agent-device/daemon/testing/lease-registry').LeaseRegistry[],
 }));
-vi.mock('../../../daemon/lease-registry.ts', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../../../daemon/lease-registry.ts')>();
+vi.mock('@agent-device/daemon/testing/lease-registry', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('@agent-device/daemon/testing/lease-registry')>();
   class RecordedLeaseRegistry extends actual.LeaseRegistry {
     constructor(...args: ConstructorParameters<typeof actual.LeaseRegistry>) {
       super(...args);
diff --git a/src/__tests__/daemon-composition/server/daemon-runtime-interactor-composition.test.ts b/src/__tests__/daemon-composition/server/daemon-runtime-interactor-composition.test.ts
index 4ecef4000d..3682e93845 100644
--- a/src/__tests__/daemon-composition/server/daemon-runtime-interactor-composition.test.ts
+++ b/src/__tests__/daemon-composition/server/daemon-runtime-interactor-composition.test.ts
@@ -12,7 +12,7 @@ import {
   tryAcquireDaemonRegistration,
 } from '@agent-device/daemon-contracts/daemon-registration-owner';
 import { resolveDaemonPaths } from '@agent-device/daemon-contracts/daemon-resolution';
-import { interactorResolution } from '../../../daemon/interactor-resolution.ts';
+import { interactorResolution } from '@agent-device/daemon/testing/interactor-resolution';
 
 vi.mock('../../../platform-runtime.ts', () => ({
   androidObservation: {},
diff --git a/src/__tests__/daemon-composition/server/daemon-runtime-lifecycle-shutdown.test.ts b/src/__tests__/daemon-composition/server/daemon-runtime-lifecycle-shutdown.test.ts
index 1e9afab92a..3f8e342072 100644
--- a/src/__tests__/daemon-composition/server/daemon-runtime-lifecycle-shutdown.test.ts
+++ b/src/__tests__/daemon-composition/server/daemon-runtime-lifecycle-shutdown.test.ts
@@ -48,14 +48,15 @@ vi.mock('../../../provider-device-runtimes.ts', () => ({
 }));
 
 const shutdownProbe = vi.hoisted(() => ({
-  store: undefined as import('../../../daemon/session-store.ts').SessionStore | undefined,
+  store: undefined as import('@agent-device/daemon/testing/session-store').SessionStore | undefined,
   drain: undefined as (() => Promise<void>) | undefined,
   finalize: vi.fn(async () => {}),
-  dispatch: undefined as import('../../../daemon/daemon-request.ts').DaemonInvokeFn | undefined,
+  dispatch: undefined as import('@agent-device/daemon/daemon-request').DaemonInvokeFn | undefined,
   closeTimeout: undefined as number | undefined,
 }));
-vi.mock('../../../daemon/session-store.ts', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../../../daemon/session-store.ts')>();
+vi.mock('@agent-device/daemon/testing/session-store', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('@agent-device/daemon/testing/session-store')>();
   return {
     ...actual,
     SessionStore: class extends actual.SessionStore {
@@ -66,8 +67,9 @@ vi.mock('../../../daemon/session-store.ts', async (importOriginal) => {
     },
   };
 });
-vi.mock('../../../daemon/server/server-shutdown.ts', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../../../daemon/server/server-shutdown.ts')>();
+vi.mock('@agent-device/daemon/testing/server/server-shutdown', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('@agent-device/daemon/testing/server/server-shutdown')>();
   return {
     ...actual,
     closeDaemonServers: async (...args: Parameters<typeof actual.closeDaemonServers>) => {
@@ -76,8 +78,9 @@ vi.mock('../../../daemon/server/server-shutdown.ts', async (importOriginal) => {
     },
   };
 });
-vi.mock('../../../daemon/request-router.ts', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../../../daemon/request-router.ts')>();
+vi.mock('@agent-device/daemon/testing/request-router', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('@agent-device/daemon/testing/request-router')>();
   return {
     ...actual,
     createRequestHandler: (...args: Parameters<typeof actual.createRequestHandler>) => {
@@ -87,17 +90,20 @@ vi.mock('../../../daemon/request-router.ts', async (importOriginal) => {
     },
   };
 });
-vi.mock('../../../daemon/application-lifecycle-recovery.ts', async (importOriginal) => ({
-  ...(await importOriginal<typeof import('../../../daemon/application-lifecycle-recovery.ts')>()),
+vi.mock('@agent-device/daemon/testing/application-lifecycle-recovery', async (importOriginal) => ({
+  ...(await importOriginal<
+    typeof import('@agent-device/daemon/testing/application-lifecycle-recovery')
+  >()),
   finalizeDaemonSessionApplicationLifecycle: shutdownProbe.finalize,
 }));
 const leaseProbe = vi.hoisted(() => ({
-  registries: [] as import('../../../daemon/lease-registry.ts').LeaseRegistry[],
+  registries: [] as import('@agent-device/daemon/testing/lease-registry').LeaseRegistry[],
   released: [] as import('@agent-device/contracts/device').DeviceLease[],
 }));
 
-vi.mock('../../../daemon/lease-registry.ts', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../../../daemon/lease-registry.ts')>();
+vi.mock('@agent-device/daemon/testing/lease-registry', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('@agent-device/daemon/testing/lease-registry')>();
   class RecordedLeaseRegistry extends actual.LeaseRegistry {
     constructor(...args: ConstructorParameters<typeof actual.LeaseRegistry>) {
       super(...args);
@@ -107,8 +113,9 @@ vi.mock('../../../daemon/lease-registry.ts', async (importOriginal) => {
   return { ...actual, LeaseRegistry: RecordedLeaseRegistry };
 });
 
-vi.mock('../../../daemon/provider-lease-expiry.ts', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../../../daemon/provider-lease-expiry.ts')>();
+vi.mock('@agent-device/daemon/testing/provider-lease-expiry', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('@agent-device/daemon/testing/provider-lease-expiry')>();
   return {
     ...actual,
     createExpiredProviderLeaseReleaser: (
@@ -126,19 +133,19 @@ vi.mock('../../../daemon/provider-lease-expiry.ts', async (importOriginal) => {
   };
 });
 
-import { acquireDeviceClaim } from '../../../daemon/device/device-claims.ts';
-import { resolveDeviceClaimPath } from '../../../daemon/device/device-claim-paths.ts';
+import { acquireDeviceClaim } from '@agent-device/daemon/device/device-claims';
+import { resolveDeviceClaimPath } from '@agent-device/daemon/testing/device/device-claim-paths';
 import { ANDROID_EMULATOR } from '@agent-device/test-kit/device-fixtures';
 import {
   isolatedDeviceClaimStores,
   retainOrphanedDeviceClaims,
-} from '../../../daemon/__tests__/support/device-claim-store.ts';
+} from '@agent-device/daemon/testing/__tests__/support/device-claim-store';
 import { sendRequest } from '../../../daemon-client/daemon-client-transport.ts';
 import { resolveDaemonPaths } from '@agent-device/daemon-contracts/daemon-resolution';
-import { teardownDaemonSessionForShutdown } from '../../../daemon/server/daemon-runtime.ts';
+import { teardownDaemonSessionForShutdown } from '@agent-device/daemon/server/daemon-runtime';
 import { startDaemonRuntimeFixture } from '../daemon-runtime-fixture.ts';
-import { makeIosSession } from '../../../daemon/__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
+import { makeIosSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 
 afterEach(() => {
   lifecycleEvents.length = 0;
diff --git a/src/__tests__/daemon-composition/server/daemon-runtime-metadata-ownership.test.ts b/src/__tests__/daemon-composition/server/daemon-runtime-metadata-ownership.test.ts
index 84318a1fba..ddecc12557 100644
--- a/src/__tests__/daemon-composition/server/daemon-runtime-metadata-ownership.test.ts
+++ b/src/__tests__/daemon-composition/server/daemon-runtime-metadata-ownership.test.ts
@@ -256,7 +256,7 @@ test('the loss watch is armed only after this daemon publishes its own record',
   // Arming before publication would report a predecessor's record as a takeover of something this
   // daemon never owned. Ordering is the invariant, the same way the startup-ordering guards read it.
   const source = fs.readFileSync(
-    new URL('../../../daemon/server/daemon-runtime.ts', import.meta.url),
+    new URL('../../../../packages/daemon/src/server/server/daemon-runtime.ts', import.meta.url),
     'utf8',
   );
   const published = source.indexOf('publishDaemonInfo(socketPort, httpPort);');
@@ -272,7 +272,7 @@ test('both exits tear the watch down before they touch daemon.json', () => {
   // publication needs a real toolchain — so the invariant is read off the source, the same way the
   // arming order above is.
   const source = fs.readFileSync(
-    new URL('../../../daemon/server/daemon-runtime.ts', import.meta.url),
+    new URL('../../../../packages/daemon/src/server/server/daemon-runtime.ts', import.meta.url),
     'utf8',
   );
   const stops = [...source.matchAll(/stopMetadataLossWatch\(\);/g)].map((m) => m.index);
diff --git a/src/__tests__/daemon-composition/server/daemon-runtime-recording-teardown.test.ts b/src/__tests__/daemon-composition/server/daemon-runtime-recording-teardown.test.ts
index 1dd9cf1d2b..6ef487f6a2 100644
--- a/src/__tests__/daemon-composition/server/daemon-runtime-recording-teardown.test.ts
+++ b/src/__tests__/daemon-composition/server/daemon-runtime-recording-teardown.test.ts
@@ -3,9 +3,9 @@ import { afterEach, expect, test, vi } from 'vitest';
 import type { ScreenRecordingCompletion } from '@agent-device/contracts/screen-recording-runtime';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { platformResourceCleanup } from '../../../platform-runtime-resource-cleanup.ts';
-import { SessionStore } from '../../../daemon/session-store.ts';
-import { makeRecordingSession } from '../../../daemon/__tests__/session-teardown.fixtures.ts';
-import { teardownDaemonSessionForShutdown } from '../../../daemon/server/daemon-runtime.ts';
+import { SessionStore } from '@agent-device/daemon/testing/session-store';
+import { makeRecordingSession } from '@agent-device/daemon/testing/__tests__/session-teardown.fixtures';
+import { teardownDaemonSessionForShutdown } from '@agent-device/daemon/server/daemon-runtime';
 
 afterEach(() => {
   vi.useRealTimers();
diff --git a/src/__tests__/daemon-composition/server/daemon-runtime-rpc-flow-failure.test.ts b/src/__tests__/daemon-composition/server/daemon-runtime-rpc-flow-failure.test.ts
index 67d4dbf112..8b55069f65 100644
--- a/src/__tests__/daemon-composition/server/daemon-runtime-rpc-flow-failure.test.ts
+++ b/src/__tests__/daemon-composition/server/daemon-runtime-rpc-flow-failure.test.ts
@@ -14,8 +14,9 @@ const requestProbe = vi.hoisted(() => ({
   failuresRemaining: 0,
 }));
 
-vi.mock('../../../daemon/request-router.ts', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../../../daemon/request-router.ts')>();
+vi.mock('@agent-device/daemon/testing/request-router', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('@agent-device/daemon/testing/request-router')>();
   return {
     ...actual,
     createRequestHandler: (...args: Parameters<typeof actual.createRequestHandler>) => {
diff --git a/src/__tests__/daemon-composition/server/daemon-runtime-snapshot-shutdown.test.ts b/src/__tests__/daemon-composition/server/daemon-runtime-snapshot-shutdown.test.ts
index 7e986a20f6..ba2b4a45ab 100644
--- a/src/__tests__/daemon-composition/server/daemon-runtime-snapshot-shutdown.test.ts
+++ b/src/__tests__/daemon-composition/server/daemon-runtime-snapshot-shutdown.test.ts
@@ -5,20 +5,20 @@ import {
   registerRequestAbort,
 } from '@agent-device/host-kit/request';
 import { ANDROID_EMULATOR } from '@agent-device/test-kit/device-fixtures';
-import { makeAndroidSession } from '../../../daemon/__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
-import { legacyDispatchCapture } from '../../../daemon/__tests__/legacy-snapshot-capture-fixture.ts';
-import { snapshotRuntimeFixture } from '../../../daemon/__tests__/snapshot-runtime-fixture.ts';
+import { makeAndroidSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { legacyDispatchCapture } from '@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture';
+import { snapshotRuntimeFixture } from '@agent-device/daemon/testing/__tests__/snapshot-runtime-fixture';
 import { platformResourceCleanup } from '../../../platform-runtime-resource-cleanup.ts';
-import { DAEMON_SESSION_TEARDOWN_TIMEOUT_MS } from '../../../daemon/session-teardown-budget.ts';
-import { dispatchSnapshotViaRuntime } from '../../../daemon/snapshot-runtime.ts';
-import { teardownDaemonSessionForShutdown } from '../../../daemon/server/daemon-runtime.ts';
+import { DAEMON_SESSION_TEARDOWN_TIMEOUT_MS } from '@agent-device/daemon/testing/session-teardown-budget';
+import { dispatchSnapshotViaRuntime } from '@agent-device/daemon/testing/snapshot-runtime';
+import { teardownDaemonSessionForShutdown } from '@agent-device/daemon/server/daemon-runtime';
 import { testCreateCommandSurface } from '../command-surface-fixture.ts';
 
 vi.mock('@agent-device/device-selection/dispatch-resolve', () => ({
   resolveTargetDevice: vi.fn(async () => ANDROID_EMULATOR),
 }));
-vi.mock('../../../daemon/device/device-ready.ts', () => ({
+vi.mock('@agent-device/daemon/testing/device/device-ready', () => ({
   ensureDeviceReady: vi.fn(async () => {}),
 }));
 vi.mock('../../../platform-runtime-resource-cleanup.ts', () => ({
diff --git a/src/__tests__/daemon-composition/server/daemon-runtime-web-close-teardown.test.ts b/src/__tests__/daemon-composition/server/daemon-runtime-web-close-teardown.test.ts
index 1119913108..fafe5c7661 100644
--- a/src/__tests__/daemon-composition/server/daemon-runtime-web-close-teardown.test.ts
+++ b/src/__tests__/daemon-composition/server/daemon-runtime-web-close-teardown.test.ts
@@ -10,9 +10,9 @@ import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { installFakeManagedAgentBrowser } from '@agent-device/test-kit/web-managed-agent-browser';
 import { platformResourceCleanup } from '../../../platform-runtime-resource-cleanup.ts';
 import { runCmd } from '@agent-device/host-kit/command';
-import { SessionStore } from '../../../daemon/session-store.ts';
-import { makeWebSession } from '../../../daemon/__tests__/session-teardown.fixtures.ts';
-import { teardownDaemonSessionForShutdown } from '../../../daemon/server/daemon-runtime.ts';
+import { SessionStore } from '@agent-device/daemon/testing/session-store';
+import { makeWebSession } from '@agent-device/daemon/testing/__tests__/session-teardown.fixtures';
+import { teardownDaemonSessionForShutdown } from '@agent-device/daemon/server/daemon-runtime';
 
 const mockRunCmd = vi.mocked(runCmd);
 
diff --git a/src/__tests__/daemon-composition/session-lifecycle/session-close-error-precedence.test.ts b/src/__tests__/daemon-composition/session-lifecycle/session-close-error-precedence.test.ts
index b461adbf5d..c2ea50c22c 100644
--- a/src/__tests__/daemon-composition/session-lifecycle/session-close-error-precedence.test.ts
+++ b/src/__tests__/daemon-composition/session-lifecycle/session-close-error-precedence.test.ts
@@ -3,8 +3,8 @@ import { daemonPlatformServicesFixture } from '../platform-services-fixture.ts';
 import {
   sessionCloseShutdownFixture,
   type SessionState,
-} from '../../../daemon/session-lifecycle/internal/__tests__/session-close-shutdown.fixtures.ts';
-import { fakeCreateCommandSurface } from '../../../daemon/__tests__/support/command-surface-fake.ts';
+} from '@agent-device/daemon/testing/session-lifecycle/internal/__tests__/session-close-shutdown.fixtures';
+import { fakeCreateCommandSurface } from '@agent-device/daemon/testing/__tests__/support/command-surface-fake';
 import { applicationLifecycleRuntimeFixture } from '../application-lifecycle-runtime-fixture.ts';
 
 const {
diff --git a/src/__tests__/daemon-composition/session-lifecycle/session-close-runtime-hints.test.ts b/src/__tests__/daemon-composition/session-lifecycle/session-close-runtime-hints.test.ts
index 48e95db254..6d39444d43 100644
--- a/src/__tests__/daemon-composition/session-lifecycle/session-close-runtime-hints.test.ts
+++ b/src/__tests__/daemon-composition/session-lifecycle/session-close-runtime-hints.test.ts
@@ -1,9 +1,9 @@
 import { beforeEach, expect, test, vi } from 'vitest';
 import path from 'node:path';
-import { SessionStore } from '../../../daemon/session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../../../daemon/daemon-request.ts';
-import type { SessionState } from '../../../daemon/session-state.ts';
-import { fakeCreateCommandSurface } from '../../../daemon/__tests__/support/command-surface-fake.ts';
+import { SessionStore } from '@agent-device/daemon/testing/session-store';
+import type { DaemonRequest, DaemonResponse } from '@agent-device/daemon/daemon-request';
+import type { SessionState } from '@agent-device/daemon/testing/session-state';
+import { fakeCreateCommandSurface } from '@agent-device/daemon/testing/__tests__/support/command-surface-fake';
 
 // These close cases pin when the REAL composed lifecycle reaches the root runtime-hints module
 // (lazy evaluation: only an admitted hint mutation loads it), so they run in the composition lane
@@ -23,8 +23,8 @@ import {
   handleSessionCommands as handleHarnessSessionCommands,
   mockBindDeviceRuntime,
   mockInspectDeviceRuntimeFacts,
-} from '../../../daemon/handlers/__tests__/session-command-harness.ts';
-import { lifecycleRuntimeFacts } from '../../../daemon/__tests__/application-lifecycle-runtime-harness.ts';
+} from '@agent-device/daemon/testing/handlers/__tests__/session-command-harness';
+import { lifecycleRuntimeFacts } from '@agent-device/daemon/testing/__tests__/application-lifecycle-runtime-harness';
 import {
   applicationLifecycleRuntimeFixture,
   dispatchApplicationLifecycleEffect,
diff --git a/src/__tests__/daemon-composition/session-lifecycle/session-close-save-script.test.ts b/src/__tests__/daemon-composition/session-lifecycle/session-close-save-script.test.ts
index 3c88d70cf2..d7b1c93464 100644
--- a/src/__tests__/daemon-composition/session-lifecycle/session-close-save-script.test.ts
+++ b/src/__tests__/daemon-composition/session-lifecycle/session-close-save-script.test.ts
@@ -1,9 +1,9 @@
 import { beforeEach, expect, test } from 'vitest';
 import { daemonPlatformServicesFixture } from '../platform-services-fixture.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from '../../../daemon/__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '@agent-device/daemon/testing/__tests__/support/command-surface-fake';
 import { applicationLifecycleRuntimeFixture } from '../application-lifecycle-runtime-fixture.ts';
-import { sessionCloseShutdownFixture } from '../../../daemon/session-lifecycle/internal/__tests__/session-close-shutdown.fixtures.ts';
+import { sessionCloseShutdownFixture } from '@agent-device/daemon/testing/session-lifecycle/internal/__tests__/session-close-shutdown.fixtures';
 
 const {
   handleSessionCommands: handleHarnessSessionCommands,
diff --git a/src/__tests__/daemon-composition/session-lifecycle/session-close-shutdown-platform.test.ts b/src/__tests__/daemon-composition/session-lifecycle/session-close-shutdown-platform.test.ts
index 463bf9fc12..2503b4307c 100644
--- a/src/__tests__/daemon-composition/session-lifecycle/session-close-shutdown-platform.test.ts
+++ b/src/__tests__/daemon-composition/session-lifecycle/session-close-shutdown-platform.test.ts
@@ -1,9 +1,9 @@
 import { beforeEach, expect, test } from 'vitest';
 import { daemonPlatformServicesFixture } from '../platform-services-fixture.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from '../../../daemon/__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '@agent-device/daemon/testing/__tests__/support/command-surface-fake';
 import { applicationLifecycleRuntimeFixture } from '../application-lifecycle-runtime-fixture.ts';
-import { sessionCloseShutdownFixture } from '../../../daemon/session-lifecycle/internal/__tests__/session-close-shutdown.fixtures.ts';
+import { sessionCloseShutdownFixture } from '@agent-device/daemon/testing/session-lifecycle/internal/__tests__/session-close-shutdown.fixtures';
 
 const {
   handleSessionCommands: handleHarnessSessionCommands,
diff --git a/src/__tests__/daemon-composition/session-lifecycle/session-open-existing.test.ts b/src/__tests__/daemon-composition/session-lifecycle/session-open-existing.test.ts
index 5759bde5cd..d742c714c0 100644
--- a/src/__tests__/daemon-composition/session-lifecycle/session-open-existing.test.ts
+++ b/src/__tests__/daemon-composition/session-lifecycle/session-open-existing.test.ts
@@ -9,11 +9,11 @@ import {
   makeSession,
   noopInvoke,
   assertInvalidArgsMessage,
-} from '../../../daemon/handlers/__tests__/session-test-harness.ts';
-import { handleSessionCommands as handleHarnessSessionCommands } from '../../../daemon/handlers/__tests__/session-command-harness.ts';
+} from '@agent-device/daemon/testing/handlers/__tests__/session-test-harness';
+import { handleSessionCommands as handleHarnessSessionCommands } from '@agent-device/daemon/testing/handlers/__tests__/session-command-harness';
 import { applicationLifecycleRuntimeFixture } from '../application-lifecycle-runtime-fixture.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from '../../../daemon/__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '@agent-device/daemon/testing/__tests__/support/command-surface-fake';
 import { daemonPlatformServicesFixture } from '../platform-services-fixture.ts';
 
 // These open cases pin what the REAL composed open-target and surface rules answer through the
diff --git a/src/__tests__/daemon-composition/session-lifecycle/session-open-post-open-observation.test.ts b/src/__tests__/daemon-composition/session-lifecycle/session-open-post-open-observation.test.ts
index f7dd78c3f5..3a2e30cf83 100644
--- a/src/__tests__/daemon-composition/session-lifecycle/session-open-post-open-observation.test.ts
+++ b/src/__tests__/daemon-composition/session-lifecycle/session-open-post-open-observation.test.ts
@@ -15,14 +15,14 @@ vi.mock('@agent-device/device-selection/dispatch-resolve', async (importOriginal
   const actual =
     await importOriginal<typeof import('@agent-device/device-selection/dispatch-resolve')>();
   const { selectionFromResolveTargetDevice } =
-    await import('../../../daemon/__tests__/device-selection-stub.ts');
+    await import('@agent-device/daemon/testing/__tests__/device-selection-stub');
   return {
     ...actual,
     resolveTargetDevice: mockResolveTargetDevice,
     resolveTargetDeviceSelection: vi.fn(selectionFromResolveTargetDevice(mockResolveTargetDevice)),
   };
 });
-vi.mock('../../../daemon/device/device-ready.ts', () => ({
+vi.mock('@agent-device/daemon/testing/device/device-ready', () => ({
   ensureDeviceReady: vi.fn(async () => {}),
 }));
 vi.mock('../../../platform-runtime-apple-application-tools.ts', async (importOriginal) => {
@@ -55,16 +55,16 @@ vi.mock('@agent-device/host-kit/process', async (importOriginal) => {
 });
 
 import { daemonPlatformServicesFixture } from '../platform-services-fixture.ts';
-import { fakeCreateCommandSurface } from '../../../daemon/__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '@agent-device/daemon/testing/__tests__/support/command-surface-fake';
 import {
   handleSessionCommands as handleHarnessSessionCommands,
   mockBindDeviceRuntime,
-} from '../../../daemon/handlers/__tests__/session-command-harness.ts';
+} from '@agent-device/daemon/testing/handlers/__tests__/session-command-harness';
 import {
   applicationLifecycleRuntimeFixture,
   dispatchApplicationLifecycleEffect,
 } from '../application-lifecycle-runtime-fixture.ts';
-import { pendingSurfaceStabilization } from '../../../daemon/deferred-interaction-outcome.ts';
+import { pendingSurfaceStabilization } from '@agent-device/daemon/testing/deferred-interaction-outcome';
 
 // The harness takes the lifecycle-operations loader per call, exactly like the gateway factories:
 // these composition cases pass the REAL composed fixture instead of the daemon's canned default.
@@ -77,7 +77,7 @@ import {
   makeAppleSimulator,
   makeSessionStore,
   noopInvoke,
-} from '../../../daemon/session-lifecycle/internal/__tests__/session-open-runtime.fixtures.ts';
+} from '@agent-device/daemon/testing/session-lifecycle/internal/__tests__/session-open-runtime.fixtures';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
 const mockDispatch = vi.mocked(dispatchApplicationLifecycleEffect);
diff --git a/src/__tests__/daemon-composition/session-lifecycle/session-open-surface.test.ts b/src/__tests__/daemon-composition/session-lifecycle/session-open-surface.test.ts
index ee6cf19bb0..2c44185891 100644
--- a/src/__tests__/daemon-composition/session-lifecycle/session-open-surface.test.ts
+++ b/src/__tests__/daemon-composition/session-lifecycle/session-open-surface.test.ts
@@ -1,9 +1,7 @@
 import assert from 'node:assert/strict';
 import { test } from 'vitest';
 import { AppError } from '@agent-device/kernel/errors';
-import { buildOpenResult } from '../../../daemon/session-lifecycle/internal/session-open-surface.ts';
 import { resolveRequestedOpenSurface } from '../../../platform-runtime-open-target.ts';
-import { IOS_SIMULATOR } from '@agent-device/test-kit/device-fixtures';
 
 test('resolveRequestedOpenSurface rejects surface flag on iOS', () => {
   assert.throws(
@@ -24,77 +22,3 @@ test('resolveRequestedOpenSurface rejects surface flag on iOS', () => {
       /surface is only supported on macOS/i.test(error.message),
   );
 });
-
-test('buildOpenResult exposes the Vega serial without leaking an internal platform alias', () => {
-  const result = buildOpenResult({
-    sessionName: 'vega-tv',
-    sessionStateDir: '/tmp/state',
-    runnerLogPath: '/tmp/runner.log',
-    requestLogPath: '/tmp/request.ndjson',
-    eventLogPath: '/tmp/events.ndjson',
-    appName: 'com.example.app.main',
-    surface: 'app',
-    device: {
-      platform: 'vega',
-      id: 'amazon-vvd',
-      name: 'Vega Virtual Device',
-      kind: 'emulator',
-      target: 'tv',
-      booted: true,
-    },
-    runtimeHintCount: () => 0,
-    sessionReused: false,
-  });
-
-  assert.equal(result.platform, 'vega');
-  assert.equal(result.serial, 'amazon-vvd');
-  assert.equal(result.target, 'tv');
-});
-
-test('buildOpenResult exposes typed device-selection evidence once at response level', () => {
-  const result = buildOpenResult({
-    sessionName: 'ios-selection',
-    sessionStateDir: '/tmp/state',
-    runnerLogPath: '/tmp/runner.log',
-    requestLogPath: '/tmp/request.ndjson',
-    eventLogPath: '/tmp/events.ndjson',
-    surface: 'app',
-    device: IOS_SIMULATOR,
-    runtimeHintCount: () => 0,
-    sessionReused: false,
-    selection: {
-      device: IOS_SIMULATOR,
-      reason: 'single-booted-local',
-      source: 'local',
-      candidateCount: 1,
-      bootOccurred: false,
-    },
-  });
-
-  assert.deepEqual(result.selection, {
-    reason: 'single-booted-local',
-    source: 'local',
-    candidateCount: 1,
-    bootOccurred: false,
-  });
-});
-
-test('buildOpenResult reports an answered launch confirmation and omits one that never appeared', () => {
-  const base = {
-    sessionName: 'ios-launch-url',
-    sessionStateDir: '/tmp/state',
-    runnerLogPath: '/tmp/runner.log',
-    requestLogPath: '/tmp/request.ndjson',
-    eventLogPath: '/tmp/events.ndjson',
-    surface: 'app' as const,
-    device: IOS_SIMULATOR,
-    runtimeHintCount: () => 0,
-    sessionReused: false,
-  };
-
-  assert.equal(
-    buildOpenResult({ ...base, launchConfirmation: 'accepted' }).launchConfirmation,
-    'accepted',
-  );
-  assert.equal('launchConfirmation' in buildOpenResult(base), false);
-});
diff --git a/src/__tests__/daemon-composition/session-lifecycle/session-open-url-prewarm.test.ts b/src/__tests__/daemon-composition/session-lifecycle/session-open-url-prewarm.test.ts
index 180cfe4486..3ebd57cafe 100644
--- a/src/__tests__/daemon-composition/session-lifecycle/session-open-url-prewarm.test.ts
+++ b/src/__tests__/daemon-composition/session-lifecycle/session-open-url-prewarm.test.ts
@@ -1,13 +1,13 @@
 import { test, expect, vi, beforeEach } from 'vitest';
 import * as path from 'node:path';
 import { AppError } from '@agent-device/kernel/errors';
-import { fakeCreateCommandSurface } from '../../../daemon/__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '@agent-device/daemon/testing/__tests__/support/command-surface-fake';
 
 vi.mock('node:timers/promises', async (importOriginal) => {
   const actual = await importOriginal<typeof import('node:timers/promises')>();
   return { ...actual, setTimeout: vi.fn(async () => undefined) };
 });
-vi.mock('../../../daemon/device/device-ready.ts', () => ({
+vi.mock('@agent-device/daemon/testing/device/device-ready', () => ({
   ensureDeviceReady: vi.fn(async () => {}),
 }));
 vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal) => {
@@ -44,19 +44,19 @@ vi.mock('@agent-device/platform-android/mechanics', async (importOriginal) => {
   return { ...actual, resolveAndroidPackageForOpen: vi.fn(async () => undefined) };
 });
 
-import { createRequestHandler } from '../../../daemon/__tests__/test-device-runtime-gateway.ts';
+import { createRequestHandler } from '@agent-device/daemon/testing/__tests__/test-device-runtime-gateway';
 import {
   createRealLifecycleDeviceRuntimeGatewaySpies,
   realLifecycleDeviceRuntimeGateway,
 } from '../lifecycle-runtime-gateway.ts';
 import { platformResourceCleanup } from '../../../platform-runtime-resource-cleanup.ts';
 import { dispatchApplicationLifecycleEffect } from '../application-lifecycle-runtime-fixture.ts';
-import { getResolveTargetDeviceMock } from '../../../daemon/__tests__/request-router-dispatch-mocks.ts';
+import { getResolveTargetDeviceMock } from '@agent-device/daemon/testing/__tests__/request-router-dispatch-mocks';
 import { createTestDeviceInventoryGateways } from '@agent-device/device-selection/inventory-gateways-fixtures';
-import { makeSessionStore } from '../../../daemon/__tests__/support/store-factory.ts';
-import { makeSession } from '../../../daemon/__tests__/support/session-factories.ts';
-import { LeaseRegistry } from '../../../daemon/lease-registry.ts';
-import type { DaemonRequest } from '../../../daemon/daemon-request.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
+import { makeSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 import {
   prepareIosRunner,
   prewarmAppleRunnerCache,
diff --git a/src/__tests__/daemon-composition/session-lifecycle/session-teardown-resources.test.ts b/src/__tests__/daemon-composition/session-lifecycle/session-teardown-resources.test.ts
index f2abae4726..048ce0324e 100644
--- a/src/__tests__/daemon-composition/session-lifecycle/session-teardown-resources.test.ts
+++ b/src/__tests__/daemon-composition/session-lifecycle/session-teardown-resources.test.ts
@@ -2,9 +2,9 @@ import { beforeEach, expect, test } from 'vitest';
 import { platformResourceCleanup } from '../../../platform-runtime-resource-cleanup.ts';
 import { daemonPlatformServicesFixture } from '../platform-services-fixture.ts';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { fakeCreateCommandSurface } from '../../../daemon/__tests__/support/command-surface-fake.ts';
+import { fakeCreateCommandSurface } from '@agent-device/daemon/testing/__tests__/support/command-surface-fake';
 import { applicationLifecycleRuntimeFixture } from '../application-lifecycle-runtime-fixture.ts';
-import { sessionCloseShutdownFixture } from '../../../daemon/session-lifecycle/internal/__tests__/session-close-shutdown.fixtures.ts';
+import { sessionCloseShutdownFixture } from '@agent-device/daemon/testing/session-lifecycle/internal/__tests__/session-close-shutdown.fixtures';
 
 const {
   handleSessionCommands: handleHarnessSessionCommands,
diff --git a/src/__tests__/daemon-composition/session-teardown-import-closure.test.ts b/src/__tests__/daemon-composition/session-teardown-import-closure.test.ts
index 505308ac0b..7937da88da 100644
--- a/src/__tests__/daemon-composition/session-teardown-import-closure.test.ts
+++ b/src/__tests__/daemon-composition/session-teardown-import-closure.test.ts
@@ -1,5 +1,6 @@
 import { expect, test } from 'vitest';
 import path from 'node:path';
+import { DAEMON_SOURCE_ROOT } from '../../../scripts/layering/tracked-sources.ts';
 import { eagerClosureOf } from '../eager-import-closure.fixtures.ts';
 
 /**
@@ -15,8 +16,11 @@ import { eagerClosureOf } from '../eager-import-closure.fixtures.ts';
  * eager closure and fails here.
  */
 
-const srcRoot = path.resolve(import.meta.dirname, '../..');
-const teardownFile = path.resolve(srcRoot, 'daemon/session-teardown.ts');
+const repoRoot = path.resolve(import.meta.dirname, '../../..');
+// Derived from the layering constant rather than a fresh literal: the daemon moved to
+// packages/daemon/src and a hand-written `daemon/...` under src/ silently ENOENTs (#3546 CI).
+const daemonRoot = path.join(repoRoot, DAEMON_SOURCE_ROOT);
+const teardownFile = path.join(daemonRoot, 'sessions/session-teardown.ts');
 const LAZY_ANDROID_HELPERS = [
   /platforms[/\\]android[/\\]perf\.ts$/,
   /platforms[/\\]android[/\\]snapshot-helper\.ts$/,
@@ -29,7 +33,7 @@ test('the session teardown eager import closure never evaluates the android clea
   );
 
   expect(
-    offenders.map((file) => path.relative(srcRoot, file)),
+    offenders.map((file) => path.relative(daemonRoot, file)),
     'Load the android perf/snapshot-helper cleanup helpers on demand instead: teardown is shared ' +
       'by every platform, and eagerly evaluating these drags their whole subtree into sessions ' +
       'that never ran an android capture.',
@@ -42,7 +46,7 @@ test('the session teardown eager import closure never evaluates the web managed-
   );
 
   expect(
-    offenders.map((file) => path.relative(srcRoot, file)),
+    offenders.map((file) => path.relative(daemonRoot, file)),
     'Load the agent-browser web provider on demand instead: teardown is shared by every ' +
       'platform, and eagerly evaluating it drags its whole subtree (agent-browser tool ' +
       'resolution, selectors, snapshot/network normalization) into sessions that never opened a ' +
@@ -55,5 +59,5 @@ test('the teardown closure walk is reachable and the dynamic seam exists', () =>
   // guard above pass while proving nothing, so pin a real lower bound…
   const closure = eagerClosureOf(teardownFile);
   expect(closure.length).toBeGreaterThan(20);
-  expect(closure).toContain(path.resolve(srcRoot, 'daemon/materialized-path-registry.ts'));
+  expect(closure).toContain(path.join(daemonRoot, 'sessions/materialized-path-registry.ts'));
 });
diff --git a/src/__tests__/daemon-composition/snapshot-command-runtime.test.ts b/src/__tests__/daemon-composition/snapshot-command-runtime.test.ts
index 746d0cd923..fb50090105 100644
--- a/src/__tests__/daemon-composition/snapshot-command-runtime.test.ts
+++ b/src/__tests__/daemon-composition/snapshot-command-runtime.test.ts
@@ -1,16 +1,16 @@
 import { daemonPlatformServicesFixture } from './platform-services-fixture.ts';
 import { afterEach, expect, test } from 'vitest';
-import { makeAndroidSession } from '../../daemon/__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
+import { makeAndroidSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import {
   clearRequestAbortRegistration,
   markRequestCanceled,
   registerRequestAbort,
 } from '@agent-device/host-kit/request';
-import { dispatchSnapshotDiffViaRuntime } from '../../daemon/snapshot-diff-runtime.ts';
-import { dispatchSnapshotViaRuntime } from '../../daemon/snapshot-runtime.ts';
-import { legacyDispatchCapture } from '../../daemon/__tests__/legacy-snapshot-capture-fixture.ts';
-import { snapshotRuntimeFixture } from '../../daemon/__tests__/snapshot-runtime-fixture.ts';
+import { dispatchSnapshotDiffViaRuntime } from '@agent-device/daemon/testing/snapshot-diff-runtime';
+import { dispatchSnapshotViaRuntime } from '@agent-device/daemon/testing/snapshot-runtime';
+import { legacyDispatchCapture } from '@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture';
+import { snapshotRuntimeFixture } from '@agent-device/daemon/testing/__tests__/snapshot-runtime-fixture';
 import { testCreateCommandSurface } from './command-surface-fixture.ts';
 
 /**
diff --git a/src/__tests__/daemon-composition/snapshot-diff-runtime.test.ts b/src/__tests__/daemon-composition/snapshot-diff-runtime.test.ts
index b370e15f93..f5305f2398 100644
--- a/src/__tests__/daemon-composition/snapshot-diff-runtime.test.ts
+++ b/src/__tests__/daemon-composition/snapshot-diff-runtime.test.ts
@@ -13,15 +13,15 @@ import {
   snapshotRuntimeOperationFacts,
 } from '@agent-device/contracts/snapshot-runtime';
 import { deviceShape } from '@agent-device/kernel/device';
-import { makeAndroidSession } from '../../daemon/__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
+import { makeAndroidSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../daemon/request-runtime-binding.ts';
-import { dispatchSnapshotDiffViaRuntime } from '../../daemon/snapshot-diff-runtime.ts';
-import { expectRefusesUnavailableExactOwnerFact } from '../../daemon/__tests__/runtime-binding-conformance.ts';
-import { unavailableDeviceRuntimeGateway } from '../../daemon/__tests__/support/unavailable-device-runtime-gateway.ts';
+} from '@agent-device/daemon/testing/request-runtime-binding';
+import { dispatchSnapshotDiffViaRuntime } from '@agent-device/daemon/testing/snapshot-diff-runtime';
+import { expectRefusesUnavailableExactOwnerFact } from '@agent-device/daemon/testing/__tests__/runtime-binding-conformance';
+import { unavailableDeviceRuntimeGateway } from '@agent-device/daemon/testing/__tests__/support/unavailable-device-runtime-gateway';
 import { testCreateCommandSurface } from './command-surface-fixture.ts';
 
 const available = Object.freeze({ available: true } as const);
diff --git a/src/__tests__/daemon-composition/snapshot-quality-latch.test.ts b/src/__tests__/daemon-composition/snapshot-quality-latch.test.ts
index d765e4bf75..65e2cf663f 100644
--- a/src/__tests__/daemon-composition/snapshot-quality-latch.test.ts
+++ b/src/__tests__/daemon-composition/snapshot-quality-latch.test.ts
@@ -1,7 +1,7 @@
 import path from 'node:path';
 import { expect, test, vi } from 'vitest';
 import type { SnapshotQualityVerdict } from '@agent-device/kernel/snapshot';
-import { makeIosSession } from '../../daemon/__tests__/support/session-factories.ts';
+import { makeIosSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
 import {
   recoveredSnapshotQualityWarning,
   renderSnapshotQualityWarnings,
@@ -9,18 +9,19 @@ import {
 import {
   applyRecoveredWarningLatch,
   resolveRecoveredWarningLatch,
-} from '../../daemon/snapshot-quality-latch.ts';
-import { dispatchSnapshotDiffViaRuntime } from '../../daemon/snapshot-diff-runtime.ts';
-import { dispatchSnapshotViaRuntime } from '../../daemon/snapshot-runtime.ts';
-import { SessionStore } from '../../daemon/session-store.ts';
-import type { SessionState } from '../../daemon/session-state.ts';
-import { legacyDispatchCapture } from '../../daemon/__tests__/legacy-snapshot-capture-fixture.ts';
-import { snapshotRuntimeFixture } from '../../daemon/__tests__/snapshot-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/snapshot-quality-latch';
+import { dispatchSnapshotDiffViaRuntime } from '@agent-device/daemon/testing/snapshot-diff-runtime';
+import { dispatchSnapshotViaRuntime } from '@agent-device/daemon/testing/snapshot-runtime';
+import { SessionStore } from '@agent-device/daemon/testing/session-store';
+import type { SessionState } from '@agent-device/daemon/testing/session-state';
+import { legacyDispatchCapture } from '@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture';
+import { snapshotRuntimeFixture } from '@agent-device/daemon/testing/__tests__/snapshot-runtime-fixture';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { testCreateCommandSurface } from './command-surface-fixture.ts';
 
-vi.mock('../../daemon/snapshot-interactor-capture.ts', async () => {
-  const fixture = await import('../../daemon/__tests__/legacy-snapshot-capture-fixture.ts');
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', async () => {
+  const fixture =
+    await import('@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture');
   return { captureSnapshotWithInteractor: fixture.captureSnapshotThroughLegacyDispatchFixture };
 });
 
diff --git a/src/__tests__/daemon-composition/snapshot-runtime-disclosure.test.ts b/src/__tests__/daemon-composition/snapshot-runtime-disclosure.test.ts
index cd2aef5532..b8543f4b8d 100644
--- a/src/__tests__/daemon-composition/snapshot-runtime-disclosure.test.ts
+++ b/src/__tests__/daemon-composition/snapshot-runtime-disclosure.test.ts
@@ -4,17 +4,18 @@ import { iosTargetActivationDisclosure } from '@agent-device/contracts/ios-targe
 import type { IosTargetActivation, PostGestureOutcome } from '@agent-device/kernel/snapshot';
 import { formatPostGestureOutcomeWarning } from '@agent-device/capture-kit/post-gesture-stability';
 import { makeSnapshotState } from '@agent-device/selectors/snapshot-geometry-fixtures';
-import { markDeferredInteractionOutcome } from '../../daemon/deferred-interaction-outcome.ts';
-import { makeIosSession } from '../../daemon/__tests__/support/session-factories.ts';
+import { markDeferredInteractionOutcome } from '@agent-device/daemon/testing/deferred-interaction-outcome';
+import { makeIosSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
-import { SessionStore } from '../../daemon/session-store.ts';
-import { handleSnapshotCommands } from '../../daemon/handlers/snapshot.ts';
-import { legacyDispatchCapture } from '../../daemon/__tests__/legacy-snapshot-capture-fixture.ts';
-import { snapshotRuntimeFixture } from '../../daemon/__tests__/snapshot-runtime-fixture.ts';
+import { SessionStore } from '@agent-device/daemon/testing/session-store';
+import { handleSnapshotCommands } from '@agent-device/daemon/testing/handlers/snapshot';
+import { legacyDispatchCapture } from '@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture';
+import { snapshotRuntimeFixture } from '@agent-device/daemon/testing/__tests__/snapshot-runtime-fixture';
 import { testCreateCommandSurface } from './command-surface-fixture.ts';
 
-vi.mock('../../daemon/snapshot-interactor-capture.ts', async () => {
-  const fixture = await import('../../daemon/__tests__/legacy-snapshot-capture-fixture.ts');
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', async () => {
+  const fixture =
+    await import('@agent-device/daemon/testing/__tests__/legacy-snapshot-capture-fixture');
   return { captureSnapshotWithInteractor: fixture.captureSnapshotThroughLegacyDispatchFixture };
 });
 
diff --git a/src/__tests__/daemon-composition/sparse-fallback-screenshot.test.ts b/src/__tests__/daemon-composition/sparse-fallback-screenshot.test.ts
index 6a39245301..7196f5d7a7 100644
--- a/src/__tests__/daemon-composition/sparse-fallback-screenshot.test.ts
+++ b/src/__tests__/daemon-composition/sparse-fallback-screenshot.test.ts
@@ -2,18 +2,18 @@ import { daemonPlatformServicesFixture } from './platform-services-fixture.ts';
 import path from 'node:path';
 import { expect, test } from 'vitest';
 import type { SnapshotQualityVerdict } from '@agent-device/kernel/snapshot';
-import { makeIosSession } from '../../daemon/__tests__/support/session-factories.ts';
+import { makeIosSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
 import { mkdtempForTest } from '@agent-device/test-kit/tmp-dir';
-import { SessionStore } from '../../daemon/session-store.ts';
-import { dispatchSnapshotViaRuntime } from '../../daemon/snapshot-runtime.ts';
-import type { DownloadableArtifactRegistration } from '../../daemon/artifact-tracking.ts';
-import { finalizeDaemonResponse } from '../../daemon/request-finalization.ts';
+import { SessionStore } from '@agent-device/daemon/testing/session-store';
+import { dispatchSnapshotViaRuntime } from '@agent-device/daemon/testing/snapshot-runtime';
+import type { DownloadableArtifactRegistration } from '@agent-device/daemon/testing/artifact-tracking';
+import { finalizeDaemonResponse } from '@agent-device/daemon/testing/request-finalization';
 import {
   screenshotRuntimeFixture,
   writeSolidPng,
   type ScreenshotRuntimeFixture,
   type ScreenshotRuntimeFixtureOptions,
-} from '../../daemon/__tests__/screenshot-runtime-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/screenshot-runtime-fixture';
 import { testCreateCommandSurface } from './command-surface-fixture.ts';
 
 const SPARSE: SnapshotQualityVerdict = {
diff --git a/src/__tests__/daemon-composition/wait-runtime.test.ts b/src/__tests__/daemon-composition/wait-runtime.test.ts
index 7044063f0a..9b750bdc91 100644
--- a/src/__tests__/daemon-composition/wait-runtime.test.ts
+++ b/src/__tests__/daemon-composition/wait-runtime.test.ts
@@ -21,17 +21,17 @@ import {
   snapshotRuntimeOperationFacts,
 } from '@agent-device/contracts/snapshot-runtime';
 import { deviceShape, type DeviceInfo } from '@agent-device/kernel/device';
-import { makeSession } from '../../daemon/__tests__/support/session-factories.ts';
-import { makeSessionStore } from '../../daemon/__tests__/support/store-factory.ts';
+import { makeSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import { unavailableDeploymentSnapshotAndShutdownOperationFacts } from '@agent-device/test-kit/runtime-operation-facts';
 import type {
   BindDeviceRuntime,
   InspectDeviceRuntimeFacts,
-} from '../../daemon/request-runtime-binding.ts';
-import { handleSnapshotCommands } from '../../daemon/handlers/snapshot.ts';
-import { resolveBoundSelectorCapture } from '../../daemon/selector-capture-binding.ts';
-import { dispatchGetViaRuntime } from '../../daemon/selector-runtime.ts';
-import type { DaemonRequest } from '../../daemon/daemon-request.ts';
+} from '@agent-device/daemon/testing/request-runtime-binding';
+import { handleSnapshotCommands } from '@agent-device/daemon/testing/handlers/snapshot';
+import { resolveBoundSelectorCapture } from '@agent-device/daemon/testing/selector-capture-binding';
+import { dispatchGetViaRuntime } from '@agent-device/daemon/testing/selector-runtime';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 import { testCreateCommandSurface } from './command-surface-fixture.ts';
 
 const webDevice = {
diff --git a/src/__tests__/daemon-entrypoint.test.ts b/src/__tests__/daemon-entrypoint.test.ts
index c656cdc1f4..5da1ba2721 100644
--- a/src/__tests__/daemon-entrypoint.test.ts
+++ b/src/__tests__/daemon-entrypoint.test.ts
@@ -7,11 +7,11 @@ import path from 'node:path';
 import { test } from 'vitest';
 import { resolveDaemonPaths } from '@agent-device/daemon-contracts/daemon-resolution';
 import { startDaemonRuntimeFixture } from './daemon-composition/daemon-runtime-fixture.ts';
-import type { DaemonRuntimeController } from '../daemon/server/daemon-runtime.ts';
+import type { DaemonRuntimeController } from '@agent-device/daemon/server/daemon-runtime';
 import {
   cleanupDownloadableArtifact,
   trackDownloadableArtifact,
-} from '../daemon/artifact-tracking.ts';
+} from '@agent-device/daemon/testing/artifact-tracking';
 import { runCmdBackground } from '@agent-device/host-kit/command';
 import {
   createOwnedProcessRecordStore,
diff --git a/src/__tests__/daemon-proxy.test.ts b/src/__tests__/daemon-proxy.test.ts
index dca0f0e6df..5410d77b04 100644
--- a/src/__tests__/daemon-proxy.test.ts
+++ b/src/__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 '../daemon/server/http-server.ts';
+import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
 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/src/__tests__/daemon-registration-owner.test.ts b/src/__tests__/daemon-registration-owner.test.ts
index b3b792cb24..fed23def09 100644
--- a/src/__tests__/daemon-registration-owner.test.ts
+++ b/src/__tests__/daemon-registration-owner.test.ts
@@ -32,7 +32,7 @@ import { inspectProcessLock } from '@agent-device/host-kit/file';
 import { AppError } from '@agent-device/kernel/errors';
 import { sleep } from '@agent-device/host-kit/retry';
 import { stopDaemonProcess } from '@agent-device/daemon-contracts/daemon-process';
-import { stopDaemon } from '../daemon/daemon-stop.ts';
+import { stopDaemon } from '@agent-device/daemon/daemon-stop';
 
 const fields = {
   socketPort: 4210,
diff --git a/src/__tests__/kernel/errors-code-policy.test.ts b/src/__tests__/kernel/errors-code-policy.test.ts
index 4845dd0295..9c8ea2ca17 100644
--- a/src/__tests__/kernel/errors-code-policy.test.ts
+++ b/src/__tests__/kernel/errors-code-policy.test.ts
@@ -42,7 +42,7 @@ test('AppError leaves details and cause undefined when the constructor omits the
 // --- asAppError: identity, wrapping, and duck-typing contract ---
 //
 // Every catch site that normalizes a thrown value (src/cli.ts, src/daemon.ts,
-// src/daemon/server/daemon-runtime.ts, the platform runners) funnels through
+// packages/daemon/src/server/server/daemon-runtime.ts, the platform runners) funnels through
 // `asAppError`, so its branch selection is load-bearing: get it wrong and a
 // caller silently loses a real error's message/stack.
 
diff --git a/src/__tests__/kernel/errors-metadata.test.ts b/src/__tests__/kernel/errors-metadata.test.ts
index c6702e483b..9217f09443 100644
--- a/src/__tests__/kernel/errors-metadata.test.ts
+++ b/src/__tests__/kernel/errors-metadata.test.ts
@@ -129,7 +129,7 @@ test('normalizeError omits details entirely once stripping diagnostic-meta keys
 });
 
 // --- Cross-cutting contract: normalizeError composes retriableForErrorCode and
-// defaultHintForCode exactly the way src/daemon/request-router.ts's
+// defaultHintForCode exactly the way packages/daemon/src/server/request-router.ts's
 // enrichDaemonError (`error.retriable ?? retriableForErrorCode(error.code)`)
 // and the CLI's printHumanError expect, for every registered code. Per-code
 // hint/retriability policy itself is pinned in errors-code-policy.test.ts. ---
diff --git a/src/__tests__/lease-provider-profile-fields.test.ts b/src/__tests__/lease-provider-profile-fields.test.ts
index 67c3e09ea0..93877912d0 100644
--- a/src/__tests__/lease-provider-profile-fields.test.ts
+++ b/src/__tests__/lease-provider-profile-fields.test.ts
@@ -10,8 +10,8 @@ import {
 } from '@agent-device/kernel/contracts';
 import { LimrunRuntime } from '../sdk/limrun.ts';
 import { createAgentDeviceClient } from '../agent-device-client.ts';
-import { handleLeaseCommands } from '../daemon/handlers/lease.ts';
-import { LeaseRegistry } from '../daemon/lease-registry.ts';
+import { handleLeaseCommands } from '@agent-device/daemon/testing/handlers/lease';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
 import { createProviderDeviceRuntimeRequestProviders } from '../provider-device-runtime.ts';
 import {
   hashRemoteConfigFile,
@@ -20,7 +20,7 @@ import {
 import { createTransport } from './client-transport-fixture.ts';
 import { runCliCapture } from './cli-capture.ts';
 import { makeTempWorkspace } from './cli-config-fixtures.ts';
-import { makeSessionStore } from '../daemon/__tests__/support/store-factory.ts';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 
 const limrunInstances = vi.hoisted(() => ({
   iosCreate: vi.fn(async () => {
diff --git a/src/__tests__/limrun-runtime.test.ts b/src/__tests__/limrun-runtime.test.ts
index f33ab96e4b..a125382405 100644
--- a/src/__tests__/limrun-runtime.test.ts
+++ b/src/__tests__/limrun-runtime.test.ts
@@ -5,7 +5,7 @@ import { afterEach, test, vi } from 'vitest';
 import { createInstanceClient as createAndroidInstanceClient } from '@limrun/api/instance-client';
 import { createInstanceClient as createIosInstanceClient } from '@limrun/api/ios-client';
 import { LimrunRuntime } from '../sdk/limrun.ts';
-import { createExpiredProviderLeaseReleaser } from '../daemon/provider-lease-expiry.ts';
+import { createExpiredProviderLeaseReleaser } from '@agent-device/daemon/testing/provider-lease-expiry';
 import type { DeviceLease } from '@agent-device/contracts/device';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import { AppError } from '@agent-device/kernel/errors';
diff --git a/src/__tests__/platform-runtime-runtime-hints.test.ts b/src/__tests__/platform-runtime-runtime-hints.test.ts
index b0d9de7a60..eef4bc3083 100644
--- a/src/__tests__/platform-runtime-runtime-hints.test.ts
+++ b/src/__tests__/platform-runtime-runtime-hints.test.ts
@@ -6,7 +6,10 @@ import {
   applyRuntimeHintValues,
   clearRuntimeHintValues,
 } from '../platform-runtime-runtime-hints.ts';
-import { applyDeviceDefaultMetroHost, runtimeHintValues } from '../daemon/session-runtime.ts';
+import {
+  applyDeviceDefaultMetroHost,
+  runtimeHintValues,
+} from '@agent-device/daemon/testing/session-runtime';
 import { resolveRuntimeTransportHints } from '@agent-device/host-kit/runtime-transport-hints';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import {
diff --git a/src/__tests__/remote-connection-harmonyos.test.ts b/src/__tests__/remote-connection-harmonyos.test.ts
index 3ecfc8e8bb..3c0f811458 100644
--- a/src/__tests__/remote-connection-harmonyos.test.ts
+++ b/src/__tests__/remote-connection-harmonyos.test.ts
@@ -12,7 +12,7 @@ import {
 } from '../cli/commands/connection-runtime.ts';
 import { disconnectCommand } from '../cli/commands/connection.ts';
 import { readRemoteConnectionState } from '../remote/remote-connection-state.ts';
-import { LeaseRegistry } from '../daemon/lease-registry.ts';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
 
 test('HarmonyOS platform resolves to its proxy lease backend', () => {
   expect(
diff --git a/src/__tests__/remote-connection-macos-app.test.ts b/src/__tests__/remote-connection-macos-app.test.ts
index 4f235d1d8d..8f08910ade 100644
--- a/src/__tests__/remote-connection-macos-app.test.ts
+++ b/src/__tests__/remote-connection-macos-app.test.ts
@@ -7,7 +7,7 @@ import { connectCommand, disconnectCommand } from '../cli/commands/connection.ts
 import { materializeRemoteConnectionForCommand } from '../cli/commands/connection-runtime.ts';
 import { beginStdoutCapture } from './test-utils/stream-capture.ts';
 import { readRemoteConnectionState } from '../remote/remote-connection-state.ts';
-import { LeaseRegistry } from '../daemon/lease-registry.ts';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
 
 const LEASE_ID = 'a1b2c3d4e5f60718293a4b5c6d7e8f90';
 
diff --git a/src/__tests__/takeover-command.test.ts b/src/__tests__/takeover-command.test.ts
index b52830a176..717442517f 100644
--- a/src/__tests__/takeover-command.test.ts
+++ b/src/__tests__/takeover-command.test.ts
@@ -9,7 +9,7 @@ import {
 import {
   HUMAN_CONTROL_HOLD,
   createControlLatch,
-} from '../daemon/__tests__/human-control-fixtures.ts';
+} from '@agent-device/daemon/testing/__tests__/human-control-fixtures';
 import type { DaemonRequest } from '@agent-device/kernel/contracts';
 import { TAKEOVER_CLI_FLAGS } from './test-utils/client-lease-fixtures.ts';
 
diff --git a/src/cli.ts b/src/cli.ts
index 3fb705fe68..3dfb3fc23d 100644
--- a/src/cli.ts
+++ b/src/cli.ts
@@ -7,7 +7,7 @@ import {
   throwDaemonError,
   type NormalizedError,
 } from '@agent-device/kernel/errors';
-import { resolveRemoteRequestDiagnosticsPath } from './daemon/session-artifact-paths.ts';
+import { resolveRemoteRequestDiagnosticsPath } from '@agent-device/daemon/session-artifact-paths';
 import { exitAfterFlush } from './cli/process-exit.ts';
 import { readVersion } from '@agent-device/host-kit/version';
 import { pathToFileURL } from 'node:url';
diff --git a/src/cli/__tests__/command-explain.test.ts b/src/cli/__tests__/command-explain.test.ts
index 408c910412..2f72527b10 100644
--- a/src/cli/__tests__/command-explain.test.ts
+++ b/src/cli/__tests__/command-explain.test.ts
@@ -5,7 +5,7 @@ import { describe, expect, test } from 'vitest';
 import { runExplainCommandCli } from '../../../scripts/explain-command.ts';
 import { commandDescriptors } from '@agent-device/command-registry/registry';
 import { ownerFilesForCommand } from '@agent-device/command-registry/owner-files';
-import { getDaemonRouteOwnerFiles } from '../../daemon/route-owner-files.ts';
+import { getDaemonRouteOwnerFiles } from '@agent-device/daemon/route-owner-files';
 import {
   explainCommand as explainCommandFromMetadata,
   formatCommandExplanation,
@@ -80,7 +80,9 @@ describe('explainCommand', () => {
     if (!result.found) return;
     expect(result.explanation.cli?.commandFlags.map((flag) => flag.key)).toContain('settle');
     expect(result.explanation.files).toContain('src/commands/interaction/index.ts');
-    expect(result.explanation.files).toContain('src/daemon/interaction/index.ts');
+    expect(result.explanation.files).toContain(
+      'packages/daemon/src/execution/interaction/index.ts',
+    );
     expect(result.explanation.files.every(fileExists)).toBe(true);
   });
 
@@ -146,15 +148,21 @@ describe('explainCommand table-driven coverage', () => {
   });
 
   test.each([
-    ['press', ['src/commands/interaction/index.ts', 'src/daemon/interaction/index.ts']],
+    [
+      'press',
+      ['src/commands/interaction/index.ts', 'packages/daemon/src/execution/interaction/index.ts'],
+    ],
     ['apps', ['src/commands/management/app.ts']],
     // R39: screenshot has no dispatch projection left, so its platform work is named directly.
-    ['screenshot', ['src/commands/capture/screenshot.ts', 'src/daemon/screenshot-runtime.ts']],
-    ['react-native', ['src/daemon/handlers/react-native.ts']],
-    ['record', ['src/daemon/handlers/record-trace.ts']],
-    ['trace', ['src/daemon/handlers/record-trace.ts']],
-    ['back', ['src/daemon/request-generic-dispatch.ts']],
-    ['home', ['src/daemon/request-generic-dispatch.ts']],
+    [
+      'screenshot',
+      ['src/commands/capture/screenshot.ts', 'packages/daemon/src/execution/screenshot-runtime.ts'],
+    ],
+    ['react-native', ['packages/daemon/src/execution/handlers/react-native.ts']],
+    ['record', ['packages/daemon/src/sessions/handlers/record-trace.ts']],
+    ['trace', ['packages/daemon/src/sessions/handlers/record-trace.ts']],
+    ['back', ['packages/daemon/src/execution/request-generic-dispatch.ts']],
+    ['home', ['packages/daemon/src/execution/request-generic-dispatch.ts']],
   ])('derives owner files for %s (split family / route variant / dispatch)', (command, owners) => {
     const result = explainCommand(command as string, { fileExists });
     expect(result.found).toBe(true);
diff --git a/src/cli/command-explain.ts b/src/cli/command-explain.ts
index a22cb9338b..569ba29a8a 100644
--- a/src/cli/command-explain.ts
+++ b/src/cli/command-explain.ts
@@ -4,7 +4,7 @@ import {
   normalizeCliCommandAlias,
 } from '@agent-device/command-registry/cli-command-aliases';
 import { buildCommandUsage } from '../commands/schema/usage.ts';
-import type { DaemonCommandRoute } from '../daemon/daemon-command-registry.ts';
+import type { DaemonCommandRoute } from '@agent-device/daemon/daemon-command-registry';
 import { commandDescriptors, type Command } from '@agent-device/command-registry/registry';
 import { ownerFilesForCommand } from '@agent-device/command-registry/owner-files';
 import type { CommandTimeoutPolicy } from '@agent-device/command-registry/types';
diff --git a/src/cli/commands/__tests__/daemon.test.ts b/src/cli/commands/__tests__/daemon.test.ts
index c7a2de231d..0de3ad7158 100644
--- a/src/cli/commands/__tests__/daemon.test.ts
+++ b/src/cli/commands/__tests__/daemon.test.ts
@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import { afterEach, expect, test, vi } from 'vitest';
-import type { DaemonStopResult } from '../../../daemon/daemon-stop.ts';
+import type { DaemonStopResult } from '@agent-device/daemon/daemon-stop';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 
 const mocks = vi.hoisted(() => ({
@@ -12,7 +12,10 @@ const mocks = vi.hoisted(() => ({
   writeCommandOutput: vi.fn(),
 }));
 
-vi.mock('../../../daemon/daemon-stop.ts', () => ({
+// The mock specifier must be the SUT's exact `@agent-device/daemon/daemon-stop`: the
+// mutation lane aliases only the manifest's exact entries, so the `./testing/*` pattern
+// form resolved outside the Stryker sandbox and the mock silently missed (#3546 CI).
+vi.mock('@agent-device/daemon/daemon-stop', () => ({
   readDaemonStopIdentity: mocks.readDaemonStopIdentity,
   stopDaemon: mocks.stopDaemon,
 }));
diff --git a/src/cli/commands/daemon.ts b/src/cli/commands/daemon.ts
index fd9c1d301f..c8fa927af0 100644
--- a/src/cli/commands/daemon.ts
+++ b/src/cli/commands/daemon.ts
@@ -3,7 +3,7 @@ import {
   readDaemonStopIdentity,
   stopDaemon,
   type DaemonStopResult,
-} from '../../daemon/daemon-stop.ts';
+} from '@agent-device/daemon/daemon-stop';
 import { readDaemonShutdownReport } from '@agent-device/daemon-contracts/daemon-shutdown-report';
 import { AppError } from '@agent-device/kernel/errors';
 import { writeCommandOutput } from './shared.ts';
diff --git a/src/cli/commands/device-release.ts b/src/cli/commands/device-release.ts
index 2efc5fd702..5259ea26d1 100644
--- a/src/cli/commands/device-release.ts
+++ b/src/cli/commands/device-release.ts
@@ -1,14 +1,14 @@
 import {
   createOwnerScopedDeviceClaimReconciler,
   type OwnerScopedClaimRecoveryComposer,
-} from '../../daemon/device/device-claim-owner-recovery.ts';
+} from '@agent-device/daemon/device/device-claim-owner-recovery';
 import { createClaimRecoveryGateway } from '../../platform-runtime-claim-recovery.ts';
-import { createDaemonRecoveryPlatformScope } from '../../daemon/platform-request-scope.ts';
+import { createDaemonRecoveryPlatformScope } from '@agent-device/daemon/platform-request-scope';
 import {
   releaseProvenStaleDeviceClaims,
   type DeviceClaimStaleReleaseOutcome,
-} from '../../daemon/device/device-claims.ts';
-import type { DeviceClaimSelectors } from '../../daemon/device/device-claim-inspection.ts';
+} from '@agent-device/daemon/device/device-claims';
+import type { DeviceClaimSelectors } from '@agent-device/daemon/device/device-claim-inspection';
 
 /**
  * Daemonless `device release --stale`: settles each provably dead owner
diff --git a/src/cli/commands/device.ts b/src/cli/commands/device.ts
index 2381c75721..de6c307eaf 100644
--- a/src/cli/commands/device.ts
+++ b/src/cli/commands/device.ts
@@ -5,8 +5,8 @@ import {
   deviceClaimRequiresStaleInspection,
   inspectDeviceClaims,
   type InspectedDeviceClaim,
-} from '../../daemon/device/device-claim-inspection.ts';
-import type { DeviceClaimStaleReleaseOutcome } from '../../daemon/device/device-claims.ts';
+} from '@agent-device/daemon/device/device-claim-inspection';
+import type { DeviceClaimStaleReleaseOutcome } from '@agent-device/daemon/device/device-claims';
 import { shellQuoteIfNeeded } from '@agent-device/kernel/device-shell';
 import { writeCommandOutput } from './shared.ts';
 import type { CliFlags } from '@agent-device/contracts/command';
diff --git a/src/cli/replay-test/__tests__/session-test-reporter-values-maestro.test.ts b/src/cli/replay-test/__tests__/session-test-reporter-values-maestro.test.ts
index b178ada491..b45523f2e6 100644
--- a/src/cli/replay-test/__tests__/session-test-reporter-values-maestro.test.ts
+++ b/src/cli/replay-test/__tests__/session-test-reporter-values-maestro.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from '../../../daemon/__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '@agent-device/daemon/testing/__tests__/platform-services-fixture';
 // Characterization of the shipped reporter contract for the MAESTRO adapter (#1478 P3).
 //
 // The sibling session-test-reporter-values.test.ts covers the same contract for native `.ad`.
@@ -41,9 +41,9 @@ import fs from 'node:fs';
 
 import path from 'node:path';
 import type { ReplaySuiteResult } from '@agent-device/contracts/replay';
-import { handleSessionCommands } from '../../../daemon/handlers/__tests__/session-command-harness.ts';
-import { SessionStore } from '../../../daemon/session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../../../daemon/daemon-request.ts';
+import { handleSessionCommands } from '@agent-device/daemon/testing/handlers/__tests__/session-command-harness';
+import { SessionStore } from '@agent-device/daemon/testing/session-store';
+import type { DaemonRequest, DaemonResponse } from '@agent-device/daemon/daemon-request';
 import { withRequestProgressSink } from '@agent-device/host-kit/request';
 import {
   getReplayTestReporterExitCode,
diff --git a/src/cli/replay-test/__tests__/session-test-reporter-values.test.ts b/src/cli/replay-test/__tests__/session-test-reporter-values.test.ts
index 02b2d2ca17..4713fbd261 100644
--- a/src/cli/replay-test/__tests__/session-test-reporter-values.test.ts
+++ b/src/cli/replay-test/__tests__/session-test-reporter-values.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from '../../../daemon/__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '@agent-device/daemon/testing/__tests__/platform-services-fixture';
 // Characterization of the shipped reporter contract across the scheduler seam (#1478 P3).
 //
 // P3 moves the scheduler into `packages/replay-test` and makes attempt identity
@@ -14,7 +14,7 @@ import { daemonPlatformServicesFixture } from '../../../daemon/__tests__/platfor
 import { expect, test, vi } from 'vitest';
 import { testCreateCommandSurface } from '../../../__tests__/daemon-composition/command-surface-fixture.ts';
 
-vi.mock('../../../daemon/snapshot-interactor-capture.ts', () => ({
+vi.mock('@agent-device/daemon/testing/snapshot-interactor-capture', () => ({
   captureSnapshotWithInteractor: vi.fn(async () => {
     throw new Error('no device runner available in this test');
   }),
@@ -24,9 +24,9 @@ import fs from 'node:fs';
 
 import path from 'node:path';
 import type { ReplaySuiteResult } from '@agent-device/contracts/replay';
-import { handleSessionCommands } from '../../../daemon/handlers/__tests__/session-command-harness.ts';
-import { SessionStore } from '../../../daemon/session-store.ts';
-import type { DaemonRequest, DaemonResponse } from '../../../daemon/daemon-request.ts';
+import { handleSessionCommands } from '@agent-device/daemon/testing/handlers/__tests__/session-command-harness';
+import { SessionStore } from '@agent-device/daemon/testing/session-store';
+import type { DaemonRequest, DaemonResponse } from '@agent-device/daemon/daemon-request';
 import { withRequestProgressSink } from '@agent-device/host-kit/request';
 import { withTestDeviceInventoryProvider as withDeviceInventoryProvider } from '@agent-device/device-selection/inventory-gateways-fixtures';
 import type { DeviceInfo } from '@agent-device/kernel/device';
diff --git a/src/client/client-normalizers.ts b/src/client/client-normalizers.ts
index ccd0a3d29c..73edc29077 100644
--- a/src/client/client-normalizers.ts
+++ b/src/client/client-normalizers.ts
@@ -25,7 +25,7 @@ import {
   leaseScopeFromOptions,
   leaseScopeToRequestMeta,
 } from '@agent-device/contracts/lease-scope';
-import type { DaemonRequest } from '../daemon/daemon-request.ts';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 import {
   asRecord,
   isRecord,
diff --git a/src/client/lease-client.test.ts b/src/client/lease-client.test.ts
index 3738bdb0ae..5ba5fff9ea 100644
--- a/src/client/lease-client.test.ts
+++ b/src/client/lease-client.test.ts
@@ -5,7 +5,7 @@ import { createAgentDeviceClient } from '../agent-device-client.ts';
 import {
   HUMAN_CONTROL_HOLD,
   HUMAN_CONTROL_SCOPE,
-} from '../daemon/__tests__/human-control-fixtures.ts';
+} from '@agent-device/daemon/testing/__tests__/human-control-fixtures';
 import type { DaemonRequest } from '@agent-device/kernel/contracts';
 
 test('human-control client carries normal remote authentication and full lease metadata', async () => {
diff --git a/src/commands/__tests__/command-surface-metadata.test.ts b/src/commands/__tests__/command-surface-metadata.test.ts
index 3f250e558b..4784c99cdc 100644
--- a/src/commands/__tests__/command-surface-metadata.test.ts
+++ b/src/commands/__tests__/command-surface-metadata.test.ts
@@ -22,7 +22,7 @@ import {
 import { listExecutableCommandNames } from '../command-surface.ts';
 import { helpBody, mcpBody } from '@agent-device/command-registry/command-text';
 import { explainCommand } from '../../cli/command-explain.ts';
-import { getDaemonRouteOwnerFiles } from '../../daemon/route-owner-files.ts';
+import { getDaemonRouteOwnerFiles } from '@agent-device/daemon/route-owner-files';
 
 test('MCP exposed command names have metadata and executable command definitions', () => {
   const mcpExposedNames = listMcpExposedCommandNames().sort();
diff --git a/src/commands/cli-grammar/flag-declaration-admission.test.ts b/src/commands/cli-grammar/flag-declaration-admission.test.ts
index 55912e3f15..7ad93591de 100644
--- a/src/commands/cli-grammar/flag-declaration-admission.test.ts
+++ b/src/commands/cli-grammar/flag-declaration-admission.test.ts
@@ -6,8 +6,8 @@ import type { CliFlags } from '@agent-device/contracts/command';
 import { getFlagDefinitionsForKey } from '@agent-device/command-registry/flag-registry';
 import type { FlagDefinition } from '@agent-device/command-registry/flag-types';
 import { resolveConfigBackedFlagDefaults } from '../schema/cli-config.ts';
-import { recordActionEntry } from '../../daemon/session-action-recorder.ts';
-import { makeIosSession } from '../../daemon/__tests__/support/session-factories.ts';
+import { recordActionEntry } from '@agent-device/daemon/testing/session-action-recorder';
+import { makeIosSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
 import { makeTempWorkspace } from '../../__tests__/cli-config-fixtures.ts';
 
 /**
@@ -99,7 +99,7 @@ test('recorder sanitization follows the declaration: an undeclared key is droppe
   const planted = getInRegistry(registry, 'overlayRefs');
   Object.assign(planted, { recorded: true });
   const { recordActionEntry: recordPlanted } =
-    await import('../../daemon/session-action-recorder.ts');
+    await import('@agent-device/daemon/testing/session-action-recorder');
   const recorded = recordPlanted(makeIosSession('default'), {
     command: 'screenshot',
     positionals: [],
diff --git a/src/commands/interaction/runtime/offscreen-double-check.test.ts b/src/commands/interaction/runtime/offscreen-double-check.test.ts
index 8eac66fb29..815fe25ffb 100644
--- a/src/commands/interaction/runtime/offscreen-double-check.test.ts
+++ b/src/commands/interaction/runtime/offscreen-double-check.test.ts
@@ -11,7 +11,7 @@ import { createInteractionDevice } from './__tests__/test-utils/index.ts';
 // resolution.test.ts uses (createInteractionDevice), mocking
 // `confirmOffscreenTargetVisible` directly rather than the local XCTest
 // runner — the runner-level probe I/O is covered separately in
-// src/daemon/__tests__/offscreen-target-probe.test.ts.
+// packages/daemon/src/execution/__tests__/offscreen-target-probe.test.ts.
 
 // The bulk tree's ScrollView ancestor is corrupted (squeezed to a sliver),
 // so the target's rect doesn't overlap it — the guard rejects even though
diff --git a/src/daemon-client/__tests__/boundary-fault-acceptance.test.ts b/src/daemon-client/__tests__/boundary-fault-acceptance.test.ts
index ea65579978..01ef1d94d7 100644
--- a/src/daemon-client/__tests__/boundary-fault-acceptance.test.ts
+++ b/src/daemon-client/__tests__/boundary-fault-acceptance.test.ts
@@ -6,7 +6,7 @@ import { AppError } from '@agent-device/kernel/errors';
 import { assertRejectsAppError } from '@agent-device/test-kit/app-error';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import type { DaemonPaths } from '@agent-device/daemon-contracts/daemon-resolution';
-import type { DaemonRequest } from '../../daemon/daemon-request.ts';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 import { sendRequest } from '../daemon-client-transport.ts';
 
 type ProcessDeathCommand = 'press' | 'fill' | 'snapshot' | 'screenshot' | 'open' | 'close';
diff --git a/src/daemon-client/__tests__/boundary-fault-transport.test.ts b/src/daemon-client/__tests__/boundary-fault-transport.test.ts
index 19518ca95c..a8e266f213 100644
--- a/src/daemon-client/__tests__/boundary-fault-transport.test.ts
+++ b/src/daemon-client/__tests__/boundary-fault-transport.test.ts
@@ -12,7 +12,7 @@ import {
 } from '@agent-device/test-kit/loopback';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import type { DaemonPaths } from '@agent-device/daemon-contracts/daemon-resolution';
-import type { DaemonRequest } from '../../daemon/daemon-request.ts';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 import { sendRequest } from '../daemon-client-transport.ts';
 
 const { mockRunCmdSync } = vi.hoisted(() => ({ mockRunCmdSync: vi.fn() }));
diff --git a/src/daemon-client/__tests__/daemon-client-abort-default-transport.test.ts b/src/daemon-client/__tests__/daemon-client-abort-default-transport.test.ts
index c0a533cf96..caf8ed643b 100644
--- a/src/daemon-client/__tests__/daemon-client-abort-default-transport.test.ts
+++ b/src/daemon-client/__tests__/daemon-client-abort-default-transport.test.ts
@@ -22,9 +22,13 @@ import { isRequestCanceledError } from '@agent-device/kernel/errors';
 import { getRequestSignal, isRequestCanceled } from '@agent-device/host-kit/request';
 import { readProcessStartTime } from '@agent-device/host-kit/process';
 import { readVersion } from '@agent-device/host-kit/version';
-import type { DaemonInvokeFn, DaemonRequest, DaemonResponse } from '../../daemon/daemon-request.ts';
-import { createDaemonHttpServer } from '../../daemon/server/http-server.ts';
-import { createSocketServer, listenNetServer } from '../../daemon/server/transport.ts';
+import type {
+  DaemonInvokeFn,
+  DaemonRequest,
+  DaemonResponse,
+} from '@agent-device/daemon/daemon-request';
+import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
+import { createSocketServer, listenNetServer } from '@agent-device/daemon/testing/server/transport';
 import { createAgentDeviceClient } from '../../agent-device-client.ts';
 import { currentDaemonCodeSignature } from '../../__tests__/test-utils/daemon-http-fixture.ts';
 import {
diff --git a/src/daemon-client/__tests__/daemon-client-abort-timeout.test.ts b/src/daemon-client/__tests__/daemon-client-abort-timeout.test.ts
index 837ea57bc0..cdb98ef8fb 100644
--- a/src/daemon-client/__tests__/daemon-client-abort-timeout.test.ts
+++ b/src/daemon-client/__tests__/daemon-client-abort-timeout.test.ts
@@ -16,8 +16,12 @@ import { DAEMON_HTTP_INSTANCE_MISMATCH_HEADER } from '@agent-device/contracts/da
 import { test, vi } from 'vitest';
 import { AppError, isRequestCanceledError } from '@agent-device/kernel/errors';
 import { getRequestSignal } from '@agent-device/host-kit/request';
-import type { DaemonInvokeFn, DaemonRequest, DaemonResponse } from '../../daemon/daemon-request.ts';
-import { createSocketServer, listenNetServer } from '../../daemon/server/transport.ts';
+import type {
+  DaemonInvokeFn,
+  DaemonRequest,
+  DaemonResponse,
+} from '@agent-device/daemon/daemon-request';
+import { createSocketServer, listenNetServer } from '@agent-device/daemon/testing/server/transport';
 import { sendRequest } from '../daemon-client-transport.ts';
 import { resolveDaemonPaths } from '@agent-device/daemon-contracts/daemon-resolution';
 import {
diff --git a/src/daemon-client/__tests__/daemon-client-abort.test.ts b/src/daemon-client/__tests__/daemon-client-abort.test.ts
index 674b3cd004..8cd014e46f 100644
--- a/src/daemon-client/__tests__/daemon-client-abort.test.ts
+++ b/src/daemon-client/__tests__/daemon-client-abort.test.ts
@@ -12,9 +12,13 @@ import assert from 'node:assert/strict';
 import { test } from 'vitest';
 import { isRequestCanceledError } from '@agent-device/kernel/errors';
 import { getRequestSignal, isRequestCanceled } from '@agent-device/host-kit/request';
-import type { DaemonInvokeFn, DaemonRequest, DaemonResponse } from '../../daemon/daemon-request.ts';
-import { createDaemonHttpServer } from '../../daemon/server/http-server.ts';
-import { createSocketServer, listenNetServer } from '../../daemon/server/transport.ts';
+import type {
+  DaemonInvokeFn,
+  DaemonRequest,
+  DaemonResponse,
+} from '@agent-device/daemon/daemon-request';
+import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
+import { createSocketServer, listenNetServer } from '@agent-device/daemon/testing/server/transport';
 import { sendRequest } from '../daemon-client-transport.ts';
 import { resolveDaemonPaths } from '@agent-device/daemon-contracts/daemon-resolution';
 import {
diff --git a/src/daemon-client/__tests__/daemon-client-address-hints.test.ts b/src/daemon-client/__tests__/daemon-client-address-hints.test.ts
index 22cd5c004b..0a3b5f8145 100644
--- a/src/daemon-client/__tests__/daemon-client-address-hints.test.ts
+++ b/src/daemon-client/__tests__/daemon-client-address-hints.test.ts
@@ -1,4 +1,4 @@
-import type { DaemonResponse } from '../../daemon/daemon-request.ts';
+import type { DaemonResponse } from '@agent-device/daemon/daemon-request';
 import { shellQuoteIfNeeded } from '@agent-device/kernel/device-shell';
 import assert from 'node:assert/strict';
 import { test } from 'vitest';
diff --git a/src/daemon-client/__tests__/daemon-client-lease-beat.test.ts b/src/daemon-client/__tests__/daemon-client-lease-beat.test.ts
index 73164ed10a..c100855bae 100644
--- a/src/daemon-client/__tests__/daemon-client-lease-beat.test.ts
+++ b/src/daemon-client/__tests__/daemon-client-lease-beat.test.ts
@@ -10,7 +10,7 @@ import {
   runProtectedLeaseWork,
 } from '../daemon-client-lease-beat.ts';
 import { leaseScopeFromRequest } from '@agent-device/contracts/lease-scope';
-import type { DaemonRequest } from '../../daemon/daemon-request.ts';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 
 function lostLeaseError(reason: string): AppError {
   return new AppError('UNAUTHORIZED', 'Lease is not active', { reason });
diff --git a/src/daemon-client/__tests__/daemon-client-timeout-route.test.ts b/src/daemon-client/__tests__/daemon-client-timeout-route.test.ts
index 0b306eb40a..bdd5f6133c 100644
--- a/src/daemon-client/__tests__/daemon-client-timeout-route.test.ts
+++ b/src/daemon-client/__tests__/daemon-client-timeout-route.test.ts
@@ -38,7 +38,7 @@ vi.mock('@agent-device/host-kit/command', async () => {
 import { AppError } from '@agent-device/kernel/errors';
 import { PUBLIC_COMMANDS } from '@agent-device/command-registry/catalog';
 import { sendRequest } from '../daemon-client-transport.ts';
-import type { DaemonRequest } from '../../daemon/daemon-request.ts';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 import type { DaemonInfo } from '../daemon-client-metadata.ts';
 import type { DaemonPaths } from '@agent-device/daemon-contracts/daemon-resolution';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
diff --git a/src/daemon-client/daemon-client-lease-beat.ts b/src/daemon-client/daemon-client-lease-beat.ts
index dcce3011e5..d000720491 100644
--- a/src/daemon-client/daemon-client-lease-beat.ts
+++ b/src/daemon-client/daemon-client-lease-beat.ts
@@ -1,4 +1,4 @@
-import type { DaemonRequest } from '../daemon/daemon-request.ts';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 import { AppError } from '@agent-device/kernel/errors';
 import { createRequestId, emitDiagnostic } from '@agent-device/host-kit/diagnostics';
 import { INTERNAL_COMMANDS } from '@agent-device/command-registry/catalog';
diff --git a/src/daemon-client/daemon-client-lifecycle.ts b/src/daemon-client/daemon-client-lifecycle.ts
index 002e3e09da..8af7232888 100644
--- a/src/daemon-client/daemon-client-lifecycle.ts
+++ b/src/daemon-client/daemon-client-lifecycle.ts
@@ -4,7 +4,7 @@ import { processLockHoldsDaemonIdentity } from '@agent-device/daemon-contracts/d
 import net from 'node:net';
 import { AppError, normalizeError, type NormalizedError } from '@agent-device/kernel/errors';
 import { readReplayDivergenceResume } from '@agent-device/ad-replay/divergence';
-import type { DaemonRequest, DaemonResponse } from '../daemon/daemon-request.ts';
+import type { DaemonRequest, DaemonResponse } from '@agent-device/daemon/daemon-request';
 import { type ExecDetachedExit } from '@agent-device/host-kit/command';
 import { shellQuoteIfNeeded } from '@agent-device/kernel/device-shell';
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
diff --git a/src/daemon-client/daemon-client-liveness-probe.ts b/src/daemon-client/daemon-client-liveness-probe.ts
index 66a3605ece..ac12e1e9e1 100644
--- a/src/daemon-client/daemon-client-liveness-probe.ts
+++ b/src/daemon-client/daemon-client-liveness-probe.ts
@@ -2,7 +2,7 @@ import net from 'node:net';
 import { INTERNAL_COMMANDS } from '@agent-device/command-registry/catalog';
 import { createRequestId } from '@agent-device/host-kit/diagnostics';
 import { loadNodeHttpRequester, consumeTextLines } from '@agent-device/host-kit/transport';
-import type { DaemonRequest } from '../daemon/daemon-request.ts';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 import type { DaemonInfo } from './daemon-client-metadata.ts';
 
 // The post-timeout liveness probe (#3177): the question a daemon reset may no longer assume. The
diff --git a/src/daemon-client/daemon-client-progress.ts b/src/daemon-client/daemon-client-progress.ts
index 1e15ab9b2a..016b255281 100644
--- a/src/daemon-client/daemon-client-progress.ts
+++ b/src/daemon-client/daemon-client-progress.ts
@@ -4,7 +4,7 @@ import type { RequestProgressSink } from '@agent-device/contracts/progress';
 import type http from 'node:http';
 import type { Socket } from 'node:net';
 import { AppError } from '@agent-device/kernel/errors';
-import type { DaemonRequest, DaemonResponse } from '../daemon/daemon-request.ts';
+import type { DaemonRequest, DaemonResponse } from '@agent-device/daemon/daemon-request';
 import { consumeTextLines } from '@agent-device/host-kit/transport';
 import {
   isDaemonProgressEnvelope,
diff --git a/src/daemon-client/daemon-client-rpc.ts b/src/daemon-client/daemon-client-rpc.ts
index 8da929e319..b6b0698a76 100644
--- a/src/daemon-client/daemon-client-rpc.ts
+++ b/src/daemon-client/daemon-client-rpc.ts
@@ -6,7 +6,7 @@ import {
 } from '@agent-device/kernel/errors';
 import { sanitizeErrorCause } from '@agent-device/kernel/redaction';
 import { createRequestId } from '@agent-device/host-kit/diagnostics';
-import type { DaemonRequest, DaemonResponse } from '../daemon/daemon-request.ts';
+import type { DaemonRequest, DaemonResponse } from '@agent-device/daemon/daemon-request';
 import { materializeRemoteArtifacts } from '../remote/daemon-artifacts.ts';
 import { localizeRemoteDaemonError } from '../remote/remote-request-diagnostics.ts';
 import type { DaemonInfo } from './daemon-client-metadata.ts';
diff --git a/src/daemon-client/daemon-client-transport.ts b/src/daemon-client/daemon-client-transport.ts
index f291b3e118..26bf8695ac 100644
--- a/src/daemon-client/daemon-client-transport.ts
+++ b/src/daemon-client/daemon-client-transport.ts
@@ -2,7 +2,7 @@ import type { RequestProgressSink } from '@agent-device/contracts/progress';
 import net from 'node:net';
 import { AppError, createRequestCanceledError } from '@agent-device/kernel/errors';
 import { loadNodeHttpRequester, readNodeHttpResponseBody } from '@agent-device/host-kit/transport';
-import type { DaemonRequest, DaemonResponse } from '../daemon/daemon-request.ts';
+import type { DaemonRequest, DaemonResponse } from '@agent-device/daemon/daemon-request';
 import { emitDiagnostic } from '@agent-device/host-kit/diagnostics';
 import type {
   DaemonPaths,
diff --git a/src/daemon-client/daemon-client.ts b/src/daemon-client/daemon-client.ts
index 5285b8f52c..6c8aa52418 100644
--- a/src/daemon-client/daemon-client.ts
+++ b/src/daemon-client/daemon-client.ts
@@ -2,7 +2,7 @@ import type { RequestProgressSink } from '@agent-device/contracts/progress';
 import type {
   DaemonRequest as SharedDaemonRequest,
   DaemonResponse as SharedDaemonResponse,
-} from '../daemon/daemon-request.ts';
+} from '@agent-device/daemon/daemon-request';
 import type { AgentDeviceDaemonTransportContext } from '@agent-device/contracts/client';
 import { AppError } from '@agent-device/kernel/errors';
 import {
diff --git a/src/daemon-composition.ts b/src/daemon-composition.ts
index 41f0c1a13a..4c68feac39 100644
--- a/src/daemon-composition.ts
+++ b/src/daemon-composition.ts
@@ -1,4 +1,4 @@
-// The daemon runtime's dependency construction, extracted from `src/daemon/server/daemon-runtime.ts`
+// The daemon runtime's dependency construction, extracted from `packages/daemon/src/server/server/daemon-runtime.ts`
 // so the operational server owns sequencing and this module owns naming runtimes (ADR 0019).
 // Everything here that names a platform runtime, a provider runtime, an interactor, host
 // diagnostics, credential fingerprinting, resource cleanup, the platform lifecycle owners, the
@@ -10,7 +10,7 @@
 // entry reaches this module through a function-scoped `await import`, so the daemon entry's eager
 // closure does not grow; the platform-services and claim-recovery
 // compositions stay behind function-scoped `await import`, and the command surface loads on first
-// request use. Nothing here value-imports `src/daemon/`: the daemon's session data enters through
+// request use. Nothing here value-imports `packages/daemon/src/`: the daemon's session data enters through
 // plain callbacks, so the platform-runtime zone keeps its value-free direction toward the daemon.
 
 import {
@@ -42,7 +42,7 @@ import type { DeviceInfo } from '@agent-device/kernel/device';
 import type {
   ComposeDaemonRuntimeDeps,
   DaemonRuntimeDeps,
-} from './daemon/server/daemon-runtime.ts';
+} from '@agent-device/daemon/server/daemon-runtime';
 
 /**
  * Best-effort startup cleanup of managed-agent-browser orphans left by a previous daemon. It runs
diff --git a/src/daemon.ts b/src/daemon.ts
index d331ae5d49..c7ca9eef94 100644
--- a/src/daemon.ts
+++ b/src/daemon.ts
@@ -1,5 +1,5 @@
 import { asAppError } from '@agent-device/kernel/errors';
-import { startDaemonRuntime } from './daemon/server/daemon-runtime.ts';
+import { startDaemonRuntime } from '@agent-device/daemon/server/daemon-runtime';
 
 // The root's composition enters as a factory behind a function-scoped `await import`: the server
 // calls it before it acquires the registration, so startup order is unchanged, and the eager
diff --git a/src/platform-runtime-app-log-output.ts b/src/platform-runtime-app-log-output.ts
index 0befd67ebf..1c8845211e 100644
--- a/src/platform-runtime-app-log-output.ts
+++ b/src/platform-runtime-app-log-output.ts
@@ -1,8 +1,8 @@
 import type { AppLogOutputSink } from '@agent-device/contracts/app-log-runtime';
 import fs from 'node:fs';
 import { openVerifiedFileForAppend, openVerifiedFileForRead } from '@agent-device/host-kit/file';
-import { ensureAppLogPath } from './daemon/app-log-files.ts';
-import { requireManagedSessionArtifactPath } from './daemon/managed-session-artifact-path.ts';
+import { ensureAppLogPath } from '@agent-device/daemon/app-log-files';
+import { requireManagedSessionArtifactPath } from '@agent-device/daemon/managed-session-artifact-path';
 
 export async function openAppLogOutput(
   sessionsDir: string,
diff --git a/src/platform-runtime-app-log-process.ts b/src/platform-runtime-app-log-process.ts
index 9c1a326630..508e65aff3 100644
--- a/src/platform-runtime-app-log-process.ts
+++ b/src/platform-runtime-app-log-process.ts
@@ -23,7 +23,7 @@ import {
   waitForProcessExit,
 } from '@agent-device/host-kit/process';
 
-import { requireManagedSessionArtifactPath } from './daemon/managed-session-artifact-path.ts';
+import { requireManagedSessionArtifactPath } from '@agent-device/daemon/managed-session-artifact-path';
 
 const APP_LOG_PID_FILENAME = 'app-log.pid';
 
diff --git a/src/platform-runtime-claim-recovery.ts b/src/platform-runtime-claim-recovery.ts
index b1f3b53a17..fbda2fe726 100644
--- a/src/platform-runtime-claim-recovery.ts
+++ b/src/platform-runtime-claim-recovery.ts
@@ -1,5 +1,5 @@
 import { createPlatformRuntimeGateway } from './platform-runtime.ts';
-import type { ClaimRecoveryGatewayFactory } from './daemon/device/claim-recovery-gateway.ts';
+import type { ClaimRecoveryGatewayFactory } from '@agent-device/daemon/device/claim-recovery-gateway';
 
 /**
  * Root composition for owner-scoped claim recovery (ADR 0019 section 1): the daemon owns the
diff --git a/src/platform-runtime-daemon-lifecycle.ts b/src/platform-runtime-daemon-lifecycle.ts
index 8526e96620..7a6433aef6 100644
--- a/src/platform-runtime-daemon-lifecycle.ts
+++ b/src/platform-runtime-daemon-lifecycle.ts
@@ -1,4 +1,4 @@
-import type { PlatformOwnerLifecycle } from './daemon/platform-owner-lifecycle.ts';
+import type { PlatformOwnerLifecycle } from '@agent-device/daemon/platform-owner-lifecycle';
 import {
   configureAppleRunnerDeviceClaimAuthorityProbe,
   configureAppleRunnerLeaseOwnerStateDir,
diff --git a/src/platform-runtime-daemon-services.ts b/src/platform-runtime-daemon-services.ts
index 916aab5574..ad29bbcee2 100644
--- a/src/platform-runtime-daemon-services.ts
+++ b/src/platform-runtime-daemon-services.ts
@@ -6,7 +6,7 @@ import {
   resolveSessionAppBundleIdForTarget,
   validateOpenRelaunchTarget,
 } from './platform-runtime-open-target.ts';
-import type { DaemonPlatformServices } from './daemon/platform-services.ts';
+import type { DaemonPlatformServices } from '@agent-device/daemon/platform-services';
 
 /**
  * Root composition of the daemon's platform-services port (ADR 0019 section 11). Each member is
diff --git a/src/platform-runtime-device-inventory.test.ts b/src/platform-runtime-device-inventory.test.ts
index 41119b45bd..bb2ee44aa4 100644
--- a/src/platform-runtime-device-inventory.test.ts
+++ b/src/platform-runtime-device-inventory.test.ts
@@ -18,18 +18,6 @@ const simctl = vi.hoisted(() => ({
   calls: [] as string[],
 }));
 
-vi.mock('../packages/platform-apple/src/core/tool-provider.ts', async (importOriginal) => ({
-  ...(await importOriginal<typeof import('@agent-device/platform-apple/tool-provider')>()),
-  runXcrun: async (args: string[]) => {
-    const idx = args.indexOf('listapps');
-    const deviceId = idx >= 0 ? args[idx + 1] : undefined;
-    if (deviceId) simctl.calls.push(deviceId);
-    const entry = simctl.listapps.find((l) => l.deviceId === deviceId);
-    return { stdout: entry ? JSON.stringify(entry.apps) : '{}', stderr: '', exitCode: 0 };
-  },
-  runAppleToolCommand: async () => ({ stdout: '', stderr: '', exitCode: 1 }),
-}));
-
 const scope: PlatformRequestScope = Object.freeze({
   signal: new AbortController().signal,
   diagnostics: Object.freeze({ emit: () => {} }),
@@ -95,13 +83,34 @@ describe('production device inventory composition', () => {
       loadHost: async () => host,
     });
 
-    const selection = await withDeviceInventoryContext({ ...gateways, requestScope: scope }, () =>
-      resolveTargetDeviceSelection(
-        { platform: 'ios' },
-        {
-          appleSimulatorAppTarget: 'com.example.demo',
+    // The fake answers through the production tool-provider scope — the same seam the
+    // package's own tests install with — so no module mock has to guess which loader
+    // identity the probe's dynamic import will land on.
+    const { withAppleToolProvider, createLocalAppleToolProvider } =
+      await import('@agent-device/platform-apple/tool-provider');
+    const selection = await withAppleToolProvider(
+      createLocalAppleToolProvider({
+        runCommand: async () => ({ stdout: '', stderr: '', exitCode: 1 }),
+        simctl: {
+          run: async (args) => {
+            const [command, deviceId] = args as readonly string[];
+            if (command !== 'listapps') return { stdout: '{}', stderr: '', exitCode: 0 };
+            simctl.calls.push(deviceId!);
+            const entry = simctl.listapps.find((l) => l.deviceId === deviceId);
+            return { stdout: entry ? JSON.stringify(entry.apps) : '{}', stderr: '', exitCode: 0 };
+          },
         },
-      ),
+        devicectl: { run: async () => ({ stdout: '', stderr: '', exitCode: 1 }) },
+      }),
+      () =>
+        withDeviceInventoryContext({ ...gateways, requestScope: scope }, () =>
+          resolveTargetDeviceSelection(
+            { platform: 'ios' },
+            {
+              appleSimulatorAppTarget: 'com.example.demo',
+            },
+          ),
+        ),
     );
 
     expect(selection.device.id).toBe('sim-b');
diff --git a/src/platform-runtime-gateway.test.ts b/src/platform-runtime-gateway.test.ts
index 96b1739359..07ef62a04a 100644
--- a/src/platform-runtime-gateway.test.ts
+++ b/src/platform-runtime-gateway.test.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from './daemon/__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '@agent-device/daemon/testing/__tests__/platform-services-fixture';
 import {
   type DeviceBinding,
   localRuntimeOwner,
@@ -16,10 +16,10 @@ import { viewportRuntimeOperationFacts } from '@agent-device/contracts/viewport-
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import { createLimrunRuntime } from '@agent-device/provider-limrun';
 import { describe, expect, test, vi } from 'vitest';
-import { handleAppStateCommand } from './daemon/handlers/session-appstate.ts';
-import { createRequestRuntimeBindings } from './daemon/request-runtime-binding.ts';
-import { createRequestDispatchLedger } from './daemon/request-dispatch-ledger.ts';
-import { makeSessionStore } from './daemon/__tests__/support/store-factory.ts';
+import { handleAppStateCommand } from '@agent-device/daemon/testing/handlers/session-appstate';
+import { createRequestRuntimeBindings } from '@agent-device/daemon/testing/request-runtime-binding';
+import { createRequestDispatchLedger } from '@agent-device/daemon/testing/request-dispatch-ledger';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import { withTestDeviceInventory } from '@agent-device/device-selection/inventory-gateways-fixtures';
 import { createComposedPlatformRuntimeGateway } from './platform-runtime-gateway.ts';
 import {
diff --git a/src/platform-runtime-resource-cleanup.ts b/src/platform-runtime-resource-cleanup.ts
index 689c02af6e..0a83a827a7 100644
--- a/src/platform-runtime-resource-cleanup.ts
+++ b/src/platform-runtime-resource-cleanup.ts
@@ -1,6 +1,6 @@
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import { isIosFamily } from '@agent-device/kernel/device';
-import type { PlatformResourceCleanup } from './daemon/platform-resource-cleanup.ts';
+import type { PlatformResourceCleanup } from '@agent-device/daemon/platform-resource-cleanup';
 import { emitDiagnostic, type ResourceDiagnostic } from '@agent-device/host-kit/diagnostics';
 import { type OwnedProcessRecordStore } from '@agent-device/host-kit/process';
 import { loadAndroidMechanics } from './platform-runtime-android-mechanics.ts';
diff --git a/src/remote/daemon-artifacts.ts b/src/remote/daemon-artifacts.ts
index ad9f0f5fbe..052d359529 100644
--- a/src/remote/daemon-artifacts.ts
+++ b/src/remote/daemon-artifacts.ts
@@ -5,7 +5,11 @@ import {
   buildRemoteTempArtifactPath,
 } from '@agent-device/contracts/daemon-http';
 import { AppError } from '@agent-device/kernel/errors';
-import type { DaemonArtifact, DaemonRequest, DaemonResponse } from '../daemon/daemon-request.ts';
+import type {
+  DaemonArtifact,
+  DaemonRequest,
+  DaemonResponse,
+} from '@agent-device/daemon/daemon-request';
 import {
   appendRecordingExtensionWhenMissing,
   recordingExtensionForPlatform,
diff --git a/src/remote/remote-request-diagnostics.ts b/src/remote/remote-request-diagnostics.ts
index e257b9f89f..6db7802ddf 100644
--- a/src/remote/remote-request-diagnostics.ts
+++ b/src/remote/remote-request-diagnostics.ts
@@ -26,7 +26,7 @@ import {
   buildDaemonHttpTenantHeaders,
   buildDaemonHttpUrl,
 } from '@agent-device/contracts/daemon-http';
-import { resolveRemoteRequestDiagnosticsPath } from '../daemon/session-artifact-paths.ts';
+import { resolveRemoteRequestDiagnosticsPath } from '@agent-device/daemon/session-artifact-paths';
 
 const REMOTE_DIAGNOSTICS_FETCH_TIMEOUT_MS = 10_000;
 const REMOTE_DIAGNOSTICS_MAX_BYTES = 8 * 1024 * 1024;
diff --git a/stryker.config.json b/stryker.config.json
index e019504f93..53c96a56f3 100644
--- a/stryker.config.json
+++ b/stryker.config.json
@@ -34,7 +34,7 @@
   },
   "mutate": [
     "packages/kernel/src/errors.ts",
-    "src/daemon/ref-frame.ts",
+    "packages/daemon/src/core/ref-frame.ts",
     "src/commands/interaction/runtime/settle.ts",
     "packages/capture-kit/src/snapshot/scroll-edge-state.ts",
     "packages/capture-kit/src/snapshot/scroll-edge-state/**/*.ts",
diff --git a/test/integration/command-coverage/declarations.ts b/test/integration/command-coverage/declarations.ts
index 0e63314d3f..1b02aff3bb 100644
--- a/test/integration/command-coverage/declarations.ts
+++ b/test/integration/command-coverage/declarations.ts
@@ -1,5 +1,5 @@
 import { PUBLIC_COMMANDS } from '@agent-device/command-registry/catalog';
-import { ANDROID_AUDIO_CONTRACT_EVIDENCE } from '../../../src/daemon/session-observability/__tests__/session-audio.coverage.ts';
+import { ANDROID_AUDIO_CONTRACT_EVIDENCE } from '@agent-device/daemon/testing/session-observability/__tests__/session-audio.coverage';
 import { ANDROID_INSTALL_SOURCE_CONTRACT_EVIDENCE } from '../../../src/__tests__/install-source.coverage.ts';
 import { ANDROID_LIFECYCLE_CONTRACT_EVIDENCE } from '../provider-scenarios/android-lifecycle.coverage.ts';
 import {
@@ -53,18 +53,18 @@ const COMMAND_COVERAGE_DECLARATIONS = {
       'inventory exposes generated recording and trace artifacts and one download consumes its entry',
     ),
     iosSimulator: iosSimulator.contract(
-      'src/daemon/__tests__/http-server-artifacts.test.ts',
+      'packages/daemon/src/server/__tests__/http-server-artifacts.test.ts',
       'daemon artifact inventory lists artifacts and downloads consume them',
       'daemon inventory exposes a typed non-empty artifact and its downloadable bytes',
     ),
     macos: macos.contract(
-      'src/daemon/__tests__/http-server-artifacts.test.ts',
+      'packages/daemon/src/server/__tests__/http-server-artifacts.test.ts',
       'daemon artifact inventory lists artifacts and downloads consume them',
       'daemon artifact inventory exposes downloadable files for the macOS session tooling',
     ),
     tvos: tvos.gap('No tvOS-specific artifact inventory command evidence exists yet'),
     web: web.contract(
-      'src/daemon/__tests__/request-router-artifacts-web.test.ts',
+      'packages/daemon/src/server/__tests__/request-router-artifacts-web.test.ts',
       'artifacts lists a daemon-tracked artifact produced during a web session',
       'daemon artifact listing round-trips a tracked artifact for a web-backed session',
     ),
@@ -112,13 +112,13 @@ const COMMAND_COVERAGE_DECLARATIONS = {
       'typed capability response includes fixture-driving commands',
     ),
     macos: macos.contract(
-      'src/daemon/session-lifecycle/internal/__tests__/session-capabilities.test.ts',
+      'packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-capabilities.test.ts',
       'capabilities preserves session-owned appstate for an active %s session',
       'the capabilities response projects exact runtime facts plus active macOS session state',
     ),
     tvos: tvos.gap('No tvOS-specific capabilities command evidence exists yet'),
     web: web.contract(
-      'src/daemon/session-lifecycle/internal/__tests__/session-capabilities.test.ts',
+      'packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-capabilities.test.ts',
       'capabilities omits apps when $label runtime facts deny the operation',
       'web capability projection reflects runtime-owned unsupported operations',
     ),
@@ -159,7 +159,7 @@ const COMMAND_COVERAGE_DECLARATIONS = {
     ),
     tvos: tvos.gap('No tvOS-specific app inventory command evidence exists yet'),
     web: web.contract(
-      'src/daemon/session-lifecycle/internal/__tests__/session-capabilities.test.ts',
+      'packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-capabilities.test.ts',
       'capabilities omits apps when $label runtime facts deny the operation',
       'web runtime facts keep native app inventory unavailable',
     ),
@@ -179,7 +179,7 @@ const COMMAND_COVERAGE_DECLARATIONS = {
       'shutdown simulator boots again and inventory confirms it',
     ),
     macos: macos.contract(
-      'src/daemon/handlers/__tests__/session-boot.test.ts',
+      'packages/daemon/src/sessions/handlers/__tests__/session-boot.test.ts',
       'boot rejects the macOS host boot cell after one facts inspection and before binding',
       'macOS boot is refused by the runtime fact before dispatch',
     ),
@@ -294,7 +294,7 @@ const COMMAND_COVERAGE_DECLARATIONS = {
     macos: macos.gap('No command-specific macOS event timeline evidence exists yet'),
     tvos: tvos.gap('No tvOS-specific session-event command evidence exists yet'),
     web: web.contract(
-      'src/daemon/__tests__/request-router-events.test.ts',
+      'packages/daemon/src/server/__tests__/request-router-events.test.ts',
       'events reads the daemon-owned session timeline for a web-backed session',
       'the session-owned event timeline works the same for a web-backed session as any other platform',
     ),
@@ -331,12 +331,12 @@ const COMMAND_COVERAGE_DECLARATIONS = {
       'host audio probing has an Android-emulator session contract',
     ),
     iosSimulator: iosSimulator.contract(
-      'src/daemon/session-observability/internal/__tests__/session-audio.test.ts',
+      'packages/daemon/src/sessions/session-observability/internal/__tests__/session-audio.test.ts',
       'audio probe starts host helper for iOS simulator audio',
       'host audio permission and probe lifecycle; ScreenCaptureKit is not available on hosted CI',
     ),
     macos: macos.contract(
-      'src/daemon/session-observability/internal/__tests__/session-audio.test.ts',
+      'packages/daemon/src/sessions/session-observability/internal/__tests__/session-audio.test.ts',
       'audio probe start binds once, adopts the durable handle, and answers from it',
       'macOS audio probe starts the ScreenCaptureKit helper and reports its backend',
     ),
@@ -347,7 +347,7 @@ const COMMAND_COVERAGE_DECLARATIONS = {
       'host-dependent',
     ),
     web: web.contract(
-      'src/daemon/session-observability/internal/__tests__/session-audio.test.ts',
+      'packages/daemon/src/sessions/session-observability/internal/__tests__/session-audio.test.ts',
       'audio probe forwards daemon millisecond timing to the web query operation',
       'web audio probe forwards typed duration and bucket values',
     ),
@@ -369,7 +369,7 @@ const COMMAND_COVERAGE_DECLARATIONS = {
     macos: macos.gap('No command-specific macOS replay evidence exists beyond the suite runner'),
     tvos: tvos.gap('No tvOS-specific replay command evidence exists yet'),
     web: web.contract(
-      'src/daemon/handlers/__tests__/session-command-replay.test.ts',
+      'packages/daemon/src/sessions/handlers/__tests__/session-command-replay.test.ts',
       'replay inherits the parent web platform selector for each invoked step',
       'replay re-invokes each recorded step with no platform branch, so a web selector threads through unchanged',
     ),
@@ -614,7 +614,7 @@ const COMMAND_COVERAGE_DECLARATIONS = {
     macos: macos.gap('No command-specific macOS batch evidence exists yet'),
     tvos: tvos.gap('No tvOS-specific batch command evidence exists yet'),
     web: web.contract(
-      'src/daemon/session-lifecycle/internal/__tests__/session-devices-batch-runtime.test.ts',
+      'packages/daemon/src/sessions/session-lifecycle/internal/__tests__/session-devices-batch-runtime.test.ts',
       'batch step forwards the parent web platform selector to each invoked step',
       'batch re-invokes each step through the normal dispatcher with no platform branch, so a web selector threads through unchanged',
     ),
@@ -814,7 +814,7 @@ const COMMAND_COVERAGE_DECLARATIONS = {
     macos: macos.gap('No command-specific macOS trace evidence exists yet'),
     tvos: tvos.gap('No tvOS-specific trace command evidence exists yet'),
     web: web.contract(
-      'src/daemon/handlers/__tests__/trace-runtime.test.ts',
+      'packages/daemon/src/sessions/handlers/__tests__/trace-runtime.test.ts',
       'starts and stops one trace through the session-owned trace slot on a web session',
       'session-scoped trace start/stop bookkeeping works the same for a web session as any other platform',
     ),
@@ -1256,7 +1256,7 @@ const COMMAND_COVERAGE_DECLARATIONS = {
       'Android viewport fails closed through its unavailable exact-owner runtime fact',
     ),
     iosSimulator: iosSimulator.contract(
-      'src/daemon/__tests__/viewport-runtime.test.ts',
+      'packages/daemon/src/execution/__tests__/viewport-runtime.test.ts',
       'rejects an unavailable exact-owner fact before binding',
       'iOS viewport fails closed through its unavailable exact-owner runtime fact',
     ),
diff --git a/test/integration/command-coverage/evidence.ts b/test/integration/command-coverage/evidence.ts
index ccd78dc1e5..f43f1720ee 100644
--- a/test/integration/command-coverage/evidence.ts
+++ b/test/integration/command-coverage/evidence.ts
@@ -52,7 +52,7 @@ export const ANDROID_FOLD_RUNTIME_CONTRACT_EVIDENCE: AndroidContractEvidence =
   );
 export const ANDROID_VIEWPORT_RUNTIME_CONTRACT_EVIDENCE: AndroidContractEvidence =
   defineAndroidContractEvidence(
-    'src/daemon/__tests__/viewport-runtime.test.ts',
+    'packages/daemon/src/execution/__tests__/viewport-runtime.test.ts',
     [C.viewport],
     'rejects an unavailable exact-owner fact before binding',
   );
diff --git a/test/integration/interaction-contract/native-ref.contract.test.ts b/test/integration/interaction-contract/native-ref.contract.test.ts
index a002969777..036167ca75 100644
--- a/test/integration/interaction-contract/native-ref.contract.test.ts
+++ b/test/integration/interaction-contract/native-ref.contract.test.ts
@@ -4,7 +4,7 @@ import type { InteractionGuarantee } from '@agent-device/contracts/interaction-g
 import type { SnapshotState } from '@agent-device/kernel/snapshot';
 import { ref } from '../../../src/commands/interaction/runtime/selector-read-utils.ts';
 import { scenarioName } from './coverage-manifest.ts';
-import { buildInteractionResponseData } from '../../../src/daemon/interaction/internal/interaction-touch-response.ts';
+import { buildInteractionResponseData } from '@agent-device/daemon/testing/interaction/internal/interaction-touch-response';
 import { NATIVE_REF_COVERAGE } from './native-ref.coverage.ts';
 import {
   closedDrawerSnapshot,
diff --git a/test/integration/nightly/concurrency-torture/bindings.ts b/test/integration/nightly/concurrency-torture/bindings.ts
index 319815c18a..55beaeb40e 100644
--- a/test/integration/nightly/concurrency-torture/bindings.ts
+++ b/test/integration/nightly/concurrency-torture/bindings.ts
@@ -2,7 +2,7 @@
 //
 // The lane does NOT hand-write which locks an operation takes. It derives the
 // plan from the REAL router primitive `resolveRequestExecutionLockPlan`
-// (src/daemon/request-binding.ts), driven with a fake in-memory device
+// (packages/daemon/src/server/request-binding.ts), driven with a fake in-memory device
 // inventory via the production `withDeviceInventoryProvider` seam. This is what
 // makes the same-device serialization invariant revert-sensitive: if production
 // stops returning a `device:` key (e.g. the router's same-device open
@@ -20,11 +20,11 @@
 
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import type { CommandFlags } from '@agent-device/contracts/command';
-import type { DaemonRequest } from '../../../../src/daemon/daemon-request.ts';
-import type { SessionRef } from '../../../../src/daemon/session-state.ts';
-import type { SessionStore } from '../../../../src/daemon/session-store.ts';
-import { resolveRequestExecutionLockPlan } from '../../../../src/daemon/request-binding.ts';
-import { shouldLockSessionExecution } from '../../../../src/daemon/daemon-command-registry.ts';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
+import type { SessionRef } from '@agent-device/daemon/testing/session-state';
+import type { SessionStore } from '@agent-device/daemon/testing/session-store';
+import { resolveRequestExecutionLockPlan } from '@agent-device/daemon/testing/request-binding';
+import { shouldLockSessionExecution } from '@agent-device/daemon/daemon-command-registry';
 import { PUBLIC_COMMANDS } from '@agent-device/command-registry/catalog';
 import { withTestDeviceInventoryProvider as withDeviceInventoryProvider } from '@agent-device/device-selection/inventory-gateways-fixtures';
 
diff --git a/test/integration/nightly/concurrency-torture/claim-registry.ts b/test/integration/nightly/concurrency-torture/claim-registry.ts
index 001db632f7..e58319caef 100644
--- a/test/integration/nightly/concurrency-torture/claim-registry.ts
+++ b/test/integration/nightly/concurrency-torture/claim-registry.ts
@@ -1,4 +1,4 @@
-// In-memory model of the enforced host-global device claim (`src/daemon/device/device-claims.ts`).
+// In-memory model of the enforced host-global device claim (`packages/daemon/src/resources/device/device-claims.ts`).
 //
 // The production claim is a filesystem lock file guarded by a process lock, keyed
 // by `canonicalLocalDeviceKey`. That is real I/O and a real OS lock — neither is
diff --git a/test/integration/nightly/concurrency-torture/harness.ts b/test/integration/nightly/concurrency-torture/harness.ts
index 6cabd1ab17..13d7718bdc 100644
--- a/test/integration/nightly/concurrency-torture/harness.ts
+++ b/test/integration/nightly/concurrency-torture/harness.ts
@@ -26,9 +26,9 @@ import os from 'node:os';
 import path from 'node:path';
 
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import { LeaseRegistry } from '../../../../src/daemon/lease-registry.ts';
-import { SessionStore } from '../../../../src/daemon/session-store.ts';
-import type { SessionState } from '../../../../src/daemon/session-state.ts';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
+import { SessionStore } from '@agent-device/daemon/testing/session-store';
+import type { SessionState } from '@agent-device/daemon/testing/session-state';
 import { AppError } from '@agent-device/kernel/errors';
 
 import { makePrng, type Prng } from './prng.ts';
diff --git a/test/integration/nightly/concurrency-torture/invariants.ts b/test/integration/nightly/concurrency-torture/invariants.ts
index 06afe30a05..610c8c6863 100644
--- a/test/integration/nightly/concurrency-torture/invariants.ts
+++ b/test/integration/nightly/concurrency-torture/invariants.ts
@@ -10,8 +10,8 @@
 //   - no cross-session bleed: each stored session carries exactly its own
 //     lease/claim/device, never a concurrent session's
 
-import type { LeaseRegistry } from '../../../../src/daemon/lease-registry.ts';
-import type { SessionStore } from '../../../../src/daemon/session-store.ts';
+import type { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
+import type { SessionStore } from '@agent-device/daemon/testing/session-store';
 
 import type { SessionInstance } from './bindings.ts';
 
diff --git a/test/integration/nightly/concurrency-torture/real-scope-serialization.ts b/test/integration/nightly/concurrency-torture/real-scope-serialization.ts
index 567a50a7ce..bf88639f80 100644
--- a/test/integration/nightly/concurrency-torture/real-scope-serialization.ts
+++ b/test/integration/nightly/concurrency-torture/real-scope-serialization.ts
@@ -2,7 +2,7 @@
 import {
   daemonPlatformServicesFixture,
   daemonClaimRecoveryGatewayFixture,
-} from '../../../../src/daemon/__tests__/platform-services-fixture.ts';
+} from '@agent-device/daemon/testing/__tests__/platform-services-fixture';
 // (#1416). The seeded sweep models the mutex GRANT (a seed cannot reproduce
 // `withKeyedLock`'s native microtask hand-off), so on its own it could stay
 // green if the PRODUCTION lock APPLICATION path regressed. This guard closes
@@ -19,12 +19,12 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 
-import { createRequestExecutionScope } from '../../../../src/daemon/request-execution-scope.ts';
-import { LeaseRegistry } from '../../../../src/daemon/lease-registry.ts';
-import { SessionStore } from '../../../../src/daemon/session-store.ts';
+import { createRequestExecutionScope } from '@agent-device/daemon/testing/request-execution-scope';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
+import { SessionStore } from '@agent-device/daemon/testing/session-store';
 import { withTestDeviceInventoryProvider as withDeviceInventoryProvider } from '@agent-device/device-selection/inventory-gateways-fixtures';
 import type { CommandFlags } from '@agent-device/contracts/command';
-import type { DaemonRequest } from '../../../../src/daemon/daemon-request.ts';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 
 import { DEVICE_POOL } from './bindings.ts';
 
diff --git a/test/integration/provider-scenarios/cloud-webdriver-ios-text-entry.test.ts b/test/integration/provider-scenarios/cloud-webdriver-ios-text-entry.test.ts
index 249bc050c7..8fac543a64 100644
--- a/test/integration/provider-scenarios/cloud-webdriver-ios-text-entry.test.ts
+++ b/test/integration/provider-scenarios/cloud-webdriver-ios-text-entry.test.ts
@@ -3,7 +3,7 @@ import { test } from 'vitest';
 import { createBundledCloudWebDriverRuntimes } from '@agent-device/provider-webdriver';
 import type { DeviceLease } from '@agent-device/contracts/device';
 import { createProviderDeviceRuntimeRequestProviders } from '../../../src/provider-device-runtime.ts';
-import type { DaemonRequest } from '../../../src/daemon/daemon-request.ts';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 import { assertRpcOk } from './assertions.ts';
 import {
   createProviderScenarioHarness,
diff --git a/test/integration/provider-scenarios/cloud-webdriver-lease-http.test.ts b/test/integration/provider-scenarios/cloud-webdriver-lease-http.test.ts
index 88934a33b1..cd97ece723 100644
--- a/test/integration/provider-scenarios/cloud-webdriver-lease-http.test.ts
+++ b/test/integration/provider-scenarios/cloud-webdriver-lease-http.test.ts
@@ -3,7 +3,7 @@ import http from 'node:http';
 import { test } from 'vitest';
 import { createBundledCloudWebDriverRuntimes } from '@agent-device/provider-webdriver';
 import { createProviderDeviceRuntimeRequestProviders } from '../../../src/provider-device-runtime.ts';
-import { createDaemonHttpServer } from '../../../src/daemon/server/http-server.ts';
+import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
 import { buildHttpRpcPayload } from '../../../src/daemon-client/daemon-client-rpc.ts';
 import {
   closeLoopbackServer,
diff --git a/test/integration/provider-scenarios/cloud-webdriver-provider-regressions.test.ts b/test/integration/provider-scenarios/cloud-webdriver-provider-regressions.test.ts
index b4ba80efe5..61e9d4810e 100644
--- a/test/integration/provider-scenarios/cloud-webdriver-provider-regressions.test.ts
+++ b/test/integration/provider-scenarios/cloud-webdriver-provider-regressions.test.ts
@@ -10,7 +10,7 @@ import type { CaptureSnapshotResult } from '@agent-device/contracts/client';
 import type { DeviceLease } from '@agent-device/contracts/device';
 import type { PlatformRuntimeHost } from '@agent-device/contracts/platform-runtime-operations';
 import { createProviderDeviceRuntimeRequestProviders } from '../../../src/provider-device-runtime.ts';
-import type { DaemonRequest } from '../../../src/daemon/daemon-request.ts';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 import * as iosSnapshotRuntime from '@agent-device/capture-kit/ios-snapshot-runtime';
 import {
   createProviderScenarioHarness,
diff --git a/test/integration/provider-scenarios/cloud-webdriver-runtime.test.ts b/test/integration/provider-scenarios/cloud-webdriver-runtime.test.ts
index f9fcbd5424..24ba1fe073 100644
--- a/test/integration/provider-scenarios/cloud-webdriver-runtime.test.ts
+++ b/test/integration/provider-scenarios/cloud-webdriver-runtime.test.ts
@@ -11,8 +11,8 @@ import { createBundledCloudWebDriverRuntimes } from '@agent-device/provider-webd
 import type { CloudArtifact } from '@agent-device/contracts/observability';
 import type { DeviceLease } from '@agent-device/contracts/device';
 import { createProviderDeviceRuntimeRequestProviders } from '../../../src/provider-device-runtime.ts';
-import { createExpiredProviderLeaseReleaser } from '../../../src/daemon/provider-lease-expiry.ts';
-import type { DaemonRequest } from '../../../src/daemon/daemon-request.ts';
+import { createExpiredProviderLeaseReleaser } from '@agent-device/daemon/testing/provider-lease-expiry';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 import { assertRpcOk } from './assertions.ts';
 import {
   createProviderScenarioHarness,
diff --git a/test/integration/provider-scenarios/daemon-http-boundary-cancellation.test.ts b/test/integration/provider-scenarios/daemon-http-boundary-cancellation.test.ts
index b05a9f3aab..7e592b0c65 100644
--- a/test/integration/provider-scenarios/daemon-http-boundary-cancellation.test.ts
+++ b/test/integration/provider-scenarios/daemon-http-boundary-cancellation.test.ts
@@ -2,8 +2,8 @@ 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 '../../../src/daemon/server/http-server.ts';
-import type { DaemonRequest, DaemonResponse } from '../../../src/daemon/daemon-request.ts';
+import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
+import type { DaemonRequest, DaemonResponse } from '@agent-device/daemon/daemon-request';
 import {
   closeLoopbackServer,
   listenOnLoopback,
diff --git a/test/integration/provider-scenarios/daemon-http-disconnect.test.ts b/test/integration/provider-scenarios/daemon-http-disconnect.test.ts
index 49db2c678d..968d33495a 100644
--- a/test/integration/provider-scenarios/daemon-http-disconnect.test.ts
+++ b/test/integration/provider-scenarios/daemon-http-disconnect.test.ts
@@ -2,8 +2,8 @@ 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 '../../../src/daemon/server/http-server.ts';
-import type { DaemonRequest, DaemonResponse } from '../../../src/daemon/daemon-request.ts';
+import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
+import type { DaemonRequest, DaemonResponse } from '@agent-device/daemon/daemon-request';
 import {
   closeLoopbackServer,
   listenOnLoopback,
diff --git a/test/integration/provider-scenarios/daemon-http-lease-allocate.test.ts b/test/integration/provider-scenarios/daemon-http-lease-allocate.test.ts
index d72cd7631b..36fa67e882 100644
--- a/test/integration/provider-scenarios/daemon-http-lease-allocate.test.ts
+++ b/test/integration/provider-scenarios/daemon-http-lease-allocate.test.ts
@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import { test } from 'vitest';
-import { createDaemonHttpServer } from '../../../src/daemon/server/http-server.ts';
-import type { DaemonRequest, DaemonResponse } from '../../../src/daemon/daemon-request.ts';
+import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
+import type { DaemonRequest, DaemonResponse } from '@agent-device/daemon/daemon-request';
 import {
   closeLoopbackServer,
   listenOnLoopback,
diff --git a/test/integration/provider-scenarios/daemon-http-resumable-upload.test.ts b/test/integration/provider-scenarios/daemon-http-resumable-upload.test.ts
index 44f5707019..0e07866b00 100644
--- a/test/integration/provider-scenarios/daemon-http-resumable-upload.test.ts
+++ b/test/integration/provider-scenarios/daemon-http-resumable-upload.test.ts
@@ -6,9 +6,9 @@ import { test } from 'vitest';
 import {
   cleanupUploadedArtifact,
   prepareUploadedArtifact,
-} from '../../../src/daemon/artifact-tracking.ts';
-import { createDaemonHttpServer } from '../../../src/daemon/server/http-server.ts';
-import type { DaemonResponse } from '../../../src/daemon/daemon-request.ts';
+} from '@agent-device/daemon/testing/artifact-tracking';
+import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
+import type { DaemonResponse } from '@agent-device/daemon/daemon-request';
 import {
   closeLoopbackServer,
   listenOnLoopback,
diff --git a/test/integration/provider-scenarios/daemon-http-server.test.ts b/test/integration/provider-scenarios/daemon-http-server.test.ts
index 36e69e625c..e367be1049 100644
--- a/test/integration/provider-scenarios/daemon-http-server.test.ts
+++ b/test/integration/provider-scenarios/daemon-http-server.test.ts
@@ -10,16 +10,16 @@ import {
   cleanupUploadedArtifact,
   prepareUploadedArtifact,
   trackDownloadableArtifact,
-} from '../../../src/daemon/artifact-tracking.ts';
+} from '@agent-device/daemon/testing/artifact-tracking';
 import { DAEMON_RPC_PROTOCOL_VERSION } from '@agent-device/contracts/daemon-http';
-import { createDaemonHttpServer } from '../../../src/daemon/server/http-server.ts';
+import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
 import {
   emitRequestProgress,
   getRequestSignal,
   isRequestCanceled,
 } from '@agent-device/host-kit/request';
 
-import type { DaemonRequest, DaemonResponse } from '../../../src/daemon/daemon-request.ts';
+import type { DaemonRequest, DaemonResponse } from '@agent-device/daemon/daemon-request';
 import {
   closeLoopbackServer,
   listenOnLoopback,
diff --git a/test/integration/provider-scenarios/daemon-lifecycle.test.ts b/test/integration/provider-scenarios/daemon-lifecycle.test.ts
index 52490603b7..2abbfff01f 100644
--- a/test/integration/provider-scenarios/daemon-lifecycle.test.ts
+++ b/test/integration/provider-scenarios/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 '../../../src/daemon/server/server-lifecycle.ts';
+import { parseIntegerEnv } from '@agent-device/daemon/testing/server/server-lifecycle';
 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/test/integration/provider-scenarios/daemon-transport.test.ts b/test/integration/provider-scenarios/daemon-transport.test.ts
index 47d2ee702f..633a0bf877 100644
--- a/test/integration/provider-scenarios/daemon-transport.test.ts
+++ b/test/integration/provider-scenarios/daemon-transport.test.ts
@@ -2,12 +2,12 @@ import assert from 'node:assert/strict';
 import http from 'node:http';
 import net from 'node:net';
 import { test } from 'vitest';
-import type { DaemonRequest, DaemonResponse } from '../../../src/daemon/daemon-request.ts';
+import type { DaemonRequest, DaemonResponse } from '@agent-device/daemon/daemon-request';
 import {
   createSocketServer,
   listenHttpServer,
   listenNetServer,
-} from '../../../src/daemon/server/transport.ts';
+} from '@agent-device/daemon/testing/server/transport';
 import { getRequestSignal } from '@agent-device/host-kit/request';
 import { closeLoopbackServer, skipWhenLoopbackUnavailable } from '@agent-device/test-kit/loopback';
 
diff --git a/test/integration/provider-scenarios/harness.ts b/test/integration/provider-scenarios/harness.ts
index 90e8b310f3..4ff1df5c2c 100644
--- a/test/integration/provider-scenarios/harness.ts
+++ b/test/integration/provider-scenarios/harness.ts
@@ -9,7 +9,7 @@ import type { AgentDeviceClient } from '../../../src/client/client-types.ts';
 import {
   createRequestHandler,
   type RequestRouterDeps,
-} from '../../../src/daemon/request-router.ts';
+} from '@agent-device/daemon/testing/request-router';
 import {
   createPlatformRuntimeGateway,
   createRequestPlatformProviders,
@@ -21,15 +21,15 @@ import { createDaemonPlatformServices } from '../../../src/platform-runtime-daem
 import { platformResourceCleanup } from '../../../src/platform-runtime-resource-cleanup.ts';
 import { readDaemonProviderCredentials } from '../../../src/provider-credential-fingerprint.ts';
 import type { AppleSimulatorScreenRecordingProcess } from '../../../src/platform-runtime-screen-recording-apple-transport.ts';
-import { trackDownloadableArtifact } from '../../../src/daemon/artifact-tracking.ts';
-import { LeaseRegistry } from '../../../src/daemon/lease-registry.ts';
-import { SessionStore } from '../../../src/daemon/session-store.ts';
+import { trackDownloadableArtifact } from '@agent-device/daemon/testing/artifact-tracking';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
+import { SessionStore } from '@agent-device/daemon/testing/session-store';
 import type {
   DaemonInvokeFn,
   DaemonRequest,
   DaemonResponse,
-} from '../../../src/daemon/daemon-request.ts';
-import type { SessionState } from '../../../src/daemon/session-state.ts';
+} from '@agent-device/daemon/daemon-request';
+import type { SessionState } from '@agent-device/daemon/testing/session-state';
 import { runCmdBackground } from '@agent-device/host-kit/command';
 import { createOwnedProcessRecordStore } from '@agent-device/host-kit/process';
 import { withClientReplayScriptSources } from '@agent-device/replay-port/replay-script-source-fixtures';
@@ -46,12 +46,12 @@ import { createHostDiagnostics } from '../../../src/platform-runtime-host-diagno
 import type { PlatformRuntimeProviderRegistration } from '../../../src/platform-runtime-gateway.ts';
 import { createProviderPlatformRuntimeRegistrations } from '../../../src/provider-device-runtimes.ts';
 import { isActiveProviderDevice } from '../../../src/provider-device-runtime.ts';
-import { installProviderDeviceAdmission } from '../../../src/daemon/provider-device-admission.ts';
-import { installInteractorResolution } from '../../../src/daemon/interactor-resolution.ts';
+import { installProviderDeviceAdmission } from '@agent-device/daemon/testing/provider-device-admission';
+import { installInteractorResolution } from '@agent-device/daemon/testing/interactor-resolution';
 import { getInteractor } from '../../../src/core/interactors.ts';
-import { unavailableDeviceRuntimeGateway } from '../../../src/daemon/__tests__/support/unavailable-device-runtime-gateway.ts';
+import { unavailableDeviceRuntimeGateway } from '@agent-device/daemon/testing/__tests__/support/unavailable-device-runtime-gateway';
 
-import { openWebSessionNames } from '../../../src/daemon/web-session-names.ts';
+import { openWebSessionNames } from '@agent-device/daemon/testing/web-session-names';
 import { testCreateCommandSurface } from '../../../src/__tests__/daemon-composition/command-surface-fixture.ts';
 
 // Match daemon composition (src/daemon-composition.ts): the daemon decides on provider
diff --git a/test/integration/provider-scenarios/ios-fold.test.ts b/test/integration/provider-scenarios/ios-fold.test.ts
index 79ab5b40d2..9cc2c082d8 100644
--- a/test/integration/provider-scenarios/ios-fold.test.ts
+++ b/test/integration/provider-scenarios/ios-fold.test.ts
@@ -4,9 +4,9 @@ import { resolveCommandRequestTimeoutMs } from '@agent-device/command-registry/t
 import { MAX_FOLD_DURATION_MS } from '@agent-device/contracts/device';
 import type { AppleToolProvider } from '@agent-device/platform-apple/tool-provider';
 import type { ExecResult } from '@agent-device/host-kit/command';
-import { recordActionEntry } from '../../../src/daemon/session-action-recorder.ts';
+import { recordActionEntry } from '@agent-device/daemon/testing/session-action-recorder';
 import { assertRpcError, assertRpcOk } from './assertions.ts';
-import { makeIosAppSession } from '../../../src/daemon/__tests__/support/session-factories.ts';
+import { makeIosAppSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
 import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import os from 'node:os';
diff --git a/test/integration/provider-scenarios/ios-wait-selector.test.ts b/test/integration/provider-scenarios/ios-wait-selector.test.ts
index b804a51c78..3ba5fb188a 100644
--- a/test/integration/provider-scenarios/ios-wait-selector.test.ts
+++ b/test/integration/provider-scenarios/ios-wait-selector.test.ts
@@ -3,7 +3,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { test } from 'vitest';
 import { AppError } from '@agent-device/kernel/errors';
-import { makeIosAppSession } from '../../../src/daemon/__tests__/support/session-factories.ts';
+import { makeIosAppSession } from '@agent-device/daemon/testing/__tests__/support/session-factories';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { PROVIDER_SCENARIO_IOS_SIMULATOR } from './fixtures.ts';
 import { assertRpcOk } from './assertions.ts';
diff --git a/test/integration/provider-scenarios/limrun-ios-snapshot-owner.test.ts b/test/integration/provider-scenarios/limrun-ios-snapshot-owner.test.ts
index c629c4690d..8b8a75059d 100644
--- a/test/integration/provider-scenarios/limrun-ios-snapshot-owner.test.ts
+++ b/test/integration/provider-scenarios/limrun-ios-snapshot-owner.test.ts
@@ -64,7 +64,7 @@ vi.mock('@agent-device/platform-apple/runner/operations', async (importOriginal)
   return { ...actual, runAppleRunnerCommand: vi.fn(async () => ({})) };
 });
 
-vi.mock('../../../src/daemon/ios-app-session-hint.ts', () => ({
+vi.mock('@agent-device/daemon/testing/ios-app-session-hint', () => ({
   buildIosOpenCommandHint: vi.fn(async () => undefined),
 }));
 
diff --git a/test/integration/provider-scenarios/provider-device-runtime.fixtures.ts b/test/integration/provider-scenarios/provider-device-runtime.fixtures.ts
index 1d391fdbc0..5380f4b8bf 100644
--- a/test/integration/provider-scenarios/provider-device-runtime.fixtures.ts
+++ b/test/integration/provider-scenarios/provider-device-runtime.fixtures.ts
@@ -45,7 +45,7 @@ import type {
 } from '@agent-device/contracts/platform-runtime-operations';
 import { bindAdmittedProviderInteractorOperations } from '@agent-device/contracts/interactor-operation-catalog';
 import { unavailableDeploymentSnapshotAndShutdownOperationFacts } from '@agent-device/test-kit/runtime-operation-facts';
-import type { DaemonRequest } from '../../../src/daemon/daemon-request.ts';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 import { deviceShape, hasAppleActionButton, type DeviceInfo } from '@agent-device/kernel/device';
 import { AppError } from '@agent-device/kernel/errors';
 import { createProviderScenarioHarness } from './harness.ts';
diff --git a/test/integration/provider-scenarios/provider-ios-runner-transport.test.ts b/test/integration/provider-scenarios/provider-ios-runner-transport.test.ts
index d8619d861d..cf72fc577b 100644
--- a/test/integration/provider-scenarios/provider-ios-runner-transport.test.ts
+++ b/test/integration/provider-scenarios/provider-ios-runner-transport.test.ts
@@ -8,7 +8,7 @@ import type {
   ProviderDeviceRuntime,
 } from '@agent-device/contracts/device';
 import type { Interactor, RunnerContext } from '@agent-device/contracts/interactor-types';
-import type { DaemonRequest } from '../../../src/daemon/daemon-request.ts';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import { applePlugin } from '@agent-device/platform-apple';
 import type {
diff --git a/test/integration/provider-scenarios/provider-ios-selector-runtime.test.ts b/test/integration/provider-scenarios/provider-ios-selector-runtime.test.ts
index 9bc06ab5cd..c4a3d03052 100644
--- a/test/integration/provider-scenarios/provider-ios-selector-runtime.test.ts
+++ b/test/integration/provider-scenarios/provider-ios-selector-runtime.test.ts
@@ -9,7 +9,7 @@ import type {
 } from '@agent-device/contracts/device';
 import type { Interactor, SnapshotResult } from '@agent-device/contracts/interactor-types';
 import { providerRuntimeOwner } from '@agent-device/contracts/platform-runtime';
-import type { DaemonRequest } from '../../../src/daemon/daemon-request.ts';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 import type { DeviceInfo } from '@agent-device/kernel/device';
 import { assertRpcOk } from './assertions.ts';
 import { createProviderScenarioHarness, withProviderScenarioResource } from './harness.ts';
diff --git a/test/integration/provider-scenarios/remote-proxy-artifact-tenant.test.ts b/test/integration/provider-scenarios/remote-proxy-artifact-tenant.test.ts
index a980bbaf48..ed58ea6a56 100644
--- a/test/integration/provider-scenarios/remote-proxy-artifact-tenant.test.ts
+++ b/test/integration/provider-scenarios/remote-proxy-artifact-tenant.test.ts
@@ -7,9 +7,9 @@ import { createAgentDeviceClient } from '../../../src/agent-device-client.ts';
 import {
   cleanupDownloadableArtifact,
   trackDownloadableArtifact,
-} from '../../../src/daemon/artifact-tracking.ts';
-import { finalizeDaemonResponse } from '../../../src/daemon/request-finalization.ts';
-import { createDaemonHttpServer } from '../../../src/daemon/server/http-server.ts';
+} from '@agent-device/daemon/testing/artifact-tracking';
+import { finalizeDaemonResponse } from '@agent-device/daemon/testing/request-finalization';
+import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
 import { normalizeAgentDeviceError } from '@agent-device/kernel/errors';
 import { downloadRemoteArtifact } from '../../../src/remote/daemon-artifacts.ts';
 import { createDaemonProxyServer } from '@agent-device/proxy';
diff --git a/test/integration/provider-scenarios/remote-proxy-parity.test.ts b/test/integration/provider-scenarios/remote-proxy-parity.test.ts
index f2ca7b4951..edefdab9e3 100644
--- a/test/integration/provider-scenarios/remote-proxy-parity.test.ts
+++ b/test/integration/provider-scenarios/remote-proxy-parity.test.ts
@@ -5,10 +5,10 @@ import os from 'node:os';
 import path from 'node:path';
 import { test } from 'vitest';
 import { sendToDaemon } from '../../../src/daemon-client/daemon-client.ts';
-import { LeaseRegistry } from '../../../src/daemon/lease-registry.ts';
-import { createDaemonHttpServer } from '../../../src/daemon/server/http-server.ts';
-import { resolveSessionRequestLogPath } from '../../../src/daemon/session-artifact-paths.ts';
-import type { DaemonRequest, DaemonResponse } from '../../../src/daemon/daemon-request.ts';
+import { LeaseRegistry } from '@agent-device/daemon/testing/lease-registry';
+import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
+import { resolveSessionRequestLogPath } from '@agent-device/daemon/session-artifact-paths';
+import type { DaemonRequest, DaemonResponse } from '@agent-device/daemon/daemon-request';
 import { createDaemonProxyServer } from '@agent-device/proxy';
 import { AppError, type DaemonError } from '@agent-device/kernel/errors';
 import {
diff --git a/test/integration/provider-scenarios/remote-proxy-request-diagnostics.test.ts b/test/integration/provider-scenarios/remote-proxy-request-diagnostics.test.ts
index 6988d578e2..778eb854c2 100644
--- a/test/integration/provider-scenarios/remote-proxy-request-diagnostics.test.ts
+++ b/test/integration/provider-scenarios/remote-proxy-request-diagnostics.test.ts
@@ -15,13 +15,13 @@ import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import path from 'node:path';
 import { test } from 'vitest';
-import { createDaemonHttpServer } from '../../../src/daemon/server/http-server.ts';
+import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
 import { createDaemonProxyServer } from '@agent-device/proxy';
 import { localizeRemoteDaemonError } from '../../../src/remote/remote-request-diagnostics.ts';
-import { resolveSessionRequestLogPath } from '../../../src/daemon/session-artifact-paths.ts';
+import { resolveSessionRequestLogPath } from '@agent-device/daemon/session-artifact-paths';
 import { safeSessionName } from '@agent-device/host-kit/session-paths';
 import type { DaemonError } from '@agent-device/kernel/errors';
-import type { DaemonResponse } from '../../../src/daemon/daemon-request.ts';
+import type { DaemonResponse } from '@agent-device/daemon/daemon-request';
 import {
   closeLoopbackServer,
   listenOnLoopback,
diff --git a/test/integration/provider-scenarios/remote-test-artifacts-directory.test.ts b/test/integration/provider-scenarios/remote-test-artifacts-directory.test.ts
index 8b8c27d94a..f6997bd234 100644
--- a/test/integration/provider-scenarios/remote-test-artifacts-directory.test.ts
+++ b/test/integration/provider-scenarios/remote-test-artifacts-directory.test.ts
@@ -15,8 +15,8 @@ import { AppError } from '@agent-device/kernel/errors';
 import {
   cleanupDownloadableArtifact,
   trackDownloadableArtifact,
-} from '../../../src/daemon/artifact-tracking.ts';
-import { createDaemonHttpServer } from '../../../src/daemon/server/http-server.ts';
+} from '@agent-device/daemon/testing/artifact-tracking';
+import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
 import { downloadRemoteArtifact } from '../../../src/remote/daemon-artifacts.ts';
 import {
   closeLoopbackServer,
diff --git a/test/integration/provider-scenarios/remote-test-artifacts-materialization.test.ts b/test/integration/provider-scenarios/remote-test-artifacts-materialization.test.ts
index 3d6e5d7d3a..12acdc0ee1 100644
--- a/test/integration/provider-scenarios/remote-test-artifacts-materialization.test.ts
+++ b/test/integration/provider-scenarios/remote-test-artifacts-materialization.test.ts
@@ -8,9 +8,9 @@ import type { ReplaySuiteResult } from '@agent-device/contracts/replay';
 import {
   cleanupDownloadableArtifact,
   trackDownloadableArtifact,
-} from '../../../src/daemon/artifact-tracking.ts';
-import type { DaemonRequest } from '../../../src/daemon/daemon-request.ts';
-import { createDaemonHttpServer } from '../../../src/daemon/server/http-server.ts';
+} from '@agent-device/daemon/testing/artifact-tracking';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
+import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
 import { attachRemoteReplayTestArtifacts } from '@agent-device/replay-port/test-command';
 import {
   downloadRemoteArtifact,
diff --git a/test/integration/provider-scenarios/remote-upload-lease-beat.test.ts b/test/integration/provider-scenarios/remote-upload-lease-beat.test.ts
index 113aab3bca..5b29cc0ab9 100644
--- a/test/integration/provider-scenarios/remote-upload-lease-beat.test.ts
+++ b/test/integration/provider-scenarios/remote-upload-lease-beat.test.ts
@@ -11,7 +11,7 @@ import {
   withDiagnosticsScope,
 } from '@agent-device/host-kit/diagnostics';
 import { sendToDaemon } from '../../../src/daemon-client/daemon-client.ts';
-import type { DaemonRequest } from '../../../src/daemon/daemon-request.ts';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 import { listenOnLoopback, skipWhenLoopbackUnavailable } from '@agent-device/test-kit/loopback';
 import { PARALLEL_PROVIDER_SCENARIO_TIMEOUT_MS } from './test-timeouts.ts';
 
diff --git a/test/integration/provider-scenarios/scenario.ts b/test/integration/provider-scenarios/scenario.ts
index 63c4f4626c..9da2bfc031 100644
--- a/test/integration/provider-scenarios/scenario.ts
+++ b/test/integration/provider-scenarios/scenario.ts
@@ -1,5 +1,5 @@
 import assert from 'node:assert/strict';
-import type { DaemonRequest } from '../../../src/daemon/daemon-request.ts';
+import type { DaemonRequest } from '@agent-device/daemon/daemon-request';
 import type { ProviderScenarioHarness, ProviderScenarioRpcResult } from './harness.ts';
 
 export type ProviderScenarioState = {
diff --git a/test/integration/provider-scenarios/scroll-movement-observation.test.ts b/test/integration/provider-scenarios/scroll-movement-observation.test.ts
index 7e059935f1..6cd1cc4ed8 100644
--- a/test/integration/provider-scenarios/scroll-movement-observation.test.ts
+++ b/test/integration/provider-scenarios/scroll-movement-observation.test.ts
@@ -36,7 +36,7 @@ const DEVICE_ID = PROVIDER_SCENARIO_IOS_SIMULATOR.id;
 // Directional-scroll observation on `observeUntil` (packages/capture-kit/src/observe-until.ts):
 // `scroll down` gates its own `movement` claim on the tree it held before the gesture against one
 // (or more, while the surface still looks untouched) post-gesture capture. The unit-level coverage
-// in src/daemon/__tests__/scroll-movement.test.ts pins the verdict against a scripted capture
+// in packages/daemon/src/execution/__tests__/scroll-movement.test.ts pins the verdict against a scripted capture
 // function directly; these two scenarios drive the SAME loop end to end through the daemon's real
 // command routing and a scripted Apple runner, the way `settle-observation.test.ts` drives `--settle`.
 
@@ -97,7 +97,7 @@ function repeatSnapshotEntry(nodes: readonly unknown[]): ProviderScenarioProvide
 }
 
 // Midpoint (201, 437) sits inside CONTAINER, matching the swipe fixture
-// `src/daemon/__tests__/scroll-movement.test.ts` uses for the same geometry.
+// `packages/daemon/src/execution/__tests__/scroll-movement.test.ts` uses for the same geometry.
 function scrollEntry(): ProviderScenarioProviderEntry {
   return {
     command: 'ios.runner.scroll',
diff --git a/test/integration/provider-scenarios/scroll-until.test.ts b/test/integration/provider-scenarios/scroll-until.test.ts
index b951518c6a..4054ca5f2b 100644
--- a/test/integration/provider-scenarios/scroll-until.test.ts
+++ b/test/integration/provider-scenarios/scroll-until.test.ts
@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import { test } from 'vitest';
 import { AppError } from '@agent-device/kernel/errors';
-import { SCROLL_UNTIL_PASS_LIMIT } from '../../../src/daemon/scroll-until.ts';
+import { SCROLL_UNTIL_PASS_LIMIT } from '@agent-device/daemon/testing/scroll-until';
 import { createAndroidSettingsWorld } from './android-world.ts';
 import { withProviderScenarioResource } from './harness.ts';
 
diff --git a/test/integration/provider-scenarios/stale-provider-runtime-admission.fixtures.ts b/test/integration/provider-scenarios/stale-provider-runtime-admission.fixtures.ts
index e6ff9013c9..ff0425a79d 100644
--- a/test/integration/provider-scenarios/stale-provider-runtime-admission.fixtures.ts
+++ b/test/integration/provider-scenarios/stale-provider-runtime-admission.fixtures.ts
@@ -1,4 +1,4 @@
-import { daemonPlatformServicesFixture } from '../../../src/daemon/__tests__/platform-services-fixture.ts';
+import { daemonPlatformServicesFixture } from '@agent-device/daemon/testing/__tests__/platform-services-fixture';
 import fs from 'node:fs';
 import path from 'node:path';
 import { vi } from 'vitest';
@@ -10,10 +10,10 @@ import type {
   PlatformRuntimeProviderModule,
 } from '@agent-device/contracts/platform-runtime-operations';
 import type { DeviceInfo } from '@agent-device/kernel/device';
-import { handleAppDeploymentCommand } from '../../../src/daemon/handlers/session-app-deployment.ts';
-import { createRequestRuntimeBindings } from '../../../src/daemon/request-runtime-binding.ts';
-import { createRequestDispatchLedger } from '../../../src/daemon/request-dispatch-ledger.ts';
-import { makeSessionStore } from '../../../src/daemon/__tests__/support/store-factory.ts';
+import { handleAppDeploymentCommand } from '@agent-device/daemon/testing/handlers/session-app-deployment';
+import { createRequestRuntimeBindings } from '@agent-device/daemon/testing/request-runtime-binding';
+import { createRequestDispatchLedger } from '@agent-device/daemon/testing/request-dispatch-ledger';
+import { makeSessionStore } from '@agent-device/daemon/testing/__tests__/support/store-factory';
 import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';
 import { createComposedPlatformRuntimeGateway } from '../../../src/platform-runtime-gateway.ts';
 
diff --git a/test/output-economy/fixtures.ts b/test/output-economy/fixtures.ts
index 3972d2fc2f..fd52759964 100644
--- a/test/output-economy/fixtures.ts
+++ b/test/output-economy/fixtures.ts
@@ -1,7 +1,7 @@
 import type { CaptureSnapshotResult, CommandRequestResult } from '@agent-device/contracts/client';
 import { AppError } from '@agent-device/kernel/errors';
 import { attachRefs, type RawSnapshotNode } from '@agent-device/kernel/snapshot';
-import type { DaemonResponseData } from '../../src/daemon/daemon-request.ts';
+import type { DaemonResponseData } from '@agent-device/daemon/daemon-request';
 
 const SNAPSHOT_NODES: RawSnapshotNode[] = [
   {
diff --git a/test/output-economy/owner-files-no-leak.test.ts b/test/output-economy/owner-files-no-leak.test.ts
index d98a6fc43f..415e954c35 100644
--- a/test/output-economy/owner-files-no-leak.test.ts
+++ b/test/output-economy/owner-files-no-leak.test.ts
@@ -3,7 +3,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { runCmdSync } from '@agent-device/host-kit/command';
 import { COMMAND_OWNER_FILES } from '@agent-device/command-registry/owner-files';
-import { getDaemonRouteOwnerFiles } from '../../src/daemon/route-owner-files.ts';
+import { getDaemonRouteOwnerFiles } from '@agent-device/daemon/route-owner-files';
 
 const repoRoot = path.resolve(import.meta.dirname, '../..');
 const distPath = path.join(repoRoot, 'dist/src');
diff --git a/test/output-economy/render-fixtures.ts b/test/output-economy/render-fixtures.ts
index 1f1b0b1ee9..64b33d93c4 100644
--- a/test/output-economy/render-fixtures.ts
+++ b/test/output-economy/render-fixtures.ts
@@ -1,7 +1,7 @@
 import { snapshotCliOutput } from '../../src/commands/capture/output.ts';
 import { interactionCliOutputFormatters } from '../../src/commands/interaction/output.ts';
 import type { AgentDeviceClient } from '../../src/client/client-types.ts';
-import { RESPONSE_VIEWS } from '../../src/daemon/response-views.ts';
+import { RESPONSE_VIEWS } from '@agent-device/daemon/testing/response-views';
 import { normalizeError } from '@agent-device/kernel/errors';
 import { createCommandToolExecutor } from '../../src/mcp/command-tools.ts';
 import type { EconomySample } from './economy-metrics.ts';
diff --git a/test/output-economy/selection-fixtures.ts b/test/output-economy/selection-fixtures.ts
index d45c1dce61..b67c019849 100644
--- a/test/output-economy/selection-fixtures.ts
+++ b/test/output-economy/selection-fixtures.ts
@@ -1,5 +1,5 @@
 import type { DebugSymbolsResult } from '@agent-device/contracts/observability';
-import type { DaemonResponseData } from '../../src/daemon/daemon-request.ts';
+import type { DaemonResponseData } from '@agent-device/daemon/daemon-request';
 
 const requestBody = JSON.stringify({
   cartId: 'cart-economy-fixture',
diff --git a/test/wire-compat/closure-policy.ts b/test/wire-compat/closure-policy.ts
index 64d3dc521e..f89b582184 100644
--- a/test/wire-compat/closure-policy.ts
+++ b/test/wire-compat/closure-policy.ts
@@ -43,11 +43,11 @@ export const WIRE_CLOSURE_WAIVERS: Readonly<Record<string, string>> = {
     'Local detail bag behind AppError; the wire form is DaemonError.details, typed as Record<string, unknown> and listed.',
   'src/daemon-client/daemon-client-metadata.ts#DaemonInfo':
     'Client-side record of where a daemon is listening (pid, ports, state dir). Never serialized into a request or response.',
-  'src/daemon/daemon-request.ts#DaemonRequest':
+  'packages/daemon/src/core/daemon-request.ts#DaemonRequest':
     'Server-side narrowing of the listed kernel DaemonRequest; the declaration that fixes the shape is packages/kernel/src/contracts.ts#DaemonRequest.',
-  'src/daemon/daemon-request.ts#DaemonResponse':
+  'packages/daemon/src/core/daemon-request.ts#DaemonResponse':
     'Re-export alias of the listed kernel DaemonResponse; the shape is fixed by packages/kernel/src/contracts.ts#DaemonResponse.',
-  'src/daemon/daemon-request.ts#DaemonArtifact':
+  'packages/daemon/src/core/daemon-request.ts#DaemonArtifact':
     'Re-export alias of the listed kernel DaemonArtifact; the shape is fixed by packages/kernel/src/contracts.ts#DaemonArtifact.',
   'src/remote/upload-stream.ts#UploadStreamProgressOptions':
     'Byte-progress callback options for local upload rendering. The bytes counted are digested through the request/response declarations; these options never cross the wire.',
diff --git a/test/wire-compat/ledger.json b/test/wire-compat/ledger.json
index 8e8077de80..d60bd3ac67 100644
--- a/test/wire-compat/ledger.json
+++ b/test/wire-compat/ledger.json
@@ -71,23 +71,23 @@
     "src/daemon-client/daemon-client-transport.ts#readHealthLink": "sha256:f56404b94d73da57de7248719c9136b760d2be8b4a53cde5315a2311b088425b",
     "src/daemon-client/daemon-client-transport.ts#readHealthPayload": "sha256:4e85ffc3e35e02379c393e9312344757e003cf1f0ad9eb8d1f77d90c81c861f1",
     "src/daemon-client/daemon-client-transport.ts#readRemoteDaemonHealth": "sha256:df174d1ccf73851ca58bd75533fb4660424003b98bd9e41fe942cf3ab3698e5f",
-    "src/daemon/downloadable-artifact-http.ts#DownloadableArtifactHttpAuthorizer": "sha256:1b2702a929ca9170db2ca97c08e3ab67e17edb3ee75325a576c4c1b9cdbebb44",
-    "src/daemon/downloadable-artifact-http.ts#DownloadableArtifactHttpRoute": "sha256:e63c4581ccde668913914149c9092d16ecf8a5cbd7ab33c6eb8617e77fc1015e",
-    "src/daemon/downloadable-artifact-http.ts#handleArtifactDownload": "sha256:7f96d17b7c605230fb3cc21ceaa5b2e515d7445653ff95b2b0f6f15fa6214d4e",
-    "src/daemon/downloadable-artifact-http.ts#handleArtifactInventory": "sha256:24f071c082af80f2c50fb4f390bd8949f0f2c91e0bb58e67518b6cdcf6108aff",
-    "src/daemon/downloadable-artifact-http.ts#readArtifactId": "sha256:3472ee52d951fdf7ef00ee500298602c68f0e1e3b8c44ff51b09981efabf348c",
-    "src/daemon/downloadable-artifact-http.ts#readRequestPathname": "sha256:6b3a49c72365cf7da4552abef59862c073461f746025e28d409048815dd586f2",
-    "src/daemon/downloadable-artifact-http.ts#resolveDownloadableArtifactHttpRoute": "sha256:9fcdc9619e8d378e8f04ef7b3584863af446e855702ddce83a16ec194a6d98af",
-    "src/daemon/http-errors.ts#NormalizedHttpError": "sha256:2c2111802fe5f193acbeacc454de9cfab82bc8e4274b896f485e19a14f5518cf",
-    "src/daemon/http-errors.ts#failStreamedHttpResponse": "sha256:7199933eca7244bc801e0601b17cc1aed584bc2353879830fd0686e99f1200c4",
-    "src/daemon/http-errors.ts#sendRestJsonError": "sha256:981abb859649419604d555601b5c4bd6616e78215327e055e5f8023c6c15f556",
-    "src/daemon/http-errors.ts#statusCodeForNormalizedError": "sha256:20ad272162e28425920bd2dcb4da5ec104bd7e8be2028b902b05bfa4da3df966",
-    "src/daemon/http-request-target.ts#decodeUriSegment": "sha256:b37622771ea4e61d1a9820169dbdc5809b5c38889bfad79277d7b22f3c3f1ef1",
-    "src/daemon/request-diagnostics-http.ts#REQUEST_DIAGNOSTICS_CONTENT_TYPE": "sha256:16bbd9ae7eaeaaa8c8cbd6e65c4ce786a6c5230c5351288228bbf1a6f11bdcdc",
-    "src/daemon/request-diagnostics-http.ts#RequestDiagnosticsHttpAuthorizer": "sha256:24b0fa6b1d965e5cf6503a4665148dc6360c56bf5a0ae710eeaa76a73a62c52a",
-    "src/daemon/request-diagnostics-http.ts#RequestDiagnosticsHttpOptions": "sha256:cd2c0dda77d2bc434857aea07206a5491ce5f0b82cb86628569f607d6c2cebcf",
-    "src/daemon/request-diagnostics-http.ts#handleRequestDiagnostics": "sha256:32c3d100176dd99ecbb61f8050d05b1cda64b7be1944a2cd16633e83fa78660b",
-    "src/daemon/request-diagnostics-http.ts#resolveRequestDiagnosticsHttpRoute": "sha256:4ff07623b27a6f7461e1addb87aabd149904da63f7462149ae4114d14336cde0",
+    "packages/daemon/src/server/downloadable-artifact-http.ts#DownloadableArtifactHttpAuthorizer": "sha256:1b2702a929ca9170db2ca97c08e3ab67e17edb3ee75325a576c4c1b9cdbebb44",
+    "packages/daemon/src/server/downloadable-artifact-http.ts#DownloadableArtifactHttpRoute": "sha256:e63c4581ccde668913914149c9092d16ecf8a5cbd7ab33c6eb8617e77fc1015e",
+    "packages/daemon/src/server/downloadable-artifact-http.ts#handleArtifactDownload": "sha256:7f96d17b7c605230fb3cc21ceaa5b2e515d7445653ff95b2b0f6f15fa6214d4e",
+    "packages/daemon/src/server/downloadable-artifact-http.ts#handleArtifactInventory": "sha256:24f071c082af80f2c50fb4f390bd8949f0f2c91e0bb58e67518b6cdcf6108aff",
+    "packages/daemon/src/server/downloadable-artifact-http.ts#readArtifactId": "sha256:3472ee52d951fdf7ef00ee500298602c68f0e1e3b8c44ff51b09981efabf348c",
+    "packages/daemon/src/server/downloadable-artifact-http.ts#readRequestPathname": "sha256:6b3a49c72365cf7da4552abef59862c073461f746025e28d409048815dd586f2",
+    "packages/daemon/src/server/downloadable-artifact-http.ts#resolveDownloadableArtifactHttpRoute": "sha256:9fcdc9619e8d378e8f04ef7b3584863af446e855702ddce83a16ec194a6d98af",
+    "packages/daemon/src/server/http-errors.ts#NormalizedHttpError": "sha256:2c2111802fe5f193acbeacc454de9cfab82bc8e4274b896f485e19a14f5518cf",
+    "packages/daemon/src/server/http-errors.ts#failStreamedHttpResponse": "sha256:7199933eca7244bc801e0601b17cc1aed584bc2353879830fd0686e99f1200c4",
+    "packages/daemon/src/server/http-errors.ts#sendRestJsonError": "sha256:981abb859649419604d555601b5c4bd6616e78215327e055e5f8023c6c15f556",
+    "packages/daemon/src/server/http-errors.ts#statusCodeForNormalizedError": "sha256:20ad272162e28425920bd2dcb4da5ec104bd7e8be2028b902b05bfa4da3df966",
+    "packages/daemon/src/server/http-request-target.ts#decodeUriSegment": "sha256:b37622771ea4e61d1a9820169dbdc5809b5c38889bfad79277d7b22f3c3f1ef1",
+    "packages/daemon/src/server/request-diagnostics-http.ts#REQUEST_DIAGNOSTICS_CONTENT_TYPE": "sha256:16bbd9ae7eaeaaa8c8cbd6e65c4ce786a6c5230c5351288228bbf1a6f11bdcdc",
+    "packages/daemon/src/server/request-diagnostics-http.ts#RequestDiagnosticsHttpAuthorizer": "sha256:24b0fa6b1d965e5cf6503a4665148dc6360c56bf5a0ae710eeaa76a73a62c52a",
+    "packages/daemon/src/server/request-diagnostics-http.ts#RequestDiagnosticsHttpOptions": "sha256:cd2c0dda77d2bc434857aea07206a5491ce5f0b82cb86628569f607d6c2cebcf",
+    "packages/daemon/src/server/request-diagnostics-http.ts#handleRequestDiagnostics": "sha256:32c3d100176dd99ecbb61f8050d05b1cda64b7be1944a2cd16633e83fa78660b",
+    "packages/daemon/src/server/request-diagnostics-http.ts#resolveRequestDiagnosticsHttpRoute": "sha256:4ff07623b27a6f7461e1addb87aabd149904da63f7462149ae4114d14336cde0",
     "packages/daemon-contracts/src/request-progress-protocol.ts#DaemonProgressEnvelope": "sha256:16162d01cfc43fc6a0198dbba3358981c1a278a70f7494ebe70d051f517cfb22",
     "packages/daemon-contracts/src/request-progress-protocol.ts#DaemonResponseEnvelope": "sha256:202ae64836af890549a1d95963903f9a506294b80bd0862c1b708e72d7f286d0",
     "packages/daemon-contracts/src/request-progress-protocol.ts#isDaemonProgressEnvelope": "sha256:e38ec26b64d20e257ff00860548e9c12ac22faf5a6308749d4715129814b381f",
@@ -96,54 +96,54 @@
     "packages/daemon-contracts/src/request-progress-protocol.ts#serializeDaemonResponseEnvelope": "sha256:bc2b651df28446c51d8b92b7fd47a3bced9fade9ae50e2cd73e453ba89fd33b5",
     "packages/daemon-contracts/src/request-progress-protocol.ts#serializeDaemonRpcResponseEnvelope": "sha256:e244291bef44cedfb59ad07c45337bb8e5fdde00b712ebdf5ca9627f6355f111",
     "packages/daemon-contracts/src/request-progress-protocol.ts#shouldStreamRequestProgress": "sha256:cf7b26ccea9cd5c33c93477f783a3bdb9a1b0ce629da8b77fef0d49d6c6f4112",
-    "src/daemon/resumable-upload.ts#BeginResumableUploadOptions": "sha256:ef804e321b8cd1f23a51566919fc0cda79c1b0ef82aeceed54ce3f2a398d8457",
-    "src/daemon/server/http-rpc-methods.ts#COMMAND_RPC_METHODS": "sha256:4b675a84ef475c2fe0e864457c254c2e888de942e4ae428d5b3e1fa72101e97b",
-    "src/daemon/server/http-authorization.ts#HttpAuthDecision": "sha256:a7fc2a91f998ce62b107b14dd9b6fcf1f4ca5abe2e30d4df5a0896d56a0a52f8",
-    "src/daemon/server/http-authorization.ts#HttpAuthHook": "sha256:1ed0ba84708f040787d81d7f546c8b6e0cb8c319625d6c654ece3819be2de8e6",
-    "src/daemon/server/http-authorization.ts#HttpAuthHookContext": "sha256:c555532dcc31c106d893445d2cff01ad6c5e5b3390b86fad982385059ec69663",
-    "src/daemon/server/http-authorization.ts#HttpAuthHookResult": "sha256:d52c3f14ff05da925a8efc53b9eac4538826ba615ab9fc073eeed4f3df678086",
-    "src/daemon/server/http-rpc-methods.ts#INSTALL_FROM_SOURCE_RPC_METHODS": "sha256:d0dc3f3d872e7384343e28aaaf2b57e0da822e654a2e345fb108d160f520c16d",
-    "src/daemon/server/http-rpc-envelope.ts#JsonRpcRequest": "sha256:7c299fe17818993a0bacbb48e12dcd1fd28b3595cf8efcae3484acbec383ce22",
-    "src/daemon/server/http-rpc-envelope.ts#JsonRpcResponse": "sha256:13b36c1e2b9eae9437fdac982efde142fd4abba947e11011fa22191675b6e4ba",
-    "src/daemon/server/http-rpc-methods.ts#LEASE_RPC_METHOD_TO_COMMAND": "sha256:ff52d6c6040080973d51c572ea09b0e23eaa07c7f7b813061599d404dfc811ca",
-    "src/daemon/server/http-server.ts#MAX_HTTP_RPC_BODY_BYTES": "sha256:3cb06e12b3110fa27e390d5c6473578b3f13c93b9f2b571e0e8e42d7ce29d48a",
-    "src/daemon/server/http-rpc-methods.ts#RELEASE_MATERIALIZED_PATHS_RPC_METHODS": "sha256:75a18d3496894309dd6042b16c4dcc241c16ec6336783e6310eddd6db7437ccb",
-    "src/daemon/server/http-rpc-methods.ts#SUPPORTED_RPC_METHODS": "sha256:4d5ed730dcb669b0dacca3bb4977f35686bab9b7fb464c0590fd50f838e6c243",
-    "src/daemon/server/http-authorization.ts#authorizeAuxiliaryHttpRequest": "sha256:1c323f97c3cefec8f95633b6abd127342bf75494bfb109d1cc6eadf3ceacaeae",
-    "src/daemon/server/http-rpc-envelope.ts#createRpcError": "sha256:1921762129636afc7772937d48e8afb8f09047b343e3a27d18b49c1c4385bbe8",
-    "src/daemon/server/http-authorization.ts#enforceDaemonToken": "sha256:60036cffc34388b33fc0dad39c905d9cb3fc18c9ed0cf24255bb7105f5d444c7",
-    "src/daemon/server/http-rpc-methods.ts#isCommandRpcMethod": "sha256:9922102ba9c72c3032f205717d772ab7c3506c6f3012f55b8e7e5636b672ed7e",
-    "src/daemon/server/http-rpc-envelope.ts#jsonRpcCodeForNormalizedError": "sha256:27f397cf1a36254602d1df2ae2c0edcb45bb210d595a76890816c841bf152458",
-    "src/daemon/server/http-rpc-methods.ts#methodToDaemonRequest": "sha256:9c0ef19695f1a4aabf355565925a5deb3fbd832997c089f11918b8c4750bb03f",
-    "src/daemon/server/http-rpc-methods.ts#parseCommandRpcParams": "sha256:303b9b596c6c5fff13bc8e16dfa32ea816f41e0988832ce795157937cb38ae79",
-    "src/daemon/server/http-authorization.ts#readHeaderValue": "sha256:0ec16993e5d9b460ba02deb4a43bbc4c248f9697eaed9aa64003eec7d5dce6bf",
-    "src/daemon/server/http-authorization.ts#resolveToken": "sha256:3abcb019e1325317618045b7138e41845990af10953dd937571997cd6ec35981",
-    "src/daemon/server/http-rpc-envelope.ts#sendJson": "sha256:a1de00da3f1db8c98e69a85dfe2e11b626a4d2ce472840e3b8f519aa8a207a8f",
-    "src/daemon/server/http-rpc-methods.ts#toDaemonRequest": "sha256:f3861d2d4f67f66e83800616926f6bbb0595de4ecbb0072b5b78971ebeb0705b",
-    "src/daemon/server/http-rpc-methods.ts#toInstallFromSourceDaemonRequest": "sha256:dff093758b433043816dfc1e2e9658078875e46b887fdc530fb9380158d629f5",
-    "src/daemon/server/http-rpc-methods.ts#toLeaseDaemonRequest": "sha256:3018984aeace4054767875f5eb6e6ad5d38bfcb71c15d1a56ccf9b53e0a419ec",
-    "src/daemon/server/http-rpc-methods.ts#toReleaseMaterializedPathsDaemonRequest": "sha256:708736ca03d6a3fc449bb408382dbd509e490de1f84ecc8771fd77d4adda0154",
-    "src/daemon/server/http-rpc-envelope.ts#writeProgressEnvelope": "sha256:7be778b3902c72d7aa6282c16dc7106fdd64e99c0b5daf9f413ff5dd3fb044f1",
-    "src/daemon/server/http-rpc-envelope.ts#writeRpcResponseEnvelope": "sha256:7a8155e9fcbb53485489728250a85109b5dab0d96cdd4aa8b7e7eb87a4898ddb",
-    "src/daemon/session-tenant-scope.ts#TenantSessionNamespace": "sha256:a6613d22933caa053e479f05b7f016664f6be8d0afdbbf81e578ff497fc1b13d",
-    "src/daemon/session-tenant-scope.ts#isTenantAddressableSessionName": "sha256:cc8ae18094b7f57d4bb694678f84ba767637b1087fd28058ffd6a3c92c79f05d",
-    "src/daemon/session-tenant-scope.ts#isTenantOwnedSessionName": "sha256:c3cff883507d462548846554b89779cb815ceb265714575e57bee022b57c4bd1",
-    "src/daemon/upload-http.ts#AuxiliaryHttpAuthorizer": "sha256:6521ffa355c57af97bfc8095699f2a2b38745a6ef8d61a34c8cfc80ee690b6b5",
-    "src/daemon/upload-http.ts#DIRECT_UPLOAD_PATH_PREFIX": "sha256:6fe7d42a65baceb595d96b6aa83fe9aa84527d9aa2e448d7ef47882d31a03276",
-    "src/daemon/upload-http.ts#UploadFinalizeBody": "sha256:c358aea9b3c341f51f3fa263032dfda8a3fbbf729396fcf7f2d8aa051b231b8b",
-    "src/daemon/upload-http.ts#UploadHttpRoute": "sha256:3fee66976292bedc9587e266f7f584ff27574e939329bb3ecb98f100c4c54b2e",
-    "src/daemon/upload-http.ts#UploadPreflightBody": "sha256:05b5e8bd75887f821c44cd54b027f09de1ea08c6e41c44d4dc9ec7cf09fc1ea5",
-    "src/daemon/upload-http.ts#buildUploadTicketAuthHeaders": "sha256:04d65207c440424257ea04a86fa50fd27f5e6b62e8cede884d9af1db4fb86475",
-    "src/daemon/upload-http.ts#handleResumableUpload": "sha256:b1e1cfd79f13470a1111a377b87975ed5c721500d99f3160a8b631194af37ce5",
-    "src/daemon/upload-http.ts#handleUpload": "sha256:bba7347a32f53b265cded1c7d73f943431ba3b5a0c8b347d621266ea20c10cd6",
-    "src/daemon/upload-http.ts#handleUploadFinalize": "sha256:f6879ce6b62d916265d98f6b6aa5f99650c82a9d391a7d5873015036d9289a24",
-    "src/daemon/upload-http.ts#handleUploadPreflight": "sha256:6d850c477241295d0e8d7e9da3c0dd6abc6f8ea436d52674c3e2ebd77b43f711",
-    "src/daemon/upload-http.ts#readUploadFinalizeBody": "sha256:076298afa73d7e498a964b6c48d823de1cc8b15e9e971d0a22b7e6c3fd98d685",
-    "src/daemon/upload-http.ts#readUploadPreflightBody": "sha256:2e56302178b75d9a6f5424f01dfc46551dca2056ba06a43e48ae09ec528956b6",
-    "src/daemon/upload-http.ts#resolveHttpRequestBaseUrl": "sha256:0d06968c7577c421573281bc574485dc964e98f484afd1dc022fbba24d1face3",
-    "src/daemon/upload-http.ts#resolveUploadHttpRoute": "sha256:8837e62933cf57111a8070454877c5859aed65b4dcdba755f145346e30f82835",
-    "src/daemon/upload-http.ts#sendJson": "sha256:c2317b4b14a10731684c9160038005965856150f05f8923765a3fa833d2ecae9",
-    "src/daemon/upload-http.ts#sendUploadedArtifactResponse": "sha256:9e418403448d58a96284fed605762fa71f9349bf2c70ad79df69b2b3e27487d6",
+    "packages/daemon/src/server/resumable-upload.ts#BeginResumableUploadOptions": "sha256:ef804e321b8cd1f23a51566919fc0cda79c1b0ef82aeceed54ce3f2a398d8457",
+    "packages/daemon/src/server/server/http-rpc-methods.ts#COMMAND_RPC_METHODS": "sha256:4b675a84ef475c2fe0e864457c254c2e888de942e4ae428d5b3e1fa72101e97b",
+    "packages/daemon/src/server/server/http-authorization.ts#HttpAuthDecision": "sha256:a7fc2a91f998ce62b107b14dd9b6fcf1f4ca5abe2e30d4df5a0896d56a0a52f8",
+    "packages/daemon/src/server/server/http-authorization.ts#HttpAuthHook": "sha256:1ed0ba84708f040787d81d7f546c8b6e0cb8c319625d6c654ece3819be2de8e6",
+    "packages/daemon/src/server/server/http-authorization.ts#HttpAuthHookContext": "sha256:c555532dcc31c106d893445d2cff01ad6c5e5b3390b86fad982385059ec69663",
+    "packages/daemon/src/server/server/http-authorization.ts#HttpAuthHookResult": "sha256:d52c3f14ff05da925a8efc53b9eac4538826ba615ab9fc073eeed4f3df678086",
+    "packages/daemon/src/server/server/http-rpc-methods.ts#INSTALL_FROM_SOURCE_RPC_METHODS": "sha256:d0dc3f3d872e7384343e28aaaf2b57e0da822e654a2e345fb108d160f520c16d",
+    "packages/daemon/src/server/server/http-rpc-envelope.ts#JsonRpcRequest": "sha256:7c299fe17818993a0bacbb48e12dcd1fd28b3595cf8efcae3484acbec383ce22",
+    "packages/daemon/src/server/server/http-rpc-envelope.ts#JsonRpcResponse": "sha256:13b36c1e2b9eae9437fdac982efde142fd4abba947e11011fa22191675b6e4ba",
+    "packages/daemon/src/server/server/http-rpc-methods.ts#LEASE_RPC_METHOD_TO_COMMAND": "sha256:ff52d6c6040080973d51c572ea09b0e23eaa07c7f7b813061599d404dfc811ca",
+    "packages/daemon/src/server/server/http-server.ts#MAX_HTTP_RPC_BODY_BYTES": "sha256:3cb06e12b3110fa27e390d5c6473578b3f13c93b9f2b571e0e8e42d7ce29d48a",
+    "packages/daemon/src/server/server/http-rpc-methods.ts#RELEASE_MATERIALIZED_PATHS_RPC_METHODS": "sha256:75a18d3496894309dd6042b16c4dcc241c16ec6336783e6310eddd6db7437ccb",
+    "packages/daemon/src/server/server/http-rpc-methods.ts#SUPPORTED_RPC_METHODS": "sha256:4d5ed730dcb669b0dacca3bb4977f35686bab9b7fb464c0590fd50f838e6c243",
+    "packages/daemon/src/server/server/http-authorization.ts#authorizeAuxiliaryHttpRequest": "sha256:1c323f97c3cefec8f95633b6abd127342bf75494bfb109d1cc6eadf3ceacaeae",
+    "packages/daemon/src/server/server/http-rpc-envelope.ts#createRpcError": "sha256:1921762129636afc7772937d48e8afb8f09047b343e3a27d18b49c1c4385bbe8",
+    "packages/daemon/src/server/server/http-authorization.ts#enforceDaemonToken": "sha256:60036cffc34388b33fc0dad39c905d9cb3fc18c9ed0cf24255bb7105f5d444c7",
+    "packages/daemon/src/server/server/http-rpc-methods.ts#isCommandRpcMethod": "sha256:9922102ba9c72c3032f205717d772ab7c3506c6f3012f55b8e7e5636b672ed7e",
+    "packages/daemon/src/server/server/http-rpc-envelope.ts#jsonRpcCodeForNormalizedError": "sha256:27f397cf1a36254602d1df2ae2c0edcb45bb210d595a76890816c841bf152458",
+    "packages/daemon/src/server/server/http-rpc-methods.ts#methodToDaemonRequest": "sha256:9c0ef19695f1a4aabf355565925a5deb3fbd832997c089f11918b8c4750bb03f",
+    "packages/daemon/src/server/server/http-rpc-methods.ts#parseCommandRpcParams": "sha256:303b9b596c6c5fff13bc8e16dfa32ea816f41e0988832ce795157937cb38ae79",
+    "packages/daemon/src/server/server/http-authorization.ts#readHeaderValue": "sha256:0ec16993e5d9b460ba02deb4a43bbc4c248f9697eaed9aa64003eec7d5dce6bf",
+    "packages/daemon/src/server/server/http-authorization.ts#resolveToken": "sha256:3abcb019e1325317618045b7138e41845990af10953dd937571997cd6ec35981",
+    "packages/daemon/src/server/server/http-rpc-envelope.ts#sendJson": "sha256:a1de00da3f1db8c98e69a85dfe2e11b626a4d2ce472840e3b8f519aa8a207a8f",
+    "packages/daemon/src/server/server/http-rpc-methods.ts#toDaemonRequest": "sha256:f3861d2d4f67f66e83800616926f6bbb0595de4ecbb0072b5b78971ebeb0705b",
+    "packages/daemon/src/server/server/http-rpc-methods.ts#toInstallFromSourceDaemonRequest": "sha256:dff093758b433043816dfc1e2e9658078875e46b887fdc530fb9380158d629f5",
+    "packages/daemon/src/server/server/http-rpc-methods.ts#toLeaseDaemonRequest": "sha256:3018984aeace4054767875f5eb6e6ad5d38bfcb71c15d1a56ccf9b53e0a419ec",
+    "packages/daemon/src/server/server/http-rpc-methods.ts#toReleaseMaterializedPathsDaemonRequest": "sha256:708736ca03d6a3fc449bb408382dbd509e490de1f84ecc8771fd77d4adda0154",
+    "packages/daemon/src/server/server/http-rpc-envelope.ts#writeProgressEnvelope": "sha256:7be778b3902c72d7aa6282c16dc7106fdd64e99c0b5daf9f413ff5dd3fb044f1",
+    "packages/daemon/src/server/server/http-rpc-envelope.ts#writeRpcResponseEnvelope": "sha256:7a8155e9fcbb53485489728250a85109b5dab0d96cdd4aa8b7e7eb87a4898ddb",
+    "packages/daemon/src/core/session-tenant-scope.ts#TenantSessionNamespace": "sha256:a6613d22933caa053e479f05b7f016664f6be8d0afdbbf81e578ff497fc1b13d",
+    "packages/daemon/src/core/session-tenant-scope.ts#isTenantAddressableSessionName": "sha256:cc8ae18094b7f57d4bb694678f84ba767637b1087fd28058ffd6a3c92c79f05d",
+    "packages/daemon/src/core/session-tenant-scope.ts#isTenantOwnedSessionName": "sha256:c3cff883507d462548846554b89779cb815ceb265714575e57bee022b57c4bd1",
+    "packages/daemon/src/server/upload-http.ts#AuxiliaryHttpAuthorizer": "sha256:6521ffa355c57af97bfc8095699f2a2b38745a6ef8d61a34c8cfc80ee690b6b5",
+    "packages/daemon/src/server/upload-http.ts#DIRECT_UPLOAD_PATH_PREFIX": "sha256:6fe7d42a65baceb595d96b6aa83fe9aa84527d9aa2e448d7ef47882d31a03276",
+    "packages/daemon/src/server/upload-http.ts#UploadFinalizeBody": "sha256:c358aea9b3c341f51f3fa263032dfda8a3fbbf729396fcf7f2d8aa051b231b8b",
+    "packages/daemon/src/server/upload-http.ts#UploadHttpRoute": "sha256:3fee66976292bedc9587e266f7f584ff27574e939329bb3ecb98f100c4c54b2e",
+    "packages/daemon/src/server/upload-http.ts#UploadPreflightBody": "sha256:05b5e8bd75887f821c44cd54b027f09de1ea08c6e41c44d4dc9ec7cf09fc1ea5",
+    "packages/daemon/src/server/upload-http.ts#buildUploadTicketAuthHeaders": "sha256:04d65207c440424257ea04a86fa50fd27f5e6b62e8cede884d9af1db4fb86475",
+    "packages/daemon/src/server/upload-http.ts#handleResumableUpload": "sha256:b1e1cfd79f13470a1111a377b87975ed5c721500d99f3160a8b631194af37ce5",
+    "packages/daemon/src/server/upload-http.ts#handleUpload": "sha256:bba7347a32f53b265cded1c7d73f943431ba3b5a0c8b347d621266ea20c10cd6",
+    "packages/daemon/src/server/upload-http.ts#handleUploadFinalize": "sha256:f6879ce6b62d916265d98f6b6aa5f99650c82a9d391a7d5873015036d9289a24",
+    "packages/daemon/src/server/upload-http.ts#handleUploadPreflight": "sha256:6d850c477241295d0e8d7e9da3c0dd6abc6f8ea436d52674c3e2ebd77b43f711",
+    "packages/daemon/src/server/upload-http.ts#readUploadFinalizeBody": "sha256:076298afa73d7e498a964b6c48d823de1cc8b15e9e971d0a22b7e6c3fd98d685",
+    "packages/daemon/src/server/upload-http.ts#readUploadPreflightBody": "sha256:2e56302178b75d9a6f5424f01dfc46551dca2056ba06a43e48ae09ec528956b6",
+    "packages/daemon/src/server/upload-http.ts#resolveHttpRequestBaseUrl": "sha256:0d06968c7577c421573281bc574485dc964e98f484afd1dc022fbba24d1face3",
+    "packages/daemon/src/server/upload-http.ts#resolveUploadHttpRoute": "sha256:8837e62933cf57111a8070454877c5859aed65b4dcdba755f145346e30f82835",
+    "packages/daemon/src/server/upload-http.ts#sendJson": "sha256:c2317b4b14a10731684c9160038005965856150f05f8923765a3fa833d2ecae9",
+    "packages/daemon/src/server/upload-http.ts#sendUploadedArtifactResponse": "sha256:9e418403448d58a96284fed605762fa71f9349bf2c70ad79df69b2b3e27487d6",
     "src/remote/artifact-download.ts#RemoteArtifactDownload": "sha256:f73a888f4f8c9d603701c505bb342787b1ca6559a13b15da2385e60349ecea8e",
     "src/remote/artifact-download.ts#downloadRemoteArtifactFromUrl": "sha256:5176697267907e3f5e4383a881969721e4ea3f6776128d28c313bdc210128834",
     "src/remote/daemon-artifacts.ts#DaemonArtifactEndpoint": "sha256:45226717ac52c0af2a62f74e91549582d95f4a4abc49be87989e026291a88c82",
@@ -184,7 +184,7 @@
     "packages/contracts/src/daemon-http.ts#DAEMON_HTTP_INSTANCE_HEADER": "sha256:d2bb3f4846470188a0fc1724271da0f0bcbdf2337bd6bf331508142cadcb65d8",
     "packages/contracts/src/daemon-http.ts#DAEMON_HTTP_UPSTREAM_INSTANCE_HEADER": "sha256:4564c2ce437d30d7a823e3326f4375c0750ba8d42bec22b4d02e8eb7f7db2973",
     "packages/contracts/src/daemon-http.ts#DAEMON_HTTP_INSTANCE_MISMATCH_HEADER": "sha256:a197edaf7f9fa94a6aab269856aa852da3204cc586f5fd23198689eb11908b61",
-    "src/daemon/server/http-instance-precondition.ts#refuseStaleDaemonInstance": "sha256:cf9b6f9dd95bb2593e4810c5b5939936b6d6358bf2614c7c234266cab1922d29",
+    "packages/daemon/src/server/server/http-instance-precondition.ts#refuseStaleDaemonInstance": "sha256:cf9b6f9dd95bb2593e4810c5b5939936b6d6358bf2614c7c234266cab1922d29",
     "packages/proxy/src/daemon-proxy.ts#refuseStaleProxyInstance": "sha256:a5d802a666fd04a5c41a40bf3c96cbb4d05d6b449e950cf52098836df01df6ea",
     "packages/proxy/src/daemon-proxy.ts#sendInstanceMismatch": "sha256:7d0a889f8c7a8151a5ac7a37f52620a269b707144303cae7304825fca49e2a0d",
     "packages/contracts/src/daemon-http.ts#buildDaemonInstanceMismatchRpcResponse": "sha256:24e50130bbd0c4a21dfc51005cabf118525b9121f918719a2c16f73fcfcfbcf9",
@@ -225,7 +225,7 @@
       "rationale": "Adds the optional providerCredentialFingerprint parameter to agent_device.lease.allocate, forwarded only when the request meta carries one, which the client sets only for a local daemon. A released protocol-2 daemon ignores unknown JSON-RPC parameters, and a request without a fingerprint keeps the previous payload byte-for-byte."
     },
     {
-      "declaration": "src/daemon/server/http-rpc-methods.ts#toLeaseDaemonRequest",
+      "declaration": "packages/daemon/src/server/server/http-rpc-methods.ts#toLeaseDaemonRequest",
       "digest": "sha256:3018984aeace4054767875f5eb6e6ad5d38bfcb71c15d1a56ccf9b53e0a419ec",
       "rationale": "#2110 read the optional providerApp lease-allocation parameter into the existing flags bag; #2494 reads the full provider-allocation flag set into that same bag through the shared readLeaseAllocateProviderFlags projection, so the reconstructed req.flags handed to prepareSession match what the line transport forwards for free. Released protocol-2 clients omit these and follow the unchanged allocation path; no existing field is required or reinterpreted. The optional retainOnClose boolean parameter is read into meta.leaseRetainOnClose; a released daemon ignores it and keeps releasing on session close. Reads the optional providerCredentialFingerprint lease-allocation parameter into request meta, so a local caller over HTTP gets the same credential check as over the socket. A daemon with an auth hook treats every HTTP caller as remote and strips it, as it does developerDir. Released protocol-2 clients omit it and follow the unchanged allocation path; no existing field is required or reinterpreted."
     },
@@ -250,12 +250,12 @@
       "rationale": "#1801 and #1862 client-side only: this reads optional daemon error metadata, most recently the structured `cause`. Parsing of every previously read field is unchanged, so a released daemon's error payload is accepted exactly as before."
     },
     {
-      "declaration": "src/daemon/downloadable-artifact-http.ts#readArtifactId",
+      "declaration": "packages/daemon/src/server/downloadable-artifact-http.ts#readArtifactId",
       "digest": "sha256:3472ee52d951fdf7ef00ee500298602c68f0e1e3b8c44ff51b09981efabf348c",
-      "rationale": "Inlined `decodeURIComponent`+catch replaced by the shared `decodeUriSegment` (src/daemon/http-request-target.ts), which is listed and byte-identical in behaviour: the same artifact ids decode, and an undecodable id still resolves to the empty id the route rejects."
+      "rationale": "Inlined `decodeURIComponent`+catch replaced by the shared `decodeUriSegment` (packages/daemon/src/server/http-request-target.ts), which is listed and byte-identical in behaviour: the same artifact ids decode, and an undecodable id still resolves to the empty id the route rejects."
     },
     {
-      "declaration": "src/daemon/downloadable-artifact-http.ts#handleArtifactDownload",
+      "declaration": "packages/daemon/src/server/downloadable-artifact-http.ts#handleArtifactDownload",
       "digest": "sha256:7f96d17b7c605230fb3cc21ceaa5b2e515d7445653ff95b2b0f6f15fa6214d4e",
       "rationale": "The mid-stream error branch moved verbatim into the shared `failStreamedHttpResponse` (listed): same status codes before headers, same destroy after. Response framing on the success path is untouched."
     },
@@ -280,17 +280,17 @@
       "rationale": "#2198 checks every link a command RPC crosses for protocol skew. #2650 caps a retry health probe at the request's remaining deadline. Health payload parsing and protocol mismatch refusal are unchanged; released peers still receive the same RPCs. #3178 threads the caller's optional AbortSignal through so a canceled call cuts a probe already in flight instead of waiting it out: the signal is client-local, never serialized, and the GET /health request and payload are unchanged."
     },
     {
-      "declaration": "src/daemon/server/http-authorization.ts#authorizeAuxiliaryHttpRequest",
+      "declaration": "packages/daemon/src/server/server/http-authorization.ts#authorizeAuxiliaryHttpRequest",
       "digest": "sha256:1c323f97c3cefec8f95633b6abd127342bf75494bfb109d1cc6eadf3ceacaeae",
       "rationale": "#2198 context: adds one optional field to the value this DAEMON-INTERNAL gate hands its own route handlers — sessionNamespace, the caller's tenant plus whether the daemon partitioned that caller's session names. Nothing about it is serialized: no request header is read that was not read before, no response field is added, and a refusal keeps the same 401 {ok:false,error,code} REST body sendRestJsonError already sent. What it enables is a refusal DROPPED, never one added — an unattested (client-declared) tenant no longer has the <tenant>: prefix rule applied to it, because scopeRequestSession never applied that prefix to its sessions either. A released peer that now gets 200 where it got 401 is getting the ndjson record it asked for and already parses."
     },
     {
-      "declaration": "src/daemon/request-diagnostics-http.ts#RequestDiagnosticsHttpAuthorizer",
+      "declaration": "packages/daemon/src/server/request-diagnostics-http.ts#RequestDiagnosticsHttpAuthorizer",
       "digest": "sha256:24b0fa6b1d965e5cf6503a4665148dc6360c56bf5a0ae710eeaa76a73a62c52a",
       "rationale": "#2198 context: widens the authorizer callback's result by the same optional sessionNamespace field, so the route can put its tenant question to session-tenant-scope instead of re-deriving the rule locally. The callback is supplied by createDaemonHttpServer inside this process and never crosses the wire; a caller of the route sends and parses exactly the bytes it did before."
     },
     {
-      "declaration": "src/daemon/request-diagnostics-http.ts#handleRequestDiagnostics",
+      "declaration": "packages/daemon/src/server/request-diagnostics-http.ts#handleRequestDiagnostics",
       "digest": "sha256:32c3d100176dd99ecbb61f8050d05b1cda64b7be1944a2cd16633e83fa78660b",
       "rationale": "#2198 context: asks isTenantAddressableSessionName instead of applying the prefix rule locally. Same UNAUTHORIZED code, same 'Session is outside this tenant' message and same 401 body for the attested-tenant case the rule still refuses; the only difference a peer can observe is that an unattested tenant now gets the 200 + ndjson record it already knows how to read instead of a 401 it could not act on."
     },
@@ -310,7 +310,7 @@
       "rationale": "#2266 broadens runtime-hint validation to accept the additive HarmonyOS platform value; existing protocol-2 runtime hints remain valid and unchanged."
     },
     {
-      "declaration": "src/daemon/server/http-rpc-envelope.ts#writeProgressEnvelope",
+      "declaration": "packages/daemon/src/server/server/http-rpc-envelope.ts#writeProgressEnvelope",
       "digest": "sha256:7be778b3902c72d7aa6282c16dc7106fdd64e99c0b5daf9f413ff5dd3fb044f1",
       "rationale": "#2894 lets an iOS runner start outlive the caller whose deadline gave up on it, so a progress event can arrive after the response ended. The sink now also skips a response whose writable side has ended, next to the destroyed check it already had. No byte written to a live response changes: the envelope framing and payload are untouched, and a released client never sees an event it could not have received before."
     },
@@ -395,7 +395,7 @@
       "rationale": "#2650 shares the existing conditional 409 JSON-RPC error envelope between daemon and proxy. Its status, header, error code, and normalized reason are unchanged; released peers omit the instance precondition and never receive this response."
     },
     {
-      "declaration": "src/daemon/server/http-instance-precondition.ts#refuseStaleDaemonInstance",
+      "declaration": "packages/daemon/src/server/server/http-instance-precondition.ts#refuseStaleDaemonInstance",
       "digest": "sha256:cf9b6f9dd95bb2593e4810c5b5939936b6d6358bf2614c7c234266cab1922d29",
       "rationale": "#2650 adds conditional RPC refusal and retry only for peers that advertise complete instance IDs. Released peers advertise none, so new clients keep per-command health probes and send their unchanged RPC; older clients omit the new request precondition and parse existing responses as before."
     },
diff --git a/test/wire-compat/surface.ts b/test/wire-compat/surface.ts
index 62aeab19a3..40cddc9e26 100644
--- a/test/wire-compat/surface.ts
+++ b/test/wire-compat/surface.ts
@@ -43,17 +43,18 @@ const KERNEL_ERRORS = 'packages/kernel/src/errors.ts';
 const KERNEL_DEVICE = 'packages/kernel/src/device.ts';
 const REQUEST_PROGRESS = 'packages/contracts/src/request-progress.ts';
 const DAEMON_HTTP = 'packages/contracts/src/daemon-http.ts';
-const HTTP_ERRORS = 'src/daemon/http-errors.ts';
-const HTTP_SERVER = 'src/daemon/server/http-server.ts';
-const HTTP_RPC_ENVELOPE = 'src/daemon/server/http-rpc-envelope.ts';
-const HTTP_RPC_METHODS = 'src/daemon/server/http-rpc-methods.ts';
-const HTTP_AUTHORIZATION = 'src/daemon/server/http-authorization.ts';
-const HTTP_INSTANCE_PRECONDITION = 'src/daemon/server/http-instance-precondition.ts';
-const UPLOAD_HTTP = 'src/daemon/upload-http.ts';
-const ARTIFACT_HTTP = 'src/daemon/downloadable-artifact-http.ts';
-const REQUEST_DIAGNOSTICS_HTTP = 'src/daemon/request-diagnostics-http.ts';
-const SESSION_TENANT_SCOPE = 'src/daemon/session-tenant-scope.ts';
-const HTTP_REQUEST_TARGET = 'src/daemon/http-request-target.ts';
+const HTTP_ERRORS = 'packages/daemon/src/server/http-errors.ts';
+const HTTP_SERVER = 'packages/daemon/src/server/server/http-server.ts';
+const HTTP_RPC_ENVELOPE = 'packages/daemon/src/server/server/http-rpc-envelope.ts';
+const HTTP_RPC_METHODS = 'packages/daemon/src/server/server/http-rpc-methods.ts';
+const HTTP_AUTHORIZATION = 'packages/daemon/src/server/server/http-authorization.ts';
+const HTTP_INSTANCE_PRECONDITION =
+  'packages/daemon/src/server/server/http-instance-precondition.ts';
+const UPLOAD_HTTP = 'packages/daemon/src/server/upload-http.ts';
+const ARTIFACT_HTTP = 'packages/daemon/src/server/downloadable-artifact-http.ts';
+const REQUEST_DIAGNOSTICS_HTTP = 'packages/daemon/src/server/request-diagnostics-http.ts';
+const SESSION_TENANT_SCOPE = 'packages/daemon/src/core/session-tenant-scope.ts';
+const HTTP_REQUEST_TARGET = 'packages/daemon/src/server/http-request-target.ts';
 const REMOTE_REQUEST_DIAGNOSTICS = 'src/remote/remote-request-diagnostics.ts';
 const PROGRESS_PROTOCOL = 'packages/daemon-contracts/src/request-progress-protocol.ts';
 const CLIENT_RPC = 'src/daemon-client/daemon-client-rpc.ts';
@@ -325,7 +326,7 @@ export const WIRE_SURFACE: readonly WireSurfaceGroup[] = [
         'sendUploadedArtifactResponse',
       ),
       // The resumable-upload ticket the preflight response hands back.
-      ...from('src/daemon/resumable-upload.ts', 'BeginResumableUploadOptions'),
+      ...from('packages/daemon/src/server/resumable-upload.ts', 'BeginResumableUploadOptions'),
       // `NormalizedHttpError` is `ReturnType<typeof normalizeError>`, so the
       // function and its return type — not a type alias — are what fix the
       // REST error payload a released client parses.
diff --git a/test/wire-compat/wire-mutations.test.ts b/test/wire-compat/wire-mutations.test.ts
index c3513637e1..4db4af44bd 100644
--- a/test/wire-compat/wire-mutations.test.ts
+++ b/test/wire-compat/wire-mutations.test.ts
@@ -51,7 +51,7 @@ type WireMutation = {
 const MUTATIONS: readonly WireMutation[] = [
   {
     breakClass: 'instance refusal: the daemon drops the mismatch response header',
-    file: 'src/daemon/server/http-instance-precondition.ts',
+    file: 'packages/daemon/src/server/server/http-instance-precondition.ts',
     name: 'refuseStaleDaemonInstance',
     from: "res.setHeader(DAEMON_HTTP_INSTANCE_MISMATCH_HEADER, 'true');",
     to: '',
@@ -72,14 +72,14 @@ const MUTATIONS: readonly WireMutation[] = [
   },
   {
     breakClass: 'method naming: a released client keeps sending the old method name',
-    file: 'src/daemon/server/http-rpc-methods.ts',
+    file: 'packages/daemon/src/server/server/http-rpc-methods.ts',
     name: 'COMMAND_RPC_METHODS',
     from: "'agent-device.command'",
     to: "'agent-device.cmd'",
   },
   {
     breakClass: 'method naming: the lease method table drops a released alias',
-    file: 'src/daemon/server/http-rpc-methods.ts',
+    file: 'packages/daemon/src/server/server/http-rpc-methods.ts',
     name: 'LEASE_RPC_METHOD_TO_COMMAND',
     from: "'agent-device.lease.allocate': 'lease_allocate',",
     to: '',
@@ -100,7 +100,7 @@ const MUTATIONS: readonly WireMutation[] = [
   },
   {
     breakClass: 'auth projection: the header a released client authenticates with is dropped',
-    file: 'src/daemon/server/http-authorization.ts',
+    file: 'packages/daemon/src/server/server/http-authorization.ts',
     name: 'resolveToken',
     from: "typeof headers['x-agent-device-token'] === 'string'",
     to: 'false',
@@ -114,42 +114,42 @@ const MUTATIONS: readonly WireMutation[] = [
   },
   {
     breakClass: 'upload ticket shape: a required preflight field is renamed',
-    file: 'src/daemon/resumable-upload.ts',
+    file: 'packages/daemon/src/server/resumable-upload.ts',
     name: 'BeginResumableUploadOptions',
     from: 'sha256: string;',
     to: 'checksum: string;',
   },
   {
     breakClass: 'upload ticket shape: the preflight body parser requires a new field',
-    file: 'src/daemon/upload-http.ts',
+    file: 'packages/daemon/src/server/upload-http.ts',
     name: 'readUploadPreflightBody',
     from: "readRequiredText(record, 'uploadAttemptId')",
     to: "readRequiredText(record, 'attemptId')",
   },
   {
     breakClass: '308 framing: resumable upload stops signalling continuation',
-    file: 'src/daemon/upload-http.ts',
+    file: 'packages/daemon/src/server/upload-http.ts',
     name: 'handleResumableUpload',
     from: 'res.statusCode = 308;',
     to: 'res.statusCode = 200;',
   },
   {
     breakClass: 'artifact framing: the direct-upload route prefix moves',
-    file: 'src/daemon/upload-http.ts',
+    file: 'packages/daemon/src/server/upload-http.ts',
     name: 'DIRECT_UPLOAD_PATH_PREFIX',
     from: "'/upload/direct/'",
     to: "'/uploads/direct/'",
   },
   {
     breakClass: 'artifact framing: the artifact inventory route stops answering its released path',
-    file: 'src/daemon/downloadable-artifact-http.ts',
+    file: 'packages/daemon/src/server/downloadable-artifact-http.ts',
     name: 'resolveDownloadableArtifactHttpRoute',
     from: "pathname === '/artifacts' || pathname === '/artifacts/'",
     to: "pathname === '/artifacts'",
   },
   {
     breakClass: 'REST error framing: a released status mapping changes',
-    file: 'src/daemon/http-errors.ts',
+    file: 'packages/daemon/src/server/http-errors.ts',
     name: 'statusCodeForNormalizedError',
     from: 'INVALID_ARGS',
     to: 'BAD_ARGS',
diff --git a/tsconfig.json b/tsconfig.json
index 6af9b4e3ac..e0a9e4aefe 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -34,6 +34,7 @@
     { "path": "packages/capture-kit" },
     { "path": "packages/command-registry" },
     { "path": "packages/contracts" },
+    { "path": "packages/daemon" },
     { "path": "packages/daemon-contracts" },
     { "path": "packages/device-selection" },
     { "path": "packages/host-kit" },