@zgeoff/atc 2.15.0 → 2.15.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgeoff/atc",
-  "version": "2.15.0",
+  "version": "2.15.1",
   "description": "Terminal control tower for coding-agent sessions",
   "homepage": "https://github.com/zgeoff/atc#readme",
   "bugs": "https://github.com/zgeoff/atc/issues",
@@ -24,6 +24,7 @@
     "build:atc-bridge": "bun scripts/build-atc-bridge.ts && oxfmt src/agents/atc-bridge-files.ts && format-codemod --quiet src/agents/atc-bridge-files.ts",
     "build:binaries": "bash scripts/build-binaries.sh",
     "audit": "bun audit",
+    "check:imports": "bun scripts/check-imports.ts",
     "deadcode": "knip",
     "lint": "oxlint --type-aware --type-check --report-unused-disable-directives-severity error",
     "lint:fix": "oxlint --type-aware --type-check --report-unused-disable-directives-severity error --fix",

package/src/agents/agent-adapter.ts

@@ -1,24 +1,9 @@
-import type { HookEvent } from '../daemon/hooks';
+import type { AdapterEvent } from '../protocol/adapter-event';
+import type { HookEvent } from '../protocol/hook-event';
+import type { AgentID } from '../shared/agent-id';
 import type { AgentSessionID } from '../shared/agent-session-id';
 import type { SessionID } from '../shared/session-id';
 
-/**
- * Which agent a session runs under: the key the adapter registry is looked
- * up by. Every agent CLI supplies one, and so does every configured backend
- * that drives a CLI it does not own, so two ids can share one kind.
- */
-export type AgentID = string;
-
-/**
- * Missing and empty values become Claude so a fleet written before the agent
- * column still restores as Claude. Any other string is returned as it stands,
- * registered or not: an id whose adapter is gone must reach the caller intact
- * so the session can be shown and refused, never quietly run as Claude.
- */
-export function toAgentID(raw: unknown): AgentID {
-  return typeof raw === 'string' && raw !== '' ? raw : 'claude';
-}
-
 export interface SpawnOptions {
   readonly prompt: string;
 
@@ -64,26 +49,6 @@ export interface GuestSpawnPlan extends SpawnPlan {
   readonly files: Readonly<Record<string, string>>;
 }
 
-export interface AdapterEvent {
-  kind: 'started' | 'needs-input' | 'turn-done' | 'prompt-submitted' | 'ended' | 'heartbeat';
-  agentSessionID?: AgentSessionID;
-  message?: string;
-
-  // Fuller activity text than message: what the agent last said or was
-  // asked, for briefing. Bounded by the adapter.
-  detail?: string;
-
-  // Opaque handle the adapter can later pull a session name from.
-  nameSource?: string;
-
-  // Claude resume-existence path. Distinct from nameSource: a naming
-  // handle is not a resume gate.
-  transcriptSource?: string;
-
-  // The agent's whole final message for a finished turn; detail holds a bounded preview of it.
-  result?: string;
-}
-
 export interface TranscriptToolUse {
   readonly name: string;
   readonly input: string;

package/src/agents/build-hook-settings.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import type { AgentID } from './agent-adapter';
+import type { AgentID } from '../shared/agent-id';
 import { buildCLICommand } from './build-cli-command';
 
 /**

package/src/agents/claude-adapter.ts

@@ -1,14 +1,15 @@
 import { existsSync } from 'node:fs';
 import { z } from 'zod';
-import type { HookEvent } from '../daemon/hooks';
+import type { AdapterEvent } from '../protocol/adapter-event';
+import type { HookEvent } from '../protocol/hook-event';
 import type { AgentSessionID } from '../shared/agent-session-id';
 import { buildOptionalString } from '../shared/build-optional-string';
 import type { Config } from '../shared/config';
 import { isRecord } from '../shared/report';
 import { toAgentSessionID } from '../shared/to-agent-session-id';
 import { toShellArg } from '../shared/to-shell-arg';
+import { truncateDetail } from '../shared/truncate-detail';
 import type {
-  AdapterEvent,
   AgentAdapter,
   AgentProfile,
   GuestPaths,
@@ -31,7 +32,6 @@ import type { ClaudeHeadlessRun } from './make-claude-headless-runner';
 import { parseClaudeTranscriptLine } from './parse-claude-transcript-line';
 import { planTypedLineInput } from './plan-typed-line-input';
 import { resolveClaudePermissionMode } from './resolve-claude-permission-mode';
-import { truncateDetail } from './truncate-detail';
 import { writeATCBridge } from './write-atc-bridge';
 import { writeHookSettings } from './write-hook-settings';
 

package/src/agents/codex-adapter.ts

@@ -1,15 +1,16 @@
 import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { z } from 'zod';
-import type { HookEvent } from '../daemon/hooks';
+import type { AdapterEvent } from '../protocol/adapter-event';
+import type { HookEvent } from '../protocol/hook-event';
 import type { AgentSessionID } from '../shared/agent-session-id';
 import { buildOptionalString } from '../shared/build-optional-string';
 import type { Config } from '../shared/config';
 import { isRecord } from '../shared/report';
 import { toAgentSessionID } from '../shared/to-agent-session-id';
 import { toShellArg } from '../shared/to-shell-arg';
+import { truncateDetail } from '../shared/truncate-detail';
 import type {
-  AdapterEvent,
   AgentAdapter,
   AgentProfile,
   NameUpdate,
@@ -22,7 +23,6 @@ import { buildArgsWithoutFlags } from './build-args-without-flags';
 import { findFlagValue } from './find-flag-value';
 import { planPastedLineInput } from './plan-pasted-line-input';
 import { resolveAgentHome } from './resolve-agent-home';
-import { truncateDetail } from './truncate-detail';
 
 // Codex's hook payload keys, snake_case. An absent or wrong-typed field
 // parses to undefined rather than failing the payload, so a broken reporter

package/src/agents/gateway-adapter.ts

@@ -1,12 +1,12 @@
-import type { HookEvent } from '../daemon/hooks';
+import type { AdapterEvent } from '../protocol/adapter-event';
+import type { HookEvent } from '../protocol/hook-event';
+import type { AgentID } from '../shared/agent-id';
 import type { AgentSessionID } from '../shared/agent-session-id';
 import type { GatewayConfig } from '../shared/collect-gateways';
 import type { Config } from '../shared/config';
 import { toShellArg } from '../shared/to-shell-arg';
 import type {
-  AdapterEvent,
   AgentAdapter,
-  AgentID,
   AgentProfile,
   HeadlessRunner,
   NameUpdate,

package/src/agents/grok-adapter.ts

@@ -1,7 +1,8 @@
 import { existsSync, readFileSync, readdirSync } from 'node:fs';
 import { join } from 'node:path';
 import { z } from 'zod';
-import type { HookEvent } from '../daemon/hooks';
+import type { AdapterEvent } from '../protocol/adapter-event';
+import type { HookEvent } from '../protocol/hook-event';
 import type { AgentSessionID } from '../shared/agent-session-id';
 import { buildOptionalString } from '../shared/build-optional-string';
 import type { Config } from '../shared/config';
@@ -9,8 +10,8 @@ import { isRecord } from '../shared/report';
 import type { SessionID } from '../shared/session-id';
 import { toAgentSessionID } from '../shared/to-agent-session-id';
 import { toShellArg } from '../shared/to-shell-arg';
+import { truncateDetail } from '../shared/truncate-detail';
 import type {
-  AdapterEvent,
   AgentAdapter,
   AgentProfile,
   NameUpdate,
@@ -22,7 +23,6 @@ import type {
 import { normalizeHookEventName } from './normalize-hook-event';
 import { planPastedLineInput } from './plan-pasted-line-input';
 import { resolveAgentHome } from './resolve-agent-home';
-import { truncateDetail } from './truncate-detail';
 
 interface GrokSessionHookState {
   latestPromptID?: string;

package/src/agents/start-claude-headless-run.ts

@@ -1,6 +1,6 @@
-import { truncateSummary } from '../daemon/truncate-summary';
 import { isCompiledBinary } from '../shared/is-compiled-binary';
 import { isRecord } from '../shared/report';
+import { truncateSummary } from '../shared/truncate-summary';
 import { buildClaudeQueryOptions } from './build-claude-query-options';
 import type { ClaudeHeadlessRunRequest } from './build-claude-query-options';
 

package/src/client/boot-daemon.ts

@@ -2,17 +2,17 @@ import { spawn as spawnChild } from 'node:child_process';
 import type { ChildProcess } from 'node:child_process';
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { toAgentID } from '../agents/agent-adapter';
-import type { AgentID } from '../agents/agent-adapter';
 import { DaemonError } from '../protocol/daemon-error';
 import type { DaemonFeature } from '../protocol/daemon-features';
 import { parseDaemonFeatures } from '../protocol/parse-daemon-features';
 import { PROTOCOL_V } from '../protocol/protocol';
+import type { AgentID } from '../shared/agent-id';
 import { daemonPidFile, daemonRecordFile, daemonSocketPath } from '../shared/config';
 import { findDaemonRecord } from '../shared/find-daemon-record';
 import { getBuild } from '../shared/get-build';
 import { isCompiledBinary } from '../shared/is-compiled-binary';
 import { makeSingleFlight } from '../shared/make-single-flight';
+import { toAgentID } from '../shared/to-agent-id';
 import { DaemonClient } from './daemon-client';
 import { formatProtocolMismatch } from './format-protocol-mismatch';
 import type { ProtocolMismatch } from './format-protocol-mismatch';

package/src/client/collect-agent-picks.ts

@@ -1,4 +1,4 @@
-import type { AgentID } from '../agents/agent-adapter';
+import type { AgentID } from '../shared/agent-id';
 import type { Config } from '../shared/config';
 
 export interface AgentPick {

package/src/client/daemon-client.ts

@@ -1,3 +1,4 @@
+import type { DaemonChannel } from '../protocol/daemon-channel';
 import { DaemonError } from '../protocol/daemon-error';
 import { LineDecoder } from '../protocol/line-decoder';
 import { OutboundQueue } from '../protocol/outbound-queue';
@@ -14,7 +15,7 @@ interface Pending {
  * event callback. `open` connects the socket; `sendHello` completes the
  * handshake and must come first.
  */
-export class DaemonClient {
+export class DaemonClient implements DaemonChannel {
   onEvent: (event: EventMsg) => void = () => {};
 
   onClose: () => void = () => {};

package/src/client/format-overlay-agent-mark.ts

@@ -1,4 +1,4 @@
-import type { AgentID } from '../agents/agent-adapter';
+import type { AgentID } from '../shared/agent-id';
 
 const BUILT_IN_MARKS: Readonly<Record<AgentID, string>> = { grok: 'g', codex: 'x' };
 

package/src/client/index.ts

@@ -1,9 +1,11 @@
 import { match } from 'ts-pattern';
 import { createActor } from 'xstate';
-import type { AgentID } from '../agents/agent-adapter';
-import { countSessionStates, sortGroupedSessionViews, sortSessionViews } from '../daemon/sessions';
+import { countSessionStates } from '../protocol/count-session-states';
 import { DaemonError } from '../protocol/daemon-error';
 import type { EventMsg } from '../protocol/protocol';
+import { sortGroupedSessionViews } from '../protocol/sort-grouped-session-views';
+import { sortSessionViews } from '../protocol/sort-session-views';
+import type { AgentID } from '../shared/agent-id';
 import { loadConfig } from '../shared/config';
 import { makeSingleFlight } from '../shared/make-single-flight';
 import { bootDaemonClient } from './boot-daemon';

package/src/client/pick-tab-target.ts

@@ -1,5 +1,5 @@
-import type { SessionState } from '../daemon/sessions';
-import { sortSessionViews } from '../daemon/sessions';
+import type { SessionState } from '../protocol/session-state';
+import { sortSessionViews } from '../protocol/sort-session-views';
 
 interface TabCandidate {
   readonly id: string;

package/src/client/spawn-picker.ts

@@ -1,6 +1,6 @@
 import { homedir } from 'node:os';
-import type { AgentID } from '../agents/agent-adapter';
 import { DaemonError } from '../protocol/daemon-error';
+import type { AgentID } from '../shared/agent-id';
 import { loadConfig } from '../shared/config';
 import { collectAgentPicks } from './collect-agent-picks';
 import type { AgentPick } from './collect-agent-picks';

package/src/client/to-mirror-session.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
-import { toAgentID } from '../agents/agent-adapter';
-import type { AgentID } from '../agents/agent-adapter';
-import type { SessionState } from '../daemon/sessions';
+import type { SessionState } from '../protocol/session-state';
+import type { AgentID } from '../shared/agent-id';
+import { toAgentID } from '../shared/to-agent-id';
 
 export interface MirrorSession {
   id: string;

package/src/client/ui.ts

@@ -1,6 +1,6 @@
-import type { AgentID } from '../agents/agent-adapter';
-import { PINNED_GROUP_KEY } from '../daemon/sessions';
-import type { SessionState } from '../daemon/sessions';
+import { PINNED_GROUP_KEY } from '../protocol/pinned-group-key';
+import type { SessionState } from '../protocol/session-state';
+import type { AgentID } from '../shared/agent-id';
 import { RESET_INPUT_MODES } from '../shared/reset-input-modes';
 import { formatDir } from './dirs';
 import { formatOverlayAgentMark } from './format-overlay-agent-mark';

package/src/daemon/build-message-trail-entry.ts

@@ -1,6 +1,6 @@
-import { truncateDetail } from '../agents/truncate-detail';
 import type { AgentSessionID } from '../shared/agent-session-id';
 import type { SessionID } from '../shared/session-id';
+import { truncateDetail } from '../shared/truncate-detail';
 import type { MessageRecord, MessageStatus } from '../store/message-record';
 import type { TrailEntry } from '../store/trail-entry';
 

package/src/daemon/build-report-trail-entry.ts

@@ -1,6 +1,6 @@
-import { truncateDetail } from '../agents/truncate-detail';
 import type { AgentSessionID } from '../shared/agent-session-id';
 import type { SessionID } from '../shared/session-id';
+import { truncateDetail } from '../shared/truncate-detail';
 import type { TrailEntry } from '../store/trail-entry';
 import type { NoteReport } from './parse-report';
 

package/src/daemon/build-scoped-context.ts

@@ -3,7 +3,7 @@ import type { SessionID } from '../shared/session-id';
 import { toSessionID } from '../shared/to-session-id';
 import { buildTargetForbiddenError } from './build-target-forbidden-error';
 import { buildTargetIdentity } from './build-target-identity';
-import type { DaemonContext } from './daemon-connection';
+import type { DaemonContext } from './daemon-context';
 import type { KeyedRequest } from './idempotency-ledger';
 import type { TargetAccess, TargetGrant } from './target-access';
 

package/src/daemon/build-session-message-event.ts

@@ -1,7 +1,7 @@
-import { truncateDetail } from '../agents/truncate-detail';
 import { PROTOCOL_V } from '../protocol/protocol';
 import type { EventMsg } from '../protocol/protocol';
 import type { SessionID } from '../shared/session-id';
+import { truncateDetail } from '../shared/truncate-detail';
 import type { MessageRecord } from '../store/message-record';
 
 /**

package/src/daemon/daemon-connection.ts

@@ -1,5 +1,4 @@
 import { basename, isAbsolute } from 'node:path';
-import type { AgentAdapter, AgentID, SpawnOptions, SpawnOverrides } from '../agents/agent-adapter';
 import { DaemonError } from '../protocol/daemon-error';
 import { DAEMON_FEATURES } from '../protocol/daemon-features';
 import { decodeCursor } from '../protocol/decode-cursor';
@@ -16,248 +15,16 @@ import {
   encodeMessage,
 } from '../protocol/protocol';
 import type { ErrorCode, EventMsg, RequestMsg } from '../protocol/protocol';
-import type { SpawnWorkspaceSource } from '../protocol/request-param-schemas';
-import type { TargetConfigError } from '../shared/collect-targets';
-import type { DaemonID } from '../shared/daemon-id';
-import type { MessageID } from '../shared/message-id';
+import type { AgentID } from '../shared/agent-id';
 import { isRecord } from '../shared/report';
 import type { SessionID } from '../shared/session-id';
 import { toSessionID } from '../shared/to-session-id';
-import type { FleetEntry } from '../store/fleet-entry';
-import type { MessageRecord } from '../store/message-record';
-import type { Dims } from './attach-registry';
-import type { AgentEntry } from './build-agent-list';
-import type { FleetEvent } from './build-fleet-events';
 import { buildPayloadHash } from './build-payload-hash';
-import type { ReportView } from './build-report-view';
 import { buildScopedContext } from './build-scoped-context';
-import type { TargetEntry } from './build-target-list';
-import type { KeyedRequest } from './idempotency-ledger';
-import type { TranscriptPage, TranscriptPosition } from './load-transcript-page';
+import type { DaemonContext, SpawnParams } from './daemon-context';
+import type { TranscriptPosition } from './load-transcript-page';
 import { parseSpawnOverrides } from './parse-spawn-overrides';
-import type { AnswerResult } from './permission-registry';
-import type { ScreenText } from './screen-model';
-import type { SessionDescriptor } from './sessions';
-import type { TargetAccess, TargetGrant } from './target-access';
-
-export interface SpawnParams {
-  readonly cwd: string;
-  readonly name: string;
-  readonly prompt: string;
-  readonly cols: number;
-  readonly rows: number;
-  readonly resume: SpawnOptions['resume'];
-  readonly namedBy: 'user' | 'auto';
-  readonly agent: AgentID;
-  readonly parent: SessionID | null;
-  readonly overrides: SpawnOverrides;
-  readonly target: string;
-
-  // Where the session's working directory comes from; null runs the
-  // session in cwd as it stands.
-  readonly workspace: SpawnWorkspaceSource | null;
-}
-
-interface SessionRecord {
-  readonly session: SessionDescriptor;
-  readonly prompt: string | null;
-  readonly lastActivityAt: number;
-  readonly pending: { readonly message: string } | null;
-  readonly result: string | null;
-}
-
-// A transcript page with the file it came from, so a cursor into a replaced
-// transcript is distinguishable from one into a grown transcript.
-/**
- * What `session.forget` answers: the token a forget that destroys a host
- * must carry, with the time it stops being taken; or the forgotten session,
- * with whether its host was destroyed.
- */
-type ForgetResult =
-  | { readonly confirmToken: string; readonly expiresAt: number }
-  | { readonly forgotten: true; readonly destroyed: boolean };
-
-interface SessionTranscriptRead {
-  readonly path: string;
-  readonly page: TranscriptPage;
-}
-
-export interface DaemonContext {
-  readonly build: string;
-  readonly daemonID: DaemonID;
-  readonly collectSessions: () => SessionDescriptor[];
-  readonly collectSpawnDirs: () => Promise<string[]>;
-  readonly collectAgents: () => AgentList;
-  readonly collectFleet: () => Promise<FleetEntry[]>;
-  readonly loadLastUsedAgent: () => Promise<AgentID>;
-  readonly findAdapter: (id: AgentID) => AgentAdapter | null;
-
-  // The targets a principal may use.
-  readonly buildTargetAccess: (principal: string) => TargetAccess;
-
-  // The target and identity a session is bound to, or null when no
-  // session holds the id.
-  readonly findSessionGrant: (id: SessionID) => TargetGrant | null;
-
-  // The identity a target holds now, or null when the config holds no such
-  // target.
-  readonly findTargetIdentity: (target: string) => string | null;
-
-  // The ids of a session's sub-sessions.
-  readonly collectChildIDs: (id: SessionID) => SessionID[];
-
-  // The session a permission request belongs to, answered or not, or null
-  // for an unknown request.
-  readonly findPermissionSession: (request: string) => SessionID | null;
-
-  // The target a spawn runs on: the one it names, else the default. Throws
-  // the refusal for a target the spawn cannot run on, and for a spawn
-  // without a target when the config gives no default.
-  readonly resolveSpawnTarget: (requested: string | undefined) => string;
-
-  // Throws the refusal for a target that cannot materialize a workspace:
-  // one whose provider cannot both transfer an archive and run a command.
-  readonly requireWorkspaceTarget: (target: string) => void;
-
-  // Runs the plan, which throws the refusal for a spawn it refuses, then
-  // spawns. Answers with the `session.spawn` ok payload, which a keyed
-  // retry replays as the first spawn answered it while the access, when
-  // there is one, still reaches the target the spawn's session was bound to.
-  readonly spawnSession: (
-    plan: () => SpawnParams,
-    keyed: KeyedRequest | null,
-    access: TargetAccess | null,
-  ) => Promise<Readonly<Record<string, unknown>>>;
-  readonly killSession: (id: SessionID) => Promise<boolean>;
-
-  // Forgets a session, or answers with the token a forget that destroys a
-  // host must carry. Throws the refusal for a token it does not take.
-  readonly forgetSession: (
-    id: SessionID,
-    confirmToken: string | undefined,
-  ) => Promise<ForgetResult | 'missing'>;
-  readonly updateSession: (id: SessionID, name?: string, pinned?: boolean) => boolean | 'child_pin';
-  readonly quitDaemon: () => void;
-  readonly ackSession: (id: SessionID) => boolean;
-  readonly buildResumeCommand: (id: SessionID) => string | null;
-  readonly readSessionScreen: (id: SessionID) => Promise<ScreenText | 'missing' | 'no_screen'>;
-  readonly answerPermission: (request: string, decision: string) => AnswerResult;
-  readonly restoreFleet: (cols: number, rows: number) => Promise<number>;
-  readonly attachSession: (
-    client: OutputClient,
-    sessionID: SessionID,
-    dims: Dims,
-  ) => 'ok' | 'missing' | 'dead';
-  readonly detachSession: (client: OutputClient, sessionID: SessionID) => void;
-  readonly detachClient: (client: OutputClient) => void;
-  readonly writeSessionInput: (
-    sessionID: SessionID,
-    data: string,
-  ) => 'busy' | 'ok' | 'missing' | 'dead';
-
-  // Types a line into the session and submits it the way the session's
-  // agent accepts a line, as opposed to the raw bytes the input write takes.
-  readonly writeSessionLine: (
-    sessionID: SessionID,
-    text: string,
-  ) => 'busy' | 'ok' | 'missing' | 'dead';
-  readonly ejectSession: (
-    id: SessionID,
-    prompt: string,
-  ) => 'ok' | 'missing' | 'unsupported' | 'no_transcript';
-  readonly adoptSession: (
-    id: SessionID,
-    cols: number,
-    rows: number,
-  ) => Promise<'ok' | 'missing' | 'no_transcript'>;
-  readonly resizeSession: (client: OutputClient, sessionID: SessionID, dims: Dims) => boolean;
-  readonly resyncClient: (sessionID: SessionID, client: OutputClient) => Promise<void>;
-  readonly queueBytes?: number;
-  readonly getEffectiveDims: (sessionID: SessionID) => Dims;
-  readonly readSessionRecord: (id: SessionID) => Promise<SessionRecord | 'missing'>;
-  readonly loadSessionTranscript: (
-    id: SessionID,
-    from: TranscriptPosition | null,
-    limit: number,
-  ) => Promise<SessionTranscriptRead | 'missing' | 'unsupported'>;
-
-  // Reads the trail, leaving out each event of a session outside the access
-  // when there is one.
-  readonly readEvents: (
-    afterID: number | null,
-    limit: number,
-    waitMs: number,
-    sessionID: SessionID | null,
-    access: TargetAccess | null,
-  ) => Promise<EventsPage>;
-
-  // One report by the trail id of its event, or null for a trail id that
-  // holds no report, or whose report's session is outside the access when
-  // there is one.
-  readonly readReport: (id: number, access: TargetAccess | null) => Promise<ReportView | null>;
-
-  // Answers with the `session.message` ok payload, which a keyed retry
-  // replays with the message's current status, or with the refusal.
-  readonly writeSessionMessage: (
-    sessionID: SessionID,
-    from: string,
-    text: string,
-    keyed: KeyedRequest | null,
-  ) => Promise<Readonly<Record<string, unknown>> | MessageRefusal>;
-  readonly readMessage: (messageID: MessageID, waitMs: number) => Promise<MessageView | null>;
-  readonly attachTap: (client: TapClient, sessionID: SessionID) => 'ok' | 'missing' | 'unsupported';
-  readonly ackMessage: (
-    client: TapClient,
-    sessionID: SessionID,
-    messageID: MessageID,
-  ) => Promise<MessageRecord | 'not_tapping' | 'unknown'>;
-}
-
-// The slice of a connection the attach bookkeeping needs: identity plus the
-// ability to receive output events.
-export interface OutputClient {
-  readonly sendOutput: (sessionID: SessionID, event: EventMsg, byteLength: number) => void;
-}
-
-// The `agents.list` answer: the host the daemon runs on, each agent, each
-// execution target, what a spawn without either runs with, a digest of
-// the target config, and the target config problems the daemon started
-// with.
-interface AgentList {
-  readonly daemon: {
-    readonly hostname: string;
-    readonly platform: string;
-    readonly arch: string;
-    readonly build: string;
-  };
-  readonly agents: readonly AgentEntry[];
-  readonly targets: readonly TargetEntry[];
-  readonly spawnDefaults: { readonly agent: AgentID; readonly target: string | null };
-  readonly configRevision: string;
-  readonly targetErrors: readonly TargetConfigError[];
-}
-
-// One `events.read` answer: the events, and whether more follow them.
-interface EventsPage {
-  readonly events: readonly FleetEvent[];
-  readonly more: boolean;
-}
-
-// One message as `message.get` reports it: the session it belongs to now,
-// every field of the record, and the other messages its turn answered.
-interface MessageView {
-  readonly session: SessionID;
-  readonly record: MessageRecord;
-  readonly answeredWith: readonly MessageID[];
-}
-
-// Why a session refuses a message before the daemon accepts it.
-export type MessageRefusal = 'missing' | 'dead' | 'unsupported' | 'no_tap';
-
-// The slice of a connection a tap subscription needs.
-export interface TapClient {
-  readonly sendEvent: (event: EventMsg) => void;
-}
+import type { TargetAccess } from './target-access';
 
 // The targets a request may use and the namespace of its idempotency keys.
 interface RequestScope {