refactor: tidy three post-extraction seams (#1551)

* refactor(replay): import REPLAY_VAR_KEY_RE from the codec package directly

vars.ts re-exported the constant for a single consumer, recorded-input.ts.
Point that consumer at @agent-device/ad-script and drop the shim, which also
makes script.ts's doc comment ("recorded-input.ts imports it from this
package") true.

* refactor(ad-script): import the target-annotation shape from contracts directly

The annotation shape types (TargetAncestryEntry, TargetAnnotationV1,
TargetScrollRegion, TargetVerification) live in @agent-device/contracts/replay;
the codec package re-exported them, and 21 files reached the shape through that
detour. Point every consumer — root src, root tests, and the package's own
tests — at contracts, then drop the re-export from the serde module and the
façade. Type-only, so nothing changes at runtime.

The package.json exports map is unchanged, so the R11 boundary assertion in
scripts/layering/package-boundaries.test.ts still holds as written.

* refactor(daemon): name the authoring-armed session read

`kind === 'authoring' && status === 'armed'` was spelled out at three handler
sites that all ask the same question. Give it a name next to
isSessionScriptPublished, mirroring how isRepairArmedSession is housed in the
repair projection, and route the three sites through it.

abortAuthoring's own guard keeps its inline check: that one is the transition's
legality test, not a session-level read.

Author: thymikee

packages/ad-script/src/index.ts

@@ -12,7 +12,9 @@
  * canonical field order, normalization, size caps, payload parsing). The
  * companion classification core (`classifyTargetBindingMatch`, local-identity
  * + ancestry-prefix matching) is NOT part of this codec — it stays in
- * `src/replay/target-identity.ts`, which imports the types below.
+ * `src/replay/target-identity.ts`. The annotation SHAPE is not exported here
+ * either: it lives in `@agent-device/contracts/replay`, which every consumer
+ * (this package included) imports directly.
  */
 
 export {
@@ -49,9 +51,3 @@ export {
   TARGET_ANNOTATION_MAX_FIELD_BYTES,
   TARGET_ANNOTATION_MAX_PAYLOAD_BYTES,
 } from './internal/target-annotation-serde.ts';
-export type {
-  TargetAncestryEntry,
-  TargetAnnotationV1,
-  TargetScrollRegion,
-  TargetVerification,
-} from './internal/target-annotation-serde.ts';

packages/ad-script/src/internal/__tests__/script.test.ts

@@ -7,7 +7,7 @@ import {
   REPLAY_METADATA_PLATFORMS,
 } from '../script.ts';
 import { formatPortableActionLine, formatTargetAnnotationLines } from '../script-formatting.ts';
-import type { TargetAnnotationV1 } from '../target-annotation-serde.ts';
+import type { TargetAnnotationV1 } from '@agent-device/contracts/replay';
 import type { SessionAction } from '@agent-device/contracts/session';
 
 // `writeReplayScript` (the `--update` heal-and-rewrite serializer) was

packages/ad-script/src/internal/__tests__/target-annotation-serde.test.ts

@@ -11,9 +11,9 @@ import {
   TARGET_ANNOTATION_MAX_ANCESTRY,
   TARGET_ANNOTATION_MAX_FIELD_BYTES,
   TARGET_ANNOTATION_MAX_PAYLOAD_BYTES,
-  type TargetAnnotationV1,
   TARGET_ANNOTATION_LINE_RE,
 } from '../target-annotation-serde.ts';
+import type { TargetAnnotationV1 } from '@agent-device/contracts/replay';
 
 function baseEvidence(overrides: Partial<TargetAnnotationV1> = {}): TargetAnnotationV1 {
   return {

packages/ad-script/src/internal/target-annotation-serde.ts

@@ -8,8 +8,9 @@
  *
  * The record/replay-shared CLASSIFICATION core (`classifyTargetBindingMatch`,
  * local-identity + ancestry-prefix matching) is not part of this codec — it
- * stays in `src/replay/target-identity.ts`, which imports the types below
- * from this package (#1478 P5 scoping dossier, "the codec seam").
+ * stays in `src/replay/target-identity.ts`, which imports the shared shape
+ * types from `@agent-device/contracts/replay` (#1478 P5 scoping dossier,
+ * "the codec seam").
  */
 
 import { AppError } from '@agent-device/kernel/errors';
@@ -36,14 +37,7 @@ export const TARGET_ANNOTATION_MAX_PAYLOAD_BYTES = 4096;
 export const TARGET_ANNOTATION_MAX_ANCESTRY = 8;
 
 // The annotation SHAPE lives in contracts/ so the recorded-action type can be stated without
-// depending on this zone; re-exported here for existing consumers.
-export type {
-  TargetAncestryEntry,
-  TargetAnnotationV1,
-  TargetRect,
-  TargetScrollRegion,
-  TargetVerification,
-} from '@agent-device/contracts/replay';
+// depending on this zone; every consumer imports it from there directly.
 import type {
   TargetAncestryEntry,
   TargetAnnotationV1,

src/commands/interaction/runtime/selector-wait.ts

@@ -11,7 +11,7 @@ import {
   filterIdentitySet,
 } from '../../../replay/target-evidence-tree.ts';
 import { annotationLocalIdentity } from '../../../replay/target-identity.ts';
-import type { TargetAnnotationV1 } from '@agent-device/ad-script';
+import type { TargetAnnotationV1 } from '@agent-device/contracts/replay';
 import type { PublicPlatform } from '@agent-device/kernel/device';
 import { checkWaitText } from '../../../selectors/arguments.ts';
 import { listSelectorChainMatches } from '../../../selectors/index.ts';

src/daemon/__tests__/session-script-active-publication.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'vitest';
-import type { TargetAnnotationV1 } from '@agent-device/ad-script';
+import type { TargetAnnotationV1 } from '@agent-device/contracts/replay';
 import type { SessionAction } from '../types.ts';
 import {
   assertActivePublicationPortability,

src/daemon/__tests__/session-store.test.ts

@@ -7,7 +7,8 @@ import { SessionStore } from '../session-store.ts';
 import type { SessionState } from '../types.ts';
 import { buildRequestFinishedEvent } from '../session-event-log.ts';
 import { HEAL_COMPLETE_SENTINEL } from '../session-script-writer.ts';
-import { parseReplayScriptDetailed, type TargetAnnotationV1 } from '@agent-device/ad-script';
+import { parseReplayScriptDetailed } from '@agent-device/ad-script';
+import type { TargetAnnotationV1 } from '@agent-device/contracts/replay';
 import { repairPublication } from '../../__tests__/test-utils/session-factories.ts';
 
 type RecordActionEntry = Parameters<SessionStore['recordAction']>[1];

src/daemon/handlers/__tests__/session-replay-repair-hint.test.ts

@@ -1,7 +1,7 @@
 import { test } from 'vitest';
 import assert from 'node:assert/strict';
 import type { RawSnapshotNode, SnapshotNode } from '@agent-device/kernel/snapshot';
-import type { TargetAnnotationV1 } from '@agent-device/ad-script';
+import type { TargetAnnotationV1 } from '@agent-device/contracts/replay';
 import {
   computeReplayRepairHint,
   type ReplayRepairHintCapture,

src/daemon/handlers/__tests__/session-replay-repair.fixtures.ts

@@ -10,7 +10,7 @@ import type { DaemonInvokeFn, DaemonRequest, DaemonResponse } from '../../types.
 import { SessionStore } from '../../session-store.ts';
 import { isInteractiveObservation } from '../../session-action-recorder.ts';
 import { makeIosSession } from '../../../__tests__/test-utils/session-factories.ts';
-import type { TargetAnnotationV1 } from '@agent-device/ad-script';
+import type { TargetAnnotationV1 } from '@agent-device/contracts/replay';
 
 export function freshEvidence(id: string, label: string): TargetAnnotationV1 {
   return {

src/daemon/handlers/__tests__/session-replay-target-classification-fixtures.ts

@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import type { RawSnapshotNode, SnapshotNode } from '@agent-device/kernel/snapshot';
 import { computeTargetEvidence } from '../../session-target-evidence.ts';
-import type { TargetAnnotationV1 } from '@agent-device/ad-script';
+import type { TargetAnnotationV1 } from '@agent-device/contracts/replay';
 
 export function toSnapshotNodes(raw: RawSnapshotNode[]): SnapshotNode[] {
   return raw.map((node, position) => ({ ...node, ref: `e${position + 1}` }));