diff --git a/docs/refactor/retained-index-cross-version-20261005/paired-installed-controller.py b/docs/refactor/retained-index-cross-version-20261005/paired-installed-controller.py index ed3945d221..7f15ea801e 100644 --- a/docs/refactor/retained-index-cross-version-20261005/paired-installed-controller.py +++ b/docs/refactor/retained-index-cross-version-20261005/paired-installed-controller.py @@ -8,7 +8,7 @@ import time from agent_comms.child_process import BoundedRun, ProcessIdentity -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec def digest(path): diff --git a/docs/refactor/retained-routing-provenance-20261005/paired-routing-installed-controller.py b/docs/refactor/retained-routing-provenance-20261005/paired-routing-installed-controller.py index 796ed10701..49ad41e14f 100644 --- a/docs/refactor/retained-routing-provenance-20261005/paired-routing-installed-controller.py +++ b/docs/refactor/retained-routing-provenance-20261005/paired-routing-installed-controller.py @@ -8,7 +8,7 @@ import time from agent_comms.child_process import BoundedRun, ProcessIdentity -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec def digest(path): diff --git a/src/agent_comms/acp.py b/src/agent_comms/acp.py index 17c0a99a8c..00d279c9bb 100644 --- a/src/agent_comms/acp.py +++ b/src/agent_comms/acp.py @@ -79,7 +79,7 @@ from .coordination_database import CoordinationStore from .cursor_owner import CursorOwner from .cursor_publication import CursorPublication -from .field_codec import ClaimId, FieldCodec, MalformedRecord, RootId +from .nominal.field_codec import ClaimId, FieldCodec, MalformedRecord, RootId from .image_inputs import prompt_images from .input_drain import InputDrain from .config_options import ConfigOptions diff --git a/src/agent_comms/acp_extension.py b/src/agent_comms/acp_extension.py index 8d953813ec..3ab7c88794 100644 --- a/src/agent_comms/acp_extension.py +++ b/src/agent_comms/acp_extension.py @@ -26,9 +26,9 @@ from .agent_events import CompactionEvent from .child_process import ProcessIdentity from .context_reading import ContextReading -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .external_transcript import DraftRow -from .field_codec import ( +from .nominal.field_codec import ( AssignmentId, ClaimId, AcceptsNull, diff --git a/src/agent_comms/acp_failure.py b/src/agent_comms/acp_failure.py index 2d6e718683..bc7e555768 100644 --- a/src/agent_comms/acp_failure.py +++ b/src/agent_comms/acp_failure.py @@ -22,9 +22,9 @@ from .turn_input_source import OriginalTurnInput from .coordination_errors import Refused -from .declared_family import DeclaredFamily, UnknownFamilyMember +from .nominal.declared_family import DeclaredFamily, UnknownFamilyMember from .delivery_presentation import DeliveryPresentation -from .field_codec import ( +from .nominal.field_codec import ( FieldCodec, JsonShapeFamily, JsonShapeMember, NullMember, RecordMember, SubclassUnion, WireName, WireOmitDefault, boundary_decoder, ) diff --git a/src/agent_comms/active_route.py b/src/agent_comms/active_route.py index 0a27803db9..edcabb18ec 100644 --- a/src/agent_comms/active_route.py +++ b/src/agent_comms/active_route.py @@ -18,9 +18,9 @@ from .bus import Bus from .child_process import Platform -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError -from .field_codec import FieldCodec, MalformedRecord, PathText, ScratchName +from .nominal.field_codec import FieldCodec, MalformedRecord, PathText, ScratchName from .launch_root import LaunchRoot from .locked_store import DocumentBytes from .private_nk_entrypoint import PrivateNkLaunch, RootLaunch diff --git a/src/agent_comms/activity.py b/src/agent_comms/activity.py index 76f0a4b6e2..53a213bfc8 100644 --- a/src/agent_comms/activity.py +++ b/src/agent_comms/activity.py @@ -13,9 +13,9 @@ from typing import TYPE_CHECKING, ClassVar, Self, Annotated -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError -from .field_codec import ( +from .nominal.field_codec import ( FieldCodec, NullMember, projected, diff --git a/src/agent_comms/activity_clocks.py b/src/agent_comms/activity_clocks.py index 452f11b2a8..920047ba36 100644 --- a/src/agent_comms/activity_clocks.py +++ b/src/agent_comms/activity_clocks.py @@ -6,7 +6,7 @@ from dataclasses import dataclass, field, fields from typing import TYPE_CHECKING, Self -from .field_codec import FieldCodec +from .nominal.field_codec import FieldCodec from .projection_source import ProducedRow, ProjectionSource from .typed_table import TypedRow diff --git a/src/agent_comms/agent_activity.py b/src/agent_comms/agent_activity.py index 45e1eecf49..f29b9fbe90 100644 --- a/src/agent_comms/agent_activity.py +++ b/src/agent_comms/agent_activity.py @@ -34,9 +34,9 @@ ) from .audience_manifest import FrozenRecipient from .coordinator import Coordination -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError -from .field_codec import ThreadLookup, TurnId +from .nominal.field_codec import ThreadLookup, TurnId from .routing import NoTurnRouting, Routing from .runtime_info import RuntimeInfo, RuntimeInfoStore from .thread_identity import OwnerIdentity, ThreadIncarnation diff --git a/src/agent_comms/agent_backend.py b/src/agent_comms/agent_backend.py index 050ac80ce4..4a927ae0b1 100644 --- a/src/agent_comms/agent_backend.py +++ b/src/agent_comms/agent_backend.py @@ -25,8 +25,8 @@ from types import MappingProxyType from typing import TYPE_CHECKING, ClassVar, Self -from .declared_family import DeclaredFamily -from .field_codec import InputId +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import InputId from .image_input import ImageInput from .pi_counts import PiCount from .pi_vocabulary import CompactionReason, ThinkingLevelField diff --git a/src/agent_comms/agent_event_updates.py b/src/agent_comms/agent_event_updates.py index 41f71ea404..5b1dd2d0e0 100644 --- a/src/agent_comms/agent_event_updates.py +++ b/src/agent_comms/agent_event_updates.py @@ -35,7 +35,7 @@ ) from .context_reading import ContextUsage, UnsizedContext from .coordinator import Coordination -from .field_codec import TurnId +from .nominal.field_codec import TurnId from .tool_declaration import ( EditAction, ExecuteAction, diff --git a/src/agent_comms/agent_events.py b/src/agent_comms/agent_events.py index de1dffc2c0..02b754a77a 100644 --- a/src/agent_comms/agent_events.py +++ b/src/agent_comms/agent_events.py @@ -27,8 +27,8 @@ ) from .child_process import ProcessIdentity from .coordinator import Coordination -from .declared_family import DeclaredFamily -from .field_codec import ( +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import ( InputId, NullMember, ToolCallId, diff --git a/src/agent_comms/agent_inbox.py b/src/agent_comms/agent_inbox.py index 16fda64540..0b8544c985 100644 --- a/src/agent_comms/agent_inbox.py +++ b/src/agent_comms/agent_inbox.py @@ -16,7 +16,7 @@ from .coordination_database import CoordinationStore from .coordination_tables.assignments import WakeAssignment from .coordination_tables.harness_deliveries import HarnessDelivery -from .field_codec import RecordMember +from .nominal.field_codec import RecordMember from .message_reference import AfterMessageStart, InboxStart, MessageReference, StreamBeginning from .read_basis import ReadCursor diff --git a/src/agent_comms/annotation_disclosure.py b/src/agent_comms/annotation_disclosure.py index 3b792c79f0..30e7ac6629 100644 --- a/src/agent_comms/annotation_disclosure.py +++ b/src/agent_comms/annotation_disclosure.py @@ -7,7 +7,7 @@ from dataclasses import dataclass from typing import TYPE_CHECKING, ClassVar -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily if TYPE_CHECKING: from .turn_context import ContextSpan diff --git a/src/agent_comms/assignment_states.py b/src/agent_comms/assignment_states.py index e824ee6eb8..208c29512f 100644 --- a/src/agent_comms/assignment_states.py +++ b/src/agent_comms/assignment_states.py @@ -8,7 +8,7 @@ from .coordination_errors import IdentityConflict, IntegrityViolationError from .coordinator_vocabulary import CoordinatorVocabulary -from .field_codec import AssignmentId, FieldCodec, ThreadLookup +from .nominal.field_codec import AssignmentId, FieldCodec, ThreadLookup from .lifecycle import LifecycleState from .lifecycle_capability import Active, Complete, Deferred, Failed, Pending, Terminal from .notification_progress import ( diff --git a/src/agent_comms/assignment_store.py b/src/agent_comms/assignment_store.py index 361f5bc13e..38c5df6f14 100644 --- a/src/agent_comms/assignment_store.py +++ b/src/agent_comms/assignment_store.py @@ -4,7 +4,7 @@ import sqlite3 -from agent_comms.field_codec import AssignmentId, ThreadLookup +from agent_comms.nominal.field_codec import AssignmentId, ThreadLookup from collections.abc import Callable, Sequence from dataclasses import replace diff --git a/src/agent_comms/attempt_recovery.py b/src/agent_comms/attempt_recovery.py index d21945b693..2eaa945061 100644 --- a/src/agent_comms/attempt_recovery.py +++ b/src/agent_comms/attempt_recovery.py @@ -57,7 +57,7 @@ from .private_send_stage import TriageNativeSend from .lifecycle_capability import Deferred from agent_comms.typed_table import RowNotFoundError -from .field_codec import MalformedRecord, ScratchName, ThreadLookup +from .nominal.field_codec import MalformedRecord, ScratchName, ThreadLookup from .input_disposition import InputDispositions from .locked_store import RegistryFile from .registration import Registration diff --git a/src/agent_comms/attempt_resolution.py b/src/agent_comms/attempt_resolution.py index 7cee01caab..97f0bfd921 100644 --- a/src/agent_comms/attempt_resolution.py +++ b/src/agent_comms/attempt_resolution.py @@ -4,8 +4,8 @@ from dataclasses import dataclass -from .declared_family import DeclaredFamily -from .field_codec import MessageId, NullMember, OrderId, RetryDecisionId, SubclassUnion, TaggedRecordMember, TurnId +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import MessageId, NullMember, OrderId, RetryDecisionId, SubclassUnion, TaggedRecordMember, TurnId class WorkDecision(DeclaredFamily, affix="Decision"): diff --git a/src/agent_comms/audience_manifest.py b/src/agent_comms/audience_manifest.py index cd40f8b3c0..9bbad76a39 100644 --- a/src/agent_comms/audience_manifest.py +++ b/src/agent_comms/audience_manifest.py @@ -25,7 +25,7 @@ from agent_comms.coordination_contracts import MAX_IDENTIFIER_CHARS from .channel_targets import exact_stored_target -from .field_codec import FieldCodec, MalformedRecord, ThreadLookup +from .nominal.field_codec import FieldCodec, MalformedRecord, ThreadLookup from .messages import BusCapability, CarriesEnvelope, Message from .projection_source import ProducedRow, ProjectionSource diff --git a/src/agent_comms/backend.py b/src/agent_comms/backend.py index a95cb9c7e5..6999a98fb1 100644 --- a/src/agent_comms/backend.py +++ b/src/agent_comms/backend.py @@ -49,7 +49,7 @@ from .agent_backend import NO_INPUT_START_LISTENER, InputStartListener, TurnInbox from .coordinator import Coordination from .extension_ui import ExtensionUiSession -from .field_codec import InputId, MalformedRecord, boundary_decoder +from .nominal.field_codec import InputId, MalformedRecord, boundary_decoder from .image_input import ImageInput from .native_attestation import AttestationError from .native_child import PiSessionChild diff --git a/src/agent_comms/behaviour_patterns.py b/src/agent_comms/behaviour_patterns.py index de20d1f8bf..63b24939d3 100644 --- a/src/agent_comms/behaviour_patterns.py +++ b/src/agent_comms/behaviour_patterns.py @@ -17,7 +17,7 @@ from .child_process import CountPrinted, NoIntegerPrinted from .commander.order import CheckRequest -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .pattern_sources import ( CeremonyFailure, CommanderRule, diff --git a/src/agent_comms/build_identity.py b/src/agent_comms/build_identity.py index 4aa9f6b5e5..548b393186 100644 --- a/src/agent_comms/build_identity.py +++ b/src/agent_comms/build_identity.py @@ -7,8 +7,8 @@ from pathlib import Path from typing import TYPE_CHECKING, Annotated, ClassVar -from agent_comms.declared_family import DeclaredFamily -from agent_comms.field_codec import GitCommitText +from agent_comms.nominal.declared_family import DeclaredFamily +from agent_comms.nominal.field_codec import GitCommitText from agent_comms.installer.runtime_resolution import RuntimePackage, RuntimeResolution from agent_comms.launch_runtime import LaunchRuntime from agent_comms.repo import Repo diff --git a/src/agent_comms/bus.py b/src/agent_comms/bus.py index dd5378505e..ab37c0edad 100644 --- a/src/agent_comms/bus.py +++ b/src/agent_comms/bus.py @@ -47,7 +47,7 @@ ResourceClaim, ) from agent_comms.errors import CommittedMessageError, RelationViolationError, UnclaimedError -from agent_comms.field_codec import ClaimId, FieldCodec, MessageId, ThreadLookup +from agent_comms.nominal.field_codec import ClaimId, FieldCodec, MessageId, ThreadLookup from agent_comms.locked_store import BusFile, FileStore, SQLiteFile, StoreCommittedError from agent_comms.message_reference import MessageReference from agent_comms.private_path import FileIdentity, PresentPath diff --git a/src/agent_comms/bus_publication.py b/src/agent_comms/bus_publication.py index 8a76a606b8..45eba80e33 100644 --- a/src/agent_comms/bus_publication.py +++ b/src/agent_comms/bus_publication.py @@ -29,7 +29,7 @@ ) from agent_comms.typed_table import Column, Generated, sql_literal -from .field_codec import FieldCodec, MessageId, ThreadLookup +from .nominal.field_codec import FieldCodec, MessageId, ThreadLookup from .repo import Checkout from .read_basis import RepliesDisplayScope from .wake_policy import RecipientDecision diff --git a/src/agent_comms/bus_route_counts.py b/src/agent_comms/bus_route_counts.py index 5286a98367..8485eec4ef 100644 --- a/src/agent_comms/bus_route_counts.py +++ b/src/agent_comms/bus_route_counts.py @@ -7,7 +7,7 @@ from .bus_tables import ReceivedSource from .class_fact import ClassFact -from .field_codec import ThreadLookup +from .nominal.field_codec import ThreadLookup from .messages import BusProjectionTables, BusRow, MessageInput, PublicRecord, PublicSender from .projection_source import ProducedRow from .read_basis import ReadCursor diff --git a/src/agent_comms/bus_source_page.py b/src/agent_comms/bus_source_page.py index 5d5015e1b3..b596dc7de7 100644 --- a/src/agent_comms/bus_source_page.py +++ b/src/agent_comms/bus_source_page.py @@ -6,7 +6,7 @@ from typing import Self from .coordination_errors import IdentityConflict -from .field_codec import FieldCodec, ThreadLookup +from .nominal.field_codec import FieldCodec, ThreadLookup @dataclass(frozen=True, kw_only=True) diff --git a/src/agent_comms/bus_tables.py b/src/agent_comms/bus_tables.py index 4195c5cd3f..8b34df7e30 100644 --- a/src/agent_comms/bus_tables.py +++ b/src/agent_comms/bus_tables.py @@ -10,7 +10,7 @@ from agent_comms import messages from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import FieldCodec, ThreadLookup +from agent_comms.nominal.field_codec import FieldCodec, ThreadLookup from agent_comms.message_reference import MessageReference from agent_comms.typed_table import ( Column, diff --git a/src/agent_comms/change_report.py b/src/agent_comms/change_report.py index c46ea09c6b..28b58fdbc6 100644 --- a/src/agent_comms/change_report.py +++ b/src/agent_comms/change_report.py @@ -19,8 +19,8 @@ from agent_comms.errors import MissingSourceLine -from .declared_family import DeclaredFamily -from .field_codec import ( +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import ( MalformedRecord, NullMember, RecordMember, diff --git a/src/agent_comms/channel_coding_tools.py b/src/agent_comms/channel_coding_tools.py index b9569945ca..2ef7fdc19b 100644 --- a/src/agent_comms/channel_coding_tools.py +++ b/src/agent_comms/channel_coding_tools.py @@ -22,7 +22,7 @@ FileClaimPath, WakeClaim, ) -from .field_codec import ClaimId, FieldCodec, InputId, MalformedRecord +from .nominal.field_codec import ClaimId, FieldCodec, InputId, MalformedRecord from .lifecycle_capability import Executing from .native_arguments import NativeArguments from .native_runtime_input import NativeRuntimeInput diff --git a/src/agent_comms/channel_management.py b/src/agent_comms/channel_management.py index a5d044b418..a671a5a738 100644 --- a/src/agent_comms/channel_management.py +++ b/src/agent_comms/channel_management.py @@ -14,7 +14,7 @@ from .channel_targets import ChannelTarget, Tag from .channels import Channel, SavedView from .cli_result import CliResult -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .display_order import ChannelSort, ThreadSort from .message_bus import MessageBus from .messages import InfoKind, MembershipConversationRole, Message diff --git a/src/agent_comms/channel_targets.py b/src/agent_comms/channel_targets.py index d07fd1600f..18e1ff7d89 100644 --- a/src/agent_comms/channel_targets.py +++ b/src/agent_comms/channel_targets.py @@ -8,9 +8,9 @@ from .activity_clocks import ActivityClocks from .class_fact import ClassFact -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import HumanSendRefusedError, RelationViolationError, UnregisteredThreadError -from .field_codec import NullMember, SingleFieldValue, SubclassUnion +from .nominal.field_codec import NullMember, SingleFieldValue, SubclassUnion from .history_result import DmHistoryPageResult, HistoryPageResult from .projection_source import ProducedRow, ProjectionSource from .repo import Checkout diff --git a/src/agent_comms/channels.py b/src/agent_comms/channels.py index 24637c7af8..3b4e6cdcfe 100644 --- a/src/agent_comms/channels.py +++ b/src/agent_comms/channels.py @@ -13,10 +13,10 @@ from .projection_source import ProjectionSource from .channel_targets import ChannelTarget, Tag from .cli_result import CliResult -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .display_order import CreatedThreadSort, ThreadSort from .errors import RelationViolationError -from .field_codec import FieldCodec, CatalogExclude +from .nominal.field_codec import FieldCodec, CatalogExclude from .history_result import ChannelHistoryPageResult, EverythingHistoryPageResult, HistoryPageResult from .messages import MembershipTransition from .read_basis import AllChannelDisplayScope, ChannelDisplayScope, MemberActivityDisplayScope diff --git a/src/agent_comms/child_process.py b/src/agent_comms/child_process.py index c70e2e3d79..51d341ab21 100644 --- a/src/agent_comms/child_process.py +++ b/src/agent_comms/child_process.py @@ -41,11 +41,11 @@ from tempfile import TemporaryDirectory from typing import TYPE_CHECKING, Annotated, Any, BinaryIO, ClassVar, NoReturn, Self, TextIO -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError -from .field_codec import FieldCodec, FieldDirective, Id128, NullMember, RecordMember, SubclassUnion, WireRequired +from .nominal.field_codec import FieldCodec, FieldDirective, Id128, NullMember, RecordMember, SubclassUnion, WireRequired from .launch_runtime import INHERITED_ENVIRONMENT, LaunchRuntime, RestoredRuntime -from .sealed import Sealed +from .nominal.sealed import Sealed from .systemd_unit import AgentsSlice, SystemdUnit if TYPE_CHECKING: diff --git a/src/agent_comms/cli_bridges/claude_protocol.py b/src/agent_comms/cli_bridges/claude_protocol.py index 9fb8cd53be..87276d2bb8 100644 --- a/src/agent_comms/cli_bridges/claude_protocol.py +++ b/src/agent_comms/cli_bridges/claude_protocol.py @@ -27,7 +27,7 @@ TimestampedWire, WireHeader, ) -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( FieldCodec, MalformedRecord, MessageId, diff --git a/src/agent_comms/cli_bridges/codex_connection.py b/src/agent_comms/cli_bridges/codex_connection.py index 15ef033af6..38b168dff3 100644 --- a/src/agent_comms/cli_bridges/codex_connection.py +++ b/src/agent_comms/cli_bridges/codex_connection.py @@ -10,7 +10,7 @@ import aiohttp from pydantic import JsonValue -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from .codex_protocol import ( Capabilities, ClientInfo, Initialize, InitializeResponse, Initialized, Request, RPC_RESPONSE, RateLimits, RateLimitsResponse, ReadRateLimits, RequestParams, RpcNotification, RpcReply, diff --git a/src/agent_comms/cli_bridges/codex_protocol.py b/src/agent_comms/cli_bridges/codex_protocol.py index cc0b293011..229b60a048 100644 --- a/src/agent_comms/cli_bridges/codex_protocol.py +++ b/src/agent_comms/cli_bridges/codex_protocol.py @@ -20,9 +20,9 @@ ) from agent_comms.cli_protocol import Declared, TaggedWire, TextWire -from agent_comms.declared_family import UnknownFamilyMember +from agent_comms.nominal.declared_family import UnknownFamilyMember from agent_comms.external_transcript import EarlierPage, NoEarlierPage -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( FieldCodec, MessageId, ToolCallId, diff --git a/src/agent_comms/cli_bridges/codex_rollout.py b/src/agent_comms/cli_bridges/codex_rollout.py index 04a8e79a88..c51bed09db 100644 --- a/src/agent_comms/cli_bridges/codex_rollout.py +++ b/src/agent_comms/cli_bridges/codex_rollout.py @@ -22,7 +22,7 @@ ) from agent_comms.cli_protocol import Declared, OpenWire, TimestampedWire, WireHeader -from agent_comms.field_codec import ToolCallId +from agent_comms.nominal.field_codec import ToolCallId from agent_comms.runtime_updates import ( HiddenItem, HistoryNotice, diff --git a/src/agent_comms/cli_bridges/history.py b/src/agent_comms/cli_bridges/history.py index f49ef82d76..4de3dd0e1f 100644 --- a/src/agent_comms/cli_bridges/history.py +++ b/src/agent_comms/cli_bridges/history.py @@ -22,7 +22,7 @@ from pydantic import TypeAdapter from agent_comms.agent_runtime import ReadsHistory -from agent_comms.field_codec import SubclassUnion +from agent_comms.nominal.field_codec import SubclassUnion from agent_comms.harness_install import ( ClaudeCodeHarness, CodexHarness, Harness, HarnessSession, OpenCodeHarness, PiHarness, ) diff --git a/src/agent_comms/cli_bridges/monitor.py b/src/agent_comms/cli_bridges/monitor.py index d0e7c1d594..894b7c8830 100644 --- a/src/agent_comms/cli_bridges/monitor.py +++ b/src/agent_comms/cli_bridges/monitor.py @@ -19,9 +19,9 @@ from agent_comms.child_process import ProcessIdentity from agent_comms.harness_delivery_states import Outcome -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.installer.runtime_wire import CrossesRuntimes -from agent_comms.field_codec import FieldCodec, MalformedRecord, MessageId, PathText +from agent_comms.nominal.field_codec import FieldCodec, MalformedRecord, MessageId, PathText from agent_comms.launch_runtime import LaunchRuntime from agent_comms.messages import Message from agent_comms.thread_status import ConnectedThreadStatus, PausedBridgeThreadStatus diff --git a/src/agent_comms/cli_bridges/opencode_parts.py b/src/agent_comms/cli_bridges/opencode_parts.py index 6f7d00ea8b..5df311bbc2 100644 --- a/src/agent_comms/cli_bridges/opencode_parts.py +++ b/src/agent_comms/cli_bridges/opencode_parts.py @@ -8,7 +8,7 @@ from pydantic import ConfigDict, Field, JsonValue, model_validator from agent_comms.cli_protocol import Declared, TaggedWire, TextWire, WireHeader -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( FieldCodec, ToolCallId, ) diff --git a/src/agent_comms/cli_bridges/opencode_protocol.py b/src/agent_comms/cli_bridges/opencode_protocol.py index 82374b3eb7..64edef7b94 100644 --- a/src/agent_comms/cli_bridges/opencode_protocol.py +++ b/src/agent_comms/cli_bridges/opencode_protocol.py @@ -9,8 +9,8 @@ from pydantic import Field, JsonValue from agent_comms.cli_protocol import Declared, TaggedWire -from agent_comms.declared_family import UnknownFamilyMember -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.declared_family import UnknownFamilyMember +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.runtime_updates import ( AllTurnsEnded, AppendDraftItem, diff --git a/src/agent_comms/cli_bridges/shared.py b/src/agent_comms/cli_bridges/shared.py index ad1b83fa99..e2ac08c132 100644 --- a/src/agent_comms/cli_bridges/shared.py +++ b/src/agent_comms/cli_bridges/shared.py @@ -26,7 +26,8 @@ from pydantic import Field, InstanceOf, PlainSerializer, PlainValidator, model_validator -from agent_comms import field_codec, messages +from agent_comms import messages +from agent_comms.nominal import field_codec from agent_comms.agent_runtime import DeliversInput, ExternalRuntime, PublishesTranscript from agent_comms.bus import Bus from agent_comms.bus_tables import MessageIdentitySource @@ -49,12 +50,12 @@ from agent_comms.coordination_errors import ( CoordinationBeginUnavailable, CoordinationError, CoordinationReadUnavailable, DeferredRead, ) -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.declared_verb import DeclaredOptions from agent_comms.coordination_database import CoordinationStore from agent_comms.coordination_tables.harness_deliveries import HarnessDelivery, HarnessObservedPart from agent_comms.coordinator import Coordination -from agent_comms.field_codec import FieldCodec, MessageId, PathText, SubclassUnion, ThreadLookup +from agent_comms.nominal.field_codec import FieldCodec, MessageId, PathText, SubclassUnion, ThreadLookup from agent_comms.installer.refusals import UpgradeRefused from agent_comms.launch_runtime import LaunchRuntime from agent_comms.private_path import PrivateDirectoryRole, PrivateFileRole, TrustedAncestorRole diff --git a/src/agent_comms/cli_command.py b/src/agent_comms/cli_command.py index 55778a9a38..9f5dcfc654 100644 --- a/src/agent_comms/cli_command.py +++ b/src/agent_comms/cli_command.py @@ -11,7 +11,7 @@ from agent_comms.repo import Checkout from agent_comms.config_options import ConfigOptions from agent_comms.errors import ToolRefusedError -from agent_comms.field_codec import FieldCodec, RecordMember, WireValue +from agent_comms.nominal.field_codec import FieldCodec, RecordMember, WireValue from agent_comms.installer.owner_starts import OwnerStart, RefusedOwner, StartedOwner from agent_comms.lifecycle_capability import LifecycleCapability, Successful from agent_comms.registry_document import RegistrySnapshot @@ -23,8 +23,8 @@ from agent_comms.channel_targets import OneChannel, ResolvedChannel, ResolvedThread from agent_comms.declared_verb import DeclaredCommand -from agent_comms.declared_family import ModuleMembers -from agent_comms.field_codec import FieldPlan, TargetBound +from agent_comms.nominal.declared_family import ModuleMembers +from agent_comms.nominal.field_codec import FieldPlan, TargetBound from agent_comms.launch_root import LaunchRoot from inspect import iscoroutinefunction, signature from types import get_original_bases diff --git a/src/agent_comms/cli_commands.py b/src/agent_comms/cli_commands.py index 00ebfcd2ce..ae97af18f0 100644 --- a/src/agent_comms/cli_commands.py +++ b/src/agent_comms/cli_commands.py @@ -28,8 +28,8 @@ from agent_comms.cli_protocol import ArrivedMessage, EarlierItems from .cli_result import CliResult from .comms import Comms -from .declared_family import DeclaredFamily -from .field_codec import Argument, PathText, WireForm, WireOmitDefault, boundary_decoder +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import Argument, PathText, WireForm, WireOmitDefault, boundary_decoder from .history_result import HistoryPageResult from .goals import Goal from .lifecycle_capability import Complete diff --git a/src/agent_comms/cli_context.py b/src/agent_comms/cli_context.py index bd5b4cdc8e..4972cb7c7f 100644 --- a/src/agent_comms/cli_context.py +++ b/src/agent_comms/cli_context.py @@ -12,8 +12,8 @@ from agent_comms.context_store import ContextManifestCursor from agent_comms.context_store import LATEST_CONTEXT from agent_comms.coordination_errors import Refused -from agent_comms.field_codec import Argument -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.native_turn_context import NativeContextData from agent_comms.owner_connection import OwnerConnection from agent_comms.owner_connection import socket_path diff --git a/src/agent_comms/cli_native_package.py b/src/agent_comms/cli_native_package.py index dce3dd45ac..5dc6c72e63 100644 --- a/src/agent_comms/cli_native_package.py +++ b/src/agent_comms/cli_native_package.py @@ -9,7 +9,7 @@ from pathlib import Path from typing import Annotated -from agent_comms import field_codec +from agent_comms.nominal import field_codec from agent_comms.command import Command from agent_comms.declared_verb import DeclaredVerb from agent_comms.native_package import ( diff --git a/src/agent_comms/cli_options.py b/src/agent_comms/cli_options.py index 3e2c9cefca..dab251ea34 100644 --- a/src/agent_comms/cli_options.py +++ b/src/agent_comms/cli_options.py @@ -7,7 +7,7 @@ from collections.abc import Sequence from typing import ClassVar, Self -from .field_codec import FieldCodec +from .nominal.field_codec import FieldCodec class JsonFlagRecord: diff --git a/src/agent_comms/cli_protocol.py b/src/agent_comms/cli_protocol.py index fd08773657..cf8d9fd15d 100644 --- a/src/agent_comms/cli_protocol.py +++ b/src/agent_comms/cli_protocol.py @@ -24,9 +24,9 @@ from typing_extensions import TypeForm from .coordination_errors import CoordinationReadUnavailable -from .declared_family import DeclaredFamily, UnknownFamilyMember +from .nominal.declared_family import DeclaredFamily, UnknownFamilyMember from .external_transcript import RequestedEarlierPage -from .field_codec import TimestampText +from .nominal.field_codec import TimestampText from .maintenance_barrier import MaintenanceHeldError from .messages import Message from .recorded_time import UnrecordedTimeError diff --git a/src/agent_comms/cli_support/constraint_pin.py b/src/agent_comms/cli_support/constraint_pin.py index 0b651b7598..3996be8105 100644 --- a/src/agent_comms/cli_support/constraint_pin.py +++ b/src/agent_comms/cli_support/constraint_pin.py @@ -7,7 +7,7 @@ from agent_comms.cli_command import CliCommand from agent_comms.cli_commands import WorktreeArgument -from agent_comms.field_codec import Argument +from agent_comms.nominal.field_codec import Argument @dataclass(frozen=True, kw_only=True) diff --git a/src/agent_comms/cli_support/conversation_limits.py b/src/agent_comms/cli_support/conversation_limits.py index a088df0456..7204445b4b 100644 --- a/src/agent_comms/cli_support/conversation_limits.py +++ b/src/agent_comms/cli_support/conversation_limits.py @@ -1,7 +1,7 @@ from __future__ import annotations from agent_comms.cli_command import CliCommand -from agent_comms.field_codec import Argument +from agent_comms.nominal.field_codec import Argument from agent_comms.importing import ImportLimits from dataclasses import dataclass from typing import Annotated diff --git a/src/agent_comms/cli_support/importing.py b/src/agent_comms/cli_support/importing.py index d4a06c1324..deb1622802 100644 --- a/src/agent_comms/cli_support/importing.py +++ b/src/agent_comms/cli_support/importing.py @@ -4,8 +4,8 @@ from agent_comms.cli_commands import _tags from agent_comms.cli_support.conversation_limits import ConversationLimitsCliCommand from agent_comms.comms import Comms -from agent_comms.field_codec import Argument -from agent_comms.field_codec import Normalize +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import Normalize from agent_comms.importing import ThreadImported from agent_comms.thread_management import ImportDirectory from agent_comms.thread_management import SourceDirectory diff --git a/src/agent_comms/cli_support/named.py b/src/agent_comms/cli_support/named.py index c50520c15b..801c713380 100644 --- a/src/agent_comms/cli_support/named.py +++ b/src/agent_comms/cli_support/named.py @@ -1,8 +1,8 @@ from __future__ import annotations from agent_comms.cli_command import CliCommand -from agent_comms.field_codec import Argument -from agent_comms.field_codec import TargetBound +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import TargetBound from dataclasses import dataclass from typing import Annotated diff --git a/src/agent_comms/cli_support/prepared_checkout.py b/src/agent_comms/cli_support/prepared_checkout.py index 4bd0234efd..ba1613f0dc 100644 --- a/src/agent_comms/cli_support/prepared_checkout.py +++ b/src/agent_comms/cli_support/prepared_checkout.py @@ -7,9 +7,9 @@ from agent_comms.cli_commands import CheckoutResult from agent_comms.cli_result import CliResult from agent_comms.comms import Comms -from agent_comms.field_codec import Argument -from agent_comms.field_codec import FieldCodec -from agent_comms.field_codec import Normalize +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import FieldCodec +from agent_comms.nominal.field_codec import Normalize from agent_comms.repo import Repo from agent_comms.storage_rules import StorageRule from agent_comms.threads import Thread diff --git a/src/agent_comms/cli_support/running_session.py b/src/agent_comms/cli_support/running_session.py index 6bf4f02a96..3d7aad7817 100644 --- a/src/agent_comms/cli_support/running_session.py +++ b/src/agent_comms/cli_support/running_session.py @@ -4,8 +4,8 @@ from agent_comms.cli_bridges.history import HarnessAddress from agent_comms.cli_bridges.history import OnlineHistory from agent_comms.cli_command import CliCommand -from agent_comms.field_codec import Argument -from agent_comms.field_codec import Editor +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import Editor from agent_comms.harness_install import Harness from agent_comms.target_fields import ChoiceTargetField from dataclasses import dataclass diff --git a/src/agent_comms/cli_support/target_arguments.py b/src/agent_comms/cli_support/target_arguments.py index 1a7bc05aef..4884eabe00 100644 --- a/src/agent_comms/cli_support/target_arguments.py +++ b/src/agent_comms/cli_support/target_arguments.py @@ -4,8 +4,8 @@ from agent_comms.channel_targets import SurroundingChannel from agent_comms.cli_command import CliCommand from agent_comms.repo import Checkout -from agent_comms.field_codec import Argument -from agent_comms.field_codec import Normalize +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import Normalize from dataclasses import dataclass from typing import Annotated import dataclasses diff --git a/src/agent_comms/cli_verbs/activity.py b/src/agent_comms/cli_verbs/activity.py index f1496be9ff..f7ffe9b1a4 100644 --- a/src/agent_comms/cli_verbs/activity.py +++ b/src/agent_comms/cli_verbs/activity.py @@ -6,8 +6,8 @@ from agent_comms.cli_commands import NameArgument from agent_comms.cli_result import CliResult from agent_comms.comms import Comms -from agent_comms.field_codec import Argument -from agent_comms.field_codec import Editor +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import Editor from agent_comms.target_fields import ChoiceTargetField from dataclasses import dataclass from typing import Annotated diff --git a/src/agent_comms/cli_verbs/annotations.py b/src/agent_comms/cli_verbs/annotations.py index 98134878e5..da6b833567 100644 --- a/src/agent_comms/cli_verbs/annotations.py +++ b/src/agent_comms/cli_verbs/annotations.py @@ -4,8 +4,8 @@ from agent_comms.cli_result import CliResult from agent_comms.comms import Comms from agent_comms.coordination_database import CoordinationStore -from agent_comms.field_codec import Argument -from agent_comms.field_codec import Editor +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import Editor from agent_comms.target_fields import ChoiceTargetField from agent_comms.working_memory_annotations import WorkingMemoryAnnotations from agent_comms.working_memory_labels import ClassifierVersion diff --git a/src/agent_comms/cli_verbs/approve_annotations.py b/src/agent_comms/cli_verbs/approve_annotations.py index 74aa569c05..271693da23 100644 --- a/src/agent_comms/cli_verbs/approve_annotations.py +++ b/src/agent_comms/cli_verbs/approve_annotations.py @@ -2,7 +2,7 @@ from agent_comms.cli_verbs.pin_constraint import PinConstraintCliCommand from agent_comms.comms import Comms -from agent_comms.field_codec import Argument +from agent_comms.nominal.field_codec import Argument from agent_comms.message_reference import MessageReference from agent_comms.messages import Message from agent_comms.turn_context import ContextSegment diff --git a/src/agent_comms/cli_verbs/archive_channel.py b/src/agent_comms/cli_verbs/archive_channel.py index a024256b06..02f355ca5a 100644 --- a/src/agent_comms/cli_verbs/archive_channel.py +++ b/src/agent_comms/cli_verbs/archive_channel.py @@ -13,8 +13,8 @@ from agent_comms.cli_verbs.archive import ArchiveCliCommand from agent_comms.cli_support.named import NamedCliCommand from agent_comms.comms import Comms -from agent_comms.field_codec import Argument -from agent_comms.field_codec import TargetBound +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import TargetBound from agent_comms.registry_document import RegistrySnapshot from dataclasses import dataclass from typing import Annotated diff --git a/src/agent_comms/cli_verbs/attach_session.py b/src/agent_comms/cli_verbs/attach_session.py index 6a1e6fc4bf..ea7caf5e93 100644 --- a/src/agent_comms/cli_verbs/attach_session.py +++ b/src/agent_comms/cli_verbs/attach_session.py @@ -8,7 +8,7 @@ from agent_comms.cli_commands import SessionAttachedResult from agent_comms.cli_result import CliResult from agent_comms.comms import Comms -from agent_comms.field_codec import Argument +from agent_comms.nominal.field_codec import Argument from dataclasses import dataclass from typing import Annotated import dataclasses diff --git a/src/agent_comms/cli_verbs/channel_activity.py b/src/agent_comms/cli_verbs/channel_activity.py index 29f313170e..582c60ac78 100644 --- a/src/agent_comms/cli_verbs/channel_activity.py +++ b/src/agent_comms/cli_verbs/channel_activity.py @@ -9,8 +9,8 @@ from agent_comms.channels import Channel from agent_comms.cli_support.named import NamedCliCommand from agent_comms.comms import Comms -from agent_comms.field_codec import Argument -from agent_comms.field_codec import TargetBound +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import TargetBound from agent_comms.registry_document import RegistrySnapshot from dataclasses import dataclass from typing import Annotated diff --git a/src/agent_comms/cli_verbs/check_root.py b/src/agent_comms/cli_verbs/check_root.py index c2bdf19577..443887d32d 100644 --- a/src/agent_comms/cli_verbs/check_root.py +++ b/src/agent_comms/cli_verbs/check_root.py @@ -5,9 +5,9 @@ from agent_comms.cli_commands import _tags from agent_comms.cli_result import CliResult from agent_comms.comms import Comms -from agent_comms.field_codec import Argument -from agent_comms.field_codec import Normalize -from agent_comms.field_codec import PathText +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import Normalize +from agent_comms.nominal.field_codec import PathText from dataclasses import dataclass from pathlib import Path from typing import Annotated diff --git a/src/agent_comms/cli_verbs/checkout.py b/src/agent_comms/cli_verbs/checkout.py index b537655616..832e2355bf 100644 --- a/src/agent_comms/cli_verbs/checkout.py +++ b/src/agent_comms/cli_verbs/checkout.py @@ -4,7 +4,7 @@ from agent_comms.cli_commands import OrderCheckoutGrant from agent_comms.cli_support.prepared_checkout import PreparedCheckoutCliCommand from agent_comms.comms import Comms -from agent_comms.field_codec import Argument +from agent_comms.nominal.field_codec import Argument from agent_comms.storage_rules import OrderCheckoutAllocation from agent_comms.storage_rules import StorageRule from agent_comms.threads import Thread diff --git a/src/agent_comms/cli_verbs/correct_annotation.py b/src/agent_comms/cli_verbs/correct_annotation.py index 1a82ce5a12..acef8ec50f 100644 --- a/src/agent_comms/cli_verbs/correct_annotation.py +++ b/src/agent_comms/cli_verbs/correct_annotation.py @@ -6,8 +6,8 @@ from agent_comms.comms import Comms from agent_comms.coordination_database import CoordinationStore from agent_comms.coordinator import Coordination -from agent_comms.field_codec import Argument -from agent_comms.field_codec import Editor +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import Editor from agent_comms.target_fields import ChoiceTargetField from agent_comms.working_memory_labels import ModelLabel from agent_comms.working_memory_questions import SpanAnswer diff --git a/src/agent_comms/cli_verbs/delete_tag.py b/src/agent_comms/cli_verbs/delete_tag.py index 233047f993..de2df668bc 100644 --- a/src/agent_comms/cli_verbs/delete_tag.py +++ b/src/agent_comms/cli_verbs/delete_tag.py @@ -6,9 +6,9 @@ from agent_comms.cli_command import MultipleTargets from agent_comms.cli_support.exact_tag import ExactTagCliCommand from agent_comms.comms import Comms -from agent_comms.field_codec import Argument -from agent_comms.field_codec import Editor -from agent_comms.field_codec import TargetBound +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import Editor +from agent_comms.nominal.field_codec import TargetBound from agent_comms.target_fields import ChoiceTargetField from dataclasses import dataclass from dataclasses import replace diff --git a/src/agent_comms/cli_verbs/drop_constraint.py b/src/agent_comms/cli_verbs/drop_constraint.py index 95a13ef01c..266c1e6909 100644 --- a/src/agent_comms/cli_verbs/drop_constraint.py +++ b/src/agent_comms/cli_verbs/drop_constraint.py @@ -7,8 +7,8 @@ from agent_comms.cli_commands import _message_reference from agent_comms.cli_result import CliResult from agent_comms.comms import Comms -from agent_comms.field_codec import Argument -from agent_comms.field_codec import Normalize +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import Normalize from agent_comms.message_reference import MessageReference from agent_comms.task_sources import CorrectionTaskChange, UserTaskDrop from dataclasses import dataclass diff --git a/src/agent_comms/cli_verbs/export_retained.py b/src/agent_comms/cli_verbs/export_retained.py index 3093231c91..4ebb59e96c 100644 --- a/src/agent_comms/cli_verbs/export_retained.py +++ b/src/agent_comms/cli_verbs/export_retained.py @@ -3,7 +3,7 @@ from agent_comms.cli_command import CliCommand from agent_comms.cli_result import CliResult from agent_comms.comms import Comms -from agent_comms.field_codec import Argument +from agent_comms.nominal.field_codec import Argument from dataclasses import dataclass from typing import Annotated diff --git a/src/agent_comms/cli_verbs/export_wire.py b/src/agent_comms/cli_verbs/export_wire.py index 939d34c33d..246e4c85ce 100644 --- a/src/agent_comms/cli_verbs/export_wire.py +++ b/src/agent_comms/cli_verbs/export_wire.py @@ -12,9 +12,9 @@ from agent_comms.exporting import SelectableWireExportFormat from agent_comms.exporting import UnsetLimitFlag from agent_comms.exporting import UnsetScopeFlag -from agent_comms.field_codec import Argument -from agent_comms.field_codec import Editor -from agent_comms.field_codec import NamedArgumentGroup +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import Editor +from agent_comms.nominal.field_codec import NamedArgumentGroup from agent_comms.target_fields import ChoiceTargetField from dataclasses import dataclass from typing import Annotated diff --git a/src/agent_comms/cli_verbs/fork.py b/src/agent_comms/cli_verbs/fork.py index b36253a47a..3ed0950f6e 100644 --- a/src/agent_comms/cli_verbs/fork.py +++ b/src/agent_comms/cli_verbs/fork.py @@ -3,8 +3,8 @@ from agent_comms.cli_verbs.new import NewThreadCliCommand from agent_comms.cli_support.thread_bound import ThreadBoundCliCommand from agent_comms.comms import Comms -from agent_comms.field_codec import Argument -from agent_comms.field_codec import TargetBound +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import TargetBound from agent_comms.thread_execution import NativeOwnerCommand from agent_comms.thread_management import ForkSpec from agent_comms.thread_management import GivenTags diff --git a/src/agent_comms/cli_verbs/goal_checkout.py b/src/agent_comms/cli_verbs/goal_checkout.py index 99bdf9914c..f5759eaf63 100644 --- a/src/agent_comms/cli_verbs/goal_checkout.py +++ b/src/agent_comms/cli_verbs/goal_checkout.py @@ -4,8 +4,8 @@ from agent_comms.cli_commands import GoalCheckoutGrant from agent_comms.cli_support.prepared_checkout import PreparedCheckoutCliCommand from agent_comms.comms import Comms -from agent_comms.field_codec import Argument -from agent_comms.field_codec import PathText +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import PathText from agent_comms.repo import Repo from agent_comms.storage_rules import StorageRule from agent_comms.threads import Thread diff --git a/src/agent_comms/cli_verbs/history.py b/src/agent_comms/cli_verbs/history.py index 3df7a4fa51..476970e879 100644 --- a/src/agent_comms/cli_verbs/history.py +++ b/src/agent_comms/cli_verbs/history.py @@ -4,7 +4,7 @@ from agent_comms.channels import AnyChannel from agent_comms.cli_command import CliCommand from agent_comms.comms import Comms -from agent_comms.field_codec import Argument +from agent_comms.nominal.field_codec import Argument from agent_comms.history_result import HistoryPageResult from agent_comms.message_page import PageBounds from agent_comms.page_traversal import NewestCursor diff --git a/src/agent_comms/cli_verbs/import_running_thread.py b/src/agent_comms/cli_verbs/import_running_thread.py index b86b10eae3..c8de1400cc 100644 --- a/src/agent_comms/cli_verbs/import_running_thread.py +++ b/src/agent_comms/cli_verbs/import_running_thread.py @@ -4,7 +4,7 @@ from agent_comms.cli_support.importing import ImportingCliCommand from agent_comms.cli_support.running_session import RunningSessionCliCommand from agent_comms.comms import Comms -from agent_comms.field_codec import Argument +from agent_comms.nominal.field_codec import Argument from dataclasses import dataclass from typing import Annotated diff --git a/src/agent_comms/cli_verbs/import_subagents.py b/src/agent_comms/cli_verbs/import_subagents.py index 3e8a542a45..0adad78fdc 100644 --- a/src/agent_comms/cli_verbs/import_subagents.py +++ b/src/agent_comms/cli_verbs/import_subagents.py @@ -4,8 +4,8 @@ from agent_comms.cli_commands import SubagentsImportedResult from agent_comms.cli_support.importing import ImportingCliCommand from agent_comms.comms import Comms -from agent_comms.field_codec import Argument -from agent_comms.field_codec import PathText +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import PathText from dataclasses import dataclass from pathlib import Path from typing import Annotated diff --git a/src/agent_comms/cli_verbs/import_thread.py b/src/agent_comms/cli_verbs/import_thread.py index 49b78f9fb4..b219a32670 100644 --- a/src/agent_comms/cli_verbs/import_thread.py +++ b/src/agent_comms/cli_verbs/import_thread.py @@ -6,9 +6,9 @@ from agent_comms.cli_result import CliResult from agent_comms.cli_support.importing import ImportingCliCommand from agent_comms.comms import Comms -from agent_comms.field_codec import Argument -from agent_comms.field_codec import Editor -from agent_comms.field_codec import PathText +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import Editor +from agent_comms.nominal.field_codec import PathText from agent_comms.harness_install import Harness from agent_comms.target_fields import ChoiceTargetField from dataclasses import dataclass diff --git a/src/agent_comms/cli_verbs/inbox.py b/src/agent_comms/cli_verbs/inbox.py index 339c673d66..1ade6d31d5 100644 --- a/src/agent_comms/cli_verbs/inbox.py +++ b/src/agent_comms/cli_verbs/inbox.py @@ -5,7 +5,7 @@ from agent_comms.cli_commands import ThreadArgument from agent_comms.cli_result import CliResult from agent_comms.comms import Comms -from agent_comms.field_codec import Argument +from agent_comms.nominal.field_codec import Argument from agent_comms.message_reference import NewestUnreadStart from agent_comms.page_traversal import NewestCursor from agent_comms.page_traversal import PageCursor diff --git a/src/agent_comms/cli_verbs/install.py b/src/agent_comms/cli_verbs/install.py index 8c4df3a697..9ba7af2a30 100644 --- a/src/agent_comms/cli_verbs/install.py +++ b/src/agent_comms/cli_verbs/install.py @@ -4,7 +4,7 @@ from agent_comms.active_route import RouteFile from agent_comms.active_route import active_route_path from agent_comms.cli_command import CliCommand -from agent_comms.field_codec import WireExclude +from agent_comms.nominal.field_codec import WireExclude from agent_comms.installer.interpreter_operation import ProcessLauncherPhase from agent_comms.installer.launch import InstallRun from agent_comms.installer.logs import InstallLogs diff --git a/src/agent_comms/cli_verbs/ledger_merge.py b/src/agent_comms/cli_verbs/ledger_merge.py index 806afdb583..24411c9e92 100644 --- a/src/agent_comms/cli_verbs/ledger_merge.py +++ b/src/agent_comms/cli_verbs/ledger_merge.py @@ -3,7 +3,7 @@ from agent_comms.cli_command import CliCommand from agent_comms.cli_commands import LedgerMergedResult from agent_comms.comms import Comms -from agent_comms.field_codec import Argument +from agent_comms.nominal.field_codec import Argument from dataclasses import dataclass from pathlib import Path from typing import Annotated diff --git a/src/agent_comms/cli_verbs/merge_review.py b/src/agent_comms/cli_verbs/merge_review.py index 8806e63181..be3a301f6c 100644 --- a/src/agent_comms/cli_verbs/merge_review.py +++ b/src/agent_comms/cli_verbs/merge_review.py @@ -8,7 +8,7 @@ from agent_comms.cli_commands import MergeReviewResult from agent_comms.comms import Comms from agent_comms.errors import ToolRefusedError -from agent_comms.field_codec import Argument +from agent_comms.nominal.field_codec import Argument from agent_comms.head_review import PullRequestHead from agent_comms.repository_name import RepositoryName from agent_comms.shell_commands import ShellCommand diff --git a/src/agent_comms/cli_verbs/new.py b/src/agent_comms/cli_verbs/new.py index d24a4b42a9..7b0e803019 100644 --- a/src/agent_comms/cli_verbs/new.py +++ b/src/agent_comms/cli_verbs/new.py @@ -8,12 +8,12 @@ from agent_comms.config_options import ConfigOptions from agent_comms.config_options import ModelConfigOption from agent_comms.config_options import ThinkingLevelConfigOption -from agent_comms.field_codec import Argument -from agent_comms.field_codec import Catalog -from agent_comms.field_codec import EditorFormat -from agent_comms.field_codec import FieldCodec -from agent_comms.field_codec import Multiline -from agent_comms.field_codec import Normalize +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import Catalog +from agent_comms.nominal.field_codec import EditorFormat +from agent_comms.nominal.field_codec import FieldCodec +from agent_comms.nominal.field_codec import Multiline +from agent_comms.nominal.field_codec import Normalize from agent_comms.native_settings import NativeThreadDefaults from agent_comms.repo import Checkout, LaunchCheckout from agent_comms.pi_vocabulary import ThinkingLevelField diff --git a/src/agent_comms/cli_verbs/pin_channel.py b/src/agent_comms/cli_verbs/pin_channel.py index 3c04ed8b23..e365a9b6e6 100644 --- a/src/agent_comms/cli_verbs/pin_channel.py +++ b/src/agent_comms/cli_verbs/pin_channel.py @@ -13,8 +13,8 @@ from agent_comms.cli_support.named import NamedCliCommand from agent_comms.cli_verbs.pin_thread import PinThreadCliCommand from agent_comms.comms import Comms -from agent_comms.field_codec import Argument -from agent_comms.field_codec import TargetBound +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import TargetBound from agent_comms.registry_document import RegistrySnapshot from dataclasses import dataclass from typing import Annotated diff --git a/src/agent_comms/cli_verbs/pin_constraint.py b/src/agent_comms/cli_verbs/pin_constraint.py index 7d2640a8ef..96a98a991e 100644 --- a/src/agent_comms/cli_verbs/pin_constraint.py +++ b/src/agent_comms/cli_verbs/pin_constraint.py @@ -5,8 +5,8 @@ from agent_comms.cli_commands import _message_reference from agent_comms.cli_result import CliResult from agent_comms.comms import Comms -from agent_comms.field_codec import Argument -from agent_comms.field_codec import Normalize +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import Normalize from agent_comms.message_reference import MessageReference from agent_comms.messages import Message from dataclasses import dataclass diff --git a/src/agent_comms/cli_verbs/pin_input_constraint.py b/src/agent_comms/cli_verbs/pin_input_constraint.py index c359266f78..607ef23b98 100644 --- a/src/agent_comms/cli_verbs/pin_input_constraint.py +++ b/src/agent_comms/cli_verbs/pin_input_constraint.py @@ -4,7 +4,7 @@ from agent_comms.cli_result import CliResult from agent_comms.cli_support.constraint_pin import OriginalConstraintPin from agent_comms.comms import Comms -from agent_comms.field_codec import Argument +from agent_comms.nominal.field_codec import Argument from agent_comms.input_disposition import InputDispositions from agent_comms.input_key import InputKey from agent_comms.input_key import InputKeyText diff --git a/src/agent_comms/cli_verbs/pin_thread.py b/src/agent_comms/cli_verbs/pin_thread.py index f194f5a070..81c6059c69 100644 --- a/src/agent_comms/cli_verbs/pin_thread.py +++ b/src/agent_comms/cli_verbs/pin_thread.py @@ -7,8 +7,8 @@ from agent_comms.cli_commands import ThreadPinnedResult from agent_comms.cli_support.named import NamedCliCommand from agent_comms.comms import Comms -from agent_comms.field_codec import Argument -from agent_comms.field_codec import TargetBound +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import TargetBound from agent_comms.thread_status import ThreadStatus from agent_comms.threads import Thread from dataclasses import dataclass diff --git a/src/agent_comms/cli_verbs/planned_reconcile.py b/src/agent_comms/cli_verbs/planned_reconcile.py index d3d65ba021..b37668fe8f 100644 --- a/src/agent_comms/cli_verbs/planned_reconcile.py +++ b/src/agent_comms/cli_verbs/planned_reconcile.py @@ -2,7 +2,7 @@ from agent_comms.cli_commands import PlannedStoresResult from agent_comms.cli_support.store_reconcile import StoreReconcileCliCommand -from agent_comms.field_codec import Argument +from agent_comms.nominal.field_codec import Argument from agent_comms.typed_table import ReconciledFile from agent_comms.typed_table import StoreRewrite from agent_comms.typed_table import ExternalStore diff --git a/src/agent_comms/cli_verbs/poll.py b/src/agent_comms/cli_verbs/poll.py index f3caa82cee..d277d073a0 100644 --- a/src/agent_comms/cli_verbs/poll.py +++ b/src/agent_comms/cli_verbs/poll.py @@ -3,8 +3,8 @@ from agent_comms.cli_command import CliCommand from agent_comms.cli_result import CliResult from agent_comms.comms import Comms -from agent_comms.field_codec import Argument -from agent_comms.field_codec import Normalize +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import Normalize from agent_comms.history_views import CallingThreadTarget from agent_comms.history_views import NamedThreadTarget from agent_comms.history_views import PollTarget diff --git a/src/agent_comms/cli_verbs/read_target.py b/src/agent_comms/cli_verbs/read_target.py index b099c311d3..4545ac2f24 100644 --- a/src/agent_comms/cli_verbs/read_target.py +++ b/src/agent_comms/cli_verbs/read_target.py @@ -10,8 +10,8 @@ from agent_comms.cli_command import MultipleTargets from agent_comms.cli_commands import TargetReadResult from agent_comms.comms import Comms -from agent_comms.field_codec import Argument -from agent_comms.field_codec import TargetBound +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import TargetBound from agent_comms.registry_document import RegistrySnapshot from agent_comms.thread_status import ThreadStatus from agent_comms.threads import Thread diff --git a/src/agent_comms/cli_verbs/reconcile_stores.py b/src/agent_comms/cli_verbs/reconcile_stores.py index 3c40ba2782..063fe7728a 100644 --- a/src/agent_comms/cli_verbs/reconcile_stores.py +++ b/src/agent_comms/cli_verbs/reconcile_stores.py @@ -2,7 +2,7 @@ from agent_comms.cli_commands import ReconciledStoresResult from agent_comms.cli_support.store_reconcile import StoreReconcileCliCommand -from agent_comms.field_codec import Argument +from agent_comms.nominal.field_codec import Argument from agent_comms.typed_table import HeldBusFile from agent_comms.typed_table import NoPractice from agent_comms.typed_table import Practice diff --git a/src/agent_comms/cli_verbs/register.py b/src/agent_comms/cli_verbs/register.py index 65d5c30a59..7945d2757b 100644 --- a/src/agent_comms/cli_verbs/register.py +++ b/src/agent_comms/cli_verbs/register.py @@ -10,9 +10,9 @@ from agent_comms.cli_commands import _tags from agent_comms.cli_result import CliResult from agent_comms.comms import Comms -from agent_comms.field_codec import Argument -from agent_comms.field_codec import Editor -from agent_comms.field_codec import Normalize +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import Editor +from agent_comms.nominal.field_codec import Normalize from agent_comms.target_fields import ChoiceTargetField from agent_comms.thread_execution import ExternalThreadExecution from agent_comms.thread_execution import ThreadExecution diff --git a/src/agent_comms/cli_verbs/rehome_thread.py b/src/agent_comms/cli_verbs/rehome_thread.py index 83e2c28a44..4d299fa91b 100644 --- a/src/agent_comms/cli_verbs/rehome_thread.py +++ b/src/agent_comms/cli_verbs/rehome_thread.py @@ -4,7 +4,7 @@ from agent_comms.cli_support.conversation_limits import ConversationLimitsCliCommand from agent_comms.cli_support.running_session import RunningSessionCliCommand from agent_comms.comms import Comms -from agent_comms.field_codec import Argument +from agent_comms.nominal.field_codec import Argument from dataclasses import dataclass from pathlib import Path from typing import Annotated diff --git a/src/agent_comms/cli_verbs/rename_tag.py b/src/agent_comms/cli_verbs/rename_tag.py index 050e24387b..995bb8d5ab 100644 --- a/src/agent_comms/cli_verbs/rename_tag.py +++ b/src/agent_comms/cli_verbs/rename_tag.py @@ -3,7 +3,7 @@ from agent_comms.cli_commands import TagRenamedResult from agent_comms.cli_support.exact_tag import ExactTagCliCommand from agent_comms.comms import Comms -from agent_comms.field_codec import Argument +from agent_comms.nominal.field_codec import Argument from dataclasses import dataclass from typing import Annotated from typing import Self diff --git a/src/agent_comms/cli_verbs/repository_checkout.py b/src/agent_comms/cli_verbs/repository_checkout.py index 168103e7a4..0f7ff31bc0 100644 --- a/src/agent_comms/cli_verbs/repository_checkout.py +++ b/src/agent_comms/cli_verbs/repository_checkout.py @@ -3,7 +3,7 @@ from agent_comms.cli_commands import CheckoutGrant from agent_comms.cli_verbs.checkout import CheckoutCliCommand from agent_comms.comms import Comms -from agent_comms.field_codec import Argument +from agent_comms.nominal.field_codec import Argument from agent_comms.repo import Repo from agent_comms.repository_name import RepositoryName from agent_comms.storage_rules import RepositoryCheckoutAllocation diff --git a/src/agent_comms/cli_verbs/restart.py b/src/agent_comms/cli_verbs/restart.py index e872961fd3..5612010027 100644 --- a/src/agent_comms/cli_verbs/restart.py +++ b/src/agent_comms/cli_verbs/restart.py @@ -5,11 +5,11 @@ from agent_comms.cli_commands import _shell_words from agent_comms.cli_result import CliResult from agent_comms.comms import Comms -from agent_comms.field_codec import Argument -from agent_comms.field_codec import NamedArgumentGroup -from agent_comms.field_codec import Normalize -from agent_comms.field_codec import TargetBound -from agent_comms.field_codec import WireName +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import NamedArgumentGroup +from agent_comms.nominal.field_codec import Normalize +from agent_comms.nominal.field_codec import TargetBound +from agent_comms.nominal.field_codec import WireName from agent_comms.native_arguments import ConfiguredBinary from agent_comms.native_arguments import InheritedArguments from agent_comms.native_arguments import LaunchArguments diff --git a/src/agent_comms/cli_verbs/restore_channel.py b/src/agent_comms/cli_verbs/restore_channel.py index dc025fb4ef..aa7f68bce8 100644 --- a/src/agent_comms/cli_verbs/restore_channel.py +++ b/src/agent_comms/cli_verbs/restore_channel.py @@ -3,8 +3,8 @@ from agent_comms.cli_command import CliCommand from agent_comms.cli_verbs.archive_channel import ArchiveChannelCliCommand -from agent_comms.field_codec import Argument -from agent_comms.field_codec import TargetBound +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import TargetBound from dataclasses import dataclass from typing import Annotated diff --git a/src/agent_comms/cli_verbs/send.py b/src/agent_comms/cli_verbs/send.py index 488ea35bb9..aa27474c5c 100644 --- a/src/agent_comms/cli_verbs/send.py +++ b/src/agent_comms/cli_verbs/send.py @@ -2,7 +2,7 @@ from agent_comms.cli_support.publishing import PublishingCliCommand from agent_comms.comms import Comms -from agent_comms.field_codec import Argument +from agent_comms.nominal.field_codec import Argument from agent_comms.send_request import SendRequest from agent_comms.send_result import MessageSentResult from dataclasses import dataclass diff --git a/src/agent_comms/cli_verbs/supersede_constraint.py b/src/agent_comms/cli_verbs/supersede_constraint.py index 8cb080b83c..192657cb49 100644 --- a/src/agent_comms/cli_verbs/supersede_constraint.py +++ b/src/agent_comms/cli_verbs/supersede_constraint.py @@ -7,8 +7,8 @@ from agent_comms.cli_commands import _message_reference from agent_comms.cli_result import CliResult from agent_comms.comms import Comms -from agent_comms.field_codec import Argument -from agent_comms.field_codec import Normalize +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import Normalize from agent_comms.message_reference import MessageReference from agent_comms.task_sources import CorrectionTaskChange from agent_comms.task_sources import UserTaskSupersession diff --git a/src/agent_comms/cli_verbs/target_action.py b/src/agent_comms/cli_verbs/target_action.py index 329bb4cbae..ddf158c180 100644 --- a/src/agent_comms/cli_verbs/target_action.py +++ b/src/agent_comms/cli_verbs/target_action.py @@ -5,7 +5,7 @@ from agent_comms.cli_result import CliResult from agent_comms.cli_support.target_arguments import TargetArguments from agent_comms.comms import Comms -from agent_comms.field_codec import Argument +from agent_comms.nominal.field_codec import Argument from dataclasses import dataclass from pydantic import JsonValue from typing import Annotated diff --git a/src/agent_comms/cli_verbs/thread.py b/src/agent_comms/cli_verbs/thread.py index c39a50f5ad..04bf4a820f 100644 --- a/src/agent_comms/cli_verbs/thread.py +++ b/src/agent_comms/cli_verbs/thread.py @@ -4,9 +4,9 @@ from agent_comms.cli_commands import NameArgument from agent_comms.cli_result import CliResult from agent_comms.comms import Comms -from agent_comms.field_codec import Argument -from agent_comms.field_codec import FieldCodec -from agent_comms.field_codec import Normalize +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import FieldCodec +from agent_comms.nominal.field_codec import Normalize from agent_comms.presentation import CountedRead from agent_comms.presentation import InboxRead from agent_comms.presentation import UncountedRead diff --git a/src/agent_comms/cli_verbs/thread_tags.py b/src/agent_comms/cli_verbs/thread_tags.py index e7eff77318..5ee2beeb37 100644 --- a/src/agent_comms/cli_verbs/thread_tags.py +++ b/src/agent_comms/cli_verbs/thread_tags.py @@ -8,9 +8,9 @@ from agent_comms.cli_commands import _tags from agent_comms.cli_support.named import NamedCliCommand from agent_comms.comms import Comms -from agent_comms.field_codec import Argument -from agent_comms.field_codec import EditorFormat -from agent_comms.field_codec import Normalize +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import EditorFormat +from agent_comms.nominal.field_codec import Normalize from agent_comms.thread_status import ThreadStatus from agent_comms.threads import Thread from dataclasses import dataclass diff --git a/src/agent_comms/cli_verbs/threads.py b/src/agent_comms/cli_verbs/threads.py index c352309011..742d7739a1 100644 --- a/src/agent_comms/cli_verbs/threads.py +++ b/src/agent_comms/cli_verbs/threads.py @@ -3,7 +3,7 @@ from agent_comms.cli_command import CliCommand from agent_comms.cli_commands import ThreadsResult from agent_comms.comms import Comms -from agent_comms.field_codec import Argument +from agent_comms.nominal.field_codec import Argument from dataclasses import dataclass from typing import Annotated diff --git a/src/agent_comms/cli_verbs/tool.py b/src/agent_comms/cli_verbs/tool.py index 0db2797933..76e5bb4bdc 100644 --- a/src/agent_comms/cli_verbs/tool.py +++ b/src/agent_comms/cli_verbs/tool.py @@ -4,9 +4,9 @@ from agent_comms import cli as comms_cli from agent_comms.cli_command import CliCommand -from agent_comms.field_codec import Argument -from agent_comms.field_codec import FieldCodec -from agent_comms.field_codec import Normalize +from agent_comms.nominal.field_codec import Argument +from agent_comms.nominal.field_codec import FieldCodec +from agent_comms.nominal.field_codec import Normalize from agent_comms.tool_caller import NoThreadCaller from agent_comms.tool_caller import ThreadCaller from agent_comms.tools import ToolReplyResult diff --git a/src/agent_comms/cli_verbs/tools.py b/src/agent_comms/cli_verbs/tools.py index e6fdb3da8e..0661883fc5 100644 --- a/src/agent_comms/cli_verbs/tools.py +++ b/src/agent_comms/cli_verbs/tools.py @@ -6,7 +6,7 @@ from agent_comms.cli_command import CliCommand from agent_comms.cli_result import ToolCatalogResult from agent_comms.comms import Comms -from agent_comms.field_codec import Argument, FieldCodec, Normalize +from agent_comms.nominal.field_codec import Argument, FieldCodec, Normalize from agent_comms.tool_caller import NoThreadCaller, ThreadCaller from agent_comms.tool_declaration import NativeRequestTools diff --git a/src/agent_comms/cli_verbs/user_send.py b/src/agent_comms/cli_verbs/user_send.py index 7b116f1bee..fdd170352f 100644 --- a/src/agent_comms/cli_verbs/user_send.py +++ b/src/agent_comms/cli_verbs/user_send.py @@ -6,7 +6,7 @@ from agent_comms.cli_result import CliResult from agent_comms.cli_support.publishing import PublishingCliCommand from agent_comms.comms import Comms -from agent_comms.field_codec import Argument +from agent_comms.nominal.field_codec import Argument from dataclasses import dataclass from typing import Annotated diff --git a/src/agent_comms/cli_verbs/watch.py b/src/agent_comms/cli_verbs/watch.py index 68f54958a1..68db77c33a 100644 --- a/src/agent_comms/cli_verbs/watch.py +++ b/src/agent_comms/cli_verbs/watch.py @@ -5,7 +5,7 @@ from agent_comms.cli_commands import ThreadArgument from agent_comms.cli_commands import WatchStream from agent_comms.comms import Comms -from agent_comms.field_codec import Argument +from agent_comms.nominal.field_codec import Argument from agent_comms.agent_inbox import TakenInputStart from agent_comms.message_reference import InboxStart from dataclasses import dataclass diff --git a/src/agent_comms/cohort_foreground.py b/src/agent_comms/cohort_foreground.py index a5c37b9f6f..f139f35599 100644 --- a/src/agent_comms/cohort_foreground.py +++ b/src/agent_comms/cohort_foreground.py @@ -8,7 +8,7 @@ from agent_comms.coordination_errors import IdentityConflict from agent_comms.coordination_session import NativeCommit from agent_comms.coordinator import Coordination -from agent_comms.field_codec import RootId, ThreadLookup +from agent_comms.nominal.field_codec import RootId, ThreadLookup from .cohort_schema import AcceptanceFrontier, CohortDeliveries, CohortTable from .coordination_cohort import AcceptedCohort diff --git a/src/agent_comms/cohort_schema.py b/src/agent_comms/cohort_schema.py index 6acd9e6862..3a4402922d 100644 --- a/src/agent_comms/cohort_schema.py +++ b/src/agent_comms/cohort_schema.py @@ -15,7 +15,7 @@ from .audience_manifest import MAX_AUDIENCE_BYTES from .coordination_contracts import POLICY_VERSION, RESOLVER_VERSION -from .field_codec import AssignmentId, MalformedRecord, MessageId, RootId, SubclassUnion, ThreadLookup, WireName +from .nominal.field_codec import AssignmentId, MalformedRecord, MessageId, RootId, SubclassUnion, ThreadLookup, WireName from .thread_text import AbsentText, GivenText, TextChoice from .response_acknowledgement import _canonical from .typed_table import ( diff --git a/src/agent_comms/command.py b/src/agent_comms/command.py index a06f0f5454..beabdfa062 100644 --- a/src/agent_comms/command.py +++ b/src/agent_comms/command.py @@ -5,7 +5,7 @@ from collections.abc import Mapping -from .field_codec import FieldCodec +from .nominal.field_codec import FieldCodec class Command[Context, Result](ABC): diff --git a/src/agent_comms/commander/config.py b/src/agent_comms/commander/config.py index 4809f0a85d..f7a994dfee 100644 --- a/src/agent_comms/commander/config.py +++ b/src/agent_comms/commander/config.py @@ -7,7 +7,7 @@ from pathlib import Path from typing import Annotated, Self -from ..field_codec import AbsolutePathText, BoundedText, DeclaredWireType, FieldCodec, NullMember, SubclassUnion +from ..nominal.field_codec import AbsolutePathText, BoundedText, DeclaredWireType, FieldCodec, NullMember, SubclassUnion from agent_comms.installer.refusals import UpgradeRefused from ..registry_document import CommanderProject, RegistrySnapshot from ..repo import Repo, RepositorySelection diff --git a/src/agent_comms/commander/judge.py b/src/agent_comms/commander/judge.py index 3c85a70277..4f9a014f5d 100644 --- a/src/agent_comms/commander/judge.py +++ b/src/agent_comms/commander/judge.py @@ -39,10 +39,10 @@ from agent_comms.comms import Comms from agent_comms.change_report import FileLine -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( Argument, BoundedText, FieldCodec, MalformedRecord, MessageId, RecordProblems, ) -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.head_review import PullRequestHead from agent_comms.recorded_time import EventTime from agent_comms.errors import TodoError diff --git a/src/agent_comms/commander/order.py b/src/agent_comms/commander/order.py index f7ec75d3e6..94e932e89f 100644 --- a/src/agent_comms/commander/order.py +++ b/src/agent_comms/commander/order.py @@ -38,9 +38,9 @@ UnownedWheelSpin, ) from agent_comms.comms import Comms, wire -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( Argument, FieldCodec, MalformedRecord, diff --git a/src/agent_comms/commander/publication_rules.py b/src/agent_comms/commander/publication_rules.py index c1ec057086..95a3f4b780 100644 --- a/src/agent_comms/commander/publication_rules.py +++ b/src/agent_comms/commander/publication_rules.py @@ -6,7 +6,7 @@ from pathlib import Path from typing import TYPE_CHECKING, Annotated, Self -from agent_comms.field_codec import OrderId, PathText +from agent_comms.nominal.field_codec import OrderId, PathText from agent_comms.head_review import PullRequestHead from agent_comms.heartbeat_subjects import HeartbeatSubject, UnlandedHeadSubject from agent_comms.repository_name import RepositoryName diff --git a/src/agent_comms/commander/request.py b/src/agent_comms/commander/request.py index a7e77e22ca..378402548b 100644 --- a/src/agent_comms/commander/request.py +++ b/src/agent_comms/commander/request.py @@ -10,7 +10,7 @@ from functools import partial from typing import Annotated -from agent_comms import field_codec +from agent_comms.nominal import field_codec from agent_comms.commander.order import Commander, CommanderVerb, Reasoned from agent_comms.bus_write import HeldBusWrite from agent_comms.owner_requests import OwnerRequestId diff --git a/src/agent_comms/commander/rule_file.py b/src/agent_comms/commander/rule_file.py index 3b178dc26a..f8df5ce291 100644 --- a/src/agent_comms/commander/rule_file.py +++ b/src/agent_comms/commander/rule_file.py @@ -10,8 +10,8 @@ from typing import ClassVar, Self from agent_comms.commander.package import CommanderPackage -from agent_comms.declared_family import DeclaredFamily -from agent_comms.field_codec import FieldCodec, boundary_decoder +from agent_comms.nominal.declared_family import DeclaredFamily +from agent_comms.nominal.field_codec import FieldCodec, boundary_decoder class RuleAudience(DeclaredFamily, affix="Audience"): diff --git a/src/agent_comms/commander/standing.py b/src/agent_comms/commander/standing.py index d78808f784..14a76bdc0f 100644 --- a/src/agent_comms/commander/standing.py +++ b/src/agent_comms/commander/standing.py @@ -17,9 +17,9 @@ from agent_comms.commander.questions import UnansweredUnitAsks from agent_comms.commander_service import CommanderService from agent_comms.comms import Comms -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.goal_actions import ReissuedOrderGoalAction -from agent_comms.field_codec import GoalId +from agent_comms.nominal.field_codec import GoalId from agent_comms.head_review import PullRequestHead from agent_comms.heartbeat_frame import HeartbeatFrame from agent_comms.heartbeat_subjects import CommanderHistory, HeadSubject, HeartbeatSubject, PassSubject diff --git a/src/agent_comms/commander/vibe_check.py b/src/agent_comms/commander/vibe_check.py index 0e69ee42d0..ecaa4a2c11 100644 --- a/src/agent_comms/commander/vibe_check.py +++ b/src/agent_comms/commander/vibe_check.py @@ -19,7 +19,7 @@ from agent_comms.commander.questions import SenderMessages, UnansweredBurst from agent_comms.commander.standing import AnswersTo from agent_comms.comms import Comms -from agent_comms.field_codec import projected +from agent_comms.nominal.field_codec import projected from agent_comms.heartbeat_frame import HeartbeatFrame from agent_comms.goal_actions import ( ChokeholdPausedGoalAction, diff --git a/src/agent_comms/commander_hud.py b/src/agent_comms/commander_hud.py index 8168553d38..5f8854dbd3 100644 --- a/src/agent_comms/commander_hud.py +++ b/src/agent_comms/commander_hud.py @@ -20,7 +20,7 @@ from agent_comms.commander_service import CommanderService from agent_comms.coordinator import Coordination from agent_comms.errors import ToolRefusedError -from agent_comms.field_codec import OrderId, WireTransient, projected +from agent_comms.nominal.field_codec import OrderId, WireTransient, projected from agent_comms.heartbeat_frame import HeartbeatFrame from agent_comms.locked_store import JsonDocument from agent_comms.plan_phases import Plan, PlanPhase diff --git a/src/agent_comms/config_options.py b/src/agent_comms/config_options.py index 989c8d818e..d679ad932c 100644 --- a/src/agent_comms/config_options.py +++ b/src/agent_comms/config_options.py @@ -18,7 +18,7 @@ from .active_route import resolve_comms_route from .launch_root import LaunchRoot from .bus import Bus -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .launch_runtime import LaunchRuntime, ThreadLaunch from .owner_launch import RetainedOwnerLaunch from .native_arguments import NativeArguments @@ -34,7 +34,7 @@ from .watched import FileSource if TYPE_CHECKING: - from .field_codec import AcpSessionId + from .nominal.field_codec import AcpSessionId from .session_config_options import SessionConfigOptions from .active_route import CommsRoute from .native_package import VerifiedNativePackage diff --git a/src/agent_comms/connector.py b/src/agent_comms/connector.py index c74c654155..9874e1a170 100644 --- a/src/agent_comms/connector.py +++ b/src/agent_comms/connector.py @@ -50,10 +50,10 @@ from .command import Command from .comms import Comms, client_wire, wire from .repo import Checkout -from .declared_family import DeclaredFamily, UnknownFamilyMember +from .nominal.declared_family import DeclaredFamily, UnknownFamilyMember from .errors import RelationViolationError, ToolRefusedError, UnregisteredThreadError from .coordination_errors import CoordinationError, Refused -from .field_codec import ( +from .nominal.field_codec import ( Argument, FieldCodec, GitCommitText, MalformedRecord, PathText, WireName, WireOmitDefault, RecordMember, boundary_decoder, projected, ) diff --git a/src/agent_comms/connector_caller.py b/src/agent_comms/connector_caller.py index 69b4caf582..801ec53d3a 100644 --- a/src/agent_comms/connector_caller.py +++ b/src/agent_comms/connector_caller.py @@ -9,7 +9,7 @@ from .bus_publication import DirectorOrigin from .comms import Comms -from .field_codec import FieldCodec, MalformedRecord +from .nominal.field_codec import FieldCodec, MalformedRecord from .head_review import HeadReviewOrder, PullRequestHead from .thread_identity import ThreadIncarnation from .todos import DirectiveText diff --git a/src/agent_comms/connector_store.py b/src/agent_comms/connector_store.py index 122dce0333..4a13773459 100644 --- a/src/agent_comms/connector_store.py +++ b/src/agent_comms/connector_store.py @@ -13,7 +13,7 @@ from .connector_caller import CALLER, ConnectorCaller, ForkingCaller from .errors import ToolRefusedError -from .field_codec import FieldCodec +from .nominal.field_codec import FieldCodec from .locked_store import DocumentChange from .maintenance_barrier import CarriedDocument from .store_files import DependentStateTier, SingleFileStore diff --git a/src/agent_comms/context_reading.py b/src/agent_comms/context_reading.py index 515747d0bf..8fad24b9d1 100644 --- a/src/agent_comms/context_reading.py +++ b/src/agent_comms/context_reading.py @@ -3,7 +3,7 @@ from abc import abstractmethod from dataclasses import dataclass -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily class ContextReading(DeclaredFamily): diff --git a/src/agent_comms/context_segments/awareness.py b/src/agent_comms/context_segments/awareness.py index 8558894c3d..67397ffc43 100644 --- a/src/agent_comms/context_segments/awareness.py +++ b/src/agent_comms/context_segments/awareness.py @@ -2,7 +2,7 @@ from dataclasses import dataclass -from ..field_codec import FieldCodec +from ..nominal.field_codec import FieldCodec from ..message_reference import MessageReference from ..turn_context import InstructionSegment, WireProvenance diff --git a/src/agent_comms/context_segments/optional_awareness.py b/src/agent_comms/context_segments/optional_awareness.py index 536ee9a787..7fd13b0cbe 100644 --- a/src/agent_comms/context_segments/optional_awareness.py +++ b/src/agent_comms/context_segments/optional_awareness.py @@ -26,7 +26,7 @@ CohortDeliveries, SelectedClaim, ) -from ..field_codec import FieldCodec, ThreadLookup +from ..nominal.field_codec import FieldCodec, ThreadLookup from ..turn_context import ContextSegment, InstructionFile, InstructionSegment, TurnContext from ..wake_candidate_index import ProjectionUnavailableError diff --git a/src/agent_comms/context_segments/partner_activity.py b/src/agent_comms/context_segments/partner_activity.py index 9c85e26191..43564c65a0 100644 --- a/src/agent_comms/context_segments/partner_activity.py +++ b/src/agent_comms/context_segments/partner_activity.py @@ -9,7 +9,7 @@ from dataclasses import dataclass from typing import ClassVar -from ..field_codec import FieldCodec +from ..nominal.field_codec import FieldCodec from ..goal_history import GoalHistoryEntry from ..goals import GoalPeerChange from ..peer_relevance import Informed diff --git a/src/agent_comms/context_segments/relationships.py b/src/agent_comms/context_segments/relationships.py index 96c8e1b4db..5645474b46 100644 --- a/src/agent_comms/context_segments/relationships.py +++ b/src/agent_comms/context_segments/relationships.py @@ -4,7 +4,7 @@ import json from dataclasses import dataclass -from ..field_codec import FieldCodec +from ..nominal.field_codec import FieldCodec from ..relationships import RelationRecord from ..turn_context import InstructionSegment, OwnerProvenance diff --git a/src/agent_comms/context_segments/wake.py b/src/agent_comms/context_segments/wake.py index 06ca0abb08..5e83038629 100644 --- a/src/agent_comms/context_segments/wake.py +++ b/src/agent_comms/context_segments/wake.py @@ -12,7 +12,7 @@ from agent_comms.coordination_tables.assignments import WakeAssignment from agent_comms.coordination_tables.responses import ResponseObligation -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.presentation import SentMessageOutcome from ..bus_publication import Delivered diff --git a/src/agent_comms/context_segments/wake_values.py b/src/agent_comms/context_segments/wake_values.py index 2a751d19f3..2805f9f874 100644 --- a/src/agent_comms/context_segments/wake_values.py +++ b/src/agent_comms/context_segments/wake_values.py @@ -5,7 +5,7 @@ from dataclasses import dataclass from typing import TYPE_CHECKING, Annotated, Self -from ..field_codec import NullMember, RecordMember, SubclassUnion, WireName +from ..nominal.field_codec import NullMember, RecordMember, SubclassUnion, WireName from ..goal_states import GoalState from ..thread_text import ThreadText diff --git a/src/agent_comms/context_store.py b/src/agent_comms/context_store.py index 864e9c07cf..b155361d4d 100644 --- a/src/agent_comms/context_store.py +++ b/src/agent_comms/context_store.py @@ -12,7 +12,7 @@ from typing import Annotated, ClassVar, Self from .errors import RelationViolationError, StoredHistoryUnreadable -from .field_codec import ContextStoreId, FieldCodec, MalformedRecord, NullMember +from .nominal.field_codec import ContextStoreId, FieldCodec, MalformedRecord, NullMember from .native_session_reopen import NativeSessionIdentity from .registration import Registration from .thread_identity import ThreadIncarnation diff --git a/src/agent_comms/coordinated_runtime.py b/src/agent_comms/coordinated_runtime.py index e512dc35f2..9eb5cb0bd6 100644 --- a/src/agent_comms/coordinated_runtime.py +++ b/src/agent_comms/coordinated_runtime.py @@ -7,7 +7,7 @@ from __future__ import annotations -from agent_comms.field_codec import RootId +from agent_comms.nominal.field_codec import RootId import threading diff --git a/src/agent_comms/coordination_cohort.py b/src/agent_comms/coordination_cohort.py index 6056b1a2c6..9f9c398a27 100644 --- a/src/agent_comms/coordination_cohort.py +++ b/src/agent_comms/coordination_cohort.py @@ -37,7 +37,7 @@ from agent_comms.coordination_tables.participants import OwnerGenerations, Participants from agent_comms.coordinator import Coordination -from .field_codec import AssignmentId, MalformedRecord, MessageId, WireName, RootId, ThreadLookup +from .nominal.field_codec import AssignmentId, MalformedRecord, MessageId, WireName, RootId, ThreadLookup _LOG = logging.getLogger(__name__) diff --git a/src/agent_comms/coordination_database.py b/src/agent_comms/coordination_database.py index f700eb24a7..2fccfb5f67 100644 --- a/src/agent_comms/coordination_database.py +++ b/src/agent_comms/coordination_database.py @@ -24,7 +24,7 @@ ) from .child_process import Platform -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .store_files import DEFAULT_STORE_CONTENTION, StoreContention diff --git a/src/agent_comms/coordination_response.py b/src/agent_comms/coordination_response.py index ef65086509..ac082587cd 100644 --- a/src/agent_comms/coordination_response.py +++ b/src/agent_comms/coordination_response.py @@ -57,7 +57,7 @@ WithoutRowid, ) -from .field_codec import MessageId, RootId, ThreadLookup +from .nominal.field_codec import MessageId, RootId, ThreadLookup from .input_disposition import InputDispositions from .locked_store import RegistryFile from .response_conversation import ResponseConversation diff --git a/src/agent_comms/coordination_snapshot.py b/src/agent_comms/coordination_snapshot.py index a59eb9a015..0306e131ba 100644 --- a/src/agent_comms/coordination_snapshot.py +++ b/src/agent_comms/coordination_snapshot.py @@ -34,7 +34,7 @@ from agent_comms.coordination_tables.publications import PublicationEvidence, PublicationIntents from agent_comms.coordination_tables.recovery import RecoveryAudit from agent_comms.coordination_tables.responses import ResponseObligation -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( boundary_decoder, projected, SnapshotName, diff --git a/src/agent_comms/coordination_tables/assignments.py b/src/agent_comms/coordination_tables/assignments.py index cc2d52689a..fc2ca8273f 100644 --- a/src/agent_comms/coordination_tables/assignments.py +++ b/src/agent_comms/coordination_tables/assignments.py @@ -22,7 +22,7 @@ from agent_comms.coordination_tables.participants import Participants from agent_comms.coordination_tables.responses import ResponseObligation from agent_comms.envelope_claim_transitions import AssignmentBinding -from agent_comms.field_codec import AssignmentId, MessageId, SnapshotExclude, ThreadLookup, WireName, projected +from agent_comms.nominal.field_codec import AssignmentId, MessageId, SnapshotExclude, ThreadLookup, WireName, projected from agent_comms.message_reference import MessageReference from agent_comms.typed_table import ( Column, diff --git a/src/agent_comms/coordination_tables/attempts.py b/src/agent_comms/coordination_tables/attempts.py index 60e7980885..d44248e5e5 100644 --- a/src/agent_comms/coordination_tables/attempts.py +++ b/src/agent_comms/coordination_tables/attempts.py @@ -21,7 +21,7 @@ OwnerRecord, Participants, ) -from agent_comms.field_codec import SnapshotExclude, ThreadLookup, projected +from agent_comms.nominal.field_codec import SnapshotExclude, ThreadLookup, projected from agent_comms.owner_fence import AttemptAuthority from agent_comms.reason_codes import ReasonCode from agent_comms.typed_table import ( diff --git a/src/agent_comms/coordination_tables/executions.py b/src/agent_comms/coordination_tables/executions.py index 0f1e599ef0..df81d39635 100644 --- a/src/agent_comms/coordination_tables/executions.py +++ b/src/agent_comms/coordination_tables/executions.py @@ -21,14 +21,14 @@ ) from agent_comms.coordination_schema import CoordinatorRow from agent_comms.coordination_tables.participants import Participants -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.coordination_tables.attempts import ( APPROVED_REPLAY_FACT_MASK, AttemptRecord, ReplayFact, ) from agent_comms.execution_states import ExecutionState -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( MalformedRecord, NullMember, SingleFieldValue, diff --git a/src/agent_comms/coordination_tables/harness_deliveries.py b/src/agent_comms/coordination_tables/harness_deliveries.py index 79363a42fb..f2be32081f 100644 --- a/src/agent_comms/coordination_tables/harness_deliveries.py +++ b/src/agent_comms/coordination_tables/harness_deliveries.py @@ -15,7 +15,7 @@ from agent_comms.coordination_errors import IdentityConflict from agent_comms.coordination_schema import CoordinatorRow from agent_comms.coordination_tables.participants import Participants -from agent_comms.field_codec import MessageId, ThreadLookup, TranscriptRecordId +from agent_comms.nominal.field_codec import MessageId, ThreadLookup, TranscriptRecordId from agent_comms.harness_delivery_states import MonitorEvidence, Outcome, UnrecordedMonitor from agent_comms.harness_install import HarnessSession from agent_comms.message_reference import MessageReference diff --git a/src/agent_comms/coordination_tables/participants.py b/src/agent_comms/coordination_tables/participants.py index 9b45a7d5b6..44c7bfaf7f 100644 --- a/src/agent_comms/coordination_tables/participants.py +++ b/src/agent_comms/coordination_tables/participants.py @@ -7,7 +7,7 @@ from agent_comms.coordination_errors import IdentityConflict from agent_comms.coordination_schema import CoordinatorRow -from agent_comms.field_codec import ThreadLookup +from agent_comms.nominal.field_codec import ThreadLookup from agent_comms.participant_identity import ParticipantIdentity from agent_comms.typed_table import ( Column, diff --git a/src/agent_comms/coordination_tables/publications.py b/src/agent_comms/coordination_tables/publications.py index 0483651588..adf38fb3a8 100644 --- a/src/agent_comms/coordination_tables/publications.py +++ b/src/agent_comms/coordination_tables/publications.py @@ -17,7 +17,7 @@ from agent_comms.coordination_tables.executions import ExecutionRecord from agent_comms.coordination_tables.responses import ResponseObligation from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import FieldCodec, MalformedRecord, MessageId, WireName +from agent_comms.nominal.field_codec import FieldCodec, MalformedRecord, MessageId, WireName from agent_comms.message_reference import MessageReference from agent_comms.messages import Message from agent_comms.response_acknowledgement import canonical_publication_key diff --git a/src/agent_comms/coordination_tables/recovery.py b/src/agent_comms/coordination_tables/recovery.py index d998f29e35..304a3c246f 100644 --- a/src/agent_comms/coordination_tables/recovery.py +++ b/src/agent_comms/coordination_tables/recovery.py @@ -6,7 +6,7 @@ from dataclasses import field as dataclass_field from typing import Annotated -from agent_comms import field_codec +from agent_comms.nominal import field_codec from agent_comms.coordination_contracts import ( MAX_SANITIZED_DETAIL_CHARS, validate_execution_id, diff --git a/src/agent_comms/coordination_tables/responses.py b/src/agent_comms/coordination_tables/responses.py index 7218bf745f..86798104e3 100644 --- a/src/agent_comms/coordination_tables/responses.py +++ b/src/agent_comms/coordination_tables/responses.py @@ -13,7 +13,7 @@ ) from agent_comms.coordination_schema import CoordinatorRow from agent_comms.coordination_tables.executions import ExecutionReference, RetryPartition, WireOrigin -from agent_comms.field_codec import MessageId, SnapshotExclude, WireName, projected +from agent_comms.nominal.field_codec import MessageId, SnapshotExclude, WireName, projected from agent_comms.obligation_states import ResponseState from agent_comms.reason_codes import ReasonCode from agent_comms.typed_table import ( diff --git a/src/agent_comms/coordinator_vocabulary.py b/src/agent_comms/coordinator_vocabulary.py index f76a28a099..3ce1e4a814 100644 --- a/src/agent_comms/coordinator_vocabulary.py +++ b/src/agent_comms/coordinator_vocabulary.py @@ -7,7 +7,7 @@ from functools import cache from typing import ClassVar -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .typed_table import sql_literal diff --git a/src/agent_comms/cursor_owner.py b/src/agent_comms/cursor_owner.py index d7e87760ce..6f18db5809 100644 --- a/src/agent_comms/cursor_owner.py +++ b/src/agent_comms/cursor_owner.py @@ -7,7 +7,7 @@ from functools import partial from typing import TYPE_CHECKING -from agent_comms.field_codec import InputId, RootId, ThreadLookup +from agent_comms.nominal.field_codec import InputId, RootId, ThreadLookup from agent_comms.native_runtime_input import NativeRuntimeTable from .acp_extension import CursorObservation, EmptyCursorObservation, VerifiedCursorObservation diff --git a/src/agent_comms/cursor_publication.py b/src/agent_comms/cursor_publication.py index 2de6706f9e..ffb75036e9 100644 --- a/src/agent_comms/cursor_publication.py +++ b/src/agent_comms/cursor_publication.py @@ -27,7 +27,7 @@ from .coordinator import Coordination from .cursor_owner import CommittedCursorOwner, CursorOwner, CursorState from .diagnostics import PublicationMeasurements -from .field_codec import InputId +from .nominal.field_codec import InputId from .message_bus import MessageBus from .native_entries import NativeEvidenceScope from .publisher import ResponseWrites diff --git a/src/agent_comms/declared_choice.py b/src/agent_comms/declared_choice.py index 2c11d4a4e3..a0b36ee7f3 100644 --- a/src/agent_comms/declared_choice.py +++ b/src/agent_comms/declared_choice.py @@ -1,7 +1,7 @@ """Named family members used as choices across backend and user interfaces.""" from typing import ClassVar -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily class DeclaredChoice(DeclaredFamily): diff --git a/src/agent_comms/declared_verb.py b/src/agent_comms/declared_verb.py index cf56afd933..164a39ad9f 100644 --- a/src/agent_comms/declared_verb.py +++ b/src/agent_comms/declared_verb.py @@ -7,8 +7,8 @@ from collections.abc import Sequence from typing import ClassVar, Self -from agent_comms.declared_family import DeclaredFamily -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.declared_family import DeclaredFamily +from agent_comms.nominal.field_codec import FieldCodec class DeclaredOptions: diff --git a/src/agent_comms/delivery_policy.py b/src/agent_comms/delivery_policy.py index 4bda31cdd4..303943d67c 100644 --- a/src/agent_comms/delivery_policy.py +++ b/src/agent_comms/delivery_policy.py @@ -3,7 +3,7 @@ from abc import abstractmethod from .audience_manifest import AudiencedMessage -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .wake import MessageControl, resolve_wake_cohort from .wake_policy import MessageAudience, RecipientDecision, WakeDecision diff --git a/src/agent_comms/diagnostics.py b/src/agent_comms/diagnostics.py index c90b5d7106..99fc161c93 100644 --- a/src/agent_comms/diagnostics.py +++ b/src/agent_comms/diagnostics.py @@ -20,7 +20,7 @@ from .child_process import Platform -from .field_codec import FieldCodec, InputId, ScratchName, TurnId +from .nominal.field_codec import FieldCodec, InputId, ScratchName, TurnId from .locked_store import PatternFile, RuntimeFile from .native_failures import NativeRequestFailure from .store_files import AtomicFile diff --git a/src/agent_comms/display_order.py b/src/agent_comms/display_order.py index ef49edcdf6..9f93117bb8 100644 --- a/src/agent_comms/display_order.py +++ b/src/agent_comms/display_order.py @@ -5,7 +5,7 @@ from abc import ABC, abstractmethod from typing import TYPE_CHECKING, ClassVar -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .declared_choice import DeclaredChoice, TitledChoice if TYPE_CHECKING: diff --git a/src/agent_comms/display_references.py b/src/agent_comms/display_references.py index 43ea9875b7..bfa126c8da 100644 --- a/src/agent_comms/display_references.py +++ b/src/agent_comms/display_references.py @@ -12,8 +12,8 @@ from types import MappingProxyType from typing import TYPE_CHECKING, Annotated, Self -from agent_comms.declared_family import DeclaredFamily -from agent_comms.field_codec import SlicePolicy +from agent_comms.nominal.declared_family import DeclaredFamily +from agent_comms.nominal.field_codec import SlicePolicy from agent_comms.registry_document import MappingRowsSlice, SnapshotRestored, WholeDocumentValue from agent_comms.thread_identity import ThreadIncarnation diff --git a/src/agent_comms/durable_turn.py b/src/agent_comms/durable_turn.py index 1a04051d58..be673f05ad 100644 --- a/src/agent_comms/durable_turn.py +++ b/src/agent_comms/durable_turn.py @@ -35,7 +35,7 @@ from .coordination_tables.attempts import ReplayFact from .coordination_tables.executions import ReplayAssessments from .coordinator import Coordination -from .field_codec import InputId +from .nominal.field_codec import InputId from .owner_fence import OwnerFence from .turn_failure import TurnFailure from .turn_phase import CompactionPhase, ModelWaitPhase, ToolRunningPhase diff --git a/src/agent_comms/envelope_claim_transitions.py b/src/agent_comms/envelope_claim_transitions.py index 8d3f566b4e..040fccc4ac 100644 --- a/src/agent_comms/envelope_claim_transitions.py +++ b/src/agent_comms/envelope_claim_transitions.py @@ -12,7 +12,7 @@ from .class_fact import ClassFact from .coordination_errors import IdentityConflict -from .field_codec import ( +from .nominal.field_codec import ( AssignmentId, BoundedText, ClaimId, diff --git a/src/agent_comms/exporting.py b/src/agent_comms/exporting.py index e63f80a52b..4fb924de96 100644 --- a/src/agent_comms/exporting.py +++ b/src/agent_comms/exporting.py @@ -15,8 +15,8 @@ from .channels import Channel from .cli_result import CliResult -from .declared_family import DeclaredFamily -from .field_codec import FieldCodec, NullMember, SingleFieldValue, SubclassUnion +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import FieldCodec, NullMember, SingleFieldValue, SubclassUnion from .message_reference import MessageReference from .messages import Message from .registration import Registration diff --git a/src/agent_comms/external_transcript.py b/src/agent_comms/external_transcript.py index b0800cb5f7..b3fff12366 100644 --- a/src/agent_comms/external_transcript.py +++ b/src/agent_comms/external_transcript.py @@ -17,8 +17,8 @@ from sqlite3 import Connection from typing import TYPE_CHECKING, Annotated, ClassVar -from .declared_family import DeclaredFamily -from .field_codec import ( +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import ( FieldCodec, InputId, PageRequestId, diff --git a/src/agent_comms/following_inputs.py b/src/agent_comms/following_inputs.py index 4234cd38bc..55e4f2c1d1 100644 --- a/src/agent_comms/following_inputs.py +++ b/src/agent_comms/following_inputs.py @@ -6,7 +6,7 @@ from functools import partial from typing import TYPE_CHECKING -from .field_codec import InputId +from .nominal.field_codec import InputId from .acp_extension import LiveQueueScope from .agent_backend import TurnInbox from .coordinator import Coordination diff --git a/src/agent_comms/fresh_private_session.py b/src/agent_comms/fresh_private_session.py index f0fc7c0fef..4a800d0707 100644 --- a/src/agent_comms/fresh_private_session.py +++ b/src/agent_comms/fresh_private_session.py @@ -7,7 +7,7 @@ from pathlib import Path from agent_comms.child_process import Platform -from .field_codec import FieldCodec, RecordedTimestamp +from .nominal.field_codec import FieldCodec, RecordedTimestamp from .native_entries import SessionEntry from .pi_payloads import ReportedText from .native_failures import NativePiUnavailable diff --git a/src/agent_comms/goal_actions.py b/src/agent_comms/goal_actions.py index c3120e498d..f74154422d 100644 --- a/src/agent_comms/goal_actions.py +++ b/src/agent_comms/goal_actions.py @@ -8,8 +8,8 @@ from dataclasses import dataclass, field, replace from typing import TYPE_CHECKING, Annotated, ClassVar, Self -from agent_comms.field_codec import GoalId, GoalWaitId, MessageId, RetryDecisionId -from agent_comms import field_codec +from agent_comms.nominal.field_codec import GoalId, GoalWaitId, MessageId, RetryDecisionId +from agent_comms.nominal import field_codec from agent_comms.goals import ( Goal, GoalChangedError, @@ -22,7 +22,7 @@ UnorderedGoalOrder, ) -from .field_codec import FieldCodec +from .nominal.field_codec import FieldCodec from .input_key import InputKey, InputKeyText from agent_comms.input_disposition import InputDispositions from agent_comms.todos import ( @@ -33,7 +33,7 @@ from .change_report import FileLine, NoSourceReference from .child_process import ProcessIdentity from .command import Command -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import OverdueHeadRefusalError, RelationViolationError from .goal_mentions import bind_goal_mentions from .goal_scope import AllGoals, OneGoal diff --git a/src/agent_comms/goal_attempt_identity.py b/src/agent_comms/goal_attempt_identity.py index c802b68542..f5b553269c 100644 --- a/src/agent_comms/goal_attempt_identity.py +++ b/src/agent_comms/goal_attempt_identity.py @@ -2,7 +2,7 @@ from dataclasses import dataclass -from agent_comms.field_codec import AttemptId, GoalId +from agent_comms.nominal.field_codec import AttemptId, GoalId class FailureNotObserved(ValueError): diff --git a/src/agent_comms/goal_attempt_phase.py b/src/agent_comms/goal_attempt_phase.py index 2f79981196..70248dbbef 100644 --- a/src/agent_comms/goal_attempt_phase.py +++ b/src/agent_comms/goal_attempt_phase.py @@ -7,7 +7,7 @@ from typing import TYPE_CHECKING, ClassVar from .attempt_resolution import AttemptResolution -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import UnresolvedAttemptError from .lifecycle import LifecycleState from .lifecycle_capability import Failed, Terminal diff --git a/src/agent_comms/goal_attempts.py b/src/agent_comms/goal_attempts.py index 1c8339338c..04f7b343d8 100644 --- a/src/agent_comms/goal_attempts.py +++ b/src/agent_comms/goal_attempts.py @@ -31,8 +31,8 @@ from .child_process import Platform from .turn_item import UsageChargeId -from .declared_family import DeclaredFamily -from .field_codec import ( +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import ( AttemptId, AttemptToken, FieldCodec, diff --git a/src/agent_comms/goal_failure_observation.py b/src/agent_comms/goal_failure_observation.py index 017888a6fc..f29f9aa617 100644 --- a/src/agent_comms/goal_failure_observation.py +++ b/src/agent_comms/goal_failure_observation.py @@ -13,7 +13,7 @@ from typing import TYPE_CHECKING, Annotated from .turn_failure import TurnFailure -from .field_codec import AttemptId, GoalId, TurnId +from .nominal.field_codec import AttemptId, GoalId, TurnId from .goal_attempt_identity import GoalAttemptIdentity from .repo import Checkout from .thread_identity import ( diff --git a/src/agent_comms/goal_generation.py b/src/agent_comms/goal_generation.py index a86e07d6f9..eeeac9ca6c 100644 --- a/src/agent_comms/goal_generation.py +++ b/src/agent_comms/goal_generation.py @@ -7,9 +7,9 @@ from agent_comms.goal_turn_permit import GoalTurnPermit, NoLaunchPermit -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import UnresolvedAttemptError -from .field_codec import AttemptId, NoAttemptId +from .nominal.field_codec import AttemptId, NoAttemptId from .goal_attempt_phase import ( FailedAttempt, GoalAttemptPhase, diff --git a/src/agent_comms/goal_history.py b/src/agent_comms/goal_history.py index 27e3590fde..01971ebb58 100644 --- a/src/agent_comms/goal_history.py +++ b/src/agent_comms/goal_history.py @@ -17,12 +17,12 @@ from pathlib import Path from typing import Annotated, Self -from agent_comms.field_codec import WireOmitDefault +from agent_comms.nominal.field_codec import WireOmitDefault from agent_comms.owner_requests import NoRequestRevision, RequestRevision from .child_process import Platform -from .declared_family import DeclaredFamily -from .field_codec import FieldCodec, HistoryExclude, MalformedRecord +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import FieldCodec, HistoryExclude, MalformedRecord from .goal_failure_observation import FailedTurnEvidence from .goal_scope import GoalScope from .goals import GoalDeclaration, NoGoal diff --git a/src/agent_comms/goal_management.py b/src/agent_comms/goal_management.py index 554679d7c9..664c351cfb 100644 --- a/src/agent_comms/goal_management.py +++ b/src/agent_comms/goal_management.py @@ -16,7 +16,7 @@ from pathlib import Path from typing import TYPE_CHECKING, TypeVar -from agent_comms.field_codec import GoalId +from agent_comms.nominal.field_codec import GoalId from .agent_activity import AgentActivity from .coordination_errors import StaleFence from .errors import RelationViolationError diff --git a/src/agent_comms/goal_mentions.py b/src/agent_comms/goal_mentions.py index 543ff7f99a..4ec785402e 100644 --- a/src/agent_comms/goal_mentions.py +++ b/src/agent_comms/goal_mentions.py @@ -9,7 +9,7 @@ import hashlib import re -from agent_comms.field_codec import GoalId +from agent_comms.nominal.field_codec import GoalId from .goals import ( GoalMentionBinding, GoalMentionSource, diff --git a/src/agent_comms/goal_presentation.py b/src/agent_comms/goal_presentation.py index 0431559ddb..24787811b8 100644 --- a/src/agent_comms/goal_presentation.py +++ b/src/agent_comms/goal_presentation.py @@ -7,8 +7,8 @@ from functools import cached_property from typing import TYPE_CHECKING, ClassVar, Self -from .declared_family import DeclaredFamily -from .field_codec import NullMember, WireValue, GoalId +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import NullMember, WireValue, GoalId from .goal_failure_observation import FailedTurnEvidence from .goal_states import PauseSource from .goals import Goal, GoalCheckpoint, GoalDeclaration diff --git a/src/agent_comms/goal_scheduler.py b/src/agent_comms/goal_scheduler.py index e35a607114..6327dc0d9f 100644 --- a/src/agent_comms/goal_scheduler.py +++ b/src/agent_comms/goal_scheduler.py @@ -13,7 +13,7 @@ from functools import partial from typing import TYPE_CHECKING -from agent_comms.field_codec import GoalId +from agent_comms.nominal.field_codec import GoalId from .agent_event_updates import AcpEventConsumer from .child_process import ProcessIdentity from .coordinator import Coordination diff --git a/src/agent_comms/goal_scope.py b/src/agent_comms/goal_scope.py index 1a006af7aa..51bd1aa1f7 100644 --- a/src/agent_comms/goal_scope.py +++ b/src/agent_comms/goal_scope.py @@ -6,7 +6,7 @@ from dataclasses import dataclass from typing import TYPE_CHECKING, TypedDict -from .field_codec import GoalId, NullMember, SingleFieldValue +from .nominal.field_codec import GoalId, NullMember, SingleFieldValue if TYPE_CHECKING: from .goal_history import RecordedGoalRevision diff --git a/src/agent_comms/goal_states.py b/src/agent_comms/goal_states.py index a4c03769ac..c13462e0de 100644 --- a/src/agent_comms/goal_states.py +++ b/src/agent_comms/goal_states.py @@ -6,7 +6,7 @@ from dataclasses import dataclass, field, replace from typing import TYPE_CHECKING, ClassVar -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .lifecycle import LifecycleState from .lifecycle_capability import Active, Complete, Terminal diff --git a/src/agent_comms/goal_turn_permit.py b/src/agent_comms/goal_turn_permit.py index 13b1ee9815..4119446d0e 100644 --- a/src/agent_comms/goal_turn_permit.py +++ b/src/agent_comms/goal_turn_permit.py @@ -8,7 +8,7 @@ from agent_comms.ordinary_turn_rules import OrdinaryGoalGrantCheck -from .field_codec import TurnId, GoalId +from .nominal.field_codec import TurnId, GoalId from .turn_item import UsageChargeId if TYPE_CHECKING: diff --git a/src/agent_comms/goal_waits.py b/src/agent_comms/goal_waits.py index b30985132a..bb0b1072b9 100644 --- a/src/agent_comms/goal_waits.py +++ b/src/agent_comms/goal_waits.py @@ -11,9 +11,9 @@ from .bus import BusReader from .bus_publication import Delivered -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import UnregisteredThreadError -from .field_codec import GoalId, GoalWaitId, NullMember, ThreadLookup, TurnId +from .nominal.field_codec import GoalId, GoalWaitId, NullMember, ThreadLookup, TurnId from .goal_presentation import GoalExecution, GoalExecutionSource, GoalWaitTarget, StandbyExecution from .goals import Goal, GoalDeclaration from .input_key import InputKey, InputKeyText diff --git a/src/agent_comms/goals.py b/src/agent_comms/goals.py index ea0b621a24..357c1194d0 100644 --- a/src/agent_comms/goals.py +++ b/src/agent_comms/goals.py @@ -26,9 +26,9 @@ TimedOutOutcome, ) from .context_segments.wake_values import NoWakeGoalContext, WakeGoalContext, WakeGoalValue -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RejectedEnforcementError, RelationViolationError -from .field_codec import ( +from .nominal.field_codec import ( FieldCodec, GoalId, GoalWaitId, diff --git a/src/agent_comms/harness_delivery_states.py b/src/agent_comms/harness_delivery_states.py index b5732647c4..e552af1d21 100644 --- a/src/agent_comms/harness_delivery_states.py +++ b/src/agent_comms/harness_delivery_states.py @@ -11,8 +11,8 @@ from functools import partial from typing import TYPE_CHECKING -from .declared_family import DeclaredFamily -from .field_codec import TranscriptRecordId +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import TranscriptRecordId if TYPE_CHECKING: from .assignment_states import AssignmentState diff --git a/src/agent_comms/harness_install.py b/src/agent_comms/harness_install.py index 3bafaa9a54..4561dcb6c1 100644 --- a/src/agent_comms/harness_install.py +++ b/src/agent_comms/harness_install.py @@ -20,9 +20,9 @@ from agent_comms_hooks import ClaudeHookProgram from .child_process import Platform, ResidentManager -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError -from .field_codec import ScratchName +from .nominal.field_codec import ScratchName from .host_services import SystemdUserService from .host_services.codex_inbox import CodexInboxService diff --git a/src/agent_comms/head_review.py b/src/agent_comms/head_review.py index 5e30777908..34a633a5c8 100644 --- a/src/agent_comms/head_review.py +++ b/src/agent_comms/head_review.py @@ -11,9 +11,9 @@ from typing import TYPE_CHECKING, Annotated, ClassVar from collections.abc import Sequence -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import ToolRefusedError -from .field_codec import FieldCodec, GitCommitText, MalformedRecord, RecordProblems +from .nominal.field_codec import FieldCodec, GitCommitText, MalformedRecord, RecordProblems from .repo import Repo from .repository_name import RepositoryName from .work_branches import WorkBranches diff --git a/src/agent_comms/heartbeat_subjects.py b/src/agent_comms/heartbeat_subjects.py index 4c57b7379f..8603dd2bf0 100644 --- a/src/agent_comms/heartbeat_subjects.py +++ b/src/agent_comms/heartbeat_subjects.py @@ -13,8 +13,8 @@ from types import MappingProxyType from typing import TYPE_CHECKING, Mapping, Self -from agent_comms.declared_family import DeclaredFamily -from agent_comms.field_codec import MessageId +from agent_comms.nominal.declared_family import DeclaredFamily +from agent_comms.nominal.field_codec import MessageId from agent_comms.head_review import PullRequestHead from agent_comms.recorded_time import EventTime, RecordedEventTime from agent_comms.service_passes import ServicePassStore diff --git a/src/agent_comms/historical_native_inputs.py b/src/agent_comms/historical_native_inputs.py index b010183b17..051cdf7320 100644 --- a/src/agent_comms/historical_native_inputs.py +++ b/src/agent_comms/historical_native_inputs.py @@ -18,8 +18,8 @@ from .cohort_schema import CohortTable from agent_comms.native_runtime_input import NativeRuntimeTable -from .declared_family import DeclaredFamily -from .field_codec import AssignmentId, InputId, MessageId, WireName, RootId, ThreadLookup +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import AssignmentId, InputId, MessageId, WireName, RootId, ThreadLookup from .native_input_record import ( FullNativeExecution, NativeInputExecution, diff --git a/src/agent_comms/historical_views.py b/src/agent_comms/historical_views.py index 19e2e8a795..53da60babe 100644 --- a/src/agent_comms/historical_views.py +++ b/src/agent_comms/historical_views.py @@ -21,7 +21,7 @@ from .channels import Channel from .coordination_errors import HistoricalSourceChanged from .errors import UnregisteredThreadError -from .field_codec import FieldCodec, ScratchName +from .nominal.field_codec import FieldCodec, ScratchName from .locked_store import DocumentChange, RegistryFile, RootFile from .maintenance_barrier import CarriedDocument from .message_page import ( diff --git a/src/agent_comms/history_result.py b/src/agent_comms/history_result.py index 60a34f4c85..25e549fe70 100644 --- a/src/agent_comms/history_result.py +++ b/src/agent_comms/history_result.py @@ -5,7 +5,7 @@ from typing import TYPE_CHECKING, ClassVar, Self from .cli_result import CliResult -from .field_codec import FieldCodec +from .nominal.field_codec import FieldCodec from .tool_result import ToolResult if TYPE_CHECKING: diff --git a/src/agent_comms/history_views.py b/src/agent_comms/history_views.py index e5c1c1571e..32106cbf21 100644 --- a/src/agent_comms/history_views.py +++ b/src/agent_comms/history_views.py @@ -16,8 +16,8 @@ from .catalog_store import ChannelCatalog from .cli_result import CliResult from .context_segments.retained import RetainedSegment -from .declared_family import DeclaredFamily -from .field_codec import FieldCodec, WireForm +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import FieldCodec, WireForm from .input_disposition import InputDispositions from .registration import Registration from .registry_document import DEFAULT_ROSTER, RegistrySnapshot, RosterVisibility diff --git a/src/agent_comms/host_services/__init__.py b/src/agent_comms/host_services/__init__.py index 3f883d155c..a03267a1c8 100644 --- a/src/agent_comms/host_services/__init__.py +++ b/src/agent_comms/host_services/__init__.py @@ -16,8 +16,8 @@ from ..child_process import ProcessIdentity, ResidentManager from ..systemd_unit import SystemdUnit -from ..declared_family import DeclaredFamily -from ..field_codec import PathText +from ..nominal.declared_family import DeclaredFamily +from ..nominal.field_codec import PathText from ..launch_runtime import LaunchRuntime diff --git a/src/agent_comms/host_services/connector.py b/src/agent_comms/host_services/connector.py index 90136093a8..8eeca2b4b3 100644 --- a/src/agent_comms/host_services/connector.py +++ b/src/agent_comms/host_services/connector.py @@ -23,7 +23,7 @@ ) from ..connector_store import ConnectorStore from ..errors import RelationViolationError, ToolRefusedError -from ..field_codec import Argument, FieldCodec, MalformedRecord, PathText +from ..nominal.field_codec import Argument, FieldCodec, MalformedRecord, PathText from ..launch_root import LaunchRoot from ..recorded_bus import RecordedBusIdentity from ..tools import CommsChannelsTool diff --git a/src/agent_comms/image_input.py b/src/agent_comms/image_input.py index be7215df55..d73ca3d0c4 100644 --- a/src/agent_comms/image_input.py +++ b/src/agent_comms/image_input.py @@ -7,7 +7,7 @@ from dataclasses import dataclass, field from typing import Annotated, Literal -from . import field_codec +from agent_comms.nominal import field_codec IMAGE_MIME_TYPES = frozenset({"image/png", "image/jpeg", "image/gif", "image/webp"}) MAX_IMAGE_BYTES = 4 * 1024 * 1024 diff --git a/src/agent_comms/importing.py b/src/agent_comms/importing.py index 1bb39895e6..b0cea081b5 100644 --- a/src/agent_comms/importing.py +++ b/src/agent_comms/importing.py @@ -15,7 +15,7 @@ from .cli_result import CliResult -from .field_codec import FieldCodec, WireName +from .nominal.field_codec import FieldCodec, WireName from .harness_install import Harness from .thread_text import NoThreadText, ThreadText from .transcript_events import ImportedInput, ImportedMessage, NoRetainedRequest diff --git a/src/agent_comms/input_attempt.py b/src/agent_comms/input_attempt.py index 82393903a7..75e10a4a39 100644 --- a/src/agent_comms/input_attempt.py +++ b/src/agent_comms/input_attempt.py @@ -6,9 +6,9 @@ from dataclasses import dataclass, field, fields, replace from typing import TYPE_CHECKING, Annotated, ClassVar -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError -from .field_codec import ( +from .nominal.field_codec import ( FieldCodec, GoalId, InputId, diff --git a/src/agent_comms/input_disposition.py b/src/agent_comms/input_disposition.py index 72419a4c84..fb643c4aa9 100644 --- a/src/agent_comms/input_disposition.py +++ b/src/agent_comms/input_disposition.py @@ -9,7 +9,7 @@ from pathlib import Path from typing import TYPE_CHECKING, Annotated, ClassVar -from agent_comms import field_codec +from agent_comms.nominal import field_codec from .channel_targets import CommandTarget from .bus import Bus @@ -18,7 +18,7 @@ from .coordination_tables.harness_deliveries import HarnessDelivery from .harness_delivery_states import Outcome, UnconfirmedOutcome from .errors import RelationViolationError -from .field_codec import GoalId, InputId, RootId, TurnId +from .nominal.field_codec import GoalId, InputId, RootId, TurnId from .input_attempt import ( UNOBSERVED_DELIVERY_SCOPE, GoalInputDecision, diff --git a/src/agent_comms/input_drain.py b/src/agent_comms/input_drain.py index 0896bc35e9..31759779be 100644 --- a/src/agent_comms/input_drain.py +++ b/src/agent_comms/input_drain.py @@ -42,7 +42,7 @@ record_drain_failure, ) from .errors import RelationViolationError, UnregisteredThreadError -from .field_codec import AcpSessionId, InputId, RootId, ThreadLookup +from .nominal.field_codec import AcpSessionId, InputId, RootId, ThreadLookup from .image_input import ImageInput from .input_attempt import ( UNOBSERVED_DELIVERY_SCOPE, diff --git a/src/agent_comms/input_effects.py b/src/agent_comms/input_effects.py index 6fa121b3ea..1ec3f0e628 100644 --- a/src/agent_comms/input_effects.py +++ b/src/agent_comms/input_effects.py @@ -5,7 +5,7 @@ from abc import ABC, abstractmethod from typing import TYPE_CHECKING -from agent_comms.field_codec import RootId +from agent_comms.nominal.field_codec import RootId if TYPE_CHECKING: from .cursor_publication import CursorPublication diff --git a/src/agent_comms/input_key.py b/src/agent_comms/input_key.py index 36f8a45be7..cd38a58dfd 100644 --- a/src/agent_comms/input_key.py +++ b/src/agent_comms/input_key.py @@ -9,8 +9,8 @@ from functools import partial from typing import TYPE_CHECKING, ClassVar -from .declared_family import DeclaredFamily -from .field_codec import FieldCodec, InputId, MalformedRecord, TextRepresentation, TurnId +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import FieldCodec, InputId, MalformedRecord, TextRepresentation, TurnId if TYPE_CHECKING: from .acp_extension import InputStartedUpdate diff --git a/src/agent_comms/input_origin.py b/src/agent_comms/input_origin.py index b68186b6a2..a9211b20a3 100644 --- a/src/agent_comms/input_origin.py +++ b/src/agent_comms/input_origin.py @@ -8,9 +8,9 @@ from .bus_publication import HumanOrigin -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError -from .field_codec import RootId +from .nominal.field_codec import RootId from .goals import GoalCheckpoint from .harness_install import HarnessSession from .input_key import InputKey, InputKeyText diff --git a/src/agent_comms/install_choices.py b/src/agent_comms/install_choices.py index efa886e974..a6c80de88f 100644 --- a/src/agent_comms/install_choices.py +++ b/src/agent_comms/install_choices.py @@ -9,7 +9,7 @@ from collections.abc import Callable, Iterator from typing import TYPE_CHECKING, Annotated, Literal -from agent_comms.field_codec import BoundedText, SingleFieldValue, SubclassUnion +from agent_comms.nominal.field_codec import BoundedText, SingleFieldValue, SubclassUnion from agent_comms.installer.reporting import UnpostedWriter from agent_comms.storage_rules import StorageRule from agent_comms.thread_text import AbsentText, GivenText, TextChoice diff --git a/src/agent_comms/installer/__main__.py b/src/agent_comms/installer/__main__.py index e76a1aa442..04181ab175 100644 --- a/src/agent_comms/installer/__main__.py +++ b/src/agent_comms/installer/__main__.py @@ -4,7 +4,7 @@ import signal import sys -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.installer.refusals import UpgradeRefused from agent_comms.installer.launch import InstallRun, stopped from agent_comms.installer.prepared import PreparedInstall diff --git a/src/agent_comms/installer/backup.py b/src/agent_comms/installer/backup.py index 58ba8a5db0..ea4d7d7c09 100644 --- a/src/agent_comms/installer/backup.py +++ b/src/agent_comms/installer/backup.py @@ -25,7 +25,7 @@ active_route_path, ) from agent_comms.child_process import Platform -from agent_comms.field_codec import FieldCodec, MalformedRecord, PathText +from agent_comms.nominal.field_codec import FieldCodec, MalformedRecord, PathText from agent_comms.installer.refusals import UpgradeRefused from agent_comms.locked_store import ( DeclaredFile, diff --git a/src/agent_comms/installer/commands.py b/src/agent_comms/installer/commands.py index d3c47ce790..b97aa20f4f 100644 --- a/src/agent_comms/installer/commands.py +++ b/src/agent_comms/installer/commands.py @@ -14,7 +14,7 @@ from typing import BinaryIO from agent_comms.child_process import SpawnedProcess, SynchronousProcess -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.installer.interpreter_operation import ( CommandPhase, GitPhase, diff --git a/src/agent_comms/installer/interpreter_operation.py b/src/agent_comms/installer/interpreter_operation.py index 08a9195719..053b64f532 100644 --- a/src/agent_comms/installer/interpreter_operation.py +++ b/src/agent_comms/installer/interpreter_operation.py @@ -24,9 +24,9 @@ from agent_comms.child_process import Platform from agent_comms.native_build_inputs import GitLaunch -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.installer.runtime_wire import CrossesRuntimes -from agent_comms.field_codec import FieldCodec, JsonValue +from agent_comms.nominal.field_codec import FieldCodec, JsonValue from agent_comms.maintenance_barrier import HOLDER_NONCE from agent_comms.store_files import BorrowedStoreLock diff --git a/src/agent_comms/installer/launch.py b/src/agent_comms/installer/launch.py index c68dc04fa2..460c71889f 100644 --- a/src/agent_comms/installer/launch.py +++ b/src/agent_comms/installer/launch.py @@ -23,7 +23,7 @@ import agent_comms.installer from agent_comms.cli_bridges.shared import SessionBridgeResumes from agent_comms.installer.request import InstallRequest -from agent_comms.field_codec import FieldCodec, PathText +from agent_comms.nominal.field_codec import FieldCodec, PathText from agent_comms.installer.logs import InstallLogs, InstallUnit from agent_comms.installer.commands import InstallCommands from agent_comms.installer.interpreter_operation import ( diff --git a/src/agent_comms/installer/logs.py b/src/agent_comms/installer/logs.py index 2777dae00b..6f32526b50 100644 --- a/src/agent_comms/installer/logs.py +++ b/src/agent_comms/installer/logs.py @@ -12,7 +12,7 @@ from typing import ClassVar from agent_comms.child_process import ResidentManager -from agent_comms.field_codec import FieldCodec, Id128 +from agent_comms.nominal.field_codec import FieldCodec, Id128 from agent_comms.installer.backup import StoreBackup from agent_comms.installer.refusals import UpgradeRefused from agent_comms.process_claim import ClaimHeldError, ProcessSingleton diff --git a/src/agent_comms/installer/owner_starts.py b/src/agent_comms/installer/owner_starts.py index 33af170205..0786fb4ce3 100644 --- a/src/agent_comms/installer/owner_starts.py +++ b/src/agent_comms/installer/owner_starts.py @@ -5,7 +5,7 @@ from abc import abstractmethod from dataclasses import dataclass -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily @dataclass(frozen=True) diff --git a/src/agent_comms/installer/practice.py b/src/agent_comms/installer/practice.py index ebc3bbeb2d..99cd4119d2 100644 --- a/src/agent_comms/installer/practice.py +++ b/src/agent_comms/installer/practice.py @@ -8,7 +8,7 @@ from dataclasses import dataclass, field from pathlib import Path -from agent_comms.field_codec import boundary_decoder +from agent_comms.nominal.field_codec import boundary_decoder from agent_comms.installer.refusals import UpgradeRefused from agent_comms.installer.declared_uv import DeclaredUv from agent_comms.launch_runtime import LaunchRuntime diff --git a/src/agent_comms/installer/prepared.py b/src/agent_comms/installer/prepared.py index b520bfdf1b..348ac8179f 100644 --- a/src/agent_comms/installer/prepared.py +++ b/src/agent_comms/installer/prepared.py @@ -8,7 +8,7 @@ import signal import sys -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.installer.launch import InstallRun, stopped from agent_comms.installer.commands import InstallCommands from agent_comms.installer.upgrade import Stack, TargetTree diff --git a/src/agent_comms/installer/probes/carry.py b/src/agent_comms/installer/probes/carry.py index 3f746dfb4d..e227ca3614 100644 --- a/src/agent_comms/installer/probes/carry.py +++ b/src/agent_comms/installer/probes/carry.py @@ -14,9 +14,9 @@ from typing_extensions import TypeForm -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import FieldPlan, PathText +from agent_comms.nominal.field_codec import FieldPlan, PathText from agent_comms.installer.interpreter_operation import ( InstallClock, InterpreterOperation, diff --git a/src/agent_comms/installer/probes/commands.py b/src/agent_comms/installer/probes/commands.py index bf2c757590..4c00150a9d 100644 --- a/src/agent_comms/installer/probes/commands.py +++ b/src/agent_comms/installer/probes/commands.py @@ -8,7 +8,7 @@ from agent_comms.cli_protocol import CoreError from agent_comms.cli_result import CliResult -from agent_comms.field_codec import FieldCodec, MalformedRecord +from agent_comms.nominal.field_codec import FieldCodec, MalformedRecord from agent_comms.installer.interpreter_operation import CliProbePhase, RuntimeProbe CORE_ERROR = TypeAdapter(CoreError.declared_union()) diff --git a/src/agent_comms/installer/probes/harnesses.py b/src/agent_comms/installer/probes/harnesses.py index 1ee4c5f6a2..ef3a931826 100644 --- a/src/agent_comms/installer/probes/harnesses.py +++ b/src/agent_comms/installer/probes/harnesses.py @@ -13,7 +13,7 @@ Comms, client_wire, ) -from agent_comms.field_codec import AbsolutePathText, Argument, PathText +from agent_comms.nominal.field_codec import AbsolutePathText, Argument, PathText from agent_comms.harness_install import Harness from agent_comms.installer.interpreter_operation import RuntimeProbe, TargetProbe from agent_comms.registry_document import CommanderProject diff --git a/src/agent_comms/installer/probes/owner_actions.py b/src/agent_comms/installer/probes/owner_actions.py index f93075ecf1..58b16e776e 100644 --- a/src/agent_comms/installer/probes/owner_actions.py +++ b/src/agent_comms/installer/probes/owner_actions.py @@ -13,7 +13,7 @@ from agent_comms.cli import _fail, execute from agent_comms.cli_command import TargetBatchResult from agent_comms.cli_failures import CLI_FAILURES -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.installer.owner_starts import OwnerStart diff --git a/src/agent_comms/installer/probes/owners.py b/src/agent_comms/installer/probes/owners.py index 14da5e6ed1..8fc016513a 100644 --- a/src/agent_comms/installer/probes/owners.py +++ b/src/agent_comms/installer/probes/owners.py @@ -6,7 +6,7 @@ from typing import Annotated from agent_comms.comms import wire -from agent_comms.field_codec import PathText +from agent_comms.nominal.field_codec import PathText from agent_comms.installer.interpreter_operation import RuntimeProbe from agent_comms.installer.probes.commands import CliCommandProbe from agent_comms.owner_restart import OwnerRestartRequest diff --git a/src/agent_comms/installer/probes/packages.py b/src/agent_comms/installer/probes/packages.py index 8b9eec0dca..46f5e3c552 100644 --- a/src/agent_comms/installer/probes/packages.py +++ b/src/agent_comms/installer/probes/packages.py @@ -13,7 +13,7 @@ from pydantic.json_schema import DEFAULT_REF_TEMPLATE import agent_comms -from agent_comms.field_codec import WireValue +from agent_comms.nominal.field_codec import WireValue from agent_comms.installer.interpreter_operation import RuntimeProbe, TargetProbe from agent_comms.package_stamp import STAMP diff --git a/src/agent_comms/installer/probes/report.py b/src/agent_comms/installer/probes/report.py index 73d2e75d0c..2fe51db47f 100644 --- a/src/agent_comms/installer/probes/report.py +++ b/src/agent_comms/installer/probes/report.py @@ -6,7 +6,7 @@ from agent_comms.channel_targets import CommsTag from agent_comms.comms import client_wire -from agent_comms.field_codec import PathText +from agent_comms.nominal.field_codec import PathText from agent_comms.installer.interpreter_operation import RuntimeProbe from agent_comms.service_sender import ServiceSender diff --git a/src/agent_comms/installer/publication.py b/src/agent_comms/installer/publication.py index f4e94654cd..b6142b3430 100644 --- a/src/agent_comms/installer/publication.py +++ b/src/agent_comms/installer/publication.py @@ -15,7 +15,7 @@ from agent_comms.child_process import ResidentManager from agent_comms.connector import LOOPBACK, PORT from agent_comms.connector_store import ConnectorStore -from agent_comms.field_codec import PathText +from agent_comms.nominal.field_codec import PathText from agent_comms.harness_install import ConnectorClientHarness, Harness, replace_link from agent_comms.installer.runtime_resolution import ( ConsoleScriptPackage, diff --git a/src/agent_comms/installer/request.py b/src/agent_comms/installer/request.py index b355153135..10bacabbd9 100644 --- a/src/agent_comms/installer/request.py +++ b/src/agent_comms/installer/request.py @@ -7,7 +7,7 @@ from pathlib import Path from typing import Annotated, Literal -from agent_comms.field_codec import AbsolutePathText, Argument, FieldCodec, Normalize, WireName +from agent_comms.nominal.field_codec import AbsolutePathText, Argument, FieldCodec, Normalize, WireName from agent_comms.install_choices import InstallerChoice, LiveMode, RehearsalMode, RunMode, UnnamedInstaller from agent_comms.installer.probes.harnesses import HarnessInstallation diff --git a/src/agent_comms/installer/runtime_resolution.py b/src/agent_comms/installer/runtime_resolution.py index bf6271ad73..d3b126a64c 100644 --- a/src/agent_comms/installer/runtime_resolution.py +++ b/src/agent_comms/installer/runtime_resolution.py @@ -13,7 +13,7 @@ from packaging.utils import canonicalize_name from pydantic import BaseModel, Field -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.installer.probes.packages import ArchivePin, GitPin, PackagePin, PackageRecord from agent_comms.installer.probes.packages import DistributionVersionsProbe, InstalledPackagesProbe from agent_comms.launch_runtime import LaunchRuntime diff --git a/src/agent_comms/installer/upgrade.py b/src/agent_comms/installer/upgrade.py index dad5df7e5b..2a81244181 100644 --- a/src/agent_comms/installer/upgrade.py +++ b/src/agent_comms/installer/upgrade.py @@ -53,8 +53,8 @@ from agent_comms.cli_result import CliResult from agent_comms.comms import wire from agent_comms.coordination_errors import CoordinationReadUnavailable -from agent_comms.declared_family import DeclaredFamily -from agent_comms.field_codec import PathText +from agent_comms.nominal.declared_family import DeclaredFamily +from agent_comms.nominal.field_codec import PathText from agent_comms.typed_table import ExternalStore from agent_comms.host_services import HostService, RestartedService from agent_comms.install_choices import InstallerChoice, RunMode diff --git a/src/agent_comms/integration.py b/src/agent_comms/integration.py index fa50ffd6d7..3aa8dc26b1 100644 --- a/src/agent_comms/integration.py +++ b/src/agent_comms/integration.py @@ -13,7 +13,7 @@ from typing import Annotated, ClassVar from .child_process import STOP_GRACE_SECONDS, ResidentManager, SpawnedProcess -from .field_codec import FieldCodec, WireName +from .nominal.field_codec import FieldCodec, WireName from .head_review import HeadReview, PullRequestHead from .launch_runtime import CheckoutSource, RestoredRuntime from .repo import Checkout, GitCommandError, Repo diff --git a/src/agent_comms/jsonl_stream.py b/src/agent_comms/jsonl_stream.py index b18ed281b9..b1a4007aba 100644 --- a/src/agent_comms/jsonl_stream.py +++ b/src/agent_comms/jsonl_stream.py @@ -1,7 +1,7 @@ """Cancellation-safe JSONL framing.""" import asyncio -from .field_codec import MalformedRecord +from .nominal.field_codec import MalformedRecord class JsonlStreamReader: diff --git a/src/agent_comms/launch_root.py b/src/agent_comms/launch_root.py index 9d8de96fb8..99b96178ab 100644 --- a/src/agent_comms/launch_root.py +++ b/src/agent_comms/launch_root.py @@ -10,7 +10,7 @@ from typing import Annotated, ClassVar, Self from .errors import RelationViolationError -from .field_codec import FieldCodec, PathText +from .nominal.field_codec import FieldCodec, PathText class LaunchSelection(ABC): diff --git a/src/agent_comms/launch_runtime.py b/src/agent_comms/launch_runtime.py index 7f576623e5..c5fbf35524 100644 --- a/src/agent_comms/launch_runtime.py +++ b/src/agent_comms/launch_runtime.py @@ -11,9 +11,9 @@ from pathlib import Path from typing import TYPE_CHECKING, Annotated, ClassVar, Self -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( FieldCodec, JsonShapeFamily, JsonShapeMember, diff --git a/src/agent_comms/locked_store.py b/src/agent_comms/locked_store.py index 2713c674f1..6c1f0ef035 100644 --- a/src/agent_comms/locked_store.py +++ b/src/agent_comms/locked_store.py @@ -24,8 +24,8 @@ from .child_process import Platform from .coordination_errors import CoordinationReadUnavailable -from .declared_family import DeclaredFamily -from .field_codec import FieldCodec, MalformedRecord, PathText +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import FieldCodec, MalformedRecord, PathText from .errors import RelationViolationError from .private_path import FileObservation, FileRevision, MissingFile, PrivateDirectoryRole, PrivateFileRole from .store_files import ( diff --git a/src/agent_comms/maintenance_barrier.py b/src/agent_comms/maintenance_barrier.py index 76da8484a5..76485b79be 100644 --- a/src/agent_comms/maintenance_barrier.py +++ b/src/agent_comms/maintenance_barrier.py @@ -20,9 +20,9 @@ from .child_process import ProcessIdentity from .private_path import PrivateFileRole -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError, ToolRefusedError -from .field_codec import ( +from .nominal.field_codec import ( FieldCodec, ClaimId, MalformedRecord, diff --git a/src/agent_comms/manual_compaction_bridge.py b/src/agent_comms/manual_compaction_bridge.py index ac4ed68331..728190e657 100644 --- a/src/agent_comms/manual_compaction_bridge.py +++ b/src/agent_comms/manual_compaction_bridge.py @@ -15,7 +15,7 @@ from acp.schema import AgentMessageChunk, PromptResponse, TextContentBlock from . import agent_events as events -from .field_codec import TurnId +from .nominal.field_codec import TurnId from .acp_extension import CompactionCommittedUpdate, TranscriptChangedUpdate, encode_updates from .agent_backend import ( CompactionOutcome, diff --git a/src/agent_comms/message_bus.py b/src/agent_comms/message_bus.py index 8cac2449e3..b60650cdec 100644 --- a/src/agent_comms/message_bus.py +++ b/src/agent_comms/message_bus.py @@ -24,7 +24,7 @@ from agent_comms.channels import AnyChannel from agent_comms.context_segments.awareness import AwarenessSegment from agent_comms.coordinator import Coordination -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.historical_views import HistoryArchive from agent_comms.maintenance_barrier import MaintenanceBarrier, MaintenanceHeldError from agent_comms.message_page import InboxPage, MessagePageRequest, PageBounds diff --git a/src/agent_comms/message_reference.py b/src/agent_comms/message_reference.py index fd0c1f332f..b53304256e 100644 --- a/src/agent_comms/message_reference.py +++ b/src/agent_comms/message_reference.py @@ -8,7 +8,7 @@ from dataclasses import dataclass from typing import TYPE_CHECKING -from .field_codec import MessageId, NullMember, RecordMember, SingleFieldValue, SubclassUnion +from .nominal.field_codec import MessageId, NullMember, RecordMember, SingleFieldValue, SubclassUnion from .page_traversal import LiveCursor, NewestCursor, PageCursor, PageTraversal from .typed_table import TypedRow diff --git a/src/agent_comms/messages.py b/src/agent_comms/messages.py index 7425d003dd..aa40d4de54 100644 --- a/src/agent_comms/messages.py +++ b/src/agent_comms/messages.py @@ -34,13 +34,13 @@ from .change_report import FileLine, NoChangeReport, ReportEvidence, SourceRoots from .channel_targets import CommandTarget from .coordination_errors import IdentityConflict -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .envelope_claim_transitions import ( ClaimOwner, ClaimProducer, ClaimProjection, ClaimTransition, ClaimTransitionError, ResourceClaim, UnclaimedResource, ) from .errors import RelationViolationError -from .field_codec import ( +from .nominal.field_codec import ( ClaimId, FieldCodec, InlineRecord, diff --git a/src/agent_comms/native_arguments.py b/src/agent_comms/native_arguments.py index c914789ec4..8d4aa28cc8 100644 --- a/src/agent_comms/native_arguments.py +++ b/src/agent_comms/native_arguments.py @@ -13,8 +13,8 @@ from typing import TYPE_CHECKING, ClassVar from .coordination_errors import IdentityConflict -from .declared_family import DeclaredFamily -from .field_codec import FieldCodec, NullMember, SingleFieldValue, SubclassUnion +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import FieldCodec, NullMember, SingleFieldValue, SubclassUnion from .launch_runtime import LaunchRuntime if TYPE_CHECKING: diff --git a/src/agent_comms/native_attestation.py b/src/agent_comms/native_attestation.py index 3de6aa4b94..dd8c5f09db 100644 --- a/src/agent_comms/native_attestation.py +++ b/src/agent_comms/native_attestation.py @@ -6,7 +6,7 @@ from dataclasses import dataclass, field from typing import TYPE_CHECKING -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.pi_payloads import RequestId from . import pi_commands as commands diff --git a/src/agent_comms/native_child.py b/src/agent_comms/native_child.py index 2e29ce1f8c..e339896aa5 100644 --- a/src/agent_comms/native_child.py +++ b/src/agent_comms/native_child.py @@ -11,7 +11,7 @@ from typing import TYPE_CHECKING, ClassVar, NoReturn from .child_process import AttachedChild, ChildOutcome, join_retirement -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .launch_runtime import INHERITED_ENVIRONMENT from .native_attestation import NativeAttestation, PendingAttestation from .native_failures import NativePiUnavailable, NativeRequestFailure diff --git a/src/agent_comms/native_claim_epoch.py b/src/agent_comms/native_claim_epoch.py index 3de1d2f085..ec1c547706 100644 --- a/src/agent_comms/native_claim_epoch.py +++ b/src/agent_comms/native_claim_epoch.py @@ -14,9 +14,9 @@ from typing import TYPE_CHECKING from .coordination_errors import StaleFence -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError -from .field_codec import JsonShapeFamily, JsonShapeMember +from .nominal.field_codec import JsonShapeFamily, JsonShapeMember from .pi_vocabulary import PendingStopReason, PiStopReason from .thread_identity import ClaimedIdentity, GenerationCounter diff --git a/src/agent_comms/native_entries.py b/src/agent_comms/native_entries.py index 8f390b31d3..ff69573f35 100644 --- a/src/agent_comms/native_entries.py +++ b/src/agent_comms/native_entries.py @@ -27,8 +27,8 @@ from .native_pi import NativeContextProof from .importing import ImportedConversation -from .declared_family import DeclaredFamily, UnknownFamilyMember -from .field_codec import ( +from .nominal.declared_family import DeclaredFamily, UnknownFamilyMember +from .nominal.field_codec import ( FieldCodec, InputId, MalformedRecord, diff --git a/src/agent_comms/native_file_artifact.py b/src/agent_comms/native_file_artifact.py index ef50d8e1ac..56c1b74465 100644 --- a/src/agent_comms/native_file_artifact.py +++ b/src/agent_comms/native_file_artifact.py @@ -2,7 +2,7 @@ from dataclasses import dataclass from pathlib import Path -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .text_digest import TextDigest diff --git a/src/agent_comms/native_fork.py b/src/agent_comms/native_fork.py index c8aec4e974..41c0085c7b 100644 --- a/src/agent_comms/native_fork.py +++ b/src/agent_comms/native_fork.py @@ -9,7 +9,7 @@ from pathlib import Path from typing import Annotated, ClassVar -from agent_comms import field_codec +from agent_comms.nominal import field_codec from .child_process import ChildResult from .launch_runtime import LaunchRuntime diff --git a/src/agent_comms/native_input_owner.py b/src/agent_comms/native_input_owner.py index 0a2dc623f4..928cd31646 100644 --- a/src/agent_comms/native_input_owner.py +++ b/src/agent_comms/native_input_owner.py @@ -10,7 +10,7 @@ from dataclasses import dataclass from typing import TYPE_CHECKING, ClassVar -from agent_comms.field_codec import GoalId, ThreadLookup +from agent_comms.nominal.field_codec import GoalId, ThreadLookup from .child_process import ProcessIdentity from .coordination_errors import StaleFence from .coordination_tables.participants import OwnerGenerations diff --git a/src/agent_comms/native_input_record.py b/src/agent_comms/native_input_record.py index 81422f126b..495892ef62 100644 --- a/src/agent_comms/native_input_record.py +++ b/src/agent_comms/native_input_record.py @@ -25,8 +25,8 @@ ) from .coordination_tables.participants import OwnerGenerations, OwnerRecord from .coordination_tables.responses import ResponseObligation -from .declared_family import DeclaredFamily -from .field_codec import ( +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import ( AssignmentId, FieldCodec, InputId, diff --git a/src/agent_comms/native_output.py b/src/agent_comms/native_output.py index c267864034..e177ecbe81 100644 --- a/src/agent_comms/native_output.py +++ b/src/agent_comms/native_output.py @@ -6,8 +6,8 @@ from typing import TYPE_CHECKING, Annotated from .coordination_errors import TranscriptChanged -from .declared_family import DeclaredFamily -from .field_codec import ( +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import ( ToolCallId, WireName, ) diff --git a/src/agent_comms/native_package.py b/src/agent_comms/native_package.py index baae320840..ce0c907eb2 100644 --- a/src/agent_comms/native_package.py +++ b/src/agent_comms/native_package.py @@ -24,7 +24,7 @@ from typing import Annotated, ClassVar, Literal from agent_comms.child_process import Platform -from agent_comms.field_codec import FieldCodec, MalformedRecord, PathText, Sha256Text, WireName +from agent_comms.nominal.field_codec import FieldCodec, MalformedRecord, PathText, Sha256Text, WireName from agent_comms.native_build_inputs import INPUTS_PREFIX, NativeBuildInputs, built_tree_pin from agent_comms.native_failures import NativePiUnavailable from agent_comms.private_path import PrivateDirectoryRole, TrustedAncestorRole diff --git a/src/agent_comms/native_pi.py b/src/agent_comms/native_pi.py index d439846824..6a732ec022 100644 --- a/src/agent_comms/native_pi.py +++ b/src/agent_comms/native_pi.py @@ -27,7 +27,7 @@ ) from .coordination_errors import IdentityConflict from .errors import RelationViolationError -from .field_codec import ( +from .nominal.field_codec import ( FieldCodec, InputId, MalformedRecord, diff --git a/src/agent_comms/native_prompt_binding.py b/src/agent_comms/native_prompt_binding.py index af56b48770..96a511eb61 100644 --- a/src/agent_comms/native_prompt_binding.py +++ b/src/agent_comms/native_prompt_binding.py @@ -20,7 +20,7 @@ from agent_comms.coordinator import Coordination from .cohort_schema import CohortTable -from .field_codec import FieldCodec, InputId, MalformedRecord, RootId, Sha256Text, ThreadLookup +from .nominal.field_codec import FieldCodec, InputId, MalformedRecord, RootId, Sha256Text, ThreadLookup from .native_entries import NativeEvidenceRead from .native_input_owner import ParticipantOwner from .native_input_record import NativeColumn, NativeInputExecution, NativeInputRecord diff --git a/src/agent_comms/native_prompt_send.py b/src/agent_comms/native_prompt_send.py index 8b7bfbc73b..62e8975747 100644 --- a/src/agent_comms/native_prompt_send.py +++ b/src/agent_comms/native_prompt_send.py @@ -19,7 +19,7 @@ from contextlib import AbstractContextManager, ExitStack from typing import TYPE_CHECKING from .diagnostics import PublicationMeasurements -from .field_codec import AcpSessionId +from .nominal.field_codec import AcpSessionId from .coordination_errors import CoordinationError from agent_comms.errors import RelationViolationError diff --git a/src/agent_comms/native_runtime_input.py b/src/agent_comms/native_runtime_input.py index d2086fc1bd..d8220030e6 100644 --- a/src/agent_comms/native_runtime_input.py +++ b/src/agent_comms/native_runtime_input.py @@ -18,8 +18,8 @@ from .coordination_errors import IdentityConflict, PublicationActivationBlocked, StaleFence from .coordination_tables.participants import OwnerGenerations from .coordination_tables.responses import ResponseObligation -from .declared_family import DeclaredFamily -from .field_codec import ( +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import ( FieldCodec, InputId, MalformedRecord, diff --git a/src/agent_comms/native_session_reopen.py b/src/agent_comms/native_session_reopen.py index dd9cc76c2d..959098d4a1 100644 --- a/src/agent_comms/native_session_reopen.py +++ b/src/agent_comms/native_session_reopen.py @@ -7,7 +7,7 @@ from dataclasses import dataclass from pathlib import Path from typing import Annotated, TYPE_CHECKING -from .field_codec import FieldCodec, MalformedRecord, NullMember, PresentMember, boundary_decoder, WireName +from .nominal.field_codec import FieldCodec, MalformedRecord, NullMember, PresentMember, boundary_decoder, WireName from abc import ABC, abstractmethod from .private_path import FileRevision from .turn_item import FreshNativeId diff --git a/src/agent_comms/native_startup.py b/src/agent_comms/native_startup.py index c895bf0bd9..178d2ad30a 100644 --- a/src/agent_comms/native_startup.py +++ b/src/agent_comms/native_startup.py @@ -8,7 +8,7 @@ from typing import TYPE_CHECKING from .diagnostics import PublicationMeasurements -from .field_codec import boundary_decoder +from .nominal.field_codec import boundary_decoder if TYPE_CHECKING: from .native_pi import NativePiRpcLaunch diff --git a/src/agent_comms/native_tool_call.py b/src/agent_comms/native_tool_call.py index ba5fb83806..809e5e2907 100644 --- a/src/agent_comms/native_tool_call.py +++ b/src/agent_comms/native_tool_call.py @@ -15,7 +15,7 @@ from pathlib import Path from typing import TYPE_CHECKING, ClassVar, Never -from .field_codec import ( +from .nominal.field_codec import ( FieldCodec, InputId, MalformedRecord, diff --git a/src/agent_comms/native_tool_transport.py b/src/agent_comms/native_tool_transport.py index adb41083fe..92fee7f265 100644 --- a/src/agent_comms/native_tool_transport.py +++ b/src/agent_comms/native_tool_transport.py @@ -19,7 +19,7 @@ from .child_process import join_retirement from .coordination_database import CoordinationStore from .errors import RelationViolationError -from .field_codec import FieldCodec, InputId, MalformedRecord, Token256Text +from .nominal.field_codec import FieldCodec, InputId, MalformedRecord, Token256Text from .lifecycle_capability import Complete from .native_tool_call import ( DuplicateToolCallIdentity, diff --git a/src/agent_comms/native_tools.py b/src/agent_comms/native_tools.py index b55d695ebd..e4c8a7be1d 100644 --- a/src/agent_comms/native_tools.py +++ b/src/agent_comms/native_tools.py @@ -9,7 +9,7 @@ from typing import TYPE_CHECKING, Annotated, ClassVar from .envelope_claim_transitions import ExistingFileClaim, FileClaimPath, WritableFileClaim -from .field_codec import ( +from .nominal.field_codec import ( FieldCodec, NullMember, ToolCallId, diff --git a/src/agent_comms/native_transcript.py b/src/agent_comms/native_transcript.py index a6a7a106c0..95e7873fe5 100644 --- a/src/agent_comms/native_transcript.py +++ b/src/agent_comms/native_transcript.py @@ -22,8 +22,8 @@ from agent_comms.native_session_files import NativeSessionFiles from .coordination_errors import TranscriptChanged -from .declared_family import DeclaredFamily -from .field_codec import MalformedRecord +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import MalformedRecord from .native_entries import ( NativeEntry, NoEntryId, diff --git a/src/agent_comms/native_turn_context.py b/src/agent_comms/native_turn_context.py index 201ff5eaba..2f727aaea6 100644 --- a/src/agent_comms/native_turn_context.py +++ b/src/agent_comms/native_turn_context.py @@ -4,7 +4,7 @@ from functools import partial from typing import TYPE_CHECKING, Annotated -from agent_comms import field_codec +from agent_comms.nominal import field_codec from .coordinator import Coordination diff --git a/src/agent_comms/nk_foreground.py b/src/agent_comms/nk_foreground.py index 7c53ad9e0a..e30f29e813 100644 --- a/src/agent_comms/nk_foreground.py +++ b/src/agent_comms/nk_foreground.py @@ -31,7 +31,7 @@ from .coordinated_runtime import SelectedExecution from .cursor_publication import CursorDelivery from .errors import RelationViolationError -from .field_codec import FieldCodec, MalformedRecord, RootId +from .nominal.field_codec import FieldCodec, MalformedRecord, RootId from agent_comms.native_session_files import NativeSessionFiles from .native_package import VerifiedNativePackage from .selected_result import CoordinatedTurn diff --git a/src/agent_comms/nominal/__init__.py b/src/agent_comms/nominal/__init__.py new file mode 100644 index 0000000000..51831a77ff --- /dev/null +++ b/src/agent_comms/nominal/__init__.py @@ -0,0 +1 @@ +"""Declaration, discovery and boundary conversion mechanisms.""" diff --git a/src/agent_comms/declared_family.py b/src/agent_comms/nominal/declared_family.py similarity index 100% rename from src/agent_comms/declared_family.py rename to src/agent_comms/nominal/declared_family.py diff --git a/src/agent_comms/field_codec.py b/src/agent_comms/nominal/field_codec.py similarity index 99% rename from src/agent_comms/field_codec.py rename to src/agent_comms/nominal/field_codec.py index 9169d83373..143405c56a 100644 --- a/src/agent_comms/field_codec.py +++ b/src/agent_comms/nominal/field_codec.py @@ -53,7 +53,7 @@ if TYPE_CHECKING: from _typeshed import DataclassInstance - from .registration_inheritance import RegistrationInheritance + from ..registration_inheritance import RegistrationInheritance T = TypeVar("T") diff --git a/src/agent_comms/json_schema.py b/src/agent_comms/nominal/json_schema.py similarity index 100% rename from src/agent_comms/json_schema.py rename to src/agent_comms/nominal/json_schema.py diff --git a/src/agent_comms/sealed.py b/src/agent_comms/nominal/sealed.py similarity index 100% rename from src/agent_comms/sealed.py rename to src/agent_comms/nominal/sealed.py diff --git a/src/agent_comms/notification_assignment.py b/src/agent_comms/notification_assignment.py index e60c62df8c..96f76a33a7 100644 --- a/src/agent_comms/notification_assignment.py +++ b/src/agent_comms/notification_assignment.py @@ -16,8 +16,8 @@ from .coordination_tables.executions import CurrentExecutions from .coordination_tables.harness_deliveries import HarnessDelivery from .coordination_tables.publications import PublicationEvidence -from .declared_family import DeclaredFamily -from .field_codec import FieldCodec, MalformedRecord, MessageId, ThreadLookup, boundary_decoder +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import FieldCodec, MalformedRecord, MessageId, ThreadLookup, boundary_decoder from .message_reference import MessageReference from .notification_progress import ( AnsweredProgress, diff --git a/src/agent_comms/notification_evidence.py b/src/agent_comms/notification_evidence.py index 8920b89c1d..e1d394be05 100644 --- a/src/agent_comms/notification_evidence.py +++ b/src/agent_comms/notification_evidence.py @@ -15,7 +15,7 @@ from .comms import Comms from .coordination_tables.assignments import WakeAssignment from .coordination_tables.harness_deliveries import HarnessDelivery - from .field_codec import ThreadLookup + from .nominal.field_codec import ThreadLookup from .message_reference import MessageReference from .notification_assignment import AssignmentActivityEvidence from .notification_progress import DeliveryProgress diff --git a/src/agent_comms/notification_progress.py b/src/agent_comms/notification_progress.py index 81925885a9..7a91a7daf4 100644 --- a/src/agent_comms/notification_progress.py +++ b/src/agent_comms/notification_progress.py @@ -5,7 +5,7 @@ from dataclasses import dataclass, replace from typing import TYPE_CHECKING, ClassVar, Self -from .declared_family import DeclaredOrder +from .nominal.declared_family import DeclaredOrder from .message_reference import MessageReference from .thread_presentation import ThreadPresentationStatus, WorkingThreadPresentationStatus diff --git a/src/agent_comms/obligation_states.py b/src/agent_comms/obligation_states.py index 24585566ab..b4cb65fa35 100644 --- a/src/agent_comms/obligation_states.py +++ b/src/agent_comms/obligation_states.py @@ -7,7 +7,7 @@ from .coordination_errors import IdentityConflict, IntegrityViolationError from .coordinator_vocabulary import CoordinatorVocabulary -from .field_codec import MessageId, NullMember +from .nominal.field_codec import MessageId, NullMember from .lifecycle import LifecycleState from .lifecycle_capability import Deferred, Failed, Pending, Successful, Terminal from .message_reference import MessageReference diff --git a/src/agent_comms/optional_awareness_projection.py b/src/agent_comms/optional_awareness_projection.py index 8594573031..85bea3bd00 100644 --- a/src/agent_comms/optional_awareness_projection.py +++ b/src/agent_comms/optional_awareness_projection.py @@ -46,7 +46,7 @@ ) from .coordination_cohort import _claim_record from .errors import RelationViolationError -from .field_codec import FieldCodec, RootId, ThreadLookup +from .nominal.field_codec import FieldCodec, RootId, ThreadLookup from .message_reference import MessageReference from .native_input_owner import RegistryOwner from .private_registry_guard import RegistryPrivacy diff --git a/src/agent_comms/order_runs.py b/src/agent_comms/order_runs.py index f671b86c1e..042db0a1f2 100644 --- a/src/agent_comms/order_runs.py +++ b/src/agent_comms/order_runs.py @@ -7,7 +7,7 @@ from pathlib import Path from typing import TYPE_CHECKING, ClassVar -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.errors import ToolRefusedError if TYPE_CHECKING: diff --git a/src/agent_comms/order_story.py b/src/agent_comms/order_story.py index 57acfb3fc6..0b65899ceb 100644 --- a/src/agent_comms/order_story.py +++ b/src/agent_comms/order_story.py @@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Self from .build_identity import InstalledBuild -from .field_codec import OrderId +from .nominal.field_codec import OrderId from .recorded_time import EventTime from .tool_result import ToolResult diff --git a/src/agent_comms/order_tools.py b/src/agent_comms/order_tools.py index c30347268e..9b2791105e 100644 --- a/src/agent_comms/order_tools.py +++ b/src/agent_comms/order_tools.py @@ -37,7 +37,7 @@ from .commander_hud import CommanderHud from .comms import Comms from .errors import ToolRefusedError -from .field_codec import FieldCodec, MessageId, OrderId, RecordProblems, WireName +from .nominal.field_codec import FieldCodec, MessageId, OrderId, RecordProblems, WireName from .goal_actions import CreateProblemGoalAction, OrderGoalAction from .goals import Goal, OrderCheck from .head_review import HeadReviewOrder, PreparedHeadReview, PullRequestHead diff --git a/src/agent_comms/order_work.py b/src/agent_comms/order_work.py index 37004ce302..b44c972db9 100644 --- a/src/agent_comms/order_work.py +++ b/src/agent_comms/order_work.py @@ -4,7 +4,7 @@ from dataclasses import dataclass -from .field_codec import ToolCallId +from .nominal.field_codec import ToolCallId from .thread_identity import ThreadIncarnation from .tool_result import ToolResult from .transcript_events import OrderCall, TurnDigest diff --git a/src/agent_comms/ordinary_turn_rules.py b/src/agent_comms/ordinary_turn_rules.py index c5f312adae..0fe382558a 100644 --- a/src/agent_comms/ordinary_turn_rules.py +++ b/src/agent_comms/ordinary_turn_rules.py @@ -7,7 +7,7 @@ from .input_key import InputKey -from .field_codec import InputId, TurnId +from .nominal.field_codec import InputId, TurnId from .reservation_rules import ReservationRule, RuleCheck if TYPE_CHECKING: diff --git a/src/agent_comms/owned_send.py b/src/agent_comms/owned_send.py index 98f9ea2b3d..8790289036 100644 --- a/src/agent_comms/owned_send.py +++ b/src/agent_comms/owned_send.py @@ -24,7 +24,7 @@ from .coordination_session import NativeCapture, NativeCommit from .coordinator import Coordination from .envelope_claim_transitions import NativeClaim -from .field_codec import ClaimId, InputId, TurnId +from .nominal.field_codec import ClaimId, InputId, TurnId from .input_attempt import InputAlreadyCleared from .reservation_rules import ReservationRule, ReservationViolationError from .tool_denial import SelectedToolDenied diff --git a/src/agent_comms/owned_turn.py b/src/agent_comms/owned_turn.py index 78f48ff91c..0a8e61ffde 100644 --- a/src/agent_comms/owned_turn.py +++ b/src/agent_comms/owned_turn.py @@ -29,7 +29,7 @@ from .channel_input_batch import InputBatch from .coordination_errors import CoordinationError, Refused from .coordinator import Coordination -from .field_codec import GoalId, TurnId +from .nominal.field_codec import GoalId, TurnId from .goals import Goal from .image_input import ImageInput from .input_attempt import ReservedInput diff --git a/src/agent_comms/owner_connection.py b/src/agent_comms/owner_connection.py index 205b51650f..67beca7a79 100644 --- a/src/agent_comms/owner_connection.py +++ b/src/agent_comms/owner_connection.py @@ -13,12 +13,12 @@ from collections.abc import Awaitable from dataclasses import dataclass, replace from .command import Command -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .tool_result import DeclaredReply from .coordinator import Coordination from .errors import RelationViolationError, UnregisteredThreadError -from .field_codec import AcpSessionId, FieldCodec, NullMember, WireOmitDefault +from .nominal.field_codec import AcpSessionId, FieldCodec, NullMember, WireOmitDefault from .maintenance_barrier import MaintenanceHolder, NoMaintenanceHolder from .jsonl_stream import JsonlStreamReader from .owner_protocol import OwnerLine, OwnerResult diff --git a/src/agent_comms/owner_fence.py b/src/agent_comms/owner_fence.py index aa4f0a033b..e5692e8f3b 100644 --- a/src/agent_comms/owner_fence.py +++ b/src/agent_comms/owner_fence.py @@ -12,7 +12,7 @@ require_nonempty, validate_execution_id, ) -from agent_comms.field_codec import ThreadLookup +from agent_comms.nominal.field_codec import ThreadLookup @dataclass(frozen=True, slots=True) diff --git a/src/agent_comms/owner_launch.py b/src/agent_comms/owner_launch.py index 473d98505b..6404df288e 100644 --- a/src/agent_comms/owner_launch.py +++ b/src/agent_comms/owner_launch.py @@ -15,7 +15,7 @@ from . import launch_runtime from .native_arguments import ConfiguredBinary, InheritedArguments, LaunchArguments, LaunchBinary, NativeArguments from .registry_document import RegistryEntry, RegistrySnapshot -from .field_codec import AcpSessionId, FieldCodec +from .nominal.field_codec import AcpSessionId, FieldCodec from .owner_connection import OwnerConnection, ResultRuntimeRequest, RuntimeRequestContext from .thread_identity import ClaimedIdentity, OwnerIdentity from .tool_result import DeclaredReply diff --git a/src/agent_comms/owner_lifecycle.py b/src/agent_comms/owner_lifecycle.py index 995d31b60c..e366f8b31f 100644 --- a/src/agent_comms/owner_lifecycle.py +++ b/src/agent_comms/owner_lifecycle.py @@ -22,7 +22,7 @@ ProcessState, ) from .cli_result import CliResult -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .owner_connection import OwnerConnection from .owner_launch import RetainedOwnerLaunch, StartOwnerRuntimeRequest, StopOwnerRuntimeRequest from .root_runtime import RootRuntimeStore @@ -31,7 +31,7 @@ from .errors import RelationViolationError from .launch_root import LaunchRoot from .input_key import AcpInputKey, InputKey -from .field_codec import InputId +from .nominal.field_codec import InputId from .input_disposition import InputDispositions from .launch_runtime import LaunchRuntime, RestartEnvironment, SetVariable, ThreadLaunch from .maintenance_barrier import MaintenanceBarrier diff --git a/src/agent_comms/owner_protocol.py b/src/agent_comms/owner_protocol.py index 6a8bdfb754..0ee8d53064 100644 --- a/src/agent_comms/owner_protocol.py +++ b/src/agent_comms/owner_protocol.py @@ -14,8 +14,8 @@ from pydantic import BaseModel -from .declared_family import DeclaredFamily -from .field_codec import ( +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import ( FieldCodec, MalformedRecord, NullMember, RecordMember, SubclassUnion, Token256Text, WireName, ) from .package_stamp import STAMP diff --git a/src/agent_comms/owner_requests.py b/src/agent_comms/owner_requests.py index f08db122be..b6360069bb 100644 --- a/src/agent_comms/owner_requests.py +++ b/src/agent_comms/owner_requests.py @@ -8,9 +8,9 @@ from dataclasses import dataclass from typing import TYPE_CHECKING, ClassVar, Self -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( NullMember, OwnerRequestKey, RecordMember, diff --git a/src/agent_comms/page_traversal.py b/src/agent_comms/page_traversal.py index 1a2f15e441..52ed4720ab 100644 --- a/src/agent_comms/page_traversal.py +++ b/src/agent_comms/page_traversal.py @@ -8,7 +8,7 @@ from dataclasses import dataclass, replace from typing import TYPE_CHECKING, ClassVar -from .field_codec import NullMember, RecordMember, SingleFieldValue, SubclassUnion +from .nominal.field_codec import NullMember, RecordMember, SingleFieldValue, SubclassUnion if TYPE_CHECKING: from .bus import BusReader diff --git a/src/agent_comms/participant_identity.py b/src/agent_comms/participant_identity.py index 7e06bbf69e..17e918944d 100644 --- a/src/agent_comms/participant_identity.py +++ b/src/agent_comms/participant_identity.py @@ -2,7 +2,7 @@ from abc import ABC, abstractmethod -from .field_codec import ThreadLookup +from .nominal.field_codec import ThreadLookup class ParticipantIdentity(ABC): diff --git a/src/agent_comms/participant_store.py b/src/agent_comms/participant_store.py index a26b16e26c..8fc5243a74 100644 --- a/src/agent_comms/participant_store.py +++ b/src/agent_comms/participant_store.py @@ -20,7 +20,7 @@ OwnerGenerations, Participants, ) -from agent_comms.field_codec import ThreadLookup +from agent_comms.nominal.field_codec import ThreadLookup @dataclass(frozen=True, slots=True) diff --git a/src/agent_comms/pattern_sources.py b/src/agent_comms/pattern_sources.py index e287dc4264..4b3373cdd2 100644 --- a/src/agent_comms/pattern_sources.py +++ b/src/agent_comms/pattern_sources.py @@ -11,7 +11,7 @@ from dataclasses import dataclass from typing import ClassVar -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily COMMANDER_SKILL = "../../src/agent_comms/skills/comms-commander/SKILL.md" diff --git a/src/agent_comms/peer_relevance.py b/src/agent_comms/peer_relevance.py index 5f5e8508b1..832ead12a9 100644 --- a/src/agent_comms/peer_relevance.py +++ b/src/agent_comms/peer_relevance.py @@ -10,7 +10,7 @@ from abc import ABC from collections.abc import Sequence -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily class RelevanceCapability(ABC): diff --git a/src/agent_comms/pending_requests.py b/src/agent_comms/pending_requests.py index e68ac0d841..44bbba9063 100644 --- a/src/agent_comms/pending_requests.py +++ b/src/agent_comms/pending_requests.py @@ -6,7 +6,7 @@ from dataclasses import dataclass from typing import TYPE_CHECKING -from .sealed import Sealed +from .nominal.sealed import Sealed from .turn_item import PiRequestKey if TYPE_CHECKING: diff --git a/src/agent_comms/phase_evidence.py b/src/agent_comms/phase_evidence.py index 4f4e1fb89a..55959cc7d6 100644 --- a/src/agent_comms/phase_evidence.py +++ b/src/agent_comms/phase_evidence.py @@ -20,8 +20,8 @@ from threading import Lock from typing import TYPE_CHECKING, ClassVar, get_args, get_origin, get_type_hints -from agent_comms.declared_family import DeclaredFamily -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.declared_family import DeclaredFamily +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.head_review import HeadReview from agent_comms.pinned_audit import ForeignAbsenceProbe, GodFunction, ParsedModule from agent_comms.private_path import FileObservation, FileRevision diff --git a/src/agent_comms/pi_commands.py b/src/agent_comms/pi_commands.py index c74484d587..196913e5a5 100644 --- a/src/agent_comms/pi_commands.py +++ b/src/agent_comms/pi_commands.py @@ -17,8 +17,8 @@ from .acp_failure import UnrecordedFailureSource from .agent_backend import InputRequest, StreamingInputPolicy from .child_process import BoundedRun -from .declared_family import DeclaredFamily, UnknownFamilyMember -from .field_codec import ( +from .nominal.declared_family import DeclaredFamily, UnknownFamilyMember +from .nominal.field_codec import ( FieldCodec, InputId, MalformedRecord, diff --git a/src/agent_comms/pi_counts.py b/src/agent_comms/pi_counts.py index 11b77a3e47..83eaffe85f 100644 --- a/src/agent_comms/pi_counts.py +++ b/src/agent_comms/pi_counts.py @@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Annotated, ClassVar from .context_reading import ContextReading, ContextUsage, UnmeasuredContext, UnsizedContextUsage -from .field_codec import ( +from .nominal.field_codec import ( AcceptsNull, ExternalField, ExternalJsonShape, diff --git a/src/agent_comms/pi_durable_backend.py b/src/agent_comms/pi_durable_backend.py index 3ce6faae6a..68a52ead9b 100644 --- a/src/agent_comms/pi_durable_backend.py +++ b/src/agent_comms/pi_durable_backend.py @@ -10,7 +10,7 @@ from pydantic import JsonValue -from agent_comms import field_codec +from agent_comms.nominal import field_codec from .agent_backend import ( AgentBackend, diff --git a/src/agent_comms/pi_events.py b/src/agent_comms/pi_events.py index cfe1f5a292..889df08c76 100644 --- a/src/agent_comms/pi_events.py +++ b/src/agent_comms/pi_events.py @@ -10,8 +10,8 @@ from . import agent_events as events from . import turn_phase as phases from .acp_failure import UnrecordedFailureSource -from .declared_family import DeclaredFamily -from .field_codec import ( +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import ( DeclaredWireType, FieldCodec, FieldPlan, diff --git a/src/agent_comms/pi_helper.py b/src/agent_comms/pi_helper.py index 0ef23ba345..835c968322 100644 --- a/src/agent_comms/pi_helper.py +++ b/src/agent_comms/pi_helper.py @@ -9,8 +9,8 @@ from typing import ClassVar from .child_process import BoundedRun, ChildResult -from .declared_family import DeclaredFamily -from .field_codec import FieldCodec, MalformedRecord +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import FieldCodec, MalformedRecord from .launch_runtime import INHERITED_ENVIRONMENT, LaunchRuntime, RestartEnvironment from .native_package import VerifiedNativePackage diff --git a/src/agent_comms/pi_payloads.py b/src/agent_comms/pi_payloads.py index 41692fa8ab..fab79054f0 100644 --- a/src/agent_comms/pi_payloads.py +++ b/src/agent_comms/pi_payloads.py @@ -23,8 +23,8 @@ from pydantic import JsonValue from .annotation_disclosure import PublicInstructionAnnotations, WithheldAnnotations -from .declared_family import DeclaredFamily, UnknownFamilyMember -from .field_codec import ( +from .nominal.declared_family import DeclaredFamily, UnknownFamilyMember +from .nominal.field_codec import ( ExternalField, ExternalNull, ExternalNullMember, diff --git a/src/agent_comms/pi_rpc.py b/src/agent_comms/pi_rpc.py index 5687bc4d96..5870d2f982 100644 --- a/src/agent_comms/pi_rpc.py +++ b/src/agent_comms/pi_rpc.py @@ -1,7 +1,7 @@ """Pi JSON-line transport; tolerant discovery and strict native proof share one decoder.""" from __future__ import annotations -from .field_codec import FieldCodec, MalformedRecord +from .nominal.field_codec import FieldCodec, MalformedRecord from .jsonl_stream import JsonlStreamReader from .pi_events import PiEvent, Response from contextlib import asynccontextmanager @@ -11,7 +11,7 @@ from typing import TYPE_CHECKING from .pending_requests import PendingRequest, PendingRequests -from .sealed import Sealed +from .nominal.sealed import Sealed if TYPE_CHECKING: from .pi_commands import PiCommand diff --git a/src/agent_comms/pi_vocabulary.py b/src/agent_comms/pi_vocabulary.py index ea5736e01c..2fd2d91350 100644 --- a/src/agent_comms/pi_vocabulary.py +++ b/src/agent_comms/pi_vocabulary.py @@ -7,8 +7,8 @@ from enum import StrEnum from typing import TYPE_CHECKING, Annotated -from .declared_family import DeclaredFamily -from .field_codec import ( +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import ( AcceptsNull, DefaultExternalName, ExternalName, diff --git a/src/agent_comms/plan_phases.py b/src/agent_comms/plan_phases.py index 338e1d3b8a..e8ef7f5ced 100644 --- a/src/agent_comms/plan_phases.py +++ b/src/agent_comms/plan_phases.py @@ -11,7 +11,7 @@ from typing import TYPE_CHECKING, ClassVar -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.process_claim import ProcessSingleton from agent_comms.store_files import SqliteStore from agent_comms.installer.probes.carry import Carry @@ -20,7 +20,7 @@ from agent_comms.thread_identity import BirthlessIncarnation from agent_comms.tool_calls import CliToolArguments from agent_comms_hooks.queue_bypass import QueueBypassGuard -from agent_comms.field_codec import Id128, MessageId, NominalSpelling, NominalText +from agent_comms.nominal.field_codec import Id128, MessageId, NominalSpelling, NominalText from agent_comms.phase_evidence import ( AllEvidence, BusStorageAbsent, @@ -474,7 +474,7 @@ class DuplicatesPhase(MultipleInheritancePhase): ("__init__",), ("durable_turn.py", "execution_store.py", "exporting.py", "publisher.py"), ), - (("wire_member",), ("pi_payloads.py", "field_codec.py")), + (("wire_member",), ("pi_payloads.py", "nominal/field_codec.py")), ( ( "_assert_response_schema", @@ -536,12 +536,12 @@ class NominalIdTypePhase(Id128NominalPhase): evidence = AllEvidence( ( - *(ClassDeclared(kind.__name__, ("src/agent_comms/field_codec.py",)) + *(ClassDeclared(kind.__name__, ("src/agent_comms/nominal/field_codec.py",)) for kind in ( NominalText, NominalSpelling, Id128, MessageId, *Id128.__subclasses__(), )), PatternAbsent( - r"def mint\(cls(, text: str)?\) -> str:", ("src/agent_comms/field_codec.py",) + r"def mint\(cls(, text: str)?\) -> str:", ("src/agent_comms/nominal/field_codec.py",) ), ) ) @@ -632,8 +632,8 @@ class RedecodesDeletedPhase(Id128NominalPhase): ( PatternAbsent(r"Id128Text\.(decode|from_text)\("), PatternAbsent(r"Annotated\[str, *(Id128Text|MessageIdText)\]"), - PatternAbsent(r"uuid4\(\)\.hex([^\[]|$)", ("src", ":!src/agent_comms/field_codec.py")), - PatternAbsent(r"isinstance\(\w+, NominalText\)", ("src/agent_comms/field_codec.py",)), + PatternAbsent(r"uuid4\(\)\.hex([^\[]|$)", ("src", ":!src/agent_comms/nominal/field_codec.py")), + PatternAbsent(r"isinstance\(\w+, NominalText\)", ("src/agent_comms/nominal/field_codec.py",)), ) ) @@ -835,9 +835,9 @@ class OwnedDispatchPhase(RemainingSlopPhase): PatternAbsent(r"class TurnInboxReceiver\b"), PatternAbsent( r"""separators\s*=\s*\(\s*["'],["']\s*,\s*["']:["']\s*\)""", - ("src", ":!src/agent_comms/field_codec.py"), + ("src", ":!src/agent_comms/nominal/field_codec.py"), ), - FunctionDeclared("compact", ("src/agent_comms/field_codec.py",)), + FunctionDeclared("compact", ("src/agent_comms/nominal/field_codec.py",)), ) ) diff --git a/src/agent_comms/presentation.py b/src/agent_comms/presentation.py index 3a21c7715a..ea0407a593 100644 --- a/src/agent_comms/presentation.py +++ b/src/agent_comms/presentation.py @@ -26,11 +26,11 @@ from .commander_frame_file import CommanderFrameFile from .coordination_database import CoordinationStore from .coordination_errors import DMPaintedBoundChanged, StaleRevision -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .display_order import ChannelSort, NameChannelSort from .display_references import CurrentDisplayReferences from .external_transcript import ExternalTranscript -from .field_codec import ( +from .nominal.field_codec import ( Differs, FieldCodec, JsonShapeFamily, diff --git a/src/agent_comms/private_nk_entrypoint.py b/src/agent_comms/private_nk_entrypoint.py index da2595b1d1..241accb397 100644 --- a/src/agent_comms/private_nk_entrypoint.py +++ b/src/agent_comms/private_nk_entrypoint.py @@ -7,7 +7,7 @@ from __future__ import annotations -from agent_comms.field_codec import RootId +from agent_comms.nominal.field_codec import RootId import shutil from abc import ABC, abstractmethod diff --git a/src/agent_comms/private_path.py b/src/agent_comms/private_path.py index 01c0fe5586..87615b60c9 100644 --- a/src/agent_comms/private_path.py +++ b/src/agent_comms/private_path.py @@ -16,9 +16,9 @@ from typing import BinaryIO, ClassVar from .child_process import Platform -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError -from .field_codec import NullMember, RecordMember, SubclassUnion +from .nominal.field_codec import NullMember, RecordMember, SubclassUnion @dataclass(frozen=True, slots=True) diff --git a/src/agent_comms/private_registry_guard.py b/src/agent_comms/private_registry_guard.py index 045ab785da..91d87af38b 100644 --- a/src/agent_comms/private_registry_guard.py +++ b/src/agent_comms/private_registry_guard.py @@ -35,7 +35,7 @@ from .coordination_tables.participants import Participants from .coordinator import Coordination from .errors import RelationViolationError -from .field_codec import RootId, ThreadLookup +from .nominal.field_codec import RootId, ThreadLookup from .locked_store import RollbackRetained, WireWakeFile from .native_input_owner import RegistryOwner from .native_runtime_input import NativeRuntimeInput, NativeRuntimeTable diff --git a/src/agent_comms/private_send_claim.py b/src/agent_comms/private_send_claim.py index 1e175de8c6..1ce0832733 100644 --- a/src/agent_comms/private_send_claim.py +++ b/src/agent_comms/private_send_claim.py @@ -16,7 +16,7 @@ from typing import TYPE_CHECKING from agent_comms.native_runtime_input import NativeRuntimeTable -from .field_codec import AcpSessionId, InputId +from .nominal.field_codec import AcpSessionId, InputId from .coordination_errors import IdentityConflict, RetryScheduled from .coordinator import Coordination from .diagnostics import ( diff --git a/src/agent_comms/private_send_rules.py b/src/agent_comms/private_send_rules.py index aef7c5b264..6d5f81e57b 100644 --- a/src/agent_comms/private_send_rules.py +++ b/src/agent_comms/private_send_rules.py @@ -5,7 +5,7 @@ from dataclasses import dataclass from typing import TYPE_CHECKING -from agent_comms.field_codec import RootId +from agent_comms.nominal.field_codec import RootId from .child_process import ProcessIdentity from .coordination_tables.assignments import WakeAssignment diff --git a/src/agent_comms/private_send_stage.py b/src/agent_comms/private_send_stage.py index aced2c1a2f..016d513c80 100644 --- a/src/agent_comms/private_send_stage.py +++ b/src/agent_comms/private_send_stage.py @@ -20,7 +20,7 @@ from .coordination_tables.assignments import WakeAssignment from .coordinator import Coordination from .durable_turn import DurableTurn -from .field_codec import ThreadLookup, InputId, RootId +from .nominal.field_codec import ThreadLookup, InputId, RootId from .private_send_rules import ( NativeBindingCheck, NativeClaimCheck, diff --git a/src/agent_comms/private_sidecar.py b/src/agent_comms/private_sidecar.py index ab3321c7b4..fbacc4ae5b 100644 --- a/src/agent_comms/private_sidecar.py +++ b/src/agent_comms/private_sidecar.py @@ -29,7 +29,7 @@ from agent_comms.coordination_errors import IdentityConflict from agent_comms.locked_store import DurableFile, SQLiteFile -from .field_codec import FieldCodec +from .nominal.field_codec import FieldCodec if TYPE_CHECKING: from .agent_backend import StreamingInputPolicy diff --git a/src/agent_comms/progress_claims.py b/src/agent_comms/progress_claims.py index 537e040f87..838c9dcbbd 100644 --- a/src/agent_comms/progress_claims.py +++ b/src/agent_comms/progress_claims.py @@ -13,7 +13,7 @@ from pathlib import Path from typing import TYPE_CHECKING, ClassVar -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .repo import Repo if TYPE_CHECKING: diff --git a/src/agent_comms/proven_source_coverage.py b/src/agent_comms/proven_source_coverage.py index a6dc20cc64..cfd6284a8b 100644 --- a/src/agent_comms/proven_source_coverage.py +++ b/src/agent_comms/proven_source_coverage.py @@ -25,7 +25,7 @@ from .cohort_schema import ClaimBatchAcknowledgements, CohortTable from .coordination_cohort import AcceptedCohort, _claim_record from .coordination_session import NativeCapture -from .field_codec import FieldCodec, RootId, ThreadLookup +from .nominal.field_codec import FieldCodec, RootId, ThreadLookup from .historical_native_inputs import HistoricalNativeInput, read_historical_native_inputs from .message_bus import MessageBus from .native_input_record import NumberNativeColumn, TextNativeColumn, UnrecordedNativeColumn diff --git a/src/agent_comms/publisher.py b/src/agent_comms/publisher.py index 98b46a5f9e..437e57b132 100644 --- a/src/agent_comms/publisher.py +++ b/src/agent_comms/publisher.py @@ -20,7 +20,7 @@ from agent_comms.coordination_tables.publications import ( PublicationIntents, ) -from agent_comms.field_codec import ClaimId +from agent_comms.nominal.field_codec import ClaimId from agent_comms.messages import BusRecord, ClaimNoticeKind, Message from agent_comms.response_acknowledgement import canonical_publication_key diff --git a/src/agent_comms/queued_input.py b/src/agent_comms/queued_input.py index 737a0fd587..14170bb615 100644 --- a/src/agent_comms/queued_input.py +++ b/src/agent_comms/queued_input.py @@ -34,7 +34,7 @@ ) from .coordinator import Coordination from .errors import RelationViolationError -from .field_codec import InputId, GoalId, RootId +from .nominal.field_codec import InputId, GoalId, RootId from .goals import GoalDeclaration, NoGoal from .image_input import ImageInput from .input_attempt import InputAttempt, ReservedInput diff --git a/src/agent_comms/read_basis.py b/src/agent_comms/read_basis.py index cfe4c6f5fa..511eb2967b 100644 --- a/src/agent_comms/read_basis.py +++ b/src/agent_comms/read_basis.py @@ -26,9 +26,9 @@ from .activity_clocks import ActivityClocks, ChannelActivity from .channel_targets import CommandTarget, ThreadTarget from .coordination_errors import DMPaintedBoundChanged, DMScopeChanged, HistoricalSourceChanged -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError, UnregisteredThreadError -from .field_codec import FieldCodec, NullMember, PathText, SingleFieldValue, SubclassUnion +from .nominal.field_codec import FieldCodec, NullMember, PathText, SingleFieldValue, SubclassUnion from .mentions import ThreadMention from .message_reference import MessageReference from .private_path import FileObservation, MissingFile diff --git a/src/agent_comms/read_ledger.py b/src/agent_comms/read_ledger.py index 0aff5d5151..1e536a7956 100644 --- a/src/agent_comms/read_ledger.py +++ b/src/agent_comms/read_ledger.py @@ -17,7 +17,7 @@ from .bus import Bus, BusReader from .channel_targets import CommandTarget from .coordination_errors import DMScopeChanged -from .field_codec import FieldCodec, NullMember, SingleFieldValue, SubclassUnion +from .nominal.field_codec import FieldCodec, NullMember, SingleFieldValue, SubclassUnion from .locked_store import DocumentChange from .maintenance_barrier import CarriedDocument from .private_path import ObservedPath @@ -33,7 +33,7 @@ ReadCursor, ) from .recorded_bus import NoRecordedBus, RecordedBus, RecordedBusIdentity -from .sealed import Sealed +from .nominal.sealed import Sealed from .store_files import DependentStateTier, SingleFileStore from .thread_identity import RecordedThreadIncarnation from .thread_owned_state import ThreadOwnedState diff --git a/src/agent_comms/reason_codes.py b/src/agent_comms/reason_codes.py index fa09625e2f..de85889326 100644 --- a/src/agent_comms/reason_codes.py +++ b/src/agent_comms/reason_codes.py @@ -4,7 +4,7 @@ from dataclasses import dataclass from agent_comms.coordination_contracts import MAX_REASON_CODE_CHARS, MAX_SANITIZED_DETAIL_CHARS -from agent_comms.field_codec import SubclassUnion +from agent_comms.nominal.field_codec import SubclassUnion from agent_comms.thread_text import AbsentText, GivenText, TextChoice diff --git a/src/agent_comms/recorded_bus.py b/src/agent_comms/recorded_bus.py index b3b791d8f6..69ece314bf 100644 --- a/src/agent_comms/recorded_bus.py +++ b/src/agent_comms/recorded_bus.py @@ -5,7 +5,7 @@ from abc import abstractmethod from pathlib import Path -from .field_codec import DeclaredWireType, FieldCodec, MalformedRecord, NullMember, SubclassUnion +from .nominal.field_codec import DeclaredWireType, FieldCodec, MalformedRecord, NullMember, SubclassUnion from .private_path import AbsentPath, FileIdentity, ObservedPath, PresentPath diff --git a/src/agent_comms/recorded_time.py b/src/agent_comms/recorded_time.py index 80f914c6ac..5438e2be00 100644 --- a/src/agent_comms/recorded_time.py +++ b/src/agent_comms/recorded_time.py @@ -8,8 +8,8 @@ from math import isfinite from typing import ClassVar, Never -from .declared_family import DeclaredFamily -from .field_codec import AcceptsNull, FieldCodec, FieldRepresentation, NullMember, boundary_decoder +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import AcceptsNull, FieldCodec, FieldRepresentation, NullMember, boundary_decoder class RecordedEventSeconds(FieldRepresentation): """The recorded-time value of an existing numeric-seconds contract.""" diff --git a/src/agent_comms/registration.py b/src/agent_comms/registration.py index 2658c1c4fd..2ae7cd2cfd 100644 --- a/src/agent_comms/registration.py +++ b/src/agent_comms/registration.py @@ -11,7 +11,7 @@ from .catalog_store import ChannelCatalog from .child_process import NoProcess, ProcessIdentity from .errors import RelationViolationError, UnregisteredThreadError -from .field_codec import GoalId, ThreadLookup, TurnId +from .nominal.field_codec import GoalId, ThreadLookup, TurnId from .goal_history import GoalHistoryEntry, GoalHistoryStore from .goal_scope import AllGoals, GoalScope from .native_input_owner import RegistryOwner diff --git a/src/agent_comms/registry_document.py b/src/agent_comms/registry_document.py index cafdf85a4f..89a4850ddf 100644 --- a/src/agent_comms/registry_document.py +++ b/src/agent_comms/registry_document.py @@ -16,9 +16,9 @@ from .activity import ActivityCapture from .child_process import NoProcess, ProcessIdentity -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError, UnregisteredThreadError -from .field_codec import ( +from .nominal.field_codec import ( ExternalJsonShape, FieldCodec, MalformedRecord, diff --git a/src/agent_comms/registry_provenance.py b/src/agent_comms/registry_provenance.py index b64031fed8..8e1deeef77 100644 --- a/src/agent_comms/registry_provenance.py +++ b/src/agent_comms/registry_provenance.py @@ -11,7 +11,7 @@ from pathlib import Path from typing import TYPE_CHECKING, Generic, TypeVar -from agent_comms.field_codec import FieldCodec, ThreadLookup +from agent_comms.nominal.field_codec import FieldCodec, ThreadLookup from .agent_activity import UnavailableRecipientActivity from .errors import RelationViolationError, UnregisteredThreadError diff --git a/src/agent_comms/registry_store.py b/src/agent_comms/registry_store.py index 449a32715b..b86ba21b63 100644 --- a/src/agent_comms/registry_store.py +++ b/src/agent_comms/registry_store.py @@ -17,7 +17,7 @@ from .coordination_database import CoordinationStore from .coordination_errors import StaleFence from .errors import RelationViolationError -from .field_codec import FieldCodec, NullMember, TurnId +from .nominal.field_codec import FieldCodec, NullMember, TurnId from .locked_store import DocumentBytes, LockedStore, RegistryFile from .maintenance_barrier import CarriedDocument from .native_input_owner import RegistryOwner diff --git a/src/agent_comms/relationships.py b/src/agent_comms/relationships.py index 97dda8bae1..9680c6f552 100644 --- a/src/agent_comms/relationships.py +++ b/src/agent_comms/relationships.py @@ -15,13 +15,13 @@ from pathlib import Path from typing import TYPE_CHECKING, Annotated, ClassVar, Literal -from agent_comms.field_codec import GoalId -from agent_comms import field_codec +from agent_comms.nominal.field_codec import GoalId +from agent_comms.nominal import field_codec from . import presentation from .channel_targets import CommandTarget from .command import Command -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .display_order import CreatedThreadSort, LastActivityThreadSort, ThreadSort from .errors import RelationViolationError, UnregisteredThreadError from .goals import Goal, GoalMentionBinding diff --git a/src/agent_comms/repo.py b/src/agent_comms/repo.py index ca1d5e1c42..8a8cbdbc19 100644 --- a/src/agent_comms/repo.py +++ b/src/agent_comms/repo.py @@ -12,9 +12,9 @@ from pydantic import BaseModel, ConfigDict, InstanceOf, PlainSerializer, PlainValidator from .coordination_errors import CommandFailure -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import MissingSourceLine -from .field_codec import FieldCodec, PresentMember, SingleFieldValue, WireValue +from .nominal.field_codec import FieldCodec, PresentMember, SingleFieldValue, WireValue from .native_build_inputs import GitLaunch from .repository_name import RepositoryName diff --git a/src/agent_comms/reported_turn.py b/src/agent_comms/reported_turn.py index e19908a56a..c35739c9c7 100644 --- a/src/agent_comms/reported_turn.py +++ b/src/agent_comms/reported_turn.py @@ -5,8 +5,8 @@ from abc import abstractmethod from dataclasses import dataclass -from .declared_family import DeclaredFamily -from .field_codec import JsonShapeFamily, JsonShapeMember, TurnId +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import JsonShapeFamily, JsonShapeMember, TurnId class ReportedTurnState(DeclaredFamily, JsonShapeFamily, affix="ReportedTurnState"): diff --git a/src/agent_comms/repository_name.py b/src/agent_comms/repository_name.py index 8e5a1e935b..082f91aa08 100644 --- a/src/agent_comms/repository_name.py +++ b/src/agent_comms/repository_name.py @@ -7,7 +7,7 @@ from dataclasses import dataclass from typing import ClassVar -from .field_codec import MalformedRecord, WireValue +from .nominal.field_codec import MalformedRecord, WireValue @dataclass(frozen=True, slots=True, eq=False) diff --git a/src/agent_comms/request_progress.py b/src/agent_comms/request_progress.py index d893b0478c..8b3c74de41 100644 --- a/src/agent_comms/request_progress.py +++ b/src/agent_comms/request_progress.py @@ -5,7 +5,7 @@ from dataclasses import dataclass from typing import Annotated, Literal -from agent_comms import field_codec +from agent_comms.nominal import field_codec from .child_process import ProcessIdentity from .pi_counts import PiCount, UnreportedCount diff --git a/src/agent_comms/reservation_rules.py b/src/agent_comms/reservation_rules.py index 4d14b2afd8..15b3b389e4 100644 --- a/src/agent_comms/reservation_rules.py +++ b/src/agent_comms/reservation_rules.py @@ -5,7 +5,7 @@ from abc import abstractmethod from typing import ClassVar -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily class ReservationViolationError(ValueError): diff --git a/src/agent_comms/response_acknowledgement.py b/src/agent_comms/response_acknowledgement.py index bcd35a3dab..6f0acfde99 100644 --- a/src/agent_comms/response_acknowledgement.py +++ b/src/agent_comms/response_acknowledgement.py @@ -13,7 +13,7 @@ MAX_IDENTIFIER_CHARS, require_bounded, require_nonempty, validate_execution_id, ) from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( FieldCodec, MalformedRecord, NullMember, diff --git a/src/agent_comms/response_policy.py b/src/agent_comms/response_policy.py index 237513509c..a8919dc7cc 100644 --- a/src/agent_comms/response_policy.py +++ b/src/agent_comms/response_policy.py @@ -10,7 +10,7 @@ from types import MappingProxyType from typing import TYPE_CHECKING -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .input_key import BusInputKey, InputKey, OwnedBusInputKey from .projection_source import ProducedRow, ProjectionSource diff --git a/src/agent_comms/restart_queue.py b/src/agent_comms/restart_queue.py index ddefba3bf5..5a0b4fffff 100644 --- a/src/agent_comms/restart_queue.py +++ b/src/agent_comms/restart_queue.py @@ -23,9 +23,9 @@ from .comms import Comms, wire from .coordination_errors import CoordinationError from .coordinator import Coordination -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError -from .field_codec import FieldCodec, RecordMember, RestartId, WireOmitDefault +from .nominal.field_codec import FieldCodec, RecordMember, RestartId, WireOmitDefault from .launch_runtime import LaunchRuntime, RestartEnvironment from .lifecycle_capability import Active, LifecycleCapability, Pending from .locked_store import RuntimeFile diff --git a/src/agent_comms/restart_refusals.py b/src/agent_comms/restart_refusals.py index 567283e0a0..802ec55ae5 100644 --- a/src/agent_comms/restart_refusals.py +++ b/src/agent_comms/restart_refusals.py @@ -3,7 +3,7 @@ from abc import abstractmethod from typing import ClassVar -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError diff --git a/src/agent_comms/restart_scope.py b/src/agent_comms/restart_scope.py index 572ff42b0e..c91e3cb9ab 100644 --- a/src/agent_comms/restart_scope.py +++ b/src/agent_comms/restart_scope.py @@ -5,7 +5,7 @@ from dataclasses import dataclass from typing import TYPE_CHECKING -from agent_comms.field_codec import NullMember, SingleFieldValue, SubclassUnion +from agent_comms.nominal.field_codec import NullMember, SingleFieldValue, SubclassUnion if TYPE_CHECKING: from agent_comms.registry_document import RegistrySnapshot diff --git a/src/agent_comms/retained_context.py b/src/agent_comms/retained_context.py index f0024465ed..1243cfbc3f 100644 --- a/src/agent_comms/retained_context.py +++ b/src/agent_comms/retained_context.py @@ -4,7 +4,7 @@ from collections.abc import Mapping from .exporting import WireExportFormat -from .field_codec import FieldCodec +from .nominal.field_codec import FieldCodec from .messages import Message from .context_segments.retained import RetainedSegment diff --git a/src/agent_comms/retained_task_facts.py b/src/agent_comms/retained_task_facts.py index ba7d21d1b6..c3296c6925 100644 --- a/src/agent_comms/retained_task_facts.py +++ b/src/agent_comms/retained_task_facts.py @@ -11,9 +11,9 @@ from dataclasses import dataclass from typing import TYPE_CHECKING -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError -from .field_codec import FieldCodec +from .nominal.field_codec import FieldCodec from .input_attempt import StoredInput from .message_reference import MessageReference from .messages import ClaimMessage, Message diff --git a/src/agent_comms/revision_views.py b/src/agent_comms/revision_views.py index ca1fc42cd9..1882207205 100644 --- a/src/agent_comms/revision_views.py +++ b/src/agent_comms/revision_views.py @@ -4,7 +4,7 @@ from itertools import zip_longest -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .private_path import FileObservation, MissingFile diff --git a/src/agent_comms/root_runtime.py b/src/agent_comms/root_runtime.py index cebaa49bb5..afbe298abc 100644 --- a/src/agent_comms/root_runtime.py +++ b/src/agent_comms/root_runtime.py @@ -12,9 +12,9 @@ from .bus import Bus from .child_process import NoProcess, ObservedProcess, OutlivesLauncherLifetime, ProcessIdentity, ProcessState, SpawnedProcess -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError -from .field_codec import PathText, WireOmitDefault +from .nominal.field_codec import PathText, WireOmitDefault from .launch_runtime import LaunchRuntime from .locked_store import DocumentChange, LockedStore, RegistryFile, RollbackRetained from .maintenance_barrier import MaintenanceBarrier diff --git a/src/agent_comms/routing.py b/src/agent_comms/routing.py index e66d4979ad..daa94b6f3f 100644 --- a/src/agent_comms/routing.py +++ b/src/agent_comms/routing.py @@ -14,7 +14,7 @@ from .channel_targets import CommandTarget from .repo import Checkout -from .field_codec import ( +from .nominal.field_codec import ( ThreadLookup, FieldCodec, NullMember, PresentMember, RecordMember, SubclassUnion, WireOmitDefault, ) from .goal_scope import AllGoals, GoalScope diff --git a/src/agent_comms/runtime.py b/src/agent_comms/runtime.py index 89dfdde624..59a08c4c74 100644 --- a/src/agent_comms/runtime.py +++ b/src/agent_comms/runtime.py @@ -41,7 +41,7 @@ from .controller import ( ACP_PERMISSION_TIMEOUT_SECONDS, UNBOUND_CONTROLLER, Controller, SessionUpdateSink, ) -from .field_codec import AcpSessionId, FieldCodec, MalformedRecord, WireName +from .nominal.field_codec import AcpSessionId, FieldCodec, MalformedRecord, WireName from .owner_protocol import ( ClientLine, IncompatibleOwnerError, diff --git a/src/agent_comms/runtime_children.py b/src/agent_comms/runtime_children.py index 4dcd0378f0..8eba236a75 100644 --- a/src/agent_comms/runtime_children.py +++ b/src/agent_comms/runtime_children.py @@ -20,8 +20,8 @@ ProcessIdentity, RecordedRuntimeGroup, ) -from .declared_family import DeclaredFamily -from .field_codec import PathText +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import PathText from .launch_runtime import CallingThreadUnavailable, ThreadLaunch from .locked_store import DocumentChange from .maintenance_barrier import CarriedDocument diff --git a/src/agent_comms/runtime_info.py b/src/agent_comms/runtime_info.py index 449dd55f0e..c30f508b05 100644 --- a/src/agent_comms/runtime_info.py +++ b/src/agent_comms/runtime_info.py @@ -8,9 +8,9 @@ from typing import TYPE_CHECKING, Annotated, ClassVar from .context_reading import ContextReading, UnmeasuredContext -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError -from .field_codec import FieldCodec, SingleFieldValue, WireName, WireRequired +from .nominal.field_codec import FieldCodec, SingleFieldValue, WireName, WireRequired from .locked_store import DocumentChange from .maintenance_barrier import CarriedDocument from .pi_counts import PiCount, UnreportedCount diff --git a/src/agent_comms/runtime_processes.py b/src/agent_comms/runtime_processes.py index f8b4e1f20f..df23d6740c 100644 --- a/src/agent_comms/runtime_processes.py +++ b/src/agent_comms/runtime_processes.py @@ -8,7 +8,7 @@ from pathlib import Path from agent_comms.child_process import IdentityMismatchError, Platform, ProcessIdentity -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.launch_runtime import LaunchRuntime from agent_comms.runtime_children import ApplicationChildInitiator diff --git a/src/agent_comms/runtime_requests.py b/src/agent_comms/runtime_requests.py index e27e56237e..d6706e4f24 100644 --- a/src/agent_comms/runtime_requests.py +++ b/src/agent_comms/runtime_requests.py @@ -33,9 +33,9 @@ from .context_store import ContextManifestReference from .coordination_database import CoordinationStore from .coordinator import Coordination -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError -from .field_codec import AcpSessionId, FieldCodec, WireName, WireValue, GoalId +from .nominal.field_codec import AcpSessionId, FieldCodec, WireName, WireValue, GoalId from .goal_actions import GoalAction from .goal_history import RecordedGoalHistory from .goal_scope import AllGoals, OneGoal diff --git a/src/agent_comms/schedule_rules.py b/src/agent_comms/schedule_rules.py index c8f08d7e7d..6fae6777f0 100644 --- a/src/agent_comms/schedule_rules.py +++ b/src/agent_comms/schedule_rules.py @@ -8,7 +8,7 @@ from .coordinator import Coordination -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .drain_failures import drain_failures from .activity import FailedWakeDiagnostic from .errors import RelationViolationError diff --git a/src/agent_comms/schema_report.py b/src/agent_comms/schema_report.py index 8514bfddbe..dcda528215 100644 --- a/src/agent_comms/schema_report.py +++ b/src/agent_comms/schema_report.py @@ -8,8 +8,8 @@ from .cli_result import CliResult from .locked_store import SQLiteFile -from .declared_family import UnknownFamilyMember -from .field_codec import FieldCodec +from .nominal.declared_family import UnknownFamilyMember +from .nominal.field_codec import FieldCodec from .typed_table import SQLiteSchemaDifference, SQLiteSchemaObject, SQLiteTableName, TypedTable diff --git a/src/agent_comms/selected_actions.py b/src/agent_comms/selected_actions.py index dbe58561c6..1b3a7c3eb1 100644 --- a/src/agent_comms/selected_actions.py +++ b/src/agent_comms/selected_actions.py @@ -9,7 +9,7 @@ from .coordination_errors import IdentityConflict from .envelope_claim_transitions import ExistingFileClaim -from .field_codec import ClaimId +from .nominal.field_codec import ClaimId from .native_tool_call import NativeToolMode from .native_tool_transport import ToolTransport from .selected_claim import ( diff --git a/src/agent_comms/selected_participant.py b/src/agent_comms/selected_participant.py index cdf17be4a9..a28c142af8 100644 --- a/src/agent_comms/selected_participant.py +++ b/src/agent_comms/selected_participant.py @@ -28,7 +28,7 @@ from .coordinator import Coordination from .cursor_publication import CursorDelivery from .errors import RelationViolationError -from .field_codec import TurnId, RootId, ThreadLookup +from .nominal.field_codec import TurnId, RootId, ThreadLookup from .message_bus import MessageBus from .message_reference import MessageReference from .native_arguments import SelectedModel diff --git a/src/agent_comms/selected_result.py b/src/agent_comms/selected_result.py index 18ae9199ec..87ed704d2b 100644 --- a/src/agent_comms/selected_result.py +++ b/src/agent_comms/selected_result.py @@ -5,12 +5,12 @@ from typing import Annotated from dataclasses import dataclass -from agent_comms import field_codec +from agent_comms.nominal import field_codec from .assignment_states import AssignmentState from .coordination_tables.publications import PublicationEvidence from .diagnostics import record_terminal_failure -from .field_codec import AssignmentId, FieldCodec, InputId +from .nominal.field_codec import AssignmentId, FieldCodec, InputId from .messages import AlertKind, NoticeRole from .send_result import SendResult from .turn_failure import BackendFailed diff --git a/src/agent_comms/selected_session.py b/src/agent_comms/selected_session.py index a6473e2aa5..d3c0ba7135 100644 --- a/src/agent_comms/selected_session.py +++ b/src/agent_comms/selected_session.py @@ -16,7 +16,7 @@ from .native_session_reopen import NativeSessionIdentity from agent_comms.native_pi import _session_location from agent_comms.native_failures import NativePiUnavailable -from .field_codec import boundary_decoder +from .nominal.field_codec import boundary_decoder from .private_path import PrivateFileRole from .launch_runtime import RestartEnvironment, ThreadLaunch from .pi_vocabulary import ThinkingChoice diff --git a/src/agent_comms/selected_source_batch.py b/src/agent_comms/selected_source_batch.py index 3dd064ad32..cc9255611c 100644 --- a/src/agent_comms/selected_source_batch.py +++ b/src/agent_comms/selected_source_batch.py @@ -7,7 +7,7 @@ from .bus_publication import Delivered from .coordination_errors import IdentityConflict from .coordination_tables.assignments import WakeAssignment -from .field_codec import AssignmentId, FieldCodec +from .nominal.field_codec import AssignmentId, FieldCodec from .messages import InfoKind, Message from .native_failures import NativePiUnavailable from .turn_context import ReplyRouteSegment, WireProvenance diff --git a/src/agent_comms/selected_tool_broker.py b/src/agent_comms/selected_tool_broker.py index bf88aafb8b..5f5590bfc8 100644 --- a/src/agent_comms/selected_tool_broker.py +++ b/src/agent_comms/selected_tool_broker.py @@ -23,7 +23,7 @@ from .coordination_tables.participants import OwnerGenerations from .coordinator import Coordination from .envelope_claim_transitions import ExistingFileClaim, WakeClaim -from .field_codec import ( +from .nominal.field_codec import ( FieldCodec, InputId, MalformedRecord, diff --git a/src/agent_comms/selected_triage.py b/src/agent_comms/selected_triage.py index 345cf88922..72a4ec5695 100644 --- a/src/agent_comms/selected_triage.py +++ b/src/agent_comms/selected_triage.py @@ -12,8 +12,8 @@ from .coordination_tables.assignments import WakeAssignment from .coordination_tables.executions import WireOrigin from .coordinator import Coordination -from .declared_family import DeclaredFamily -from .field_codec import ( +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import ( FieldCodec, InputId, JsonShapeFamily, diff --git a/src/agent_comms/selected_write_authority.py b/src/agent_comms/selected_write_authority.py index 6f2203c0c9..63450edefb 100644 --- a/src/agent_comms/selected_write_authority.py +++ b/src/agent_comms/selected_write_authority.py @@ -7,7 +7,7 @@ from typing import TYPE_CHECKING from .coordination_errors import IdentityConflict -from .field_codec import ClaimId +from .nominal.field_codec import ClaimId from .selected_write_plan import SelectedWritePlans if TYPE_CHECKING: diff --git a/src/agent_comms/selected_write_plan.py b/src/agent_comms/selected_write_plan.py index 0cd5477244..f008b3c387 100644 --- a/src/agent_comms/selected_write_plan.py +++ b/src/agent_comms/selected_write_plan.py @@ -31,9 +31,9 @@ from .child_process import Platform from .coordination_cohort import sealed_cohort_assignments -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .envelope_claim_transitions import ExistingFileClaim -from .field_codec import AssignmentId, ClaimId, FieldCodec, MalformedRecord, MessageId, RootId +from .nominal.field_codec import AssignmentId, ClaimId, FieldCodec, MalformedRecord, MessageId, RootId from .repo import Checkout from .message_reference import MessageReference from .private_path import PrivateDirectoryRole, PrivateFileRole diff --git a/src/agent_comms/send_outcome.py b/src/agent_comms/send_outcome.py index 0bdece9d64..c1bdc528d8 100644 --- a/src/agent_comms/send_outcome.py +++ b/src/agent_comms/send_outcome.py @@ -8,7 +8,7 @@ from typing import TYPE_CHECKING from . import turn_failure as failures -from .field_codec import InputId +from .nominal.field_codec import InputId if TYPE_CHECKING: from .agent_backend import TurnInbox, TurnInboxItem diff --git a/src/agent_comms/send_request.py b/src/agent_comms/send_request.py index ee3c8eb991..2a355bbba2 100644 --- a/src/agent_comms/send_request.py +++ b/src/agent_comms/send_request.py @@ -1,11 +1,11 @@ from __future__ import annotations -from agent_comms import field_codec +from agent_comms.nominal import field_codec from agent_comms import messages from agent_comms.change_report import NoChangeReport from agent_comms.change_report import ReportEvidence from agent_comms.declared_verb import DeclaredOptions -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.send_result import SendResult from agent_comms.target_fields import ChoiceTargetField from dataclasses import dataclass diff --git a/src/agent_comms/send_result.py b/src/agent_comms/send_result.py index 679b87cce6..b4584a3a89 100644 --- a/src/agent_comms/send_result.py +++ b/src/agent_comms/send_result.py @@ -2,8 +2,8 @@ from abc import abstractmethod from dataclasses import dataclass -from .declared_family import DeclaredFamily -from .field_codec import MessageId +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import MessageId from .messages import Message @@ -43,7 +43,7 @@ def notices(self) -> tuple[str, ...]: return self.correction.notices(self.message.message_id) from agent_comms.cli_result import CliResult -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec @dataclass(frozen=True) class MessageSentResult(CliResult): diff --git a/src/agent_comms/session_config_options.py b/src/agent_comms/session_config_options.py index aa666aa367..5cfca5ce47 100644 --- a/src/agent_comms/session_config_options.py +++ b/src/agent_comms/session_config_options.py @@ -19,7 +19,7 @@ from .config_options import (CatalogConfigOption, ConfigOptions, InvalidConfigChoice) from .coordinator import Coordination -from .field_codec import FieldCodec +from .nominal.field_codec import FieldCodec from .native_failures import NativePiUnavailable from .threads import ChosenModel, NextTurnConfiguration from .thread_model import CatalogSelection diff --git a/src/agent_comms/session_file.py b/src/agent_comms/session_file.py index 469c0ddfa4..228cf018a6 100644 --- a/src/agent_comms/session_file.py +++ b/src/agent_comms/session_file.py @@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Annotated from .errors import RelationViolationError -from .field_codec import NullMember, PathText, RecordMember, SubclassUnion, WireTransient +from .nominal.field_codec import NullMember, PathText, RecordMember, SubclassUnion, WireTransient from .unstarted_runtime import UnstartedRuntime if TYPE_CHECKING: diff --git a/src/agent_comms/session_lifecycle.py b/src/agent_comms/session_lifecycle.py index 5d2cbb0d5a..e54f11695a 100644 --- a/src/agent_comms/session_lifecycle.py +++ b/src/agent_comms/session_lifecycle.py @@ -44,7 +44,7 @@ from .session_config_options import SessionConfigOptions from .coordinator import Coordination from .errors import RelationViolationError -from .field_codec import AcpSessionId, FieldCodec, MalformedRecord, boundary_decoder +from .nominal.field_codec import AcpSessionId, FieldCodec, MalformedRecord, boundary_decoder from .owner_protocol import IncompatibleOwner, IncompatibleOwnerError from .registry_document import RegistryEntry from .runtime import RuntimeProxy, RuntimeServer diff --git a/src/agent_comms/session_load.py b/src/agent_comms/session_load.py index 2628eab8fa..50b5a215eb 100644 --- a/src/agent_comms/session_load.py +++ b/src/agent_comms/session_load.py @@ -5,9 +5,9 @@ from dataclasses import dataclass from typing import TYPE_CHECKING -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError -from .field_codec import FieldCodec +from .nominal.field_codec import FieldCodec from .thread_presentation import LiveThreadOwnerBinding, ThreadOwnerBinding from .native_arguments import GivenArguments diff --git a/src/agent_comms/session_revision.py b/src/agent_comms/session_revision.py index 85bfdbad3f..9b38a1d15a 100644 --- a/src/agent_comms/session_revision.py +++ b/src/agent_comms/session_revision.py @@ -5,7 +5,7 @@ from abc import abstractmethod from dataclasses import dataclass -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .native_session_files import NativeSessionFiles from .private_path import FileRevision diff --git a/src/agent_comms/shared_ledger.py b/src/agent_comms/shared_ledger.py index 0fb84e61bb..a2710781b9 100644 --- a/src/agent_comms/shared_ledger.py +++ b/src/agent_comms/shared_ledger.py @@ -7,8 +7,8 @@ from typing import TYPE_CHECKING, ClassVar, Self from agent_comms.cli_result import CliResult -from agent_comms.declared_family import DeclaredFamily -from agent_comms.field_codec import FieldCodec, JsonShapeFamily, JsonShapeMember +from agent_comms.nominal.declared_family import DeclaredFamily +from agent_comms.nominal.field_codec import FieldCodec, JsonShapeFamily, JsonShapeMember from agent_comms.locked_store import DocumentChange from agent_comms.maintenance_barrier import CarriedDocument from agent_comms.thread_owned_state import ThreadOwnedState diff --git a/src/agent_comms/slop.py b/src/agent_comms/slop.py index 957e933dc5..8298f93a2f 100644 --- a/src/agent_comms/slop.py +++ b/src/agent_comms/slop.py @@ -16,8 +16,8 @@ from agent_comms import skills from agent_comms.change_report import Declaration, FileLine -from agent_comms.declared_family import DeclaredFamily -from agent_comms.field_codec import ( +from agent_comms.nominal.declared_family import DeclaredFamily +from agent_comms.nominal.field_codec import ( FieldCodec, FieldRepresentation, MalformedRecord, diff --git a/src/agent_comms/standing_rules.py b/src/agent_comms/standing_rules.py index 87f66cc606..8bde001b7d 100644 --- a/src/agent_comms/standing_rules.py +++ b/src/agent_comms/standing_rules.py @@ -17,10 +17,10 @@ from pathlib import Path from typing import TYPE_CHECKING, ClassVar, Self, cast -from agent_comms.declared_family import DeclaredFamily, RegisteredFamily +from agent_comms.nominal.declared_family import DeclaredFamily, RegisteredFamily from agent_comms.declared_verb import DeclaredVerb from agent_comms.errors import RejectedEnforcementError, TodoConflict -from agent_comms.field_codec import FieldCodec, OrderId +from agent_comms.nominal.field_codec import FieldCodec, OrderId from agent_comms.head_review import HeadReviewOrder, PullRequestHead from agent_comms.heartbeat_subjects import ( AnswerSubject, diff --git a/src/agent_comms/storage_room.py b/src/agent_comms/storage_room.py index 56c160ac89..921642a292 100644 --- a/src/agent_comms/storage_room.py +++ b/src/agent_comms/storage_room.py @@ -18,8 +18,8 @@ from .activity import ActivityState from .child_process import ProcessIdentity, ResidentMemory -from .declared_family import DeclaredFamily -from .field_codec import RoomTicket +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import RoomTicket from .store_files import StoreContention from .thread_identity import ThreadIncarnation from .typed_table import ( diff --git a/src/agent_comms/storage_rules.py b/src/agent_comms/storage_rules.py index 6164449fa1..cc1627da3a 100644 --- a/src/agent_comms/storage_rules.py +++ b/src/agent_comms/storage_rules.py @@ -12,9 +12,9 @@ from pathlib import Path from typing import TYPE_CHECKING, ClassVar, Self -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.child_process import ResidentMemory -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( FieldCodec, GoalId, MalformedRecord, diff --git a/src/agent_comms/store_files.py b/src/agent_comms/store_files.py index 36627b072b..177aa8f961 100644 --- a/src/agent_comms/store_files.py +++ b/src/agent_comms/store_files.py @@ -30,9 +30,9 @@ from .child_process import LockHolder, Platform from .coordination_errors import CoordinationReadUnavailable, DeferredRead, StaleRevision -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError -from .field_codec import PathText, ScratchName +from .nominal.field_codec import PathText, ScratchName from .private_path import FileIdentity, FileObservation, FileRevision, OwnedDirectoryRole, PrivateFileRole from .process_claim import ExclusiveFlock, FlockMode, SharedFlock diff --git a/src/agent_comms/target_fields.py b/src/agent_comms/target_fields.py index f07a82f7a5..a5c67041a5 100644 --- a/src/agent_comms/target_fields.py +++ b/src/agent_comms/target_fields.py @@ -3,8 +3,8 @@ from pydantic import JsonValue from typing import cast -from agent_comms import field_codec -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal import field_codec +from agent_comms.nominal.field_codec import FieldCodec from collections.abc import Callable from dataclasses import dataclass from dataclasses import replace diff --git a/src/agent_comms/task_attachments/commander_pings.py b/src/agent_comms/task_attachments/commander_pings.py index e3a35ec684..190bd90ca1 100644 --- a/src/agent_comms/task_attachments/commander_pings.py +++ b/src/agent_comms/task_attachments/commander_pings.py @@ -16,11 +16,11 @@ from agent_comms.bus_publication import AgentOrigin from agent_comms.channel_targets import ThreadTarget -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.harness_delivery_states import DeliveredOutcome, Outcome from agent_comms.commander_service import CommanderService from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import FieldCodec, OrderId +from agent_comms.nominal.field_codec import FieldCodec, OrderId from agent_comms.message_reference import MessageReference from agent_comms.heartbeat_subjects import CommanderHistory, HeartbeatSubject from agent_comms.messages import ( diff --git a/src/agent_comms/task_sources.py b/src/agent_comms/task_sources.py index 0f4b5a2739..ff88011edb 100644 --- a/src/agent_comms/task_sources.py +++ b/src/agent_comms/task_sources.py @@ -7,9 +7,9 @@ from typing import TYPE_CHECKING, Annotated from .channel_targets import CommandTarget -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError -from .field_codec import FieldCodec, TurnId, WireOmitDefault +from .nominal.field_codec import FieldCodec, TurnId, WireOmitDefault from .goals import GoalDeclaration, GoalRevision from .message_reference import MessageReference from .owner_requests import OwnerRequestId, RequestDirective diff --git a/src/agent_comms/text_digest.py b/src/agent_comms/text_digest.py index 8fde6a0527..42d963a627 100644 --- a/src/agent_comms/text_digest.py +++ b/src/agent_comms/text_digest.py @@ -4,7 +4,7 @@ from dataclasses import dataclass from typing import Self -from .field_codec import Sha256Text +from .nominal.field_codec import Sha256Text @dataclass(frozen=True, slots=True) diff --git a/src/agent_comms/thread_creation.py b/src/agent_comms/thread_creation.py index 693f37487d..933bc22a61 100644 --- a/src/agent_comms/thread_creation.py +++ b/src/agent_comms/thread_creation.py @@ -10,7 +10,7 @@ from metaclass_registry.mro_dispatch import handles from .errors import RelationViolationError -from .field_codec import FieldCodec, FieldRepresentation, WireValue +from .nominal.field_codec import FieldCodec, FieldRepresentation, WireValue class CreationTime(float, WireValue, ABC): diff --git a/src/agent_comms/thread_execution.py b/src/agent_comms/thread_execution.py index 7762d15c7c..935e1d9c63 100644 --- a/src/agent_comms/thread_execution.py +++ b/src/agent_comms/thread_execution.py @@ -7,7 +7,7 @@ from typing import TYPE_CHECKING from .child_process import ProcessState -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError from .thread_presentation import UnavailableThreadOwnerBinding from .thread_status import ThreadStatus diff --git a/src/agent_comms/thread_identity.py b/src/agent_comms/thread_identity.py index 880aef1716..c13fc19de3 100644 --- a/src/agent_comms/thread_identity.py +++ b/src/agent_comms/thread_identity.py @@ -18,14 +18,14 @@ from agent_comms.participant_identity import ParticipantIdentity from .cli_options import JsonFlagRecord -from .declared_family import ( +from .nominal.declared_family import ( DeclaredFamily, UniqueExternalSelector, UnknownFamilyMember, declared_words, ) from .errors import RelationViolationError -from .field_codec import ( +from .nominal.field_codec import ( FieldCodec, TurnId, SingleFieldValue, diff --git a/src/agent_comms/thread_management.py b/src/agent_comms/thread_management.py index 2f79f5b457..0e7ad63923 100644 --- a/src/agent_comms/thread_management.py +++ b/src/agent_comms/thread_management.py @@ -36,7 +36,7 @@ from .collaboration_ledger import CollaborationLedger from .config_options import RunningSelection from .errors import RelationViolationError -from .field_codec import ( +from .nominal.field_codec import ( DeclaredWireType, FieldCodec, NullMember, diff --git a/src/agent_comms/thread_model.py b/src/agent_comms/thread_model.py index e1fc9a05b2..c5a16cb9eb 100644 --- a/src/agent_comms/thread_model.py +++ b/src/agent_comms/thread_model.py @@ -7,7 +7,7 @@ from pathlib import Path from typing import TYPE_CHECKING -from agent_comms.field_codec import SubclassUnion, boundary_decoder +from agent_comms.nominal.field_codec import SubclassUnion, boundary_decoder from agent_comms.native_arguments import NativeArguments, SelectedModel from agent_comms.native_failures import NativePiUnavailable from agent_comms.pi_vocabulary import NoThinkingOverride, ThinkingChoice diff --git a/src/agent_comms/thread_presentation.py b/src/agent_comms/thread_presentation.py index 975703cae8..0ffff1f376 100644 --- a/src/agent_comms/thread_presentation.py +++ b/src/agent_comms/thread_presentation.py @@ -9,7 +9,7 @@ from agent_comms.coordination_errors import StaleRevision from agent_comms.errors import RelationViolationError, RouteChangedError, UnregisteredThreadError -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .thread_identity import OwnerIdentity from .child_process import ProcessIdentity from .notification_evidence import NoNotificationWindow, NotificationWindow diff --git a/src/agent_comms/thread_status.py b/src/agent_comms/thread_status.py index 05cf7c5d29..e854e740d8 100644 --- a/src/agent_comms/thread_status.py +++ b/src/agent_comms/thread_status.py @@ -9,9 +9,9 @@ from typing import TYPE_CHECKING, ClassVar, Self from .child_process import ProcessIdentity, ProcessState -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError, ThreadNotStoppedError -from .field_codec import FieldCodec, TextRepresentation +from .nominal.field_codec import FieldCodec, TextRepresentation from .lifecycle_capability import LifecycleCapability from .thread_presentation import ( InactiveThreadPresentationStatus, diff --git a/src/agent_comms/thread_storage.py b/src/agent_comms/thread_storage.py index 6f4368387d..81cad68229 100644 --- a/src/agent_comms/thread_storage.py +++ b/src/agent_comms/thread_storage.py @@ -9,7 +9,7 @@ from pydantic import JsonValue from .errors import RelationViolationError -from .field_codec import ( +from .nominal.field_codec import ( FieldCodec, FieldRepresentation, NullMember, diff --git a/src/agent_comms/thread_text.py b/src/agent_comms/thread_text.py index bfc07eb071..550eb50efc 100644 --- a/src/agent_comms/thread_text.py +++ b/src/agent_comms/thread_text.py @@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, ClassVar -from agent_comms.field_codec import NullMember, SingleFieldValue, SubclassUnion, boundary_decoder +from agent_comms.nominal.field_codec import NullMember, SingleFieldValue, SubclassUnion, boundary_decoder if TYPE_CHECKING: pass diff --git a/src/agent_comms/threads.py b/src/agent_comms/threads.py index 45fc25ab73..12e41f6e7a 100644 --- a/src/agent_comms/threads.py +++ b/src/agent_comms/threads.py @@ -14,9 +14,9 @@ from .child_process import NoProcess, ProcessIdentity, ProcessState from .cli_result import ThreadToolCatalogResult from .context_segments.wake_values import WakeWorkContext -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError -from .field_codec import ( +from .nominal.field_codec import ( Argument, Description, FieldCodec, diff --git a/src/agent_comms/todos.py b/src/agent_comms/todos.py index b3df514c33..da5e197f75 100644 --- a/src/agent_comms/todos.py +++ b/src/agent_comms/todos.py @@ -65,7 +65,7 @@ from agent_comms.command import Command from agent_comms.commander.rule_file import RuleAudience, RuleFile from agent_comms.coordination_session import NativeCapture -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.errors import ( MissingSourceLine, RejectedEnforcementError, @@ -73,7 +73,7 @@ TodoError, ToolRefusedError, ) -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( DefaultNonNull, Description, FieldCodec, diff --git a/src/agent_comms/tool_caller.py b/src/agent_comms/tool_caller.py index f9bcaaa7c8..c1fa24ac85 100644 --- a/src/agent_comms/tool_caller.py +++ b/src/agent_comms/tool_caller.py @@ -8,7 +8,7 @@ from .bus_publication import AgentOrigin from .cli_result import ThreadToolCatalogResult, ToolCatalogResult from .errors import ToolRefusedError -from .field_codec import WireForm +from .nominal.field_codec import WireForm from .launch_root import LaunchRoot from .launch_runtime import CallingThreadUnavailable from .presentation import AllOutcomes, OutcomeViewer, OwnerOutcomes, SentMessageSummary, ThreadRecord diff --git a/src/agent_comms/tool_calls.py b/src/agent_comms/tool_calls.py index d00435e8a1..2a53b51829 100644 --- a/src/agent_comms/tool_calls.py +++ b/src/agent_comms/tool_calls.py @@ -15,8 +15,8 @@ from pydantic import AliasChoices, Field, JsonValue, ValidationError -from .declared_family import UniqueExternalSelector -from .field_codec import ( +from .nominal.declared_family import UniqueExternalSelector +from .nominal.field_codec import ( FieldCodec, MalformedRecord, ToolCallId, diff --git a/src/agent_comms/tool_declaration.py b/src/agent_comms/tool_declaration.py index 689719c47d..eb2aff2ebe 100644 --- a/src/agent_comms/tool_declaration.py +++ b/src/agent_comms/tool_declaration.py @@ -9,8 +9,8 @@ from pathlib import Path from typing import Annotated, ClassVar, Self -from .declared_family import DeclaredFamily, UnknownFamilyMember -from .field_codec import ( +from .nominal.declared_family import DeclaredFamily, UnknownFamilyMember +from .nominal.field_codec import ( FieldCodec, MalformedRecord, NullMember, diff --git a/src/agent_comms/tool_request.py b/src/agent_comms/tool_request.py index 6b28d21b9c..27c9390e83 100644 --- a/src/agent_comms/tool_request.py +++ b/src/agent_comms/tool_request.py @@ -10,9 +10,9 @@ from pydantic import JsonValue from .comms import Comms -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import ToolRefusedError -from .field_codec import ( +from .nominal.field_codec import ( ContextSource, DefaultNonNull, Description, diff --git a/src/agent_comms/tool_result.py b/src/agent_comms/tool_result.py index 19f194310a..22e1595588 100644 --- a/src/agent_comms/tool_result.py +++ b/src/agent_comms/tool_result.py @@ -1,6 +1,6 @@ """Declared CLI and tool replies share their JSON behavior.""" -from .field_codec import FieldCodec +from .nominal.field_codec import FieldCodec class DeclaredReply: diff --git a/src/agent_comms/tool_results.py b/src/agent_comms/tool_results.py index 33a2b3b901..6fabbbf3d3 100644 --- a/src/agent_comms/tool_results.py +++ b/src/agent_comms/tool_results.py @@ -9,7 +9,7 @@ from pydantic import JsonValue -from .field_codec import NullMember +from .nominal.field_codec import NullMember if TYPE_CHECKING: from .transcript_events import SentTranscript diff --git a/src/agent_comms/tools.py b/src/agent_comms/tools.py index 9e27aac205..ed0942c5c8 100644 --- a/src/agent_comms/tools.py +++ b/src/agent_comms/tools.py @@ -39,7 +39,7 @@ from .coordination_tables.refusals import SendRefusal from .display_order import ChannelSort, ThreadSort from .errors import RelationViolationError, ToolRefusedError -from .field_codec import FieldCodec, NullMember, SingleFieldValue, SubclassUnion, WireForm, WireName, WireOmitDefault, projected, GoalId +from .nominal.field_codec import FieldCodec, NullMember, SingleFieldValue, SubclassUnion, WireForm, WireName, WireOmitDefault, projected, GoalId from .goal_actions import ActiveGoalAction, EditGoalAction, GoalAction, GoalPrecondition, ModelInvocable, SetGoalAction, TransitionGoalAction from .goal_history import RecordedGoalHistory from .goal_scope import AllGoals, OneGoal diff --git a/src/agent_comms/tracked_turn.py b/src/agent_comms/tracked_turn.py index a0a117a2cd..49fe7d019e 100644 --- a/src/agent_comms/tracked_turn.py +++ b/src/agent_comms/tracked_turn.py @@ -22,7 +22,7 @@ from .coordinator import Coordination from .errors import RelationViolationError from .external_transcript import DraftRow -from .field_codec import InputId, MalformedRecord +from .nominal.field_codec import InputId, MalformedRecord from .following_inputs import FollowingInputs from .maintenance_barrier import UNCOORDINATED_INGRESS, MaintenanceIngress from .native_arguments import SelectedModel diff --git a/src/agent_comms/transcript_events.py b/src/agent_comms/transcript_events.py index de4b8f8185..49a0971103 100644 --- a/src/agent_comms/transcript_events.py +++ b/src/agent_comms/transcript_events.py @@ -12,8 +12,8 @@ from pydantic import JsonValue from . import tool_declaration -from .declared_family import DeclaredFamily -from .field_codec import ( +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import ( ActivityExclude, FieldCodec, InputId, diff --git a/src/agent_comms/transcript_routes.py b/src/agent_comms/transcript_routes.py index 0bbaff9fff..35866b6e43 100644 --- a/src/agent_comms/transcript_routes.py +++ b/src/agent_comms/transcript_routes.py @@ -13,7 +13,7 @@ from agent_comms.native_session_reopen import NativeSessionIdentity from .errors import RelationViolationError -from .field_codec import InputId, MalformedRecord, NominalSpelling, NominalText, NullMember, SingleFieldValue +from .nominal.field_codec import InputId, MalformedRecord, NominalSpelling, NominalText, NullMember, SingleFieldValue from .input_disposition import InputDispositions from .private_path import FileObservation, FileRevision from .routing import NoTurnRouting, Routing, TurnRouting diff --git a/src/agent_comms/transcript_sources.py b/src/agent_comms/transcript_sources.py index 182550c4fa..5d09f51cae 100644 --- a/src/agent_comms/transcript_sources.py +++ b/src/agent_comms/transcript_sources.py @@ -33,8 +33,8 @@ from .bus import Bus from .bus_publication import Delivered from .coordination_errors import StaleRevision, TranscriptChanged -from .declared_family import DeclaredFamily -from .field_codec import FieldCodec, MalformedRecord +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import FieldCodec, MalformedRecord from .native_runtime_input import NativeRuntimeInput, PublishedReplyRevision from .recorded_time import EventTime, UnrecordedEventTime from .routing import TurnRouting diff --git a/src/agent_comms/transcript_updates.py b/src/agent_comms/transcript_updates.py index de435ec6a1..c19c7af1e7 100644 --- a/src/agent_comms/transcript_updates.py +++ b/src/agent_comms/transcript_updates.py @@ -16,7 +16,7 @@ encode_updates, ) from .coordinator import Coordination -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .turn_lease import TurnState from .ui_model.observation import ObservationProcess, ReadTranscript, SubscribeTranscript diff --git a/src/agent_comms/transcripts.py b/src/agent_comms/transcripts.py index 7f98da9363..4117d87ede 100644 --- a/src/agent_comms/transcripts.py +++ b/src/agent_comms/transcripts.py @@ -16,10 +16,10 @@ from .bus_publication import Delivered from .coordination_database import CoordinationStore from .coordination_errors import CoordinationReadUnavailable, StaleRevision, TranscriptChanged -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError from .external_transcript import ExternalTranscript -from .field_codec import ContentExclude, FieldCodec, WireName, projected +from .nominal.field_codec import ContentExclude, FieldCodec, WireName, projected from .historical_views import HistorySource from .message_bus import MessageBus from .message_reference import MessageReference diff --git a/src/agent_comms/triage_native_sources.py b/src/agent_comms/triage_native_sources.py index fc0aa9ce3f..4547d0ac96 100644 --- a/src/agent_comms/triage_native_sources.py +++ b/src/agent_comms/triage_native_sources.py @@ -8,7 +8,7 @@ from dataclasses import dataclass from typing import Annotated -from .field_codec import AssignmentId, InputId +from .nominal.field_codec import AssignmentId, InputId from .native_runtime_input import NativeRuntimeInput, NativeRuntimeTable from .typed_table import ( Column, diff --git a/src/agent_comms/turn_context.py b/src/agent_comms/turn_context.py index 378ee30f8d..efa092e4e6 100644 --- a/src/agent_comms/turn_context.py +++ b/src/agent_comms/turn_context.py @@ -17,9 +17,9 @@ from .annotation_disclosure import PublicInstructionAnnotations, WithheldAnnotations from .cli_result import CliResult -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError -from .field_codec import ( +from .nominal.field_codec import ( FieldCodec, IdentityExclude, NullMember, diff --git a/src/agent_comms/turn_digests.py b/src/agent_comms/turn_digests.py index 0784efe81d..4430497b9a 100644 --- a/src/agent_comms/turn_digests.py +++ b/src/agent_comms/turn_digests.py @@ -12,10 +12,10 @@ from .bus import Bus from .context_store import ContextStore -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import ToolRefusedError from .external_transcript import ExternalTranscript, StoreRead -from .field_codec import FieldCodec +from .nominal.field_codec import FieldCodec from .held_orders import HeldOrders, LiveHold from .order_work import OrderWork from .repo import Checkout, Repo diff --git a/src/agent_comms/turn_failure.py b/src/agent_comms/turn_failure.py index 1fd7ce4acc..3953b7e3d9 100644 --- a/src/agent_comms/turn_failure.py +++ b/src/agent_comms/turn_failure.py @@ -9,7 +9,7 @@ from typing import TYPE_CHECKING, ClassVar from .attempt_resolution import RecordedResolution -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import StaleAttemptError from .native_arguments import SelectedModel from .native_failures import NativePiUnavailable diff --git a/src/agent_comms/turn_goal_account.py b/src/agent_comms/turn_goal_account.py index b11173eb13..a4d4ae0ccc 100644 --- a/src/agent_comms/turn_goal_account.py +++ b/src/agent_comms/turn_goal_account.py @@ -19,7 +19,7 @@ from typing import TYPE_CHECKING -from .field_codec import GoalId, TurnId +from .nominal.field_codec import GoalId, TurnId from .turn_item import UsageChargeId from agent_comms.goal_turn_permit import GoalTurnPermit, NoLaunchPermit from .goal_states import ActiveGoal, CompletedGoal, PausedGoal diff --git a/src/agent_comms/turn_goal_permission.py b/src/agent_comms/turn_goal_permission.py index 726102fc43..5dc3ce7a28 100644 --- a/src/agent_comms/turn_goal_permission.py +++ b/src/agent_comms/turn_goal_permission.py @@ -6,7 +6,7 @@ from dataclasses import dataclass from typing import TYPE_CHECKING -from agent_comms.field_codec import GoalId +from agent_comms.nominal.field_codec import GoalId from .ordinary_turn_rules import OrdinaryGoalRule from .reservation_rules import ReservationViolationError from .tool_denial import SelectedToolDenied diff --git a/src/agent_comms/turn_input_source.py b/src/agent_comms/turn_input_source.py index 2b66f8643f..25821e4ebe 100644 --- a/src/agent_comms/turn_input_source.py +++ b/src/agent_comms/turn_input_source.py @@ -14,7 +14,7 @@ from .acp_extension import InputStartedUpdate, NoQueueScope, UnidentifiedInputStarted from .agent_backend import BusyInputPolicy, SteerInputPolicy from .channel_input_batch import InputBatch, SingleInputBatch -from .field_codec import InputId, TurnId +from .nominal.field_codec import InputId, TurnId from .input_attempt import InputAlreadyCleared, MissingInput from .input_key import InputKey from .messages import Message diff --git a/src/agent_comms/turn_inputs.py b/src/agent_comms/turn_inputs.py index 4a3af2e7e8..3e10bcd877 100644 --- a/src/agent_comms/turn_inputs.py +++ b/src/agent_comms/turn_inputs.py @@ -20,7 +20,7 @@ from . import turn_failure as failures from .acp_failure import UnrecordedFailureSource from .agent_backend import ClearQueue, InputRequest, SendNow, TurnInbox, TurnInboxItem, UseSettings -from .field_codec import InputId +from .nominal.field_codec import InputId from .locked_store import RegistryFile from .maintenance_barrier import MaintenanceBarrier from .native_failures import NativePiUnavailable diff --git a/src/agent_comms/turn_item.py b/src/agent_comms/turn_item.py index 747f1c1a2e..4427628b13 100644 --- a/src/agent_comms/turn_item.py +++ b/src/agent_comms/turn_item.py @@ -6,7 +6,7 @@ from dataclasses import dataclass from typing import TYPE_CHECKING, Self -from .field_codec import Id128, NominalSpelling, NominalText +from .nominal.field_codec import Id128, NominalSpelling, NominalText if TYPE_CHECKING: from .routing import Routing diff --git a/src/agent_comms/turn_lease.py b/src/agent_comms/turn_lease.py index d8804536c0..79bb4005aa 100644 --- a/src/agent_comms/turn_lease.py +++ b/src/agent_comms/turn_lease.py @@ -15,7 +15,7 @@ from .coordination_session import NativeCapture from .bus_tables import MessageIdentitySource from .errors import RelationViolationError -from .field_codec import ( +from .nominal.field_codec import ( NullMember, RecordMember, SingleFieldValue, diff --git a/src/agent_comms/turn_phase.py b/src/agent_comms/turn_phase.py index 1521c5c4c9..820ad8eef0 100644 --- a/src/agent_comms/turn_phase.py +++ b/src/agent_comms/turn_phase.py @@ -6,8 +6,8 @@ from typing import TYPE_CHECKING, ClassVar, Self from .activity import Activity, ActivityState, ObservedActivity, ThreadOutput -from .declared_family import DeclaredFamily -from .field_codec import ToolCallId +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import ToolCallId from .pi_payloads import ProviderDiagnosticError if TYPE_CHECKING: diff --git a/src/agent_comms/turn_runner.py b/src/agent_comms/turn_runner.py index dfb901532c..9cfeebfc65 100644 --- a/src/agent_comms/turn_runner.py +++ b/src/agent_comms/turn_runner.py @@ -30,7 +30,7 @@ from .channels import AllChannel from .controller import Controller from .coordinator import Coordination -from .field_codec import GoalId, InputId, TurnId +from .nominal.field_codec import GoalId, InputId, TurnId from .errors import RelationViolationError from .following_inputs import OwnerFollowingInputs from .goal_actions import ( diff --git a/src/agent_comms/turn_watchdog.py b/src/agent_comms/turn_watchdog.py index d8bf836019..6d3b489edf 100644 --- a/src/agent_comms/turn_watchdog.py +++ b/src/agent_comms/turn_watchdog.py @@ -16,7 +16,7 @@ from . import agent_events as events from . import turn_failure as failures from . import turn_phase as phases -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .native_startup import SessionLoad if TYPE_CHECKING: diff --git a/src/agent_comms/typed_table.py b/src/agent_comms/typed_table.py index bf78b95c9d..00251f8727 100644 --- a/src/agent_comms/typed_table.py +++ b/src/agent_comms/typed_table.py @@ -46,9 +46,9 @@ ) from .class_fact import ClassFact -from .declared_family import DeclaredFamily, FamilyMember, declared_words +from .nominal.declared_family import DeclaredFamily, FamilyMember, declared_words from .errors import RelationViolationError -from .field_codec import ( +from .nominal.field_codec import ( FieldCodec, FieldDirective, FieldPlan, diff --git a/src/agent_comms/ui_model/delivery.py b/src/agent_comms/ui_model/delivery.py index 2cb54d9da5..05a5062b2b 100644 --- a/src/agent_comms/ui_model/delivery.py +++ b/src/agent_comms/ui_model/delivery.py @@ -7,8 +7,8 @@ from pydantic import JsonValue -from agent_comms.declared_family import DeclaredFamily -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.declared_family import DeclaredFamily +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.input_attempt import HistoricalInput, UnresolvedInput from agent_comms.input_disposition import DeliveryOverview from agent_comms.thread_presentation import ThreadPresentation, ThreadPresentationStatus diff --git a/src/agent_comms/ui_model/message_category.py b/src/agent_comms/ui_model/message_category.py index 40b9409af9..49aff3f57e 100644 --- a/src/agent_comms/ui_model/message_category.py +++ b/src/agent_comms/ui_model/message_category.py @@ -1,7 +1,7 @@ """Frontend-neutral message categories and agent-output grouping.""" from abc import abstractmethod -from ..declared_family import DeclaredFamily +from ..nominal.declared_family import DeclaredFamily class MessageCategory(DeclaredFamily, affix="Category"): diff --git a/src/agent_comms/ui_model/observation.py b/src/agent_comms/ui_model/observation.py index b517aac113..08b1933144 100644 --- a/src/agent_comms/ui_model/observation.py +++ b/src/agent_comms/ui_model/observation.py @@ -54,7 +54,7 @@ StaleRevision, ) from agent_comms.errors import RelationViolationError, ToolRefusedError -from agent_comms.field_codec import FieldCodec, OrderId +from agent_comms.nominal.field_codec import FieldCodec, OrderId from agent_comms.historical_views import HistorySource from agent_comms.history_views import RetiredViews from agent_comms.message_reference import MessageReference diff --git a/src/agent_comms/ui_model/unit_state.py b/src/agent_comms/ui_model/unit_state.py index 44e79cf5b5..78e9fa6242 100644 --- a/src/agent_comms/ui_model/unit_state.py +++ b/src/agent_comms/ui_model/unit_state.py @@ -16,8 +16,8 @@ from typing import TYPE_CHECKING, ClassVar, Self from agent_comms.comms import Comms -from agent_comms.declared_family import DeclaredFamily -from agent_comms.field_codec import ( +from agent_comms.nominal.declared_family import DeclaredFamily +from agent_comms.nominal.field_codec import ( MalformedRecord, ToolCallId, ) diff --git a/src/agent_comms/wake.py b/src/agent_comms/wake.py index 52719aa5ed..d9c5e0a770 100644 --- a/src/agent_comms/wake.py +++ b/src/agent_comms/wake.py @@ -9,7 +9,7 @@ from .audience_manifest import AudiencedMessage, FrozenRecipient from .channel_targets import CommandTarget, NamedTarget -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .messages import Message from .wake_policy import NoWakeDecision, PassiveWake, RecipientDecision, WakePolicy diff --git a/src/agent_comms/wake_candidate_index.py b/src/agent_comms/wake_candidate_index.py index c12429f44d..f7ccf63ef5 100644 --- a/src/agent_comms/wake_candidate_index.py +++ b/src/agent_comms/wake_candidate_index.py @@ -9,7 +9,7 @@ from .bus import Bus from .bus_publication import Delivered from .bus_source_page import CandidateQuery -from .field_codec import MalformedRecord, MessageId, ThreadLookup +from .nominal.field_codec import MalformedRecord, MessageId, ThreadLookup from .wake_policy import WakePolicy diff --git a/src/agent_comms/wake_policy.py b/src/agent_comms/wake_policy.py index 12459820ea..ed7364e8ae 100644 --- a/src/agent_comms/wake_policy.py +++ b/src/agent_comms/wake_policy.py @@ -7,11 +7,11 @@ from enum import StrEnum from typing import ClassVar -from agent_comms.field_codec import FieldCodec, ThreadLookup +from agent_comms.nominal.field_codec import FieldCodec, ThreadLookup from .coordination_errors import IntegrityViolationError from .coordinator_vocabulary import CoordinatorVocabulary -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .lifecycle_capability import Active, LifecycleCapability from .source_proof_requirement import ( FullSourceProof, diff --git a/src/agent_comms/wire_models.py b/src/agent_comms/wire_models.py index 02ae903a28..01bb3b4cd9 100644 --- a/src/agent_comms/wire_models.py +++ b/src/agent_comms/wire_models.py @@ -8,7 +8,7 @@ from pydantic._internal._model_construction import ModelMetaclass from typing_extensions import TypeForm -from .declared_family import DeclaredFamily, FamilyMeta +from .nominal.declared_family import DeclaredFamily, FamilyMeta class WireModel(BaseModel): diff --git a/src/agent_comms/work_branches.py b/src/agent_comms/work_branches.py index 96b04c8e91..9c9021bdf7 100644 --- a/src/agent_comms/work_branches.py +++ b/src/agent_comms/work_branches.py @@ -21,8 +21,8 @@ from pydantic.alias_generators import to_camel from .code_lines import CodeLines -from .declared_family import DeclaredFamily -from .field_codec import GitCommitText, PathText, projected +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import GitCommitText, PathText, projected from .repo import GitCommandError, Repo from .repository_name import RepositoryName from .wire_models import WireModel diff --git a/src/agent_comms/working_memory_disclosure.py b/src/agent_comms/working_memory_disclosure.py index c7be0fbcb7..be31a10fcd 100644 --- a/src/agent_comms/working_memory_disclosure.py +++ b/src/agent_comms/working_memory_disclosure.py @@ -4,7 +4,7 @@ from typing import Annotated from dataclasses import dataclass -from agent_comms import field_codec +from agent_comms.nominal import field_codec from .turn_context import ContextSegment, ContextSpan from .working_memory_questions import SpanQuestion diff --git a/src/agent_comms/working_memory_labels.py b/src/agent_comms/working_memory_labels.py index 4bddf9c5c5..c143d7f06b 100644 --- a/src/agent_comms/working_memory_labels.py +++ b/src/agent_comms/working_memory_labels.py @@ -12,8 +12,8 @@ ) from .cli_result import CliResult -from .declared_family import DeclaredFamily -from .field_codec import FieldCodec +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import FieldCodec from .thread_identity import ThreadIncarnation from .turn_context import ContextSpan from .working_memory_questions import OtherSpan, SpanAnswer, SpanQuestion diff --git a/src/agent_comms/working_memory_policy.py b/src/agent_comms/working_memory_policy.py index e7de389d5f..102aa9e662 100644 --- a/src/agent_comms/working_memory_policy.py +++ b/src/agent_comms/working_memory_policy.py @@ -6,9 +6,9 @@ from abc import abstractmethod from dataclasses import dataclass -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily from .errors import RelationViolationError -from .field_codec import FieldCodec +from .nominal.field_codec import FieldCodec from .message_reference import MessageReference from .retained_task_facts import RetainedTaskFacts from .task_sources import AnnotationDisclosureGrant diff --git a/src/agent_comms/working_memory_questions.py b/src/agent_comms/working_memory_questions.py index d0585800ca..e6d8364c17 100644 --- a/src/agent_comms/working_memory_questions.py +++ b/src/agent_comms/working_memory_questions.py @@ -5,7 +5,7 @@ from typing import ClassVar from .annotation_disclosure import PublicInstructionDisclosure -from .declared_family import DeclaredFamily +from .nominal.declared_family import DeclaredFamily class SpanAnswer(DeclaredFamily, affix="Answer"): diff --git a/src/agent_comms/working_memory_requests.py b/src/agent_comms/working_memory_requests.py index 9bb5088434..1dbe92aa86 100644 --- a/src/agent_comms/working_memory_requests.py +++ b/src/agent_comms/working_memory_requests.py @@ -5,8 +5,8 @@ from dataclasses import dataclass from typing import Literal -from .declared_family import DeclaredFamily -from .field_codec import FieldCodec +from .nominal.declared_family import DeclaredFamily +from .nominal.field_codec import FieldCodec from .turn_context import ContextSpan from .message_reference import MessageReference from .working_memory_disclosure import DisclosureState diff --git a/src/agent_comms_hooks/read_gate.py b/src/agent_comms_hooks/read_gate.py index 2c34bdeb2c..ed8f0fab9a 100644 --- a/src/agent_comms_hooks/read_gate.py +++ b/src/agent_comms_hooks/read_gate.py @@ -19,7 +19,7 @@ from dataclasses import dataclass from pathlib import Path -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms_hooks import ClaudeHookProgram, ClaudeToolHook, HookRecord, SubagentId diff --git a/stack/test-native-global-extensions.py b/stack/test-native-global-extensions.py index ff9ea6cf84..8b7f037c40 100755 --- a/stack/test-native-global-extensions.py +++ b/stack/test-native-global-extensions.py @@ -19,7 +19,7 @@ import tempfile from agent_comms.comms import wire -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.storage_rules import StorageRoots from agent_comms.native_package import NativeImportsManifest, VerifiedNativePackage from agent_comms.launch_runtime import RestartEnvironment diff --git a/tests/acp_error_payload_installed_journey.py b/tests/acp_error_payload_installed_journey.py index e653739ed0..726994e9a4 100644 --- a/tests/acp_error_payload_installed_journey.py +++ b/tests/acp_error_payload_installed_journey.py @@ -31,7 +31,7 @@ from agent_comms.acp_failure import RequestFailure, ProviderQuotaFailure from agent_comms.comms import wire from agent_comms.fresh_private_session import create_fresh_private_session -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.threads import Thread from native_context_budget_installed_journey import ReceiptSubscriber diff --git a/tests/bus_record_fixture.py b/tests/bus_record_fixture.py index 658427ec61..e6c526227c 100644 --- a/tests/bus_record_fixture.py +++ b/tests/bus_record_fixture.py @@ -12,7 +12,7 @@ from agent_comms.child_process import ProcessIdentity from agent_comms.comms import Comms, wire from agent_comms.envelope_claim_transitions import UnscopedClaims -from agent_comms.field_codec import ClaimId, InputId, RootId, ThreadLookup +from agent_comms.nominal.field_codec import ClaimId, InputId, RootId, ThreadLookup from agent_comms.messages import ClaimMessage, ConversationRole, InfoKind, Message from agent_comms.response_acknowledgement import ( KeyedResponseAcknowledgement, diff --git a/tests/certified_sequence_channel_installed_journey.py b/tests/certified_sequence_channel_installed_journey.py index 7fdfd99d95..6623d5590e 100644 --- a/tests/certified_sequence_channel_installed_journey.py +++ b/tests/certified_sequence_channel_installed_journey.py @@ -58,7 +58,7 @@ def script(cls, options): os.environ.pop(key, None) from agent_comms.comms import wire - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.read_ledger import ReadLedger service = wire() root = service.root diff --git a/tests/conftest.py b/tests/conftest.py index 267bdec096..edb68d9926 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -13,7 +13,7 @@ import uuid from collections.abc import AsyncIterator, Awaitable, Callable, Iterator from pydantic import JsonValue -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.pi_payloads import PiMessage from agent_comms.native_entries import SessionEntry from agent_comms.tool_declaration import ToolDeclaration, NoToolRecord @@ -62,7 +62,7 @@ class TranscriptRecords: """Fixed test time, projected through each record's declared constructor.""" def __init__(self) -> None: - from agent_comms.field_codec import RecordedTimestamp + from agent_comms.nominal.field_codec import RecordedTimestamp self.timestamp = RecordedTimestamp("2026-10-01T00:00:00.000Z") diff --git a/tests/delivery_owner_fixture.py b/tests/delivery_owner_fixture.py index bf78dc5c30..c425940e12 100644 --- a/tests/delivery_owner_fixture.py +++ b/tests/delivery_owner_fixture.py @@ -1,5 +1,5 @@ """Canonical ACP owners sharing the production bus, SQL stores and owner socket.""" -from agent_comms.field_codec import AcpSessionId +from agent_comms.nominal.field_codec import AcpSessionId from agent_comms.session_lifecycle import PublishedSession from agent_comms.controller import SessionUpdateSink diff --git a/tests/github_fixture.py b/tests/github_fixture.py index 53ead17486..c962fbbf29 100644 --- a/tests/github_fixture.py +++ b/tests/github_fixture.py @@ -7,7 +7,7 @@ import pytest -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.repository_name import RepositoryName from agent_comms.todos import ListedPullRequest, UnmergedListedPullRequest diff --git a/tests/goal_generation_installed_journey.py b/tests/goal_generation_installed_journey.py index 8356378308..cfdcff8046 100644 --- a/tests/goal_generation_installed_journey.py +++ b/tests/goal_generation_installed_journey.py @@ -21,7 +21,7 @@ from toad.goal_interaction import ToggleInteraction from toad.widgets.goal_bar import GoalControl -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.goal_generation import BlockedGeneration, CompletedGeneration from agent_comms.goal_management import Goals from agent_comms.goal_states import BlockedGoal, CompletedGoal diff --git a/tests/goal_stop_journey.py b/tests/goal_stop_journey.py index 89cd352926..53aff3e497 100644 --- a/tests/goal_stop_journey.py +++ b/tests/goal_stop_journey.py @@ -10,7 +10,7 @@ from agent_comms.cli_verbs.stop import StopCliCommand from agent_comms.comms import wire -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.goal_actions import SetGoalAction from agent_comms.goal_states import ActiveGoal from agent_comms.goal_attempts import AttemptRecord diff --git a/tests/guards/test_debt_ratchet.py b/tests/guards/test_debt_ratchet.py index 738aecee97..e04b3f8474 100644 --- a/tests/guards/test_debt_ratchet.py +++ b/tests/guards/test_debt_ratchet.py @@ -14,7 +14,7 @@ import pytest from agent_comms.child_process import ObservedProcess, SpawnedProcess -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from fixture_git import IDENTITY from process_tree_fixture import TREE, identities, ready @@ -1082,12 +1082,12 @@ def test_unchanged_old_sites_are_not_forced_to_zero(repo, measure, source): def test_none_as_absence_fails_with_its_line_except_in_a_declared_boundary_decoder(repo): marked = ( - "from agent_comms.field_codec import boundary_decoder\n\n\n" + "from agent_comms.nominal.field_codec import boundary_decoder\n\n\n" "@boundary_decoder\ndef decoded(value: str):\n return value\n" ) files = { "plan.py": marked, - "foreign.py": marked.replace("agent_comms.field_codec", "elsewhere"), + "foreign.py": marked.replace("agent_comms.nominal.field_codec", "elsewhere"), "owner.py": "def owner(value: str):\n return value\n", } base = repo.commit(files) diff --git a/tests/guards/test_field_codec_ownership.py b/tests/guards/test_field_codec_ownership.py index ea8cecda25..5d35818ee1 100644 --- a/tests/guards/test_field_codec_ownership.py +++ b/tests/guards/test_field_codec_ownership.py @@ -7,7 +7,7 @@ import pytest pytestmark = pytest.mark.refactor_guard -OWNER = "agent_comms.field_codec" +OWNER = "agent_comms.nominal.field_codec" def codec_subclasses(sources: dict[str, str]) -> set[str]: @@ -120,7 +120,7 @@ def test_no_field_codec_subclasses_outside_its_owner(): def test_codec_owner_rejects_subclasses_even_through_an_alias(): - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec alias = FieldCodec with pytest.raises(TypeError): @@ -132,20 +132,20 @@ def test_guard_follows_aliases_qualified_imports_and_inherited_reexports(): sources = { OWNER: "class FieldCodec: pass\nclass Shared(FieldCodec): pass", "agent_comms.a": ( - "from .field_codec import FieldCodec as F\n" + "from .nominal.field_codec import FieldCodec as F\n" "Alias = F\nclass Bad(Alias): pass" ), - "agent_comms.b": "import agent_comms.field_codec as fc\nclass Bad(fc.FieldCodec): pass", + "agent_comms.b": "import agent_comms.nominal.field_codec as fc\nclass Bad(fc.FieldCodec): pass", "agent_comms.c": "from .a import Bad as Imported\nclass Worse(Imported): pass", "agent_comms.d": ( - "import agent_comms.field_codec\n" - "class Bad(agent_comms.field_codec.Shared): pass" + "import agent_comms.nominal.field_codec\n" + "class Bad(agent_comms.nominal.field_codec.Shared): pass" ), "agent_comms.e": ( - "import agent_comms.field_codec as fc\n" + "import agent_comms.nominal.field_codec as fc\n" "class Bad(fc.FieldCodec): pass" ), - "agent_comms.f": "from .field_codec import *\nclass Bad(Shared): pass", + "agent_comms.f": "from .nominal.field_codec import *\nclass Bad(Shared): pass", "agent_comms.safe": "class FieldCodec: pass\nclass Fine(FieldCodec): pass", } assert codec_subclasses(sources) == { diff --git a/tests/guards/test_sealed_mechanisms.py b/tests/guards/test_sealed_mechanisms.py index 0dcb309235..0193076ebb 100644 --- a/tests/guards/test_sealed_mechanisms.py +++ b/tests/guards/test_sealed_mechanisms.py @@ -8,12 +8,12 @@ import pytest from agent_comms.child_process import AttachedChild, ChildProcess, SynchronousProcess -from agent_comms.declared_family import DeclaredFamily -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.declared_family import DeclaredFamily +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.pending_requests import PendingRequests from agent_comms.pi_rpc import PiRpcChannel from agent_comms.read_ledger import ReadLedger -from agent_comms.sealed import Sealed +from agent_comms.nominal.sealed import Sealed pytestmark = pytest.mark.refactor_guard diff --git a/tests/native_backend_fixture.py b/tests/native_backend_fixture.py index bc354d1ac5..3f1624e6cc 100644 --- a/tests/native_backend_fixture.py +++ b/tests/native_backend_fixture.py @@ -21,7 +21,7 @@ from agent_comms.child_process import BoundedRun, join_retirement from agent_comms.comms import wire from agent_comms.coordinator import Coordination -from agent_comms.field_codec import FieldCodec, InputId +from agent_comms.nominal.field_codec import FieldCodec, InputId from agent_comms.fresh_private_session import create_fresh_private_session from agent_comms.native_arguments import GivenArguments, GivenBinary, NativeArguments from agent_comms.native_child import PiSessionChild diff --git a/tests/native_proof_cases.py b/tests/native_proof_cases.py index f39d59015c..b35a9f5492 100644 --- a/tests/native_proof_cases.py +++ b/tests/native_proof_cases.py @@ -7,7 +7,7 @@ from collections.abc import Iterable from pathlib import Path -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.native_pi import NativeContextJournal, NativeContextProof, NativeContextRecord from agent_comms.native_session_files import NativeSessionFiles diff --git a/tests/native_request_wait_installed_journey.py b/tests/native_request_wait_installed_journey.py index 853872d3ea..da20ca63bc 100644 --- a/tests/native_request_wait_installed_journey.py +++ b/tests/native_request_wait_installed_journey.py @@ -17,7 +17,7 @@ from agent_comms.comms import wire from agent_comms.acp_extension import TranscriptSnapshotUpdate, decode_updates -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.native_package import VerifiedNativePackage from agent_comms.runtime import socket_path from agent_comms.runtime_requests import SubscribeRuntimeRequest diff --git a/tests/process_tree_fixture.py b/tests/process_tree_fixture.py index 890f108ce0..a249bac24b 100644 --- a/tests/process_tree_fixture.py +++ b/tests/process_tree_fixture.py @@ -7,12 +7,12 @@ from pathlib import Path from agent_comms.child_process import ProcessIdentity -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec TREE = """import subprocess,sys,os,time,json from pathlib import Path from agent_comms.child_process import ProcessIdentity -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec grandchild = ('import signal,time,sys; ' 'stop = signal.SIGBREAK if sys.platform=="win32" else signal.SIGTERM; ' 'signal.signal(stop, signal.SIG_IGN); print("ready",flush=True); time.sleep(60)') diff --git a/tests/registration_lifecycle_child.py b/tests/registration_lifecycle_child.py index 5b9d1dc30d..a8ae4fef26 100644 --- a/tests/registration_lifecycle_child.py +++ b/tests/registration_lifecycle_child.py @@ -7,7 +7,7 @@ from pathlib import Path from agent_comms.child_process import ProcessIdentity -from agent_comms.field_codec import FieldCodec, TurnId +from agent_comms.nominal.field_codec import FieldCodec, TurnId from agent_comms.registration import Registration from agent_comms.repo import Checkout from agent_comms.thread_text import ForkedParent, GivenThreadText diff --git a/tests/reply_relevance_installed_journey.py b/tests/reply_relevance_installed_journey.py index 867c192268..13d3ba4a9e 100644 --- a/tests/reply_relevance_installed_journey.py +++ b/tests/reply_relevance_installed_journey.py @@ -23,7 +23,7 @@ from agent_comms.coordinator import Coordination from agent_comms.coordination_tables.assignments import WakeAssignment from agent_comms.coordination_tables.publications import PublicationEvidence -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.historical_native_inputs import read_historical_native_inputs from agent_comms.native_fork import ForkSessionHelper, ForkSessionRequest from agent_comms.native_input_record import FullNativeExecution, TriageNativeExecution diff --git a/tests/restart_fixture.py b/tests/restart_fixture.py index cc4e50c560..c06f7911e3 100644 --- a/tests/restart_fixture.py +++ b/tests/restart_fixture.py @@ -7,7 +7,7 @@ import agent_comms.restart_queue as queue from agent_comms.child_process import ProcessIdentity -from agent_comms.field_codec import RestartId +from agent_comms.nominal.field_codec import RestartId from agent_comms.launch_runtime import RestartEnvironment from agent_comms.owner_lifecycle import OwnerRestartSelection from agent_comms.repo import Checkout diff --git a/tests/round2/test_typed_table.py b/tests/round2/test_typed_table.py index e8c6dc5093..f0ea21b417 100644 --- a/tests/round2/test_typed_table.py +++ b/tests/round2/test_typed_table.py @@ -10,7 +10,7 @@ import pytest -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( AttemptId, BoundedText, FieldCodec, GitCommitText, GoalId, Id128Text, MalformedRecord, NoAttemptId, NullMember, ) from agent_comms.messages import InfoKind, MessageKind diff --git a/tests/runtime_process_child.py b/tests/runtime_process_child.py index 5ef1048045..cee2972fc9 100644 --- a/tests/runtime_process_child.py +++ b/tests/runtime_process_child.py @@ -2,7 +2,7 @@ import sys -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.launch_runtime import LaunchRuntime from agent_comms.runtime_processes import RuntimeProcesses diff --git a/tests/shared_bus_restart_native.py b/tests/shared_bus_restart_native.py index 0618a77c63..068d0862ca 100644 --- a/tests/shared_bus_restart_native.py +++ b/tests/shared_bus_restart_native.py @@ -47,7 +47,7 @@ from contextlib import AsyncExitStack, closing, contextmanager from abc import abstractmethod import sqlite3 -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.native_prompt_binding import PromptBinding, PromptBindings from agent_comms.coordinator import Coordination from agent_comms.historical_native_inputs import read_historical_native_inputs @@ -117,7 +117,7 @@ async def configured_pure_channel(arguments): from agent_comms.native_input_record import FullNativeExecution from agent_comms.selected_triage import FullSelectedTriage from agent_comms.coordination_tables.publications import PublicationEvidence - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.store_files import _store_lock from agent_comms.native_entries import NativeEntry from agent_comms.coordination_cohort import _claim_record @@ -390,7 +390,7 @@ async def configured_cancel_continue(arguments, service, attachment, name, sende """Use ordinary originals and the existing joined ACP cancellation boundary.""" from agent_comms.coordination_tables.assignments import ExecutionAssignmentLink from agent_comms.coordination_tables.publications import PublicationEvidence - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.native_input_record import FullNativeExecution from agent_comms.store_files import _store_lock @@ -473,7 +473,7 @@ async def configured_mixed_routes(arguments): """ from agent_comms.comms import wire from agent_comms.native_input_record import FullNativeExecution - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.native_entries import NativeEntry from agent_comms.pi_payloads import ToolResultMessage from agent_comms.coordination_tables.publications import PublicationEvidence diff --git a/tests/test_absence_owners.py b/tests/test_absence_owners.py index 1df5626bb7..f731955e8e 100644 --- a/tests/test_absence_owners.py +++ b/tests/test_absence_owners.py @@ -9,7 +9,7 @@ from agent_comms.backend import EventFinishSignal, FinishSignal, NoFinishSignal from agent_comms.change_report import FileLine, NoSourceReference from agent_comms.errors import TodoError -from agent_comms.field_codec import FieldCodec, InputId +from agent_comms.nominal.field_codec import FieldCodec, InputId from agent_comms.input_drain import DrainedSession from agent_comms.native_child import NoInputForwarder from agent_comms.native_session_reopen import SessionRetention diff --git a/tests/test_acp.py b/tests/test_acp.py index 44abbd441d..ce86d64c1b 100644 --- a/tests/test_acp.py +++ b/tests/test_acp.py @@ -34,7 +34,7 @@ from agent_comms.context_reading import ContextUsage, UnmeasuredContext from agent_comms.errors import UnregisteredThreadError from agent_comms.coordination_errors import Refused -from agent_comms.field_codec import TurnId +from agent_comms.nominal.field_codec import TurnId from agent_comms.native_arguments import GivenArguments from agent_comms.pi_counts import PiCount from agent_comms.read_basis import NamedViewer diff --git a/tests/test_acp_compact_command.py b/tests/test_acp_compact_command.py index 57908f5aae..05c7141e1a 100644 --- a/tests/test_acp_compact_command.py +++ b/tests/test_acp_compact_command.py @@ -18,7 +18,7 @@ ) from agent_comms.agent_backend import PlacedCompaction from agent_comms.comms import wire -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.pi_counts import PiCount from delivery_owner_fixture import canonical_agent diff --git a/tests/test_acp_extension.py b/tests/test_acp_extension.py index 069b6b314e..746c4429ff 100644 --- a/tests/test_acp_extension.py +++ b/tests/test_acp_extension.py @@ -39,7 +39,7 @@ from agent_comms.agent_events import CompactionStart from agent_comms.child_process import ProcessIdentity from agent_comms.context_reading import UnmeasuredContext -from agent_comms.field_codec import AssignmentId, ClaimId, InputId, MessageId, RootId, TurnId +from agent_comms.nominal.field_codec import AssignmentId, ClaimId, InputId, MessageId, RootId, TurnId from agent_comms.goal_presentation import IdleGoalExecution from agent_comms.goals import NoGoal from agent_comms.pi_payloads import McpLiveAcknowledgement diff --git a/tests/test_acp_failure.py b/tests/test_acp_failure.py index 3b670079c8..2c49d6ebaf 100644 --- a/tests/test_acp_failure.py +++ b/tests/test_acp_failure.py @@ -139,7 +139,7 @@ def test_declared_provider_retry_exhaustion_owns_execution_retry_classification( @pytest.mark.parametrize("failure_type", [RequestACPFailure, ProviderConnectionFailure, ProviderQuotaFailure]) def test_every_failure_action_uses_native_retry_end_not_text_claims(failure_type): from agent_comms.pi_events import NativeRetryEnd - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec event = NativeRetryEnd.from_wire({ "type": "native_retry_end", "success": False, diff --git a/tests/test_acp_private_nk_delivery.py b/tests/test_acp_private_nk_delivery.py index baa1762c30..cdc6a2d506 100644 --- a/tests/test_acp_private_nk_delivery.py +++ b/tests/test_acp_private_nk_delivery.py @@ -15,7 +15,7 @@ import pytest -from agent_comms.field_codec import AcpSessionId +from agent_comms.nominal.field_codec import AcpSessionId from agent_comms.session_lifecycle import PublishedSession from agent_comms.acp import CommsAgent from agent_comms.acp_extension import ( diff --git a/tests/test_acp_queue_contract.py b/tests/test_acp_queue_contract.py index b58729414b..897c00d2c9 100644 --- a/tests/test_acp_queue_contract.py +++ b/tests/test_acp_queue_contract.py @@ -10,7 +10,7 @@ from acp import RequestError from acp.schema import TextContentBlock -from agent_comms.field_codec import AcpSessionId +from agent_comms.nominal.field_codec import AcpSessionId from agent_comms.session_lifecycle import PublishedSession from agent_comms.acp import CommsAgent from agent_comms.acp_extension import ( @@ -30,7 +30,7 @@ from agent_comms.child_process import ProcessIdentity from agent_comms.comms import Comms, wire from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import InputId, RootId, TurnId +from agent_comms.nominal.field_codec import InputId, RootId, TurnId from agent_comms.input_key import AcpInputKey from agent_comms.input_attempt import ReservedInput from agent_comms.queued_input import QueuedInput, QueuedInputContext diff --git a/tests/test_active_turn.py b/tests/test_active_turn.py index 2d832a311b..05398df31e 100644 --- a/tests/test_active_turn.py +++ b/tests/test_active_turn.py @@ -8,7 +8,7 @@ ) from agent_comms.child_process import ProcessIdentity from agent_comms.comms import wire -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( ToolCallId, TurnId, ) diff --git a/tests/test_activity_text.py b/tests/test_activity_text.py index c24f5ce586..29c755ccdc 100644 --- a/tests/test_activity_text.py +++ b/tests/test_activity_text.py @@ -10,7 +10,7 @@ from agent_comms.child_process import ProcessIdentity from agent_comms.display_order import LastActivityThreadSort from agent_comms.external_transcript import ExternalTranscript -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( FieldCodec, ToolCallId, TurnId, diff --git a/tests/test_agent_backend.py b/tests/test_agent_backend.py index 1f7e04b2ec..016d5421f1 100644 --- a/tests/test_agent_backend.py +++ b/tests/test_agent_backend.py @@ -14,9 +14,9 @@ import pytest import agent_comms.agent_backend as ab -from agent_comms.field_codec import InputId -from agent_comms.declared_family import DeclaredFamily -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import InputId +from agent_comms.nominal.declared_family import DeclaredFamily +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.native_arguments import NativeArguments from agent_comms.pi_durable_backend import PiDurableBackend from agent_comms.pi_native_backend import PI_0_85_1_EVENT_KINDS, PiNativeBackend, PiSessionFile diff --git a/tests/test_atomic_turn_source_owner.py b/tests/test_atomic_turn_source_owner.py index fb179ed788..9933e0b5e4 100644 --- a/tests/test_atomic_turn_source_owner.py +++ b/tests/test_atomic_turn_source_owner.py @@ -11,7 +11,7 @@ from agent_comms.child_process import ProcessIdentity from agent_comms.comms import wire from agent_comms.coordination_errors import StaleFence -from agent_comms.field_codec import TurnId +from agent_comms.nominal.field_codec import TurnId from agent_comms.goal_actions import SetGoalAction from agent_comms.native_input_owner import RegistryOwner from agent_comms.owned_turn import OwnedTurn diff --git a/tests/test_backend.py b/tests/test_backend.py index 74fe6d0e02..49ef767464 100644 --- a/tests/test_backend.py +++ b/tests/test_backend.py @@ -10,7 +10,7 @@ import agent_comms.agent_events as ae import agent_comms.backend as backend from agent_comms.agent_backend import InputContent, InputRequest, SteerInputPolicy -from agent_comms.field_codec import InputId +from agent_comms.nominal.field_codec import InputId from agent_comms.pi_rpc import PiRpcChannel from agent_comms.turn_watchdog import ModelWait from pi_session_turn import one_turn_events diff --git a/tests/test_blocked_goal_clears.py b/tests/test_blocked_goal_clears.py index d605b9d3b1..991fcc55cf 100644 --- a/tests/test_blocked_goal_clears.py +++ b/tests/test_blocked_goal_clears.py @@ -4,7 +4,7 @@ import pytest -from agent_comms.field_codec import InputId +from agent_comms.nominal.field_codec import InputId from agent_comms.goal_actions import SetGoalAction from agent_comms.goal_generation import BlockedGeneration, ReadyGeneration from agent_comms.queued_input import InitialInput diff --git a/tests/test_board_verbs.py b/tests/test_board_verbs.py index 7d357eb129..5a125f3f03 100644 --- a/tests/test_board_verbs.py +++ b/tests/test_board_verbs.py @@ -11,7 +11,7 @@ from agent_comms.commander import judge, order from agent_comms.commander.standing import DeliveryAwaitingJudgement -from agent_comms.field_codec import FieldCodec, GoalId +from agent_comms.nominal.field_codec import FieldCodec, GoalId from agent_comms.goal_actions import SetGoalAction from agent_comms.heartbeat_frame import HeartbeatFrame from agent_comms.head_review import HeadReviewOrder diff --git a/tests/test_boundary_decoding.py b/tests/test_boundary_decoding.py index d98abf86b6..dbfca026a3 100644 --- a/tests/test_boundary_decoding.py +++ b/tests/test_boundary_decoding.py @@ -7,7 +7,7 @@ from agent_comms.channel_coding_tools import CodingToolRequest from agent_comms.input_key import BusInputKey from agent_comms.cli_bridges.claude_protocol import ClaudeHeader -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.input_attempt import ( HistoricalInput, OwnerQueueInputDeliveryScope, UnobservedInputDeliveryScope, UnresolvedInput, ) @@ -84,4 +84,4 @@ def test_raw_shape_guard_reuses_the_existing_overlay_detector(): typed = b'def read(row):\n return row.a, row.b, row.c\n' assert RawRecordShapes.count(raw, 'src/example.py') == 1 assert RawRecordShapes.count(typed, 'src/example.py') == 0 - assert RawRecordShapes.count(raw, 'src/agent_comms/field_codec.py') == 1 + assert RawRecordShapes.count(raw, 'src/agent_comms/nominal/field_codec.py') == 1 diff --git a/tests/test_bus.py b/tests/test_bus.py index c6acf83bba..4536db01ef 100644 --- a/tests/test_bus.py +++ b/tests/test_bus.py @@ -54,7 +54,7 @@ RelationViolationError, UnclaimedError, ) -from agent_comms.field_codec import GitCommitText, MessageId, MessageIdText, TimestampText +from agent_comms.nominal.field_codec import GitCommitText, MessageId, MessageIdText, TimestampText from agent_comms.message_reference import MessageReference from agent_comms.read_basis import RepliesDisplayScope from agent_comms.response_acknowledgement import ( diff --git a/tests/test_bus_activity.py b/tests/test_bus_activity.py index d8687297cd..b3ab94ea51 100644 --- a/tests/test_bus_activity.py +++ b/tests/test_bus_activity.py @@ -70,7 +70,7 @@ def test_read_capture_defers_when_coordinator_has_no_snapshot(private_comms): from agent_comms.coordination_errors import CoordinationReadUnavailable from agent_comms.coordination_session import ReadNativeCoordinationSession from agent_comms.coordinator import Coordination - from agent_comms.field_codec import ThreadLookup + from agent_comms.nominal.field_codec import ThreadLookup from agent_comms.store_files import StoreBusy held, release = threading.Event(), threading.Event() path = private_comms.root / "coordination.sqlite3" diff --git a/tests/test_bus_claimed.py b/tests/test_bus_claimed.py index 0cb115f9a3..b841654f4c 100644 --- a/tests/test_bus_claimed.py +++ b/tests/test_bus_claimed.py @@ -3,7 +3,7 @@ import pytest -from agent_comms.field_codec import ClaimId +from agent_comms.nominal.field_codec import ClaimId from agent_comms.bus import Bus, ClaimRecord, PublicRecord from agent_comms.messages import BusRow, Claimed, InfoKind, Message from agent_comms.envelope_claim_transitions import UnscopedClaims diff --git a/tests/test_bus_files.py b/tests/test_bus_files.py index 11f16b0386..d54d1411b9 100644 --- a/tests/test_bus_files.py +++ b/tests/test_bus_files.py @@ -12,7 +12,7 @@ from agent_comms.coordination_database import CoordinationStore from agent_comms.coordination_session import NativeCapture from agent_comms.envelope_claim_transitions import ExistingFileClaim, NativeClaim -from agent_comms.field_codec import ClaimId, GoalId, InputId, TurnId +from agent_comms.nominal.field_codec import ClaimId, GoalId, InputId, TurnId from agent_comms.installer.backup import bus_files from agent_comms.locked_store import DeclaredFile, DurableFile, LiveFilesRequest, RootFile, RuntimeFile, SQLiteFile from agent_comms.native_pi import NativeContextJournal diff --git a/tests/test_bus_history_seq.py b/tests/test_bus_history_seq.py index 9d3a889237..a2f2dcfe68 100644 --- a/tests/test_bus_history_seq.py +++ b/tests/test_bus_history_seq.py @@ -16,7 +16,7 @@ from agent_comms.messages import BusRow, InfoKind, Message from agent_comms.comms import wire from agent_comms.errors import HumanSendRefusedError -from agent_comms.field_codec import FieldCodec, MalformedRecord, MessageId +from agent_comms.nominal.field_codec import FieldCodec, MalformedRecord, MessageId from agent_comms.historical_views import HistoryArchive from agent_comms.locked_store import RegistryFile from agent_comms.message_bus import MessageBus diff --git a/tests/test_bus_resource_claims.py b/tests/test_bus_resource_claims.py index 37b4ae3f01..300bb51f44 100644 --- a/tests/test_bus_resource_claims.py +++ b/tests/test_bus_resource_claims.py @@ -26,7 +26,7 @@ WakeClaims, ) from agent_comms.errors import CommittedMessageError -from agent_comms.field_codec import ClaimId, InputId, TurnId +from agent_comms.nominal.field_codec import ClaimId, InputId, TurnId from agent_comms.locked_store import RegistryFile, StoreCommittedError from agent_comms.messages import ( BusCapability, @@ -130,7 +130,7 @@ def unused(seq, db): with claims.bus.reading() as reader: assert reader.resource_owner(resource) == owner assert dict(reader.claim_projection()) == {resource: owner} - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.retained_task_facts import ClaimTaskFact record = claims.bus.lookup(owner.seq) diff --git a/tests/test_carry.py b/tests/test_carry.py index b53c58d93a..99a7f21e0a 100644 --- a/tests/test_carry.py +++ b/tests/test_carry.py @@ -97,7 +97,7 @@ def commit(self, steps: dict[str, str | None]) -> str: def record_source(version: int, fields: str) -> str: return ("from dataclasses import dataclass\nfrom typing import Annotated, ClassVar\n" - "from agent_comms.field_codec import Id128, Id128Text\n\n" + "from agent_comms.nominal.field_codec import Id128, Id128Text\n\n" "class RootKind(Id128):\n \"\"\"Another kind written in the same spelling.\"\"\"\n\n" f"@dataclass(frozen=True)\nclass Record:\n version: ClassVar[int] = {version}\n{fields}") diff --git a/tests/test_carry_native_cursor_thread_key.py b/tests/test_carry_native_cursor_thread_key.py index c556fe61e5..194f4217f0 100644 --- a/tests/test_carry_native_cursor_thread_key.py +++ b/tests/test_carry_native_cursor_thread_key.py @@ -11,7 +11,7 @@ from agent_comms.coordination_database import CoordinationStore from agent_comms.locked_store import LiveFilesRequest from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import FieldCodec, RootId, ThreadLookup +from agent_comms.nominal.field_codec import FieldCodec, RootId, ThreadLookup from agent_comms.native_input_record import UnrecordedNativeColumn from agent_comms.native_runtime_input import CurrentNativeCursor diff --git a/tests/test_carry_selected_slot_column.py b/tests/test_carry_selected_slot_column.py index 2fae3c1fa3..b151371b8a 100644 --- a/tests/test_carry_selected_slot_column.py +++ b/tests/test_carry_selected_slot_column.py @@ -9,7 +9,7 @@ from agent_comms.coordination_database import CoordinationStore from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( SlotId, ToolCallId, ) diff --git a/tests/test_carry_triage_member_rows.py b/tests/test_carry_triage_member_rows.py index 0074ec1847..79e01f7e4d 100644 --- a/tests/test_carry_triage_member_rows.py +++ b/tests/test_carry_triage_member_rows.py @@ -8,7 +8,7 @@ from agent_comms.coordination_database import CoordinationStore from agent_comms.locked_store import LiveFilesRequest -from agent_comms.field_codec import AssignmentId, InputId +from agent_comms.nominal.field_codec import AssignmentId, InputId from agent_comms.native_runtime_input import NativeRuntimeInput from agent_comms.triage_native_sources import TriageNativeSource diff --git a/tests/test_change_report.py b/tests/test_change_report.py index 4eff16509c..0b83b852a3 100644 --- a/tests/test_change_report.py +++ b/tests/test_change_report.py @@ -129,7 +129,7 @@ def test_declared_report_publishes_and_round_trips(self, reporter, reporter_repo ) def test_missing_fields_are_named_in_the_refusal(self): - from agent_comms.field_codec import FieldCodec, MalformedRecord + from agent_comms.nominal.field_codec import FieldCodec, MalformedRecord with pytest.raises(MalformedRecord): FieldCodec.decode(ChangeReport, {"branch": "main"}) @@ -187,7 +187,7 @@ def test_stored_rows_without_reports_decode(self): stored.report.require_references_exist(OrderRoots(Path(), NoCommanderProject())) def test_kind_selector_resolves_once(self): - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec assert MessageKind.member_named("change-report") is ChangeReportKind assert FieldCodec.decode(type[MessageKind], "alert") is AlertKind diff --git a/tests/test_channel_bus_ownership.py b/tests/test_channel_bus_ownership.py index 80db5171b5..fad86c6d47 100644 --- a/tests/test_channel_bus_ownership.py +++ b/tests/test_channel_bus_ownership.py @@ -45,7 +45,7 @@ def test_membership_changes_keep_canonical_notification_and_history(tmp_path): def test_channel_observer_keeps_bounded_pointers_after_ui_ack(tmp_path): # noqa: F811 import json - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.message_reference import MessageReference root, root_id, comms, initial, _people = _root(tmp_path, mentioned=True) diff --git a/tests/test_channel_coding_tools.py b/tests/test_channel_coding_tools.py index 6d0ec5f96f..59bf07ec3e 100644 --- a/tests/test_channel_coding_tools.py +++ b/tests/test_channel_coding_tools.py @@ -24,7 +24,7 @@ NativeClaim, WritableFileClaim, ) -from agent_comms.field_codec import ClaimId, InputId, TurnId +from agent_comms.nominal.field_codec import ClaimId, InputId, TurnId from agent_comms.native_tool_call import CodingCall from agent_comms.native_tools import CodingTool from agent_comms.pi_events import ToolExecutionEnd, ToolExecutionStart diff --git a/tests/test_channel_input_batch.py b/tests/test_channel_input_batch.py index 648b6140fe..c4b15f94dc 100644 --- a/tests/test_channel_input_batch.py +++ b/tests/test_channel_input_batch.py @@ -6,7 +6,7 @@ import pytest from agent_comms.channel_input_batch import InputBatch -from agent_comms.field_codec import InputId +from agent_comms.nominal.field_codec import InputId from agent_comms.input_key import AcpInputKey from agent_comms.input_disposition import InputDispositions from agent_comms.messages import Message, InfoKind diff --git a/tests/test_channel_joins_running_turn.py b/tests/test_channel_joins_running_turn.py index 5689e2a730..b868a3e8c3 100644 --- a/tests/test_channel_joins_running_turn.py +++ b/tests/test_channel_joins_running_turn.py @@ -3,7 +3,7 @@ from agent_comms.cohort_foreground import _accept_visible_deliveries from agent_comms.coordination_cohort import pending_sealed_assignments from agent_comms.coordinator import Coordination -from agent_comms.field_codec import TurnId +from agent_comms.nominal.field_codec import TurnId from agent_comms.lifecycle_capability import Active from agent_comms.queued_input import DeliveredInput from agent_comms.turn_goal_permission import InactiveGoalPermission, TurnGoalPermission diff --git a/tests/test_channel_retirement.py b/tests/test_channel_retirement.py index 053d0a5017..64373d0fe1 100644 --- a/tests/test_channel_retirement.py +++ b/tests/test_channel_retirement.py @@ -12,7 +12,7 @@ from agent_comms.catalog_store import ChannelCatalog from agent_comms.channels import AnyOfMatch, ViewPredicate, ActivityView, ParticipantsView from agent_comms.comms import wire -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.message_page import PageBounds from agent_comms.messages import InfoKind, Membership, Message from agent_comms.page_traversal import LiveCursor diff --git a/tests/test_channels.py b/tests/test_channels.py index 8668e85926..d4fab25ed5 100644 --- a/tests/test_channels.py +++ b/tests/test_channels.py @@ -32,7 +32,7 @@ ThreadSort, ) from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import FieldCodec, TurnId +from agent_comms.nominal.field_codec import FieldCodec, TurnId from agent_comms.pi_vocabulary import HighThinkingLevel from agent_comms.registry_document import RosterVisibility from agent_comms.session_file import RegistrySessionLocation @@ -236,7 +236,7 @@ def test_tag_removal_commits_cohort_once_and_preserves_current_records(tmp_path) async def test_new_tag_disposition_is_declared_in_original_editor_and_tool_catalog(tmp_path): from agent_comms.channel_management import TagDisposition from agent_comms.cli_command import CliCommand - from agent_comms.field_codec import FieldCodec, compile_decoder + from agent_comms.nominal.field_codec import FieldCodec, compile_decoder from agent_comms.tool_declaration import NativeRequestTools from agent_comms.tools import CommsTagsTool diff --git a/tests/test_checkout_submodules.py b/tests/test_checkout_submodules.py index 60700222a2..233a91b6d8 100644 --- a/tests/test_checkout_submodules.py +++ b/tests/test_checkout_submodules.py @@ -14,7 +14,7 @@ from agent_comms.cli_commands import OrderCheckoutGrant from agent_comms.errors import TodoConflict from agent_comms.comms import wire -from agent_comms.field_codec import FieldCodec, GoalId +from agent_comms.nominal.field_codec import FieldCodec, GoalId from agent_comms.goals import OrderCheck from agent_comms.order_runs import MechanicalOrderRun from agent_comms.recorded_time import RecordedEventTime diff --git a/tests/test_child_process.py b/tests/test_child_process.py index 79e7cd2d80..b86317d09a 100644 --- a/tests/test_child_process.py +++ b/tests/test_child_process.py @@ -32,7 +32,7 @@ SystemdUserManager, TimedOutOutcome, ) -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.launch_runtime import LaunchRuntime from process_tree_fixture import TREE, identities, ready @@ -370,7 +370,7 @@ async def test_parent_lifeline_loss_releases_real_sqlite_reader(tmp_path: Path) LAUNCHER = """import json,sys,time from pathlib import Path from agent_comms.child_process import OutlivesLauncherLifetime, SpawnedProcess -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec sleeper = (sys.executable, '-c', 'import time; time.sleep(60)') children = (SpawnedProcess.launch(sleeper), SpawnedProcess.launch(sleeper, lifetime=OutlivesLauncherLifetime)) @@ -407,7 +407,7 @@ async def test_killed_launcher_takes_its_child_and_leaves_its_resident(tmp_path: UNIT_LAUNCHER = """import json,subprocess,sys from pathlib import Path from agent_comms.child_process import OutlivesLauncherLifetime, Platform, SpawnedProcess -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec sleeper = (sys.executable, '-c', 'import time; time.sleep(60)') # A new session and a reparent to init leave the process tree, never the unit's cgroup. plain = Platform.current().identity(subprocess.Popen(sleeper, start_new_session=True).pid) diff --git a/tests/test_claim_admission_verifier.py b/tests/test_claim_admission_verifier.py index 61fa57e87b..1bd1acebf8 100644 --- a/tests/test_claim_admission_verifier.py +++ b/tests/test_claim_admission_verifier.py @@ -20,7 +20,7 @@ from agent_comms.attempt_start import AttemptStart from agent_comms.attempt_states import ModelRunningAttempt, PromptAcceptedAttempt, SettlingAttempt from agent_comms.child_process import ProcessIdentity -from agent_comms.field_codec import ClaimId, TurnId +from agent_comms.nominal.field_codec import ClaimId, TurnId from agent_comms.selected_claim import ( publish_selected_resource_claim, verify_selected_wake, diff --git a/tests/test_claim_bus_read.py b/tests/test_claim_bus_read.py index bc78c6914c..fe282bb2bc 100644 --- a/tests/test_claim_bus_read.py +++ b/tests/test_claim_bus_read.py @@ -30,7 +30,7 @@ from agent_comms.coordination_tables.executions import WireOrigin from agent_comms.coordinator import Coordination from agent_comms.envelope_claim_transitions import ExistingFileClaim, NativeClaim, WakeClaim -from agent_comms.field_codec import ClaimId, InputId, TurnId +from agent_comms.nominal.field_codec import ClaimId, InputId, TurnId from agent_comms.message_page import ConversationMessagePageRequest, MessagePageRequest from agent_comms.messages import ClaimMessage, ClaimNoticeKind from agent_comms.owner_fence import prepare_fence_token diff --git a/tests/test_claude_tool_preview.py b/tests/test_claude_tool_preview.py index 04968596ef..31d3b07259 100644 --- a/tests/test_claude_tool_preview.py +++ b/tests/test_claude_tool_preview.py @@ -4,7 +4,7 @@ from transcript_record_fixture import transcript_record from agent_comms.cli_bridges.claude_protocol import ClaudeSession, KnownTurn, Live, TimedRecord, ToolResult, ToolUse from agent_comms.tool_calls import ToolCall -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.native_tools import BashTool from agent_comms.tool_results import NoToolDiff diff --git a/tests/test_cli.py b/tests/test_cli.py index cd5dacabf9..a8319a0f71 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -10,7 +10,7 @@ import pytest -from agent_comms.field_codec import FieldCodec, MessageId, TurnId +from agent_comms.nominal.field_codec import FieldCodec, MessageId, TurnId from agent_comms.session_file import RegistrySessionLocation from agent_comms.channel_targets import CommandTarget, NoChannel, PerTargetChannels from agent_comms.catalog_document import NoCatalog @@ -407,7 +407,7 @@ def test_tag_batch_preserves_active_refusal_and_mixed_target_outcomes(self, tmp_ from agent_comms.cli_command import CliCommand from agent_comms.cli_verbs.delete_tag import DeleteTagCliCommand from agent_comms.cli_command import TargetEdit - from agent_comms.field_codec import compile_decoder + from agent_comms.nominal.field_codec import compile_decoder from agent_comms.thread_status import RunningThreadStatus comms = self.declared(tmp_path) diff --git a/tests/test_cli_drafts.py b/tests/test_cli_drafts.py index a23bd64ead..a6fd5da81a 100644 --- a/tests/test_cli_drafts.py +++ b/tests/test_cli_drafts.py @@ -1,7 +1,7 @@ """The shared owner reconstructs prefixes, not the CLI decoders or the database.""" import pytest -from agent_comms.field_codec import ToolCallId +from agent_comms.nominal.field_codec import ToolCallId from agent_comms.recorded_time import EventTime, RecordedEventTime, UnrecordedEventTime from agent_comms.runtime_updates import ( ActiveItem, diff --git a/tests/test_cli_error_family.py b/tests/test_cli_error_family.py index 0e07e02d72..6708906a87 100644 --- a/tests/test_cli_error_family.py +++ b/tests/test_cli_error_family.py @@ -15,7 +15,7 @@ from agent_comms.cli_bridges.shared import Binding, GivenBinding, StoredBinding from agent_comms.cli_protocol import WATCH_LINE, FailedCoreError, UnavailableCoreError from agent_comms.coordination_errors import CoordinationReadUnavailable -from agent_comms.field_codec import RecordProblems +from agent_comms.nominal.field_codec import RecordProblems from agent_comms.locked_store import SQLiteFile from agent_comms.thread_identity import RecordedThreadIncarnation from agent_comms.threads import Thread diff --git a/tests/test_codec_capabilities.py b/tests/test_codec_capabilities.py index c95f38b59c..fecf5ce779 100644 --- a/tests/test_codec_capabilities.py +++ b/tests/test_codec_capabilities.py @@ -10,8 +10,8 @@ from agent_comms.cli_bridges.codex_protocol import UserInput from agent_comms.cli_bridges.opencode_parts import Part from agent_comms.cli_protocol import TextWire -from agent_comms.declared_family import DeclaredFamily -from agent_comms.field_codec import ( +from agent_comms.nominal.declared_family import DeclaredFamily +from agent_comms.nominal.field_codec import ( AcceptsNull, BoundedText, EnvelopeSequence, @@ -211,7 +211,7 @@ def test_external_fixed_tuples_refuse_wrong_lengths_at_the_codec_boundary(data): @pytest.mark.parametrize("family, spelling", [(PiStopReason, "stop"), (CompactionReason, "overflow")]) def test_external_name_families_derive_one_default_without_accepting_invalid_values(family, spelling): - from agent_comms.field_codec import DefaultExternalName + from agent_comms.nominal.field_codec import DefaultExternalName known = family.member_named(spelling) fallback, = family.members_with(DefaultExternalName) assert family.from_external(spelling) is known @@ -264,7 +264,7 @@ def test_strict_fields_rejects_extra_keys_while_ordinary_response_projects_them( def test_external_null_members_and_nullable_names_use_their_declarations(): - from agent_comms.field_codec import ExternalNullMember + from agent_comms.nominal.field_codec import ExternalNullMember from agent_comms.pi_payloads import PiModel, PiToolResult for family in (PiMessage, PiModel, PiResponseData, PiToolResult, NativeToolDetails): diff --git a/tests/test_cohort_schema.py b/tests/test_cohort_schema.py index bd60032d4f..bbf5640292 100644 --- a/tests/test_cohort_schema.py +++ b/tests/test_cohort_schema.py @@ -11,7 +11,7 @@ from bus_record_fixture import OWNER_LOOKUP, RECIPIENT_LOOKUP, SENDER_LOOKUP from agent_comms.cohort_schema import CohortDeliveries, CohortTable -from agent_comms.field_codec import AssignmentId, FieldCodec, MessageId, ThreadLookup +from agent_comms.nominal.field_codec import AssignmentId, FieldCodec, MessageId, ThreadLookup from agent_comms.coordination_tables.participants import Participants from agent_comms.coordinator import Coordination from agent_comms.coordination_database import CoordinationStore diff --git a/tests/test_command_families.py b/tests/test_command_families.py index 99ce697d4b..9b75231c83 100644 --- a/tests/test_command_families.py +++ b/tests/test_command_families.py @@ -1,5 +1,5 @@ from agent_comms.repo import Checkout -from agent_comms.field_codec import FieldCodec, GoalId +from agent_comms.nominal.field_codec import FieldCodec, GoalId """External contracts and adding commands without editing any consumer catalog.""" diff --git a/tests/test_command_target_catalog.py b/tests/test_command_target_catalog.py index a3cfa69fc7..61039a9bf0 100644 --- a/tests/test_command_target_catalog.py +++ b/tests/test_command_target_catalog.py @@ -33,7 +33,7 @@ def test_batch_completed_result_round_trips_with_its_command_result_type(target) from agent_comms.cli_verbs.stop import StopCliCommand from agent_comms.cli_commands import ThreadStoppedResult from agent_comms.cli_command import TargetBatchResult, TargetCompleted, TargetFailed - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec original = TargetBatchResult(( TargetCompleted(target, StopCliCommand(name="first"), ThreadStoppedResult("first")), diff --git a/tests/test_commander_capacity.py b/tests/test_commander_capacity.py index 5d06981a57..b3f0c87d87 100644 --- a/tests/test_commander_capacity.py +++ b/tests/test_commander_capacity.py @@ -3,7 +3,7 @@ import pytest from agent_comms.commander.vibe_check import OverloadDegradation -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec @pytest.mark.parametrize("unjudged", [0, 1, 395, 1_000_000]) diff --git a/tests/test_commander_deaf_monitor.py b/tests/test_commander_deaf_monitor.py index c650cbcb81..078a40ed17 100644 --- a/tests/test_commander_deaf_monitor.py +++ b/tests/test_commander_deaf_monitor.py @@ -15,7 +15,7 @@ from agent_comms.cli_bridges.monitor import AttachMonitor, MonitorService, SessionReady from agent_comms.cli_bridges.shared import Binding, MonitorProbe, Options, Serve, StoredBinding from agent_comms.commander_heartbeat import CommanderHeartbeat -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.messages import Addressed from agent_comms.thread_execution import ExternalThreadExecution from agent_comms.thread_status import ConnectedThreadStatus diff --git a/tests/test_commander_forks.py b/tests/test_commander_forks.py index 0a54c4e43d..14f9e75eef 100644 --- a/tests/test_commander_forks.py +++ b/tests/test_commander_forks.py @@ -26,7 +26,7 @@ from agent_comms.comms import wire from agent_comms.errors import RelationViolationError, TodoConflict, TodoError from agent_comms.external_transcript import ExternalTranscript -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( FieldCodec, GoalId, OrderId, diff --git a/tests/test_commander_latency.py b/tests/test_commander_latency.py index 926c5bd8a1..553e887d62 100644 --- a/tests/test_commander_latency.py +++ b/tests/test_commander_latency.py @@ -20,7 +20,7 @@ from agent_comms.commander_service import CommanderService from agent_comms.comms import Comms, wire from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import MessageId +from agent_comms.nominal.field_codec import MessageId from agent_comms.installer.backup import StoreBackup from agent_comms.message_reference import MessageReference from agent_comms.messages import InfoKind, Message diff --git a/tests/test_commander_notifications.py b/tests/test_commander_notifications.py index c899c80eb6..003a04319d 100644 --- a/tests/test_commander_notifications.py +++ b/tests/test_commander_notifications.py @@ -602,7 +602,7 @@ def test_codex_usage_decodes_window_and_keeps_refusal_visible(): import json from datetime import datetime from agent_comms.cli_bridges.codex_protocol import RateLimitsResponse - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec reply = FieldCodec.decode(RateLimitsResponse, json.loads('''{ "rateLimits": {"primary": { diff --git a/tests/test_commander_problem_orders.py b/tests/test_commander_problem_orders.py index 62d06d600a..36bd73466f 100644 --- a/tests/test_commander_problem_orders.py +++ b/tests/test_commander_problem_orders.py @@ -10,7 +10,7 @@ from agent_comms.change_report import FileLine from agent_comms.child_process import BoundedRun -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.goals import CountCheckResult from agent_comms.recorded_time import RecordedEventTime, UnrecordedEventTime from agent_comms.todos import ( diff --git a/tests/test_commander_run_rules.py b/tests/test_commander_run_rules.py index 38542b550b..57c4154144 100644 --- a/tests/test_commander_run_rules.py +++ b/tests/test_commander_run_rules.py @@ -5,7 +5,7 @@ from agent_comms.change_report import FileLine from agent_comms.errors import ToolRefusedError -from agent_comms.field_codec import FieldCodec, GoalId +from agent_comms.nominal.field_codec import FieldCodec, GoalId from agent_comms.recorded_time import RecordedEventTime from agent_comms.repository_name import RepositoryName from agent_comms.todos import ExpectedProblem, Todo, TodoStore diff --git a/tests/test_commander_skill_hook.py b/tests/test_commander_skill_hook.py index 0baf1d8846..bab9c59a7f 100644 --- a/tests/test_commander_skill_hook.py +++ b/tests/test_commander_skill_hook.py @@ -26,7 +26,7 @@ from agent_comms.plan_phases import BusWriterPhase from agent_comms.repository_name import RepositoryName from agent_comms.comms import wire -from agent_comms.field_codec import FieldCodec, OrderId +from agent_comms.nominal.field_codec import FieldCodec, OrderId from agent_comms.pattern_sources import PostmortemFailure from agent_comms.registry_document import RegisteredCommanderProject from agent_comms.slop import Slop diff --git a/tests/test_commander_tool_watch.py b/tests/test_commander_tool_watch.py index f440893b5d..4695f4736e 100644 --- a/tests/test_commander_tool_watch.py +++ b/tests/test_commander_tool_watch.py @@ -3,7 +3,7 @@ import json from agent_comms.commander.tool_watch import emit -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.native_tool_call import CodingCall from agent_comms.selected_triage import FullSelectedTriage, SelectedTriage diff --git a/tests/test_concurrency.py b/tests/test_concurrency.py index fe9e001454..cb4e2042d3 100644 --- a/tests/test_concurrency.py +++ b/tests/test_concurrency.py @@ -16,7 +16,7 @@ from agent_comms.activity import ActivityState from agent_comms.agent_events import AgentInfo, ContextUsageObservation from agent_comms.comms import wire -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.message_page import PageBounds from agent_comms.pi_counts import PiCount from bus_history import read_history diff --git a/tests/test_connector.py b/tests/test_connector.py index 6e8e8ee011..e1542c1f5d 100644 --- a/tests/test_connector.py +++ b/tests/test_connector.py @@ -43,7 +43,7 @@ from agent_comms.message_bus import WatchPass from agent_comms.service_passes import ServicePassStore from agent_comms.standing_rules import ServicePassFailing -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.host_services import ServiceNotServingError from agent_comms.host_services.connector import ConnectorService from agent_comms.installer.backup import StoreBackup diff --git a/tests/test_context_manifest_deltas.py b/tests/test_context_manifest_deltas.py index 0c067c5bbe..54e26a4668 100644 --- a/tests/test_context_manifest_deltas.py +++ b/tests/test_context_manifest_deltas.py @@ -9,7 +9,7 @@ from agent_comms.context_store import ContextRequest import json -from agent_comms.field_codec import FieldCodec, TurnId +from agent_comms.nominal.field_codec import FieldCodec, TurnId from agent_comms.native_session_reopen import NativeSessionIdentity from agent_comms.thread_identity import TurnIdentity from agent_comms.turn_context import ObservedDispatchRequest diff --git a/tests/test_context_source_inspection.py b/tests/test_context_source_inspection.py index 96d13326f8..cad3045a9c 100644 --- a/tests/test_context_source_inspection.py +++ b/tests/test_context_source_inspection.py @@ -9,7 +9,7 @@ import pytest from agent_comms.session_file import NoSessionFile -from agent_comms.field_codec import FieldCodec, TurnId +from agent_comms.nominal.field_codec import FieldCodec, TurnId from agent_comms.native_session_reopen import NativeSessionIdentity from agent_comms.native_turn_context import NativeContextData, NativeContextManifestData from agent_comms.runtime_requests import (RuntimeRequest, ContextRecordedSegmentRuntimeRequest, @@ -329,7 +329,7 @@ def test_cold_client_acquires_current_and_recorded_contributor_declarations(): NextContextTurn(), (contributor,))) result = subprocess.run([sys.executable, "-c", ''' import hashlib, json, sys -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.turn_context import ContextSegment, SegmentManifest, TurnContext assert "agent_comms.context_segments.awareness" not in sys.modules preview = FieldCodec.decode(TurnContext, json.load(sys.stdin)) diff --git a/tests/test_conversation_read_cursor.py b/tests/test_conversation_read_cursor.py index 54e5720c8c..ef6849f88e 100644 --- a/tests/test_conversation_read_cursor.py +++ b/tests/test_conversation_read_cursor.py @@ -77,7 +77,7 @@ def test_real_route_counts_and_inbox_use_each_conversation(tmp_path): def test_durable_cursor_map_round_trip(): - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.thread_identity import RecordedThreadIncarnation owner = RecordedThreadIncarnation("reader", 1.0) diff --git a/tests/test_conversation_revision.py b/tests/test_conversation_revision.py index 8528d3209e..89f45ae5fd 100644 --- a/tests/test_conversation_revision.py +++ b/tests/test_conversation_revision.py @@ -5,7 +5,7 @@ from agent_comms.comms import wire from agent_comms.channel_targets import CommandTarget -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.historical_views import ( ChannelDisplayHistory, ConversationObservation, diff --git a/tests/test_coordinated_runtime.py b/tests/test_coordinated_runtime.py index 44a2357092..c9ff6e1d20 100644 --- a/tests/test_coordinated_runtime.py +++ b/tests/test_coordinated_runtime.py @@ -11,7 +11,7 @@ import pytest -from agent_comms.field_codec import GoalId +from agent_comms.nominal.field_codec import GoalId from agent_comms.child_process import ProcessIdentity from agent_comms.comms import wire from agent_comms.context_segments.wake import SelectedWakeSegment diff --git a/tests/test_coordination.py b/tests/test_coordination.py index 3aa0e0e9a5..5f9bdcc26e 100644 --- a/tests/test_coordination.py +++ b/tests/test_coordination.py @@ -68,7 +68,7 @@ PendingExecution, ) from agent_comms.attempt_states import AttemptState, LiveAttempt -from agent_comms.field_codec import AssignmentId, FieldCodec, MessageId +from agent_comms.nominal.field_codec import AssignmentId, FieldCodec, MessageId from agent_comms.typed_table import HeldBusFile, JsonStorage from agent_comms.messages import InfoKind, Message from agent_comms.obligation_states import ( diff --git a/tests/test_coordination_cohort.py b/tests/test_coordination_cohort.py index d2736370cc..d9017f4eb2 100644 --- a/tests/test_coordination_cohort.py +++ b/tests/test_coordination_cohort.py @@ -19,7 +19,7 @@ import pytest -from agent_comms.field_codec import AssignmentId +from agent_comms.nominal.field_codec import AssignmentId from agent_comms.thread_identity import RecordedThreadIncarnation from agent_comms.assignment_states import ( DeferredAssignment, diff --git a/tests/test_coordination_nominal.py b/tests/test_coordination_nominal.py index f258b03a85..ca06b3f65e 100644 --- a/tests/test_coordination_nominal.py +++ b/tests/test_coordination_nominal.py @@ -19,7 +19,7 @@ ExecutionState, PendingExecution, ) -from agent_comms.field_codec import AssignmentId, FieldCodec, MessageId +from agent_comms.nominal.field_codec import AssignmentId, FieldCodec, MessageId from agent_comms.lifecycle_capability import Failed from agent_comms.obligation_states import PublishedResponse, ResponseState, SilentResponse from agent_comms.reason_codes import NoReasonCode diff --git a/tests/test_coordination_response.py b/tests/test_coordination_response.py index 6357942690..7c3fe5238e 100644 --- a/tests/test_coordination_response.py +++ b/tests/test_coordination_response.py @@ -27,7 +27,7 @@ from agent_comms.coordination_tables.executions import NoPointedExecution, WireOrigin from agent_comms.coordination_tables.responses import ResponseObligation from agent_comms.coordinator import Coordination -from agent_comms.field_codec import InputId, RootId, ThreadLookup, TurnId +from agent_comms.nominal.field_codec import InputId, RootId, ThreadLookup, TurnId from agent_comms.lifecycle_capability import Active, Complete from agent_comms.message_bus import MessageBus from agent_comms.assignment_states import CompletedAssignment diff --git a/tests/test_coordination_store.py b/tests/test_coordination_store.py index 4ea3f63e08..41ec320745 100644 --- a/tests/test_coordination_store.py +++ b/tests/test_coordination_store.py @@ -66,7 +66,7 @@ FailedExecution, PendingExecution, ) -from agent_comms.field_codec import AssignmentId, FieldCodec, MessageId +from agent_comms.nominal.field_codec import AssignmentId, FieldCodec, MessageId from agent_comms.messages import InfoKind, Message from agent_comms.owner_fence import OwnerFence, prepare_fence_token from agent_comms.reason_codes import GivenReasonCode, NoDetail diff --git a/tests/test_current_input_origin.py b/tests/test_current_input_origin.py index 0fe7d8effa..3d02272ee0 100644 --- a/tests/test_current_input_origin.py +++ b/tests/test_current_input_origin.py @@ -16,7 +16,7 @@ from agent_comms.acp_extension import QueuePromptRequest, decode_request, encode_request from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import FieldCodec, InputId, MessageId, TurnId, GoalId +from agent_comms.nominal.field_codec import FieldCodec, InputId, MessageId, TurnId, GoalId from agent_comms.goal_states import ActiveGoal, CompletedGoal, PausedGoal from agent_comms.goals import AbsentGoalCheckpoint, Goal, GoalRevision, NoGoal, PresentGoalCheckpoint from agent_comms.input_attempt import ReservedInput diff --git a/tests/test_cursor_load_recovery.py b/tests/test_cursor_load_recovery.py index 8782ad9948..6018934251 100644 --- a/tests/test_cursor_load_recovery.py +++ b/tests/test_cursor_load_recovery.py @@ -9,7 +9,7 @@ import pytest -from agent_comms.field_codec import AcpSessionId +from agent_comms.nominal.field_codec import AcpSessionId from agent_comms.session_lifecycle import PublishedSession from agent_comms.acp import CommsAgent from agent_comms.acp_extension import CursorAdvancedUpdate, decode_updates diff --git a/tests/test_declarations.py b/tests/test_declarations.py index 71c9c03c01..6e0832e64b 100644 --- a/tests/test_declarations.py +++ b/tests/test_declarations.py @@ -17,7 +17,7 @@ from agent_comms.comms import wire from agent_comms.context_reading import ContextUsage, UnmeasuredContext from agent_comms.errors import RelationViolationError, UnregisteredThreadError -from agent_comms.field_codec import FieldCodec, TurnId, GoalId +from agent_comms.nominal.field_codec import FieldCodec, TurnId, GoalId from agent_comms.goals import Goal from agent_comms.launch_runtime import CallingThreadUnavailable from agent_comms.messages import HandoffKind, InfoKind, Message diff --git a/tests/test_declared_family.py b/tests/test_declared_family.py index 311be5d428..0f4c5586aa 100644 --- a/tests/test_declared_family.py +++ b/tests/test_declared_family.py @@ -7,7 +7,7 @@ import pytest from metaclass_registry import DuplicateRegistryKeyError -from agent_comms.declared_family import DeclaredFamily, DeclaredOrder, RegisteredFamily +from agent_comms.nominal.declared_family import DeclaredFamily, DeclaredOrder, RegisteredFamily class SampleFamily(DeclaredFamily, affix="Case"): @@ -206,6 +206,68 @@ class Override(First, Selected): Rank.position_of(object) +@pytest.mark.parametrize("first", ("declared_family", "field_codec")) +def test_nominal_import_order_preserves_identity_discovery_and_new_members(first): + """Exercise the real lazy reverse import and the same codec after either entry import.""" + probe = f"import agent_comms.nominal.{first}\n" + ''' +from abc import abstractmethod +from dataclasses import dataclass +import sys + +from agent_comms.nominal import declared_family, field_codec, json_schema, sealed +from agent_comms.task_sources import TaskAttachment + +assert field_codec.DeclaredFamily is declared_family.DeclaredFamily +assert field_codec.JsonSchemaOwner is json_schema.JsonSchemaOwner +assert field_codec.Sealed is sealed.Sealed +assert field_codec.FieldCodec._sealed_home == field_codec.FieldCodec.__module__ + +# No member-module import until the existing discovery owner receives its name. +assert 'agent_comms.task_attachments.commander_pings' not in sys.modules +selected = TaskAttachment.member_named('commander_decisions') +from agent_comms.task_attachments import commander_pings +assert selected is commander_pings.CommanderDecisions +assert TaskAttachment.member_named(selected.declared_name) is selected + +from agent_comms import cli_command, tools +assert cli_command.ModuleMembers is declared_family.ModuleMembers +assert tools.FieldCodec is field_codec.FieldCodec +command = cli_command.CliCommand.member_named('threads') +from agent_comms.cli_verbs.threads import ThreadsCliCommand +assert command is ThreadsCliCommand + +class Capability: + pass + +class ProbeFamily(declared_family.DeclaredFamily, affix='Case'): + @abstractmethod + def execute(self): ... + +class AbstractCase(ProbeFamily): + pass + +@dataclass(frozen=True, slots=True) +class AddedCase(ProbeFamily, Capability): + value: int + + def execute(self): + return self.value + +assert ProbeFamily.members_with(Capability) == (AddedCase,) +assert ProbeFamily.members_with(ProbeFamily) == (AddedCase,) +assert ProbeFamily.member_named(AddedCase.declared_name) is AddedCase +value = AddedCase(7) +encoded = field_codec.FieldCodec.encode(value) +assert encoded == {ProbeFamily.family_discriminator: AddedCase.declared_name, 'value': 7} +assert field_codec.FieldCodec.decode(ProbeFamily, encoded) == value +assert field_codec.FieldCodec.decode(ProbeFamily, encoded).execute() == 7 +assert field_codec.FieldCodec.value_schema(ProbeFamily) +''' + subprocess.run( + [sys.executable, "-c", probe], capture_output=True, text=True, timeout=120, check=True, + ) + + def test_attachment_names_decode_in_a_process_that_never_imported_their_module(): """A heartbeat on the bus decodes before anything imports its member module.""" probe = ( diff --git a/tests/test_delivery_merge.py b/tests/test_delivery_merge.py index 2137370cce..c526d11206 100644 --- a/tests/test_delivery_merge.py +++ b/tests/test_delivery_merge.py @@ -1,7 +1,7 @@ """Small record/codec checks; the real CLI proof is recorded separately.""" from dataclasses import replace -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.todos import ( BranchDeliveryMerge, CheckedCommitDelivery, CommitDelivery, DeliveryMerge, DraftListedPullRequest, DraftPullRequest, ListedPullRequest, diff --git a/tests/test_display_unread.py b/tests/test_display_unread.py index 0d051ca1f8..9ae10999bf 100644 --- a/tests/test_display_unread.py +++ b/tests/test_display_unread.py @@ -2,7 +2,7 @@ from agent_comms.audience_manifest import FrozenRecipient from agent_comms.bus import Bus, DisplayUnread -from agent_comms.field_codec import ThreadLookup +from agent_comms.nominal.field_codec import ThreadLookup from agent_comms.messages import InfoKind, Message, PublicRecord from agent_comms.notification_progress import UnrecordedProgress from agent_comms.presentation import MessageNotification diff --git a/tests/test_durable_host_records.py b/tests/test_durable_host_records.py index e4d4eb99e0..ad4959de0c 100644 --- a/tests/test_durable_host_records.py +++ b/tests/test_durable_host_records.py @@ -12,7 +12,7 @@ StaleCompaction, ) from agent_comms.agent_events import Chunk, Error, Thinking, ToolStart -from agent_comms.field_codec import FieldCodec, MalformedRecord +from agent_comms.nominal.field_codec import FieldCodec, MalformedRecord from agent_comms.native_entries import NativeEntry, StoredEntry, TranscriptProjection from agent_comms.pi_commands import GetSessionStats from agent_comms.pi_counts import PiCount, UnreportedCount diff --git a/tests/test_durable_runtime_location.py b/tests/test_durable_runtime_location.py index 966e20b3ba..2e250f7b6f 100644 --- a/tests/test_durable_runtime_location.py +++ b/tests/test_durable_runtime_location.py @@ -8,7 +8,7 @@ from agent_comms.session_file import NoSessionFile, RegistrySessionLocation from agent_comms.agent_backend import NewThreadBackend -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.turn_digests import LastTurns from agent_comms.pi_durable_backend import DurableDatabase, PiDurableBackend, Inspect from agent_comms.pi_native_backend import PiNativeBackend diff --git a/tests/test_edit_evidence.py b/tests/test_edit_evidence.py index 51cd3f87f3..c84768657a 100644 --- a/tests/test_edit_evidence.py +++ b/tests/test_edit_evidence.py @@ -3,7 +3,7 @@ import pytest from agent_comms.commander.judge import Edit -from agent_comms.field_codec import FieldCodec, MalformedRecord +from agent_comms.nominal.field_codec import FieldCodec, MalformedRecord from agent_comms.recorded_time import EventTime, RecordedEventTime from agent_comms.tool_calls import CliToolArguments, ToolCall from agent_comms.turn_digests import UnjudgedEdits diff --git a/tests/test_editor_defaults.py b/tests/test_editor_defaults.py index c4b6e38e8a..e58f64e5d8 100644 --- a/tests/test_editor_defaults.py +++ b/tests/test_editor_defaults.py @@ -4,7 +4,7 @@ import pytest from agent_comms.cli_verbs.fork import ForkCliCommand -from agent_comms.field_codec import FieldCodec, compile_decoder +from agent_comms.nominal.field_codec import FieldCodec, compile_decoder from agent_comms.pi_vocabulary import HighThinkingLevel, NoThinkingOverride, ThinkingLevelField from agent_comms.repo import LaunchCheckout from agent_comms.thread_execution import ExternalThreadExecution, ThreadExecution diff --git a/tests/test_envelope_bus_integration.py b/tests/test_envelope_bus_integration.py index ff7c7510b8..e5cf1722b2 100644 --- a/tests/test_envelope_bus_integration.py +++ b/tests/test_envelope_bus_integration.py @@ -26,7 +26,7 @@ from agent_comms.envelope_claim_transitions import ClaimConflict, ExistingFileClaim, NativeClaim from agent_comms.errors import RelationViolationError from agent_comms.exporting import EverythingScope, FullLimit, JsonlFormat -from agent_comms.field_codec import ClaimId, InputId, TurnId +from agent_comms.nominal.field_codec import ClaimId, InputId, TurnId from agent_comms.message_reference import MessageReference from agent_comms.messages import Message from agent_comms.thread_status import RunningThreadStatus @@ -264,7 +264,7 @@ def test_sigkill_across_claim_acquisition_recovers_one_row_or_none( sys.path.insert(0, str(Path(sys.argv[2]).parent / 'tests')) from agent_comms.bus import Bus from agent_comms.comms import wire -from agent_comms.field_codec import InputId, TurnId +from agent_comms.nominal.field_codec import InputId, TurnId from test_envelope_bus_integration import acquire_message """ + kill + """ alice_turn = TurnId.mint() diff --git a/tests/test_envelope_claim_transitions.py b/tests/test_envelope_claim_transitions.py index ff5698c77f..9e5655b761 100644 --- a/tests/test_envelope_claim_transitions.py +++ b/tests/test_envelope_claim_transitions.py @@ -21,7 +21,7 @@ WakeClaim, WakeClaims, ) -from agent_comms.field_codec import AssignmentId, ClaimId, FieldCodec, InputId, MalformedRecord, MessageId, TurnId +from agent_comms.nominal.field_codec import AssignmentId, ClaimId, FieldCodec, InputId, MalformedRecord, MessageId, TurnId from agent_comms.messages import ClaimMessage, ClaimNoticeKind, Message G1 = ClaimId("a" * 32) diff --git a/tests/test_export_families.py b/tests/test_export_families.py index daa2d97773..7232b727a5 100644 --- a/tests/test_export_families.py +++ b/tests/test_export_families.py @@ -23,7 +23,7 @@ WireExportScope, WireTranscriptExporter, ) -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.messages import Message, InfoKind FIXTURES = Path(__file__).parent / "fixtures" / "wire_exports" diff --git a/tests/test_external_transcript.py b/tests/test_external_transcript.py index 7039e9cea6..00379bf32e 100644 --- a/tests/test_external_transcript.py +++ b/tests/test_external_transcript.py @@ -6,7 +6,7 @@ from agent_comms.bus import Bus from agent_comms.session_file import RegistrySessionLocation from agent_comms.comms import wire -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.transcript_events import AssistantTranscript, NoticeTranscript from agent_comms.transcripts import TranscriptReadIdentity, UnreadTranscriptCursor from agent_comms.turn_digests import LastTurns diff --git a/tests/test_field_codec.py b/tests/test_field_codec.py index 854dc1833c..861026d820 100644 --- a/tests/test_field_codec.py +++ b/tests/test_field_codec.py @@ -7,8 +7,8 @@ from pydantic import JsonValue from typing_extensions import TypeForm -from agent_comms.declared_family import DeclaredFamily, UnknownFamilyMember -from agent_comms.field_codec import ( +from agent_comms.nominal.declared_family import DeclaredFamily, UnknownFamilyMember +from agent_comms.nominal.field_codec import ( DeclaredWireType, FieldCodec, FlagDirective, @@ -163,7 +163,7 @@ class Record: def test_field_plan_discovers_a_new_flag_without_changing_the_selector() -> None: - from agent_comms.field_codec import DeclaredFieldPlan + from agent_comms.nominal.field_codec import DeclaredFieldPlan class ProbeDirective(FlagDirective): pass @@ -185,7 +185,7 @@ class Record: def test_field_plan_refuses_an_unclaimed_representation() -> None: - from agent_comms.field_codec import FieldPlan + from agent_comms.nominal.field_codec import FieldPlan class UnclaimedPath(PathText): field_plan = FieldPlan # The base has no registered field claim. @@ -461,7 +461,7 @@ class Scalars: assert FieldCodec.project(value, "status") == encoded assert FieldCodec.value_schema(Annotated[Path | None, PathText]) == { "anyOf": [ - {"type": "string", "description": "agent_comms.field_codec.PathText text"}, + {"type": "string", "description": f"{PathText.__module__}.{PathText.__qualname__} text"}, {"type": "null"}, ] } @@ -615,7 +615,7 @@ def test_scalar_dispatch_keeps_representation_and_exact_type_contracts() -> None import math from typing import Literal - from agent_comms.field_codec import AcceptsNull, FieldRepresentation + from agent_comms.nominal.field_codec import AcceptsNull, FieldRepresentation class NullableInteger(AcceptsNull, FieldRepresentation): @@ -994,7 +994,7 @@ class _SavedRow: def test_refused_record_data_raises_the_declared_error(wire: dict[str, JsonValue], refusal: str) -> None: with pytest.raises(MalformedRecord) as raised: FieldCodec.decode(_SavedRow, wire) - from agent_comms.field_codec import RecordProblems + from agent_comms.nominal.field_codec import RecordProblems assert type(raised.value) is RecordProblems assert len(raised.value.problems) == 1 @@ -1002,7 +1002,7 @@ def test_refused_record_data_raises_the_declared_error(wire: dict[str, JsonValue def test_record_reports_missing_unknown_and_malformed_siblings_together() -> None: - from agent_comms.field_codec import RecordProblems + from agent_comms.nominal.field_codec import RecordProblems with pytest.raises(RecordProblems) as raised: FieldCodec.decode(_SavedRow, {"path": 7, "at": 1.5, "extra": 0}) @@ -1100,7 +1100,7 @@ class SpecializedTurnId(TurnId): @pytest.mark.parametrize("count", (1, 9, 17)) def test_hex_spelling_derives_new_lengths_from_the_declaration(count: int) -> None: - from agent_comms.field_codec import HexDigits + from agent_comms.nominal.field_codec import HexDigits class DeclaredHex(HexDigits): digits = count @@ -1115,7 +1115,7 @@ class DeclaredHex(HexDigits): def test_hex_commit_spelling_keeps_its_bounded_length_contract() -> None: - from agent_comms.field_codec import GitCommitText + from agent_comms.nominal.field_codec import GitCommitText class InheritedCommit(GitCommitText): pass @@ -1129,7 +1129,7 @@ class InheritedCommit(GitCommitText): def test_order_identity_owns_minting_and_wire_spelling() -> None: - from agent_comms.field_codec import OrderId, OrderIdText + from agent_comms.nominal.field_codec import OrderId, OrderIdText order = OrderId.mint() assert type(order) is OrderId diff --git a/tests/test_field_codec_comparison.py b/tests/test_field_codec_comparison.py index e2a3c0b7f8..9da947474d 100644 --- a/tests/test_field_codec_comparison.py +++ b/tests/test_field_codec_comparison.py @@ -7,7 +7,7 @@ import pytest -from agent_comms.field_codec import FieldCodec, WireRequired +from agent_comms.nominal.field_codec import FieldCodec, WireRequired from agent_comms.standing_rules import StandingRule from agent_comms.thread_creation import CreationSeconds, CreationTime, RecordedCreationTime from agent_comms.thread_identity import RecordedThreadIncarnation diff --git a/tests/test_fleet_replay.py b/tests/test_fleet_replay.py index fa284af592..d0970b0308 100644 --- a/tests/test_fleet_replay.py +++ b/tests/test_fleet_replay.py @@ -21,7 +21,7 @@ from agent_comms.commander_heartbeat import CommanderObservation from agent_comms.comms import Comms from agent_comms.external_transcript import ExternalTranscript -from agent_comms.field_codec import ToolCallId +from agent_comms.nominal.field_codec import ToolCallId from agent_comms.goal_actions import CreateProblemGoalAction from agent_comms.goals import CountCheckResult, OrderCheck from agent_comms.order_runs import ApplicationOrderRun, MechanicalOrderRun diff --git a/tests/test_goal_answers.py b/tests/test_goal_answers.py index 7b50486cb1..bd02c8eab2 100644 --- a/tests/test_goal_answers.py +++ b/tests/test_goal_answers.py @@ -10,7 +10,7 @@ from agent_comms import agent_events as events from agent_comms.child_process import ProcessIdentity -from agent_comms.field_codec import FieldCodec, GoalId, TurnId +from agent_comms.nominal.field_codec import FieldCodec, GoalId, TurnId from agent_comms.coordination_errors import Refused from agent_comms.owner_protocol import OwnerFailure from agent_comms.goal_actions import ClearGoalAction, SetGoalAction diff --git a/tests/test_goal_attempt_lifecycle.py b/tests/test_goal_attempt_lifecycle.py index 13872b9b64..d36a920614 100644 --- a/tests/test_goal_attempt_lifecycle.py +++ b/tests/test_goal_attempt_lifecycle.py @@ -6,7 +6,7 @@ from agent_comms.turn_failure import BackendFailed -from agent_comms.field_codec import GoalId, NoAttemptId, RetryDecisionId +from agent_comms.nominal.field_codec import GoalId, NoAttemptId, RetryDecisionId from agent_comms.goal_attempts import AttemptRecord, GoalAttemptStore, GoalWorkDecision from agent_comms.errors import UnresolvedAttemptError from agent_comms.goal_generation import BlockedGeneration, CancelledGeneration, ReadyGeneration diff --git a/tests/test_goal_attempts.py b/tests/test_goal_attempts.py index fa600bbb09..4c647fce46 100644 --- a/tests/test_goal_attempts.py +++ b/tests/test_goal_attempts.py @@ -23,7 +23,7 @@ from agent_comms.cli_verbs.stop import StopCliCommand from agent_comms.coordination_database import CoordinationStore from agent_comms.coordination_errors import RecoveryBlocked -from agent_comms.field_codec import AttemptId, GoalId, MalformedRecord, RetryDecisionId +from agent_comms.nominal.field_codec import AttemptId, GoalId, MalformedRecord, RetryDecisionId from agent_comms.goal_actions import SetGoalAction from agent_comms.goal_attempt_phase import ClaimedAttempt, FailedAttempt, SucceededAttempt from agent_comms.goal_failure_observation import FailedTurnEvidence diff --git a/tests/test_goal_attempts_windows.py b/tests/test_goal_attempts_windows.py index a3d7777be3..61244d3cf7 100644 --- a/tests/test_goal_attempts_windows.py +++ b/tests/test_goal_attempts_windows.py @@ -4,7 +4,7 @@ import pytest -from agent_comms.field_codec import GoalId +from agent_comms.nominal.field_codec import GoalId from agent_comms.goal_attempts import GoalAttemptStore, ReservationConflictError from agent_comms.errors import UnresolvedAttemptError from agent_comms.goal_generation import CompletedGeneration, ReservedGeneration diff --git a/tests/test_goal_authority_continues.py b/tests/test_goal_authority_continues.py index 0f99ca2b32..66fa21e532 100644 --- a/tests/test_goal_authority_continues.py +++ b/tests/test_goal_authority_continues.py @@ -1,6 +1,6 @@ """An order or retry that re-activates a goal keeps the running turn; pausing or another goal ends it.""" -from agent_comms.field_codec import GoalId +from agent_comms.nominal.field_codec import GoalId from agent_comms.goal_states import ActiveGoal, BlockedGoal, PausedGoal from agent_comms.goals import GoalAuthority, NoGoal diff --git a/tests/test_goal_checkout.py b/tests/test_goal_checkout.py index ce2aa9add9..793fe59691 100644 --- a/tests/test_goal_checkout.py +++ b/tests/test_goal_checkout.py @@ -3,7 +3,7 @@ import pytest from agent_comms.repo import Checkout -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.goal_actions import SetGoalAction from agent_comms.repository_name import RepositoryName from agent_comms.storage_rules import StorageRule diff --git a/tests/test_goal_execution.py b/tests/test_goal_execution.py index 75ce9cfb1a..60d47ca0ce 100644 --- a/tests/test_goal_execution.py +++ b/tests/test_goal_execution.py @@ -16,7 +16,7 @@ from agent_comms.acp_failure import NativeTurnError from agent_comms.child_process import ChildOutcome, ProcessIdentity from agent_comms.comms import wire -from agent_comms.field_codec import FieldCodec, GoalId +from agent_comms.nominal.field_codec import FieldCodec, GoalId from agent_comms.goal_actions import ( PausedGoalAction, RetryGoalAction, diff --git a/tests/test_goal_failure_observation.py b/tests/test_goal_failure_observation.py index e0641512d4..084b27d32d 100644 --- a/tests/test_goal_failure_observation.py +++ b/tests/test_goal_failure_observation.py @@ -11,7 +11,7 @@ import pytest from agent_comms.child_process import ProcessIdentity -from agent_comms.field_codec import TurnId, GoalId +from agent_comms.nominal.field_codec import TurnId, GoalId from agent_comms.turn_failure import BackendFailed, FinalStopMissing from agent_comms.goal_attempts import AttemptRecord, GoalAttemptStore from agent_comms.errors import UnresolvedAttemptError diff --git a/tests/test_goal_history.py b/tests/test_goal_history.py index 1ca6877459..bd5145054a 100644 --- a/tests/test_goal_history.py +++ b/tests/test_goal_history.py @@ -12,7 +12,7 @@ from agent_comms.child_process import Platform from agent_comms.comms import Comms, wire -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from conftest import installed_comms from test_locked_store import _hold_lock, event, process from agent_comms.goal_actions import ( diff --git a/tests/test_goal_input_review.py b/tests/test_goal_input_review.py index 21f68a1ac8..63d2ae139e 100644 --- a/tests/test_goal_input_review.py +++ b/tests/test_goal_input_review.py @@ -11,7 +11,7 @@ from agent_comms.child_process import ProcessIdentity from agent_comms.comms import wire from conftest import installed_comms -from agent_comms.field_codec import FieldCodec, InputId, MalformedRecord, TurnId +from agent_comms.nominal.field_codec import FieldCodec, InputId, MalformedRecord, TurnId from agent_comms.input_key import AcpInputKey, BusInputKey, InputKeyText from agent_comms.goal_presentation import GoalExecution from agent_comms.goal_actions import ( diff --git a/tests/test_goal_nominal.py b/tests/test_goal_nominal.py index 61231e3f18..4124a8d0e0 100644 --- a/tests/test_goal_nominal.py +++ b/tests/test_goal_nominal.py @@ -6,8 +6,8 @@ import pytest -from agent_comms.field_codec import FieldCodec -from agent_comms.field_codec import GoalId +from agent_comms.nominal.field_codec import FieldCodec +from agent_comms.nominal.field_codec import GoalId from agent_comms.agent_events import GoalUnchanged from agent_comms.comms import wire from agent_comms.goal_actions import ( diff --git a/tests/test_goal_reply_lock_scope.py b/tests/test_goal_reply_lock_scope.py index 7889f184f6..cadb05dcbe 100644 --- a/tests/test_goal_reply_lock_scope.py +++ b/tests/test_goal_reply_lock_scope.py @@ -15,7 +15,7 @@ from agent_comms.bus_tables import ReceivedSource from agent_comms.child_process import ProcessIdentity from agent_comms.coordination_errors import StaleFence -from agent_comms.field_codec import GoalWaitId, TurnId +from agent_comms.nominal.field_codec import GoalWaitId, TurnId from agent_comms.goal_actions import ( EditGoalAction, GoalPublicationContext, diff --git a/tests/test_goal_resume.py b/tests/test_goal_resume.py index b9456ee63b..316c141876 100644 --- a/tests/test_goal_resume.py +++ b/tests/test_goal_resume.py @@ -11,7 +11,7 @@ from agent_comms.turn_failure import FailedTurnResolution from agent_comms.child_process import ProcessIdentity from agent_comms.comms import wire -from agent_comms.field_codec import FieldCodec, GoalId, TurnId +from agent_comms.nominal.field_codec import FieldCodec, GoalId, TurnId from agent_comms.goal_actions import ( ActiveGoalAction, BlockedGoalAction, diff --git a/tests/test_goal_standby.py b/tests/test_goal_standby.py index 2c9c0ce94b..1d47b8fb0b 100644 --- a/tests/test_goal_standby.py +++ b/tests/test_goal_standby.py @@ -7,7 +7,7 @@ import pytest from agent_comms.child_process import ProcessIdentity -from agent_comms.field_codec import GoalWaitId, TurnId +from agent_comms.nominal.field_codec import GoalWaitId, TurnId from agent_comms.goal_actions import ( EditGoalAction, GoalPrecondition, diff --git a/tests/test_goal_standby_liveness.py b/tests/test_goal_standby_liveness.py index af22dc0b2b..a6f10b71e0 100644 --- a/tests/test_goal_standby_liveness.py +++ b/tests/test_goal_standby_liveness.py @@ -12,7 +12,7 @@ from agent_comms.child_process import ProcessIdentity from agent_comms.comms import wire -from agent_comms.field_codec import TurnId +from agent_comms.nominal.field_codec import TurnId from agent_comms.goal_actions import ( EditGoalAction, GoalPrecondition, diff --git a/tests/test_goal_wait_certified_reply.py b/tests/test_goal_wait_certified_reply.py index eed985ea1f..9c53a3c96d 100644 --- a/tests/test_goal_wait_certified_reply.py +++ b/tests/test_goal_wait_certified_reply.py @@ -7,7 +7,7 @@ from agent_comms.child_process import ProcessIdentity -from agent_comms.field_codec import TurnId +from agent_comms.nominal.field_codec import TurnId from agent_comms.input_key import BusInputKey from agent_comms.goal_actions import GoalPrecondition, SetGoalAction, StandbyGoalAction from agent_comms.goal_presentation import GoalWaitTarget @@ -25,7 +25,7 @@ def register(comms, name): def test_first_wait_ignores_unreserved_reply_before_goal_publication(tmp_path): - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.goals import Goal from agent_comms.input_disposition import InputDispositions diff --git a/tests/test_goal_waits.py b/tests/test_goal_waits.py index 02c878af23..aa24849b1f 100644 --- a/tests/test_goal_waits.py +++ b/tests/test_goal_waits.py @@ -1,7 +1,7 @@ from dataclasses import replace import sqlite3 -from agent_comms.field_codec import GoalId +from agent_comms.nominal.field_codec import GoalId from agent_comms.goal_presentation import GoalWaitTarget from agent_comms.goal_waits import GoalWaits, GoalWaitTargetRow, RecordedGoalWait from agent_comms.thread_identity import RecordedThreadIncarnation diff --git a/tests/test_goals.py b/tests/test_goals.py index 8bd61bee88..e684e12a6d 100644 --- a/tests/test_goals.py +++ b/tests/test_goals.py @@ -6,7 +6,7 @@ from agent_comms.comms import wire from conftest import installed_comms from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import FieldCodec, GoalId, TurnId +from agent_comms.nominal.field_codec import FieldCodec, GoalId, TurnId from agent_comms.goal_actions import ( ActiveGoalAction, BlockedGoalAction, diff --git a/tests/test_head_review.py b/tests/test_head_review.py index a6d2d9ebd9..22e3d261b4 100644 --- a/tests/test_head_review.py +++ b/tests/test_head_review.py @@ -23,7 +23,7 @@ from agent_comms.repo import Checkout from agent_comms.threads import Thread from agent_comms.errors import ToolRefusedError -from agent_comms.field_codec import RecordProblems +from agent_comms.nominal.field_codec import RecordProblems from agent_comms.tool_caller import ThreadCaller from agent_comms.work_branches import SourceGrowth, WorkBranches from agent_comms.order_tools import CommsHeadVerdictTool diff --git a/tests/test_headless_diagnostics.py b/tests/test_headless_diagnostics.py index fc88dd4bc1..a165fada21 100644 --- a/tests/test_headless_diagnostics.py +++ b/tests/test_headless_diagnostics.py @@ -4,7 +4,7 @@ import os from agent_comms.diagnostics import record_terminal_failure -from agent_comms.field_codec import TurnId +from agent_comms.nominal.field_codec import TurnId from agent_comms.turn_failure import NativePreflightTimeout diff --git a/tests/test_held_problem_orders.py b/tests/test_held_problem_orders.py index 5d0ccd687a..c6b60499e2 100644 --- a/tests/test_held_problem_orders.py +++ b/tests/test_held_problem_orders.py @@ -11,7 +11,7 @@ from agent_comms.commander.order import OrderFile, main from agent_comms.commander.request import RequestAddVerb -from agent_comms.field_codec import FieldCodec, GoalId, OrderId +from agent_comms.nominal.field_codec import FieldCodec, GoalId, OrderId from agent_comms.installer.practice import PracticeCopy from agent_comms.locked_store import RootFile from agent_comms.goals import CountCheckResult, OrderCheck diff --git a/tests/test_historical_goal_generation.py b/tests/test_historical_goal_generation.py index d2d3359b3b..413647c41a 100644 --- a/tests/test_historical_goal_generation.py +++ b/tests/test_historical_goal_generation.py @@ -8,9 +8,9 @@ import pytest -from agent_comms.field_codec import InputId +from agent_comms.nominal.field_codec import InputId from agent_comms.input_key import AcpInputKey -from agent_comms.field_codec import GoalId +from agent_comms.nominal.field_codec import GoalId from agent_comms.child_process import ProcessIdentity from agent_comms.comms import wire from agent_comms.goal_actions import ( diff --git a/tests/test_historical_notifications.py b/tests/test_historical_notifications.py index 6c18bb27d0..d683b627c6 100644 --- a/tests/test_historical_notifications.py +++ b/tests/test_historical_notifications.py @@ -28,7 +28,7 @@ from agent_comms.coordinator import Coordination from agent_comms.harness_delivery_states import DeliveredOutcome from agent_comms.coordination_errors import DMScopeChanged, SchemaVersionError -from agent_comms.field_codec import InputId, MessageId, TurnId +from agent_comms.nominal.field_codec import InputId, MessageId, TurnId from agent_comms.read_basis import HistoricalDisplay, ReadCursor from agent_comms.read_ledger import ReadLedger from agent_comms.thread_identity import AgentThreadRole, UserThreadRole @@ -465,7 +465,7 @@ def test_recorded_response_resolution_keeps_other_collective_lifecycles( def test_live_cli_ack_does_not_become_archived_ack(archived_notification): - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.agent_activity import RecipientActivity from agent_comms.thread_execution import ExternalThreadExecution diff --git a/tests/test_historical_views.py b/tests/test_historical_views.py index 84f2c3bc21..0a05ef5932 100644 --- a/tests/test_historical_views.py +++ b/tests/test_historical_views.py @@ -15,7 +15,7 @@ from agent_comms.channel_targets import CommandTarget, ThreadTarget from agent_comms.comms import wire from agent_comms.coordination_errors import HistoricalSourceChanged -from agent_comms.field_codec import InputId +from agent_comms.nominal.field_codec import InputId from agent_comms.turn_item import FreshNativeId from agent_comms.historical_views import HistoricalMessage, HistoryArchive, HistorySource from agent_comms.installer.backup import bus_files @@ -243,7 +243,7 @@ def test_stale_cursor_is_rejected(migrated): def test_recorded_transcript_witness_roundtrip_keeps_original_namespace(tmp_path): - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.transcripts import RecordedTranscriptReadIdentity, TranscriptReadIdentity old, live = setup(tmp_path / "old", 1), setup(tmp_path / "live", 0) @@ -368,7 +368,7 @@ def test_missing_historical_peer_is_browsable_without_live_registration(migrated def test_historical_namespace_has_recorded_provenance_and_no_live_authority(migrated): from dataclasses import fields - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.registry_provenance import RegistryProvenance from agent_comms.threads import ThreadProvenance diff --git a/tests/test_history_view_declaration.py b/tests/test_history_view_declaration.py index 6f7158a8aa..0413474c1f 100644 --- a/tests/test_history_view_declaration.py +++ b/tests/test_history_view_declaration.py @@ -1,7 +1,7 @@ """A new history declaration crosses real current and retained-source boundaries.""" from agent_comms.repo import Checkout -from agent_comms.field_codec import TurnId +from agent_comms.nominal.field_codec import TurnId from agent_comms.historical_views import HistoryView from agent_comms.message_page import PageBounds from agent_comms.read_basis import ChannelDisplayScope, NoDisplaySelection diff --git a/tests/test_holder_standing_rules.py b/tests/test_holder_standing_rules.py index a38f6af895..2eee80fe39 100644 --- a/tests/test_holder_standing_rules.py +++ b/tests/test_holder_standing_rules.py @@ -33,7 +33,7 @@ from agent_comms.comms import wire from agent_comms.coordinator import Coordination from agent_comms.errors import CommittedMessageError, HumanSendRefusedError, RelationViolationError, TodoConflict -from agent_comms.field_codec import FieldCodec, InputId, MessageId, OrderId, RecordProblems, TurnId +from agent_comms.nominal.field_codec import FieldCodec, InputId, MessageId, OrderId, RecordProblems, TurnId from agent_comms.goal_actions import ( CreateProblemGoalAction, ReissuedOrderGoalAction, diff --git a/tests/test_host_services.py b/tests/test_host_services.py index d93061a9c5..a026ff8c53 100644 --- a/tests/test_host_services.py +++ b/tests/test_host_services.py @@ -34,7 +34,7 @@ from agent_comms.comms import client_wire from agent_comms.connector import ConnectorVerb, SystemdSite from agent_comms.connector_store import ConnectorStore -from agent_comms.field_codec import Id128 +from agent_comms.nominal.field_codec import Id128 from agent_comms.harness_install import CodexHarness from agent_comms.host_services import ( HostService, diff --git a/tests/test_importing.py b/tests/test_importing.py index 9fd4fe5f0f..11e22955b7 100644 --- a/tests/test_importing.py +++ b/tests/test_importing.py @@ -38,7 +38,7 @@ from agent_comms.cli_bridges.opencode_parts import SavedMessage from agent_comms.cli_bridges.opencode_protocol import Session from agent_comms.cli_bridges.opencode_store import OpenCodeDatabase, OpenCodeExport -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.harness_install import ClaudeCodeHarness, CodexHarness, OpenCodeHarness, PiHarness from agent_comms.importing import ImportBuffer, ThreadImported, ImportSnapshot, ImportedSessionMetadata from agent_comms.native_entries import NativeEntry, ImportedMetadataEntry diff --git a/tests/test_info_claim_history.py b/tests/test_info_claim_history.py index 0ec268011e..60311afd36 100644 --- a/tests/test_info_claim_history.py +++ b/tests/test_info_claim_history.py @@ -5,7 +5,7 @@ import pytest -from agent_comms.field_codec import MalformedRecord +from agent_comms.nominal.field_codec import MalformedRecord from agent_comms.messages import ClaimMessage, InfoKind, Message diff --git a/tests/test_input_delivery_history.py b/tests/test_input_delivery_history.py index 19c94ada35..0ebd8bfe02 100644 --- a/tests/test_input_delivery_history.py +++ b/tests/test_input_delivery_history.py @@ -9,7 +9,7 @@ from agent_comms.cli import main from agent_comms.input_key import AcpInputKey, BusInputKey from agent_comms.comms import wire -from agent_comms.field_codec import GoalId, InputId, TurnId +from agent_comms.nominal.field_codec import GoalId, InputId, TurnId from agent_comms.input_attempt import ( OwnerQueueInputDeliveryScope, UnobservedInputDeliveryScope, diff --git a/tests/test_input_delivery_latency.py b/tests/test_input_delivery_latency.py index 87ed093094..3c3f243858 100644 --- a/tests/test_input_delivery_latency.py +++ b/tests/test_input_delivery_latency.py @@ -12,7 +12,7 @@ from agent_comms.agent_backend import SteerInputPolicy from agent_comms.comms import Comms from agent_comms.coordinator import Coordination -from agent_comms.field_codec import InputId +from agent_comms.nominal.field_codec import InputId from agent_comms.installer.practice import PracticeCopy from agent_comms.locked_store import RootFile from agent_comms.native_package import VerifiedNativePackage diff --git a/tests/test_input_disposition.py b/tests/test_input_disposition.py index 59c0060ded..b28f269165 100644 --- a/tests/test_input_disposition.py +++ b/tests/test_input_disposition.py @@ -9,7 +9,7 @@ from agent_comms.input_key import AcpInputKey, BusInputKey from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import InputId, MessageId, TurnId +from agent_comms.nominal.field_codec import InputId, MessageId, TurnId from agent_comms.input_attempt import ( BoundUnknownInput, ClearedNativeInput, diff --git a/tests/test_input_documents.py b/tests/test_input_documents.py index 97cf68ace5..0157f04363 100644 --- a/tests/test_input_documents.py +++ b/tests/test_input_documents.py @@ -10,7 +10,7 @@ from agent_comms.input_key import AcpInputKey, BusInputKey, InputKey, InputKeyText from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import FieldCodec, GoalId, InputId, TurnId +from agent_comms.nominal.field_codec import FieldCodec, GoalId, InputId, TurnId from agent_comms.input_attempt import ( BoundUnknownInput, GoalInputDecision, diff --git a/tests/test_install.py b/tests/test_install.py index 4516ce3936..5cc525baa3 100644 --- a/tests/test_install.py +++ b/tests/test_install.py @@ -11,7 +11,7 @@ import pytest from agent_comms.locked_store import LiveFilesRequest -from agent_comms.field_codec import TurnId +from agent_comms.nominal.field_codec import TurnId from agent_comms.threads import ParkedThreadWorkState from agent_comms.active_route import ActiveRoute, read_active_route, route_new_bus @@ -156,7 +156,7 @@ def copy_then_write(cls, source, target): def test_install_report_encodes_its_registered_harnesses() -> None: # The live install printed nothing: its report's field type had no codec. from agent_comms.installer.probes.harnesses import InstallResult - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec for config in (RegisteredCommanderProject(RecordedThreadIncarnation("lead", 1.0), ()), NoCommanderProject()): diff --git a/tests/test_install_announcements.py b/tests/test_install_announcements.py index 1bccdbd22b..c0f4582a55 100644 --- a/tests/test_install_announcements.py +++ b/tests/test_install_announcements.py @@ -15,7 +15,7 @@ from agent_comms.registry_document import NoCommanderProject from agent_comms.repo import GitCommandError from agent_comms.commander_heartbeat import CommanderHeartbeat -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.host_services import RestartedService from agent_comms.installer.backup import BackupReport, RestoreSpace from agent_comms.installer.refusals import UpgradeRefused diff --git a/tests/test_install_rehearsal.py b/tests/test_install_rehearsal.py index da48147f24..a6afb4a9ef 100644 --- a/tests/test_install_rehearsal.py +++ b/tests/test_install_rehearsal.py @@ -23,7 +23,7 @@ import pytest from agent_comms.locked_store import LiveFilesRequest -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.history_result import ChannelHistoryPageResult from agent_comms.installer.backup import bus_files from agent_comms.installer.commands import InstallCommands diff --git a/tests/test_install_session_bridge.py b/tests/test_install_session_bridge.py index bb8365f6eb..a298f8ad9d 100644 --- a/tests/test_install_session_bridge.py +++ b/tests/test_install_session_bridge.py @@ -25,7 +25,7 @@ ReleasedSessionBridge, UnacknowledgedPause, UnobservedBridge, ) from conftest import installed_comms -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.installer.refusals import UpgradeRefused from agent_comms.launch_runtime import LaunchRuntime from agent_comms.root_runtime import RootRuntime diff --git a/tests/test_install_unit.py b/tests/test_install_unit.py index e8a199aa76..a08d39172e 100644 --- a/tests/test_install_unit.py +++ b/tests/test_install_unit.py @@ -10,7 +10,7 @@ from agent_comms.child_process import NoResidentManager, ResidentManager, SystemdUserManager from agent_comms.installer.request import InstallRequest from agent_comms.commander import standing -from agent_comms.field_codec import FieldCodec, Id128 +from agent_comms.nominal.field_codec import FieldCodec, Id128 from agent_comms.installer.backup import StoreBackup from agent_comms.installer.launch import InstallRun from agent_comms.installer.logs import InstallLogs, InstallRunning, InstallUnit diff --git a/tests/test_install_worker_holds.py b/tests/test_install_worker_holds.py index 25c7df4de4..714a05f2b4 100644 --- a/tests/test_install_worker_holds.py +++ b/tests/test_install_worker_holds.py @@ -8,7 +8,7 @@ from agent_comms.cli_verbs.start import StartCliCommand from agent_comms.cli_verbs.stop import StopCliCommand -from agent_comms.field_codec import ClaimId, FieldCodec +from agent_comms.nominal.field_codec import ClaimId, FieldCodec from agent_comms.installer.commands import InstallCommands from agent_comms.installer.interpreter_operation import ( ProbeReply, diff --git a/tests/test_installer_launcher_wire.py b/tests/test_installer_launcher_wire.py index 69b2a50efc..6373139256 100644 --- a/tests/test_installer_launcher_wire.py +++ b/tests/test_installer_launcher_wire.py @@ -5,7 +5,7 @@ from pathlib import Path from agent_comms.child_process import Platform -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.installer.interpreter_operation import ( GitPhase, InstallClock, diff --git a/tests/test_interrupted_delivery_recovery.py b/tests/test_interrupted_delivery_recovery.py index cba3de8aed..98a54c5251 100644 --- a/tests/test_interrupted_delivery_recovery.py +++ b/tests/test_interrupted_delivery_recovery.py @@ -11,7 +11,7 @@ from agent_comms.cohort_foreground import _accept_visible_deliveries from agent_comms.coordination_cohort import pending_sealed_assignments from agent_comms.coordinator import Coordination -from agent_comms.field_codec import InputId, TurnId +from agent_comms.nominal.field_codec import InputId, TurnId from agent_comms.input_attempt import NotSentInput from agent_comms.private_path import FileRevision from agent_comms.queued_input import DeliveredInput diff --git a/tests/test_json_flag_record.py b/tests/test_json_flag_record.py index 8a595637ce..774fff5d5d 100644 --- a/tests/test_json_flag_record.py +++ b/tests/test_json_flag_record.py @@ -6,7 +6,7 @@ import pytest from agent_comms.cli_options import JsonFlagRecord -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.native_settings import NativeThreadDefaults from agent_comms.thread_identity import RecordedThreadIncarnation from agent_comms.thread_model import DeclaredModel diff --git a/tests/test_json_shape_field_codec.py b/tests/test_json_shape_field_codec.py index 1071afd8fa..e49211ee33 100644 --- a/tests/test_json_shape_field_codec.py +++ b/tests/test_json_shape_field_codec.py @@ -6,8 +6,8 @@ import pytest -from agent_comms.declared_family import DeclaredFamily -from agent_comms.field_codec import ( +from agent_comms.nominal.declared_family import DeclaredFamily +from agent_comms.nominal.field_codec import ( Argument, FieldCodec, JsonShapeFamily, JsonShapeMember, MalformedRecord, SingleFieldValue, ) from agent_comms.launch_runtime import ImportPath, NoImportPath, SpecifiedImportPath diff --git a/tests/test_judge_dropped.py b/tests/test_judge_dropped.py index 9710cfafec..21e3a28c35 100644 --- a/tests/test_judge_dropped.py +++ b/tests/test_judge_dropped.py @@ -9,7 +9,7 @@ from agent_comms.commander.judge import Edit, main from agent_comms.errors import TodoError from agent_comms.external_transcript import ExternalTranscript -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( RecordProblems, ToolCallId, ) diff --git a/tests/test_judge_edit_ownership.py b/tests/test_judge_edit_ownership.py index ce80781616..f822305d4d 100644 --- a/tests/test_judge_edit_ownership.py +++ b/tests/test_judge_edit_ownership.py @@ -6,7 +6,7 @@ import pytest from agent_comms.errors import TodoError -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( GoalId, OrderId, ToolCallId, @@ -103,7 +103,7 @@ def test_an_edit_in_an_unknown_problems_checkout_joins_no_held_order(two_orders, def test_reading_a_stored_reason_never_flags_its_words(capsys): - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.todos import VerdictReason FieldCodec.decode(VerdictReason, "the store cutover happened before this verdict was written") diff --git a/tests/test_l0_goal_input_closure.py b/tests/test_l0_goal_input_closure.py index a07b786cc9..4cb5c4614f 100644 --- a/tests/test_l0_goal_input_closure.py +++ b/tests/test_l0_goal_input_closure.py @@ -11,7 +11,7 @@ from agent_comms.turn_failure import FailedTurnResolution from agent_comms.child_process import ProcessIdentity from agent_comms.comms import wire -from agent_comms.field_codec import FieldCodec, GoalId, InputId, TurnId +from agent_comms.nominal.field_codec import FieldCodec, GoalId, InputId, TurnId from agent_comms.goal_actions import ( GoalPrecondition, OwnerInvocable, diff --git a/tests/test_last_tool_call.py b/tests/test_last_tool_call.py index cd8cbc5ab4..300b9f6885 100644 --- a/tests/test_last_tool_call.py +++ b/tests/test_last_tool_call.py @@ -2,7 +2,7 @@ from agent_comms.external_transcript import ExternalEventRow, ExternalTranscript -from agent_comms.field_codec import ToolCallId +from agent_comms.nominal.field_codec import ToolCallId from agent_comms.recorded_time import RecordedEventTime, UnrecordedEventTime from agent_comms.thread_identity import RecordedThreadIncarnation from agent_comms.transcript_events import AssistantTranscript, ToolStartTranscript diff --git a/tests/test_ledger_attempt.py b/tests/test_ledger_attempt.py index 3cab2e252e..9834b46750 100644 --- a/tests/test_ledger_attempt.py +++ b/tests/test_ledger_attempt.py @@ -13,7 +13,7 @@ from agent_comms.attempt_resolution import GoalCleared from agent_comms.errors import StaleAttemptError -from agent_comms.field_codec import AttemptId, GoalId, NoAttemptId +from agent_comms.nominal.field_codec import AttemptId, GoalId, NoAttemptId from agent_comms.goal_attempt_identity import GoalAttemptIdentity from agent_comms.goal_attempt_phase import ReservedAttempt, ResolvedAttempt from agent_comms.goal_attempts import ( diff --git a/tests/test_live_drain_failure.py b/tests/test_live_drain_failure.py index d7a54c3783..0d9ce4b393 100644 --- a/tests/test_live_drain_failure.py +++ b/tests/test_live_drain_failure.py @@ -17,7 +17,7 @@ from agent_comms.comms import wire from agent_comms.coordinator import Coordination from agent_comms.drain_failures import drain_failures -from agent_comms.field_codec import TurnId +from agent_comms.nominal.field_codec import TurnId from test_acp_private_nk_delivery import _session from test_coordinated_runtime import tmp_path as private_root_fixture diff --git a/tests/test_maintenance_barrier.py b/tests/test_maintenance_barrier.py index 09031bc56a..b756909366 100644 --- a/tests/test_maintenance_barrier.py +++ b/tests/test_maintenance_barrier.py @@ -15,7 +15,7 @@ from agent_comms.child_process import ProcessIdentity from agent_comms.comms import wire from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import FieldCodec, TurnId +from agent_comms.nominal.field_codec import FieldCodec, TurnId from agent_comms.maintenance_barrier import ( HOLDER_NONCE, DrainingPhase, @@ -479,7 +479,7 @@ def test_the_goal_ledger_refuses_other_writers_once_the_drained_hold_is_retarget """Install 11 rolled back on "Carries changed files no step names: goal_attempts.sqlite3": the ledger committed for a non-holder after the install captured the bus. Draining owners still settle their turns in it; once retargeted, only the holder commits.""" - from agent_comms.field_codec import GoalId + from agent_comms.nominal.field_codec import GoalId from agent_comms.launch_runtime import LaunchRuntime from agent_comms.maintenance_barrier import HOLDER_NONCE diff --git a/tests/test_maintenance_holder.py b/tests/test_maintenance_holder.py index 1c8953d2f1..6bac2fc630 100644 --- a/tests/test_maintenance_holder.py +++ b/tests/test_maintenance_holder.py @@ -12,7 +12,7 @@ import pytest -from agent_comms.field_codec import FieldCodec, MalformedRecord +from agent_comms.nominal.field_codec import FieldCodec, MalformedRecord from agent_comms.maintenance_barrier import ( DeadHolderReleasedPhase, DrainingPhase, diff --git a/tests/test_mcp_acceptance.py b/tests/test_mcp_acceptance.py index b88ecee794..2e0b0bd4c1 100644 --- a/tests/test_mcp_acceptance.py +++ b/tests/test_mcp_acceptance.py @@ -36,7 +36,7 @@ from agent_comms.child_process import SpawnedProcess from agent_comms.comms import wire from agent_comms.coordinator import Coordination -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.native_arguments import GivenArguments, GivenBinary from agent_comms.runtime import RuntimeProxy from agent_comms.thread_identity import NoObservedTurn, TurnFence diff --git a/tests/test_mcp_relay.py b/tests/test_mcp_relay.py index 618b4fbe8f..5e459e4fbb 100644 --- a/tests/test_mcp_relay.py +++ b/tests/test_mcp_relay.py @@ -6,7 +6,7 @@ import pytest -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.pi_payloads import McpLiveAcknowledgement from agent_comms.owner_protocol import OwnerLine, OwnerPermissionRequest from agent_comms.runtime import SocketClient diff --git a/tests/test_message_categories.py b/tests/test_message_categories.py index 2eba3490e1..e5773c447b 100644 --- a/tests/test_message_categories.py +++ b/tests/test_message_categories.py @@ -5,7 +5,7 @@ import pytest from agent_comms.bus_publication import Delivered -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.messages import Message, MessageRole, InfoKind, ConversationRole, NoticeRole, HistoricalConversationRole, HistoricalNoticeRole, MembershipConversationRole, MembershipNoticeRole, JoinedMembership from agent_comms.thread_identity import AgentThreadRole, UserThreadRole from agent_comms.transcript_events import IncomingTranscript diff --git a/tests/test_message_notifications.py b/tests/test_message_notifications.py index 23d86badf8..5d8a0fd133 100644 --- a/tests/test_message_notifications.py +++ b/tests/test_message_notifications.py @@ -4,7 +4,7 @@ from dataclasses import replace from test_coordinated_runtime import _root, tmp_path # noqa: F401 from conftest import installed_comms -from agent_comms.field_codec import TurnId +from agent_comms.nominal.field_codec import TurnId from agent_comms.threads import Thread diff --git a/tests/test_message_text_size.py b/tests/test_message_text_size.py index 4c181f5656..588e50af85 100644 --- a/tests/test_message_text_size.py +++ b/tests/test_message_text_size.py @@ -4,7 +4,7 @@ import pytest -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.messages import InfoKind, Message diff --git a/tests/test_model_one_answer.py b/tests/test_model_one_answer.py index 212b514d36..c135d32b54 100644 --- a/tests/test_model_one_answer.py +++ b/tests/test_model_one_answer.py @@ -17,7 +17,7 @@ (None, ()), ]) def test_saved_models_and_requests_share_catalog_arguments_without_changing_wire(wire, arguments): - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.native_arguments import NativeArguments from agent_comms.thread_model import ThreadModel from agent_comms.threads import ModelChoice @@ -30,7 +30,7 @@ def test_saved_models_and_requests_share_catalog_arguments_without_changing_wire def test_keep_request_preserves_the_existing_model_and_chosen_request_replaces_it(tmp_path): - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.threads import ModelChoice, Thread thread = Thread('worker', frozenset(), Checkout(tmp_path), model=DeclaredModel('test/one')) diff --git a/tests/test_monitor_delivery.py b/tests/test_monitor_delivery.py index 12518c2c05..310a366831 100644 --- a/tests/test_monitor_delivery.py +++ b/tests/test_monitor_delivery.py @@ -48,7 +48,7 @@ from agent_comms.coordination_errors import CoordinationReadUnavailable from agent_comms.coordination_tables.harness_deliveries import HarnessDelivery, HarnessObservedPart from agent_comms.coordinator import Coordination -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.message_reference import BridgeStart, MessageReference from agent_comms.runtime_updates import HiddenItem from agent_comms.turn_item import NativeTurnId diff --git a/tests/test_native_context_reference.py b/tests/test_native_context_reference.py index a45e53ac0d..29768f618f 100644 --- a/tests/test_native_context_reference.py +++ b/tests/test_native_context_reference.py @@ -20,7 +20,7 @@ RecordedCursor, UnstartedCursor, ) -from agent_comms.field_codec import FieldCodec, InputId, MessageId, RootId, ThreadLookup +from agent_comms.nominal.field_codec import FieldCodec, InputId, MessageId, RootId, ThreadLookup from agent_comms.historical_native_inputs import ( FullHistoricalNativeInput, TriageHistoricalNativeInput, diff --git a/tests/test_native_drain_readiness.py b/tests/test_native_drain_readiness.py index d9037b895f..77d8f750b4 100644 --- a/tests/test_native_drain_readiness.py +++ b/tests/test_native_drain_readiness.py @@ -9,7 +9,7 @@ StoppedDrainDiagnostic, UnavailableDrainDiagnostic, UnavailableDrainReadiness, ) from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.thread_identity import OwnerIdentity from agent_comms.thread_identity import RecordedThreadIncarnation diff --git a/tests/test_native_failure_recovery.py b/tests/test_native_failure_recovery.py index 30386eccb9..722cf8ada2 100644 --- a/tests/test_native_failure_recovery.py +++ b/tests/test_native_failure_recovery.py @@ -16,7 +16,7 @@ from agent_comms.coordination_tables.executions import WireOrigin from agent_comms.coordinator import Coordination from agent_comms.cursor_publication import CursorDelivery -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.fresh_private_session import create_fresh_private_session from agent_comms.launch_runtime import ThreadLaunch from agent_comms.native_runtime_input import NativeRuntimeInput diff --git a/tests/test_native_input_bus_path.py b/tests/test_native_input_bus_path.py index d6c39b0356..d681813df5 100644 --- a/tests/test_native_input_bus_path.py +++ b/tests/test_native_input_bus_path.py @@ -14,7 +14,7 @@ from agent_comms.agent_backend import ClearQueue, InputContent, InputRequest, SteerInputPolicy, TurnInbox from agent_comms.backend import NativeSession from agent_comms.child_process import Platform -from agent_comms.field_codec import InputId +from agent_comms.nominal.field_codec import InputId from agent_comms.locked_store import RegistryFile from agent_comms.store_files import RegistryLocking from agent_comms.native_package import VerifiedNativePackage diff --git a/tests/test_native_output_commit.py b/tests/test_native_output_commit.py index 718ce938ab..1aeccb5a12 100644 --- a/tests/test_native_output_commit.py +++ b/tests/test_native_output_commit.py @@ -12,7 +12,7 @@ NativeRoundCommittedUpdate, ) from agent_comms.coordination_errors import TranscriptChanged -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( FieldCodec, ToolCallId, ) diff --git a/tests/test_native_pi.py b/tests/test_native_pi.py index 4b735a4679..079a63744f 100644 --- a/tests/test_native_pi.py +++ b/tests/test_native_pi.py @@ -11,8 +11,8 @@ import pytest from agent_comms.coordination_errors import IdentityConflict -from agent_comms.declared_family import DeclaredFamily -from agent_comms.field_codec import FieldCodec, InputId +from agent_comms.nominal.declared_family import DeclaredFamily +from agent_comms.nominal.field_codec import FieldCodec, InputId from agent_comms.native_arguments import SelectedModel from agent_comms.native_entries import NativeEntry from agent_comms.native_failures import NativePiUnavailable diff --git a/tests/test_native_request_progress.py b/tests/test_native_request_progress.py index 51007ef7ee..e43c9003b0 100644 --- a/tests/test_native_request_progress.py +++ b/tests/test_native_request_progress.py @@ -4,7 +4,7 @@ import subprocess from pathlib import Path -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.request_progress import ( IteratorStreamId, IteratorTiming, RequestProgress, UnreportedIteratorTiming, ) diff --git a/tests/test_native_send_admission.py b/tests/test_native_send_admission.py index 1425beabce..a0f418060b 100644 --- a/tests/test_native_send_admission.py +++ b/tests/test_native_send_admission.py @@ -28,7 +28,7 @@ from agent_comms.comms import Comms from agent_comms.coordination_database import CoordinationStore from agent_comms.coordinator import Coordination -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.diagnostics import PublicationMeasurements from agent_comms.locked_store import RegistryFile from agent_comms.errors import RelationViolationError diff --git a/tests/test_native_tool_declarations.py b/tests/test_native_tool_declarations.py index 065fc4d139..ad5d565574 100644 --- a/tests/test_native_tool_declarations.py +++ b/tests/test_native_tool_declarations.py @@ -13,7 +13,7 @@ from agent_comms.acp import SdkSessionConnection from agent_comms.agent_event_updates import AcpEventConsumer from agent_comms.comms import wire -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( FieldCodec, ToolCallId, ) @@ -111,7 +111,7 @@ def test_recorded_metadata_does_not_require_an_executable_request(name, label, k assert (start.title, start.kind, start.raw_input) == (label, kind, foreign) assert (end.title, end.kind) == (label, kind) assert events.ToolStart.from_call("saved", name, foreign).title == label - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec for invalid in (17, None, [["path", "external.txt"]]): with pytest.raises((TypeError, ValueError)): FieldCodec.decode(ToolStartTranscript, {**FieldCodec.encode(start), "raw_input": invalid}) @@ -123,7 +123,7 @@ def test_recorded_metadata_does_not_require_an_executable_request(name, label, k def test_foreign_protocol_owners_decode_canonical_preview_arguments(): from agent_comms.cli_bridges.codex_protocol import FileChange, UpdatedFile from agent_comms.cli_bridges.opencode_parts import ToolPart - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.native_tools import FilePatchTool from agent_comms.tool_calls import ToolCall from agent_comms.transcript_events import TranscriptEvent @@ -176,7 +176,7 @@ def test_core_commands_share_native_identity_without_changing_external_decode(): assert call.call_id == "isolated-call" and call.arguments == arguments assert call.allowed_claim() is None assert call.digest() == f'{request.declared_name} {json.dumps(arguments)}' - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec assert isinstance(FieldCodec.decode(ToolRequest, {"tool": "comms_send", "to": "destination", "body": "decode-only"}), CommsSendTool) @@ -185,7 +185,7 @@ def test_core_commands_share_native_identity_without_changing_external_decode(): def test_native_call_fields_are_not_model_arguments(): - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.native_tool_call import CodingCall from agent_comms.tool_denial import SelectedToolDenied diff --git a/tests/test_native_transcript.py b/tests/test_native_transcript.py index 6a62babb47..78fa6d17f4 100644 --- a/tests/test_native_transcript.py +++ b/tests/test_native_transcript.py @@ -5,7 +5,7 @@ import pytest -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( FieldCodec, MalformedRecord, ToolCallId, diff --git a/tests/test_native_unknown_recovery.py b/tests/test_native_unknown_recovery.py index a2f5753e3f..373226baa1 100644 --- a/tests/test_native_unknown_recovery.py +++ b/tests/test_native_unknown_recovery.py @@ -3,7 +3,7 @@ from __future__ import annotations -from agent_comms.field_codec import InputId, TurnId +from agent_comms.nominal.field_codec import InputId, TurnId from agent_comms.lifecycle_capability import Failed import asyncio import multiprocessing diff --git a/tests/test_observer_death.py b/tests/test_observer_death.py index 78379f87c3..bc1cbd4def 100644 --- a/tests/test_observer_death.py +++ b/tests/test_observer_death.py @@ -11,7 +11,7 @@ from agent_comms.active_route import LocalRoute from agent_comms.coordination_errors import StaleRevision from agent_comms.errors import RelationViolationError, UnregisteredThreadError -from agent_comms.field_codec import MessageId +from agent_comms.nominal.field_codec import MessageId from agent_comms.thread_identity import RecordedThreadIncarnation from agent_comms.owner_connection import OwnerIdentityChangedError from agent_comms.message_reference import MessageReference diff --git a/tests/test_operations.py b/tests/test_operations.py index f3a5b3b3d9..df08d79e73 100644 --- a/tests/test_operations.py +++ b/tests/test_operations.py @@ -19,7 +19,7 @@ from agent_comms.agent_events import AgentInfo, ContextUsageObservation from agent_comms.child_process import ProcessIdentity from agent_comms.comms import Comms, wire -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.errors import RelationViolationError, UnregisteredThreadError from agent_comms.history_views import CallingThreadTarget, NamedThreadTarget from agent_comms.launch_runtime import CallingThreadUnavailable, ThreadLaunch diff --git a/tests/test_optional_awareness_projection.py b/tests/test_optional_awareness_projection.py index ba78e1c977..7a7aa41cda 100644 --- a/tests/test_optional_awareness_projection.py +++ b/tests/test_optional_awareness_projection.py @@ -6,7 +6,7 @@ from agent_comms.repo import Checkout from bus_record_fixture import prepare_native_comms -from agent_comms.field_codec import FieldCodec, MessageId, TurnId +from agent_comms.nominal.field_codec import FieldCodec, MessageId, TurnId from agent_comms.lifecycle_capability import Executing from conftest import publish_initial, without_mutation_guards diff --git a/tests/test_order_check_writes.py b/tests/test_order_check_writes.py index cddb114c5e..b8d63129ae 100644 --- a/tests/test_order_check_writes.py +++ b/tests/test_order_check_writes.py @@ -5,7 +5,7 @@ import pytest from agent_comms.commander.order import CheckRequest -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.goals import CountCheckResult, OrderCheck from agent_comms.shell_commands import ShellCommand from agent_comms.work_branches import WorkBranches diff --git a/tests/test_order_claims.py b/tests/test_order_claims.py index 93be66f41a..fbbf27be0b 100644 --- a/tests/test_order_claims.py +++ b/tests/test_order_claims.py @@ -14,7 +14,7 @@ from agent_comms.commander.standing import DeliveryAwaitingJudgement, Scrutinize from agent_comms.standing_rules import OwedAnswer from agent_comms.errors import TodoConflict, TodoError, ToolRefusedError -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( FieldCodec, GoalId, OrderId, diff --git a/tests/test_order_completion.py b/tests/test_order_completion.py index bf59c061fb..fd289aad55 100644 --- a/tests/test_order_completion.py +++ b/tests/test_order_completion.py @@ -11,7 +11,7 @@ from agent_comms.commander.order import Commander, main from agent_comms.commander.standing import HolderGone from agent_comms.goals import CountCheckResult, OrderCheck -from agent_comms.field_codec import RecordProblems +from agent_comms.nominal.field_codec import RecordProblems from agent_comms.repo import Checkout, DetachedStart from agent_comms.installer.runtime_resolution import CorePackage, RuntimeResolution from agent_comms.launch_runtime import LaunchRuntime diff --git a/tests/test_order_file.py b/tests/test_order_file.py index a80c166ed7..fa3852f2af 100644 --- a/tests/test_order_file.py +++ b/tests/test_order_file.py @@ -9,7 +9,7 @@ from agent_comms.commander.order import OrderFile, forwarders_added, main, overrides from agent_comms.commander.request import RequestAddVerb -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.goals import OrderCheck from agent_comms.recorded_time import RecordedEventTime from agent_comms.repo import Repo diff --git a/tests/test_order_scopes.py b/tests/test_order_scopes.py index a2be344d16..a272060739 100644 --- a/tests/test_order_scopes.py +++ b/tests/test_order_scopes.py @@ -13,7 +13,7 @@ from agent_comms.check_root import CheckRoot from agent_comms.commander.order import OrderFile from cli_command import core -from agent_comms.field_codec import FieldCodec, MalformedRecord +from agent_comms.nominal.field_codec import FieldCodec, MalformedRecord from agent_comms.goal_actions import CreateProblemGoalAction from agent_comms.held_orders import HeldOrders from agent_comms.recorded_time import RecordedEventTime diff --git a/tests/test_order_story.py b/tests/test_order_story.py index 7d29cae6ad..9d17ee600d 100644 --- a/tests/test_order_story.py +++ b/tests/test_order_story.py @@ -10,7 +10,7 @@ from agent_comms.change_report import FileLine from agent_comms.comms import wire from agent_comms.errors import MissingSourceLine, TodoError -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( FieldCodec, MessageId, OrderId, diff --git a/tests/test_outbound_transcript_source.py b/tests/test_outbound_transcript_source.py index 83dec2c377..68a87772fc 100644 --- a/tests/test_outbound_transcript_source.py +++ b/tests/test_outbound_transcript_source.py @@ -140,7 +140,7 @@ def test_notification_window_preserves_exact_receipts_and_rejects_duplicates(tmp def test_publication_intent_joins_original_sender_and_target_only(tmp_path): # noqa: F811 - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.routing import MessageRoute, TurnRouting from agent_comms.transcript_sources import AssignedTranscriptSource diff --git a/tests/test_owned_turn_goal_replacement.py b/tests/test_owned_turn_goal_replacement.py index d23cddc259..443da2eeda 100644 --- a/tests/test_owned_turn_goal_replacement.py +++ b/tests/test_owned_turn_goal_replacement.py @@ -13,7 +13,7 @@ from agent_comms.agent_backend import InputContent from agent_comms.channel_input_batch import InputBatch from agent_comms.child_process import ProcessIdentity -from agent_comms.field_codec import InputId, OrderId, TurnId +from agent_comms.nominal.field_codec import InputId, OrderId, TurnId from agent_comms.goal_actions import ( BlockedGoalAction, CreateProblemGoalAction, diff --git a/tests/test_owner_process.py b/tests/test_owner_process.py index 8178255ce3..f3629eaf6a 100644 --- a/tests/test_owner_process.py +++ b/tests/test_owner_process.py @@ -24,7 +24,7 @@ from agent_comms.config_options import ThinkingLevelConfigOption from agent_comms.coordinator import Coordination from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import GoalId, TurnId, compile_decoder +from agent_comms.nominal.field_codec import GoalId, TurnId, compile_decoder from agent_comms.launch_root import LaunchRoot from agent_comms.launch_runtime import LaunchRuntime from agent_comms.native_arguments import GivenArguments, GivenBinary @@ -123,7 +123,7 @@ async def test_fleet_memory_stays_under_its_cap(tmp_path, native_workers, owner_ from delivery_owner_fixture import FakeClient from agent_comms.tools import CommsResourcesTool from agent_comms.tool_caller import NoThreadCaller - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.child_process import Platform, ProportionalMemory, ResidentMemory import json diff --git a/tests/test_owner_release_restart.py b/tests/test_owner_release_restart.py index c583a4ff5e..6e6927e338 100644 --- a/tests/test_owner_release_restart.py +++ b/tests/test_owner_release_restart.py @@ -35,7 +35,7 @@ async def test_installed_idle_worker_retains_state_across_runtime_restart(tmp_pa from contextlib import AsyncExitStack from agent_comms.child_process import BoundedRun from agent_comms.input_disposition import InputDispositions - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.owner_launch import RetainedOwnerLaunch from agent_comms.launch_runtime import RestartEnvironment from native_backend_fixture import native_backend_fixture @@ -77,7 +77,7 @@ async def retire_owned_worker(): from agent_comms.session_file import RegistrySessionLocation from agent_comms.thread_model import DeclaredModel from agent_comms.goal_actions import SetGoalAction, BlockedGoalAction -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.launch_runtime import RestartEnvironment service = wire(Path(os.environ['AGENT_COMMS_ROOT'])) name, project, session = sys.argv[1:4] diff --git a/tests/test_owner_requests.py b/tests/test_owner_requests.py index aaab8aac4b..e47affec7b 100644 --- a/tests/test_owner_requests.py +++ b/tests/test_owner_requests.py @@ -6,7 +6,7 @@ import pytest -from agent_comms.field_codec import GoalId +from agent_comms.nominal.field_codec import GoalId from agent_comms.change_report import FileLine, MainRevision from agent_comms.commander.order import Commander from agent_comms.commander.request import main as request_main diff --git a/tests/test_owner_restart_handoff.py b/tests/test_owner_restart_handoff.py index c5670c385b..8c6ffda5ce 100644 --- a/tests/test_owner_restart_handoff.py +++ b/tests/test_owner_restart_handoff.py @@ -13,7 +13,7 @@ from agent_comms.child_process import ProcessIdentity from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.owner_launch import RetainedOwnerLaunch from agent_comms.launch_runtime import LaunchRuntime, RestartEnvironment, SetVariable, UnsetVariable from agent_comms.owner_lifecycle import OwnerRestartSelection, ProcessExitedOwnerCompletion diff --git a/tests/test_package_imports.py b/tests/test_package_imports.py index adb07d0bf2..8001f2ec8a 100644 --- a/tests/test_package_imports.py +++ b/tests/test_package_imports.py @@ -42,7 +42,7 @@ def test_saved_tool_record_acquires_its_family_without_package_bootstrap(): import sys sys.path.insert(0, {str(source)!r}) from dataclasses import dataclass -from agent_comms.field_codec import FieldCodec, GoalId +from agent_comms.nominal.field_codec import FieldCodec, GoalId goal_id = GoalId.mint() from agent_comms.tool_declaration import ToolDeclaration assert 'agent_comms.tools' not in sys.modules diff --git a/tests/test_page_cursor.py b/tests/test_page_cursor.py index c12e7aaa9f..6ef9331277 100644 --- a/tests/test_page_cursor.py +++ b/tests/test_page_cursor.py @@ -5,7 +5,7 @@ from agent_comms.cli import build_parser from agent_comms.cli_command import CliCommand -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.page_traversal import ( HistoryCursor, LiveCursor, diff --git a/tests/test_pi_payloads.py b/tests/test_pi_payloads.py index 2aec06eb6a..63a2a898a2 100644 --- a/tests/test_pi_payloads.py +++ b/tests/test_pi_payloads.py @@ -6,7 +6,7 @@ import pytest -from agent_comms.field_codec import FieldCodec, InputId, MalformedRecord +from agent_comms.nominal.field_codec import FieldCodec, InputId, MalformedRecord from agent_comms.tool_results import NoToolDiff from agent_comms.pi_commands import GetState, PiCommand, Prompt from agent_comms.pi_counts import PiCount, ReportedCount, UnreportedCount @@ -56,8 +56,8 @@ def test_idle_proof_requires_reported_native_state(state): def test_single_external_member_is_derived_and_requires_one_provided_case(): - from agent_comms.declared_family import DeclaredFamily - from agent_comms.field_codec import ExternalNullMember, SingleExternalMember + from agent_comms.nominal.declared_family import DeclaredFamily + from agent_comms.nominal.field_codec import ExternalNullMember, SingleExternalMember from agent_comms.pi_payloads import PiPayload class Choice(SingleExternalMember, PiPayload, DeclaredFamily, affix="Choice"): diff --git a/tests/test_pi_rpc_nominal.py b/tests/test_pi_rpc_nominal.py index a75a9299d9..02dfbaa21e 100644 --- a/tests/test_pi_rpc_nominal.py +++ b/tests/test_pi_rpc_nominal.py @@ -11,7 +11,7 @@ import agent_comms.pi_commands as commands import agent_comms.pi_events as pi import agent_comms.turn_failure as failures -from agent_comms.field_codec import FieldCodec, InputId, MalformedRecord +from agent_comms.nominal.field_codec import FieldCodec, InputId, MalformedRecord from agent_comms.native_session_prepare import NativeSessionPreparation from agent_comms.native_tool_call import OwnerToolConnection from agent_comms.pi_payloads import AnonymousRequest, ReportedText, RequestId diff --git a/tests/test_preflight_feedback.py b/tests/test_preflight_feedback.py index 9353cc1976..01f67ec7c8 100644 --- a/tests/test_preflight_feedback.py +++ b/tests/test_preflight_feedback.py @@ -2,7 +2,7 @@ import pytest from agent_comms.input_key import AcpInputKey -from agent_comms.field_codec import InputId, TurnId +from agent_comms.nominal.field_codec import InputId, TurnId from agent_comms.input_attempt import MissingInput, NotSentInput, ReservedInput from agent_comms.input_disposition import InputDocument from agent_comms.turn_failure import ( diff --git a/tests/test_private_human_ingress.py b/tests/test_private_human_ingress.py index 47c9363b74..c9561b47b0 100644 --- a/tests/test_private_human_ingress.py +++ b/tests/test_private_human_ingress.py @@ -26,7 +26,7 @@ RelationViolationError, UnregisteredThreadError, ) -from agent_comms.field_codec import PathText +from agent_comms.nominal.field_codec import PathText from agent_comms.launch_root import LaunchRoot from agent_comms.message_reference import MessageReference from agent_comms.messages import InfoKind, Message @@ -219,7 +219,7 @@ def test_cooperating_process_objects_serialize_distinct_user_inputs(tmp_path: Pa def test_separate_processes_serialize_one_private_user_identity(tmp_path: Path) -> None: comms, _, root_id, _ = _root(tmp_path) program = ( - "import sys\nfrom agent_comms.comms import wire\nfrom agent_comms.channel_targets import CommandTarget\nfrom agent_comms.field_codec import FieldCodec\nfrom agent_comms.repo import Checkout\nm = wire(sys.argv[1]).messaging.send_user_message(CommandTarget.named('#team'), sys.argv[2], worktree=FieldCodec.decode(Checkout, sys.argv[3]))\nprint(m.seq, m.message_id)" + "import sys\nfrom agent_comms.comms import wire\nfrom agent_comms.channel_targets import CommandTarget\nfrom agent_comms.nominal.field_codec import FieldCodec\nfrom agent_comms.repo import Checkout\nm = wire(sys.argv[1]).messaging.send_user_message(CommandTarget.named('#team'), sys.argv[2], worktree=FieldCodec.decode(Checkout, sys.argv[3]))\nprint(m.seq, m.message_id)" ) env = {**os.environ, "PYTHONPATH": str(Path(__file__).resolve().parents[1] / "src")} processes = [ diff --git a/tests/test_private_sidecar.py b/tests/test_private_sidecar.py index 957b689955..bb5bf939c7 100644 --- a/tests/test_private_sidecar.py +++ b/tests/test_private_sidecar.py @@ -12,7 +12,7 @@ import agent_comms.private_sidecar as sidecar from agent_comms.native_input_record import TriageNativeExecution, UnrecordedNativeColumn from agent_comms.coordination_errors import IdentityConflict -from agent_comms.field_codec import FieldCodec, InputId, RootId, ThreadLookup +from agent_comms.nominal.field_codec import FieldCodec, InputId, RootId, ThreadLookup from agent_comms.native_prompt_binding import PromptBinding, PromptBindings from agent_comms.maintenance_barrier import MaintenanceNotHeldError from agent_comms.typed_table import ReconciledFile @@ -248,7 +248,7 @@ def test_mode_drift_and_connection_attachment_are_not_admitted(path): import agent_comms.private_sidecar as s from agent_comms.native_input_record import TriageNativeExecution, UnrecordedNativeColumn from agent_comms.native_prompt_binding import PromptBinding, PromptBindings -from agent_comms.field_codec import FieldCodec, InputId, RootId, ThreadLookup +from agent_comms.nominal.field_codec import FieldCodec, InputId, RootId, ThreadLookup p = Path(sys.argv[1]) print('READY', flush=True) assert sys.stdin.readline() == 'GO\n' diff --git a/tests/test_process_state.py b/tests/test_process_state.py index c77564536d..7bd2f86802 100644 --- a/tests/test_process_state.py +++ b/tests/test_process_state.py @@ -8,7 +8,7 @@ from agent_comms.child_process import NoProcess, ProcessIdentity, ProcessState from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.owner_lifecycle import OwnerReleaseEvidence diff --git a/tests/test_project_resume.py b/tests/test_project_resume.py index 3c39ab862c..fce3df22b2 100644 --- a/tests/test_project_resume.py +++ b/tests/test_project_resume.py @@ -13,7 +13,7 @@ from agent_comms.child_process import ProcessIdentity from agent_comms.comms import wire from agent_comms.coordinator import Coordination -from agent_comms.field_codec import FieldCodec, TurnId +from agent_comms.nominal.field_codec import FieldCodec, TurnId from agent_comms.messages import Message, InfoKind from agent_comms.turn_phase import CancellingPhase from native_backend_fixture import native_backend_fixture diff --git a/tests/test_prompt_response.py b/tests/test_prompt_response.py index e370ec3657..83f98c9617 100644 --- a/tests/test_prompt_response.py +++ b/tests/test_prompt_response.py @@ -6,7 +6,7 @@ import pytest from agent_comms.agent_backend import FollowUpInputPolicy, InputContent, InputRequest -from agent_comms.field_codec import FieldCodec, InputId +from agent_comms.nominal.field_codec import FieldCodec, InputId from agent_comms.image_input import ImageInput from agent_comms.native_tool_call import OwnerToolConnection from agent_comms.pi_commands import ClearQueue, FollowingPrompt, GetSessionStats, GetState, PiCommand, Prompt, SettingCommand diff --git a/tests/test_proof_build.py b/tests/test_proof_build.py index 023789d968..da44b477ee 100644 --- a/tests/test_proof_build.py +++ b/tests/test_proof_build.py @@ -20,7 +20,7 @@ from agent_comms.commander.order import Commander from agent_comms.commander.standing import InstallDue from agent_comms.comms import wire -from agent_comms.field_codec import FieldCodec, GoalId +from agent_comms.nominal.field_codec import FieldCodec, GoalId from agent_comms.goal_actions import CreateProblemGoalAction from agent_comms.goals import CountCheckResult, OrderCheck from agent_comms.installer.probes.packages import ArchiveRecord, CommitRecord, GitRecord, PackageRecord diff --git a/tests/test_publication_rules.py b/tests/test_publication_rules.py index 147991594a..03a7e84dfa 100644 --- a/tests/test_publication_rules.py +++ b/tests/test_publication_rules.py @@ -11,7 +11,7 @@ from agent_comms.commander.publication_rules import ( ClosedPullRequestScanPending, ClosedUnmergedPullRequest, ) -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.head_review import PullRequestHead from agent_comms.heartbeat_frame import HeartbeatFrame from agent_comms.heartbeat_subjects import CommanderHistory diff --git a/tests/test_publication_snapshot_identity.py b/tests/test_publication_snapshot_identity.py index c30ded1e55..7b7ddf9f64 100644 --- a/tests/test_publication_snapshot_identity.py +++ b/tests/test_publication_snapshot_identity.py @@ -3,7 +3,7 @@ from dataclasses import dataclass, replace from typing import Annotated -from agent_comms import field_codec +from agent_comms.nominal import field_codec from agent_comms.mentions import ThreadMention from agent_comms.messages import InfoKind, Message, MessageKind from agent_comms.thread_identity import UserThreadRole diff --git a/tests/test_read_ledger.py b/tests/test_read_ledger.py index 2962856e2f..9ac48b0f8c 100644 --- a/tests/test_read_ledger.py +++ b/tests/test_read_ledger.py @@ -11,7 +11,7 @@ from agent_comms.child_process import ProcessIdentity from agent_comms.comms import wire from agent_comms.coordination_errors import DMPaintedBoundChanged, StaleRevision -from agent_comms.field_codec import FieldCodec, TurnId +from agent_comms.nominal.field_codec import FieldCodec, TurnId from agent_comms.message_page import MessagePageRequest, PageBounds from agent_comms.page_traversal import PageCursor from agent_comms.presentation import ReadThrough diff --git a/tests/test_reconcile_stores.py b/tests/test_reconcile_stores.py index f00650963d..a7bab55607 100644 --- a/tests/test_reconcile_stores.py +++ b/tests/test_reconcile_stores.py @@ -31,7 +31,7 @@ from agent_comms.cli_bridges.shared import BridgeDeliveryStore, BridgeStateTable from agent_comms.coordination_database import CoordinationStore from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import ClaimId, FieldCodec, MessageId +from agent_comms.nominal.field_codec import ClaimId, FieldCodec, MessageId from agent_comms.goal_attempts import GoalAttemptStore from agent_comms.goal_failure_observation import FailedTurnEvidence from agent_comms.coordination_session import CoordinationSession diff --git a/tests/test_registration_authority.py b/tests/test_registration_authority.py index e93197bd3d..842e3bd153 100644 --- a/tests/test_registration_authority.py +++ b/tests/test_registration_authority.py @@ -13,7 +13,7 @@ from test_locked_store import RegistryWithConcurrentDecoder, _hold_lock, event, process from agent_comms.comms import wire from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import TurnId, GoalId +from agent_comms.nominal.field_codec import TurnId, GoalId from agent_comms.goals import Goal from agent_comms.store_files import SharedLock, store_lock_path from agent_comms.thread_identity import UserThreadRole diff --git a/tests/test_registration_components.py b/tests/test_registration_components.py index 507d11b937..e445619ec1 100644 --- a/tests/test_registration_components.py +++ b/tests/test_registration_components.py @@ -12,7 +12,7 @@ from agent_comms.child_process import ProcessIdentity from agent_comms.errors import RelationViolationError, UnregisteredThreadError -from agent_comms.field_codec import FieldCodec, TurnId +from agent_comms.nominal.field_codec import FieldCodec, TurnId from agent_comms.locked_store import DocumentChange, LockedStore from agent_comms.registration import Registration from agent_comms.routing import NoTurnRouting diff --git a/tests/test_registration_inheritance.py b/tests/test_registration_inheritance.py index 214f77b7b2..d7b8cf3a16 100644 --- a/tests/test_registration_inheritance.py +++ b/tests/test_registration_inheritance.py @@ -5,9 +5,9 @@ from typing import Annotated from dataclasses import dataclass, replace -from agent_comms.field_codec import TurnId +from agent_comms.nominal.field_codec import TurnId from agent_comms.session_file import RegistrySessionLocation -from agent_comms import field_codec +from agent_comms.nominal import field_codec from agent_comms.comms import wire from agent_comms.pi_vocabulary import HighThinkingLevel from agent_comms.registration_inheritance import PredicateInheritance diff --git a/tests/test_registration_process_identity.py b/tests/test_registration_process_identity.py index 180360d1e7..8a9ef56eac 100644 --- a/tests/test_registration_process_identity.py +++ b/tests/test_registration_process_identity.py @@ -9,7 +9,7 @@ from agent_comms.child_process import NoProcess, ProcessIdentity, SpawnedProcess from agent_comms.comms import wire from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import TurnId +from agent_comms.nominal.field_codec import TurnId from agent_comms.registry_document import RegistryDocument from agent_comms.runtime_requests import ProjectRuntimeRequest from agent_comms.thread_execution import ExternalThreadExecution diff --git a/tests/test_registration_transitions.py b/tests/test_registration_transitions.py index 40b31c03e2..4cb17b3a7b 100644 --- a/tests/test_registration_transitions.py +++ b/tests/test_registration_transitions.py @@ -6,7 +6,7 @@ import pytest -from agent_comms.field_codec import TurnId +from agent_comms.nominal.field_codec import TurnId from agent_comms.session_file import RegistrySessionLocation from agent_comms.child_process import ProcessIdentity from agent_comms.errors import RelationViolationError diff --git a/tests/test_registry_current_format.py b/tests/test_registry_current_format.py index d28b224242..f142425daa 100644 --- a/tests/test_registry_current_format.py +++ b/tests/test_registry_current_format.py @@ -10,7 +10,7 @@ import pytest from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import FieldCodec, GoalId +from agent_comms.nominal.field_codec import FieldCodec, GoalId from agent_comms.goal_states import BlockedGoal, GoalState from agent_comms.goals import Goal from agent_comms.registration import Registration diff --git a/tests/test_registry_revision.py b/tests/test_registry_revision.py index 49b28073d0..f5823f450b 100644 --- a/tests/test_registry_revision.py +++ b/tests/test_registry_revision.py @@ -5,7 +5,7 @@ import pytest -from agent_comms.field_codec import MalformedRecord +from agent_comms.nominal.field_codec import MalformedRecord from agent_comms.registration import Registration from agent_comms.store_files import AtomicFile from agent_comms.thread_status import StoppedThreadStatus @@ -36,7 +36,7 @@ def test_dependent_selection_refuses_changed_authority_without_repeating_its_eff def test_missing_registry_version_is_rejected_without_rewriting_the_file(tmp_path): from agent_comms.errors import RelationViolationError - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.registry_document import RegistryDocument path = tmp_path / "registry.json" diff --git a/tests/test_relationships.py b/tests/test_relationships.py index 05b967883b..5ed308d39f 100644 --- a/tests/test_relationships.py +++ b/tests/test_relationships.py @@ -322,7 +322,7 @@ def test_retained_alias_contact_without_projected_person_is_unavailable(tmp_path def test_new_group_supplies_snapshot_choices_defaults_and_persistence(tmp_path): - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.relationships import ( InboundRelationshipGroup, RelationshipGroup, SortableRelationshipGroup, ) diff --git a/tests/test_repository_name.py b/tests/test_repository_name.py index ec8d91209e..78572a4cdc 100644 --- a/tests/test_repository_name.py +++ b/tests/test_repository_name.py @@ -2,7 +2,7 @@ import pytest -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.repository_name import RepositoryName diff --git a/tests/test_reservation_rules.py b/tests/test_reservation_rules.py index d5c198e37d..f917d433fc 100644 --- a/tests/test_reservation_rules.py +++ b/tests/test_reservation_rules.py @@ -5,7 +5,7 @@ import pytest from agent_comms.input_key import AcpInputKey -from agent_comms.field_codec import FieldCodec, InputId, TurnId +from agent_comms.nominal.field_codec import FieldCodec, InputId, TurnId from agent_comms.input_disposition import InputDispositions from agent_comms.native_session_files import NativeSessionFiles from agent_comms.native_session_reopen import NativeSessionIdentity diff --git a/tests/test_response_policy.py b/tests/test_response_policy.py index 7de96afcf5..8eba5d00a1 100644 --- a/tests/test_response_policy.py +++ b/tests/test_response_policy.py @@ -1,5 +1,5 @@ from agent_comms.repo import Checkout -from agent_comms.field_codec import GoalId +from agent_comms.nominal.field_codec import GoalId from agent_comms.messages import ConversationRole, Message, InfoKind from agent_comms.response_policy import ResponseEligibility, ResponsePolicy from agent_comms.routing import ScheduledTurn diff --git a/tests/test_restart.py b/tests/test_restart.py index bc04e8f893..4aabc287b3 100644 --- a/tests/test_restart.py +++ b/tests/test_restart.py @@ -7,7 +7,7 @@ from agent_comms.agent_events import AgentInfo, ContextUsageObservation from agent_comms.cli_verbs.queue_restart import QueueRestartCliCommand from agent_comms.comms import wire -from agent_comms.field_codec import FieldCodec, TurnId +from agent_comms.nominal.field_codec import FieldCodec, TurnId from agent_comms.restart_queue import PendingRestart, RestartedRestart from agent_comms.launch_root import LaunchRoot from agent_comms.pi_counts import PiCount diff --git a/tests/test_restart_queue.py b/tests/test_restart_queue.py index 36ceb3fe8a..c0f5c124dd 100644 --- a/tests/test_restart_queue.py +++ b/tests/test_restart_queue.py @@ -9,7 +9,7 @@ from agent_comms.repo import Checkout from agent_comms.threads import Thread from agent_comms.bus import Bus -from agent_comms.field_codec import FieldCodec, RestartId +from agent_comms.nominal.field_codec import FieldCodec, RestartId from agent_comms.watched import FileSource from restart_fixture import dead_owner_restart diff --git a/tests/test_retained_context_operations.py b/tests/test_retained_context_operations.py index b6baa7adb7..a5f046912b 100644 --- a/tests/test_retained_context_operations.py +++ b/tests/test_retained_context_operations.py @@ -15,7 +15,7 @@ from agent_comms.session_file import RegistrySessionLocation from agent_comms.cli import main from agent_comms.cli_commands import ConstraintPinnedResult -from agent_comms.field_codec import InputId, FieldCodec, GoalId +from agent_comms.nominal.field_codec import InputId, FieldCodec, GoalId from agent_comms.input_key import AcpInputKey from agent_comms.context_segments.retained import RetainedSegment from agent_comms.turn_lease import NoTurnLease diff --git a/tests/test_roster_restoration.py b/tests/test_roster_restoration.py index dcc9745fd1..d95eadd240 100644 --- a/tests/test_roster_restoration.py +++ b/tests/test_roster_restoration.py @@ -12,7 +12,7 @@ import pytest -from agent_comms.field_codec import TurnId +from agent_comms.nominal.field_codec import TurnId from agent_comms.assignment_states import FullPendingAssignment, TriagePendingAssignment from agent_comms.registry_document import ThreadRows diff --git a/tests/test_route_counts.py b/tests/test_route_counts.py index 93b3154e78..b527a70428 100644 --- a/tests/test_route_counts.py +++ b/tests/test_route_counts.py @@ -12,7 +12,7 @@ from agent_comms.audience_manifest import FrozenRecipient, freeze_audience from agent_comms.bus import Bus, PrivateRecord from agent_comms.comms import Comms -from agent_comms.field_codec import ThreadLookup +from agent_comms.nominal.field_codec import ThreadLookup from agent_comms.messages import InfoKind, Message from agent_comms.thread_identity import AgentThreadRole, UserThreadRole from agent_comms.threads import Thread diff --git a/tests/test_runtime.py b/tests/test_runtime.py index 0a609af0cb..6bf1ae7285 100644 --- a/tests/test_runtime.py +++ b/tests/test_runtime.py @@ -22,7 +22,7 @@ ) from agent_comms.child_process import ProcessIdentity, SpawnedProcess from agent_comms.comms import wire -from agent_comms.field_codec import RootId +from agent_comms.nominal.field_codec import RootId from agent_comms.owner_protocol import OwnerAnnouncement, OwnerReady, OwnerResult, OwnerUpdate from agent_comms.runtime import ( RuntimeConnection, RuntimeProxy, present_session, socket_path, diff --git a/tests/test_runtime_collaboration_documents.py b/tests/test_runtime_collaboration_documents.py index 0403eeb1db..e2469e1623 100644 --- a/tests/test_runtime_collaboration_documents.py +++ b/tests/test_runtime_collaboration_documents.py @@ -6,7 +6,7 @@ import pytest -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.locked_store import DocumentChange from agent_comms.runtime_info import RuntimeInfoStore from agent_comms.shared_ledger import SharedLedger diff --git a/tests/test_runtime_goal_edit.py b/tests/test_runtime_goal_edit.py index 31a9c8305f..cdd2a95000 100644 --- a/tests/test_runtime_goal_edit.py +++ b/tests/test_runtime_goal_edit.py @@ -9,7 +9,7 @@ from delivery_owner_fixture import canonical_agent from agent_comms.acp_extension import GoalChangedUpdate, decode_updates from agent_comms.comms import wire -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.goal_presentation import GoalExecution from agent_comms.goal_actions import ( OwnerInvocable, diff --git a/tests/test_runtime_owned_session_admission.py b/tests/test_runtime_owned_session_admission.py index 557db7db49..924ef4f047 100644 --- a/tests/test_runtime_owned_session_admission.py +++ b/tests/test_runtime_owned_session_admission.py @@ -17,7 +17,7 @@ from agent_comms.comms import wire from agent_comms.child_process import ProcessIdentity from agent_comms.errors import UnregisteredThreadError -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.owner_protocol import OwnerFailure, OwnerLine from agent_comms.private_path import PrivateSocketRole from agent_comms.runtime import RuntimeProxy, socket_path diff --git a/tests/test_runtime_processes.py b/tests/test_runtime_processes.py index 7b9bdeca03..965a4bc06e 100644 --- a/tests/test_runtime_processes.py +++ b/tests/test_runtime_processes.py @@ -7,7 +7,7 @@ from pathlib import Path from agent_comms.child_process import Platform, ProcessIdentity, SpawnedProcess -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.launch_runtime import LaunchRuntime from agent_comms.runtime_processes import ( RuntimeProcessOutcome, diff --git a/tests/test_runtime_resolution.py b/tests/test_runtime_resolution.py index 17c50d3cfb..faa7d221ef 100644 --- a/tests/test_runtime_resolution.py +++ b/tests/test_runtime_resolution.py @@ -3,7 +3,7 @@ import pytest -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.installer.refusals import UpgradeRefused from agent_comms.installer.commands import InstallCommands from agent_comms.installer.probes.packages import InstalledPackagesProbe diff --git a/tests/test_runtime_subscription_handshake.py b/tests/test_runtime_subscription_handshake.py index 3fc2ac88c5..8b05ec88b0 100644 --- a/tests/test_runtime_subscription_handshake.py +++ b/tests/test_runtime_subscription_handshake.py @@ -16,7 +16,7 @@ from agent_comms.comms import wire from agent_comms.coordination_database import CoordinationStore from agent_comms.coordination_errors import CoordinationReadUnavailable -from agent_comms.field_codec import MalformedRecord +from agent_comms.nominal.field_codec import MalformedRecord from agent_comms.owner_protocol import OwnerAnnouncement from agent_comms.private_path import PrivateSocketRole from agent_comms.runtime import RuntimeProxy, socket_path diff --git a/tests/test_runtime_wire_install.py b/tests/test_runtime_wire_install.py index d2393c14c2..aed737dc61 100644 --- a/tests/test_runtime_wire_install.py +++ b/tests/test_runtime_wire_install.py @@ -15,7 +15,7 @@ from agent_comms.bus import Bus from agent_comms.cli_bridges.monitor import PauseSession from agent_comms.installer.request import InstallRequest -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.installer.commands import InstallCommands from agent_comms.installer.launch import InstallRun from agent_comms.installer.upgrade import TargetTree diff --git a/tests/test_s3_legality_behavior.py b/tests/test_s3_legality_behavior.py index 2d7effef2d..374befbdd6 100644 --- a/tests/test_s3_legality_behavior.py +++ b/tests/test_s3_legality_behavior.py @@ -26,7 +26,7 @@ ExecutionState, FailedExecution, ) -from agent_comms.field_codec import FieldCodec, MalformedRecord +from agent_comms.nominal.field_codec import FieldCodec, MalformedRecord from agent_comms.response_acknowledgement import canonical_publication_key from agent_comms.messages import InfoKind, Message from agent_comms.obligation_states import PublishedResponse, ResponseState diff --git a/tests/test_s4_ownership.py b/tests/test_s4_ownership.py index 06984a54cf..bde89404c0 100644 --- a/tests/test_s4_ownership.py +++ b/tests/test_s4_ownership.py @@ -3,7 +3,7 @@ from agent_comms.channels import ActivityView, AnyOfMatch, SavedView, ViewPredicate -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.messages import Message, InfoKind diff --git a/tests/test_saved_view_boundary.py b/tests/test_saved_view_boundary.py index f5afd4cd01..ec9394e419 100644 --- a/tests/test_saved_view_boundary.py +++ b/tests/test_saved_view_boundary.py @@ -9,7 +9,7 @@ ViewMatch, ViewPredicate, ) -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.tool_declaration import NativeRequestTools diff --git a/tests/test_schema_report.py b/tests/test_schema_report.py index 2136119f6c..88113e4419 100644 --- a/tests/test_schema_report.py +++ b/tests/test_schema_report.py @@ -6,7 +6,7 @@ from agent_comms.cli import main from agent_comms.cli_verbs.schema_report import SchemaReportCliCommand -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.todos import Todo from agent_comms.typed_table import SQLiteSchemaObject, SQLiteSchemaDifference from bus_record_fixture import context_comms diff --git a/tests/test_selected_answer_forms.py b/tests/test_selected_answer_forms.py index 0f65b85250..2c86104b0c 100644 --- a/tests/test_selected_answer_forms.py +++ b/tests/test_selected_answer_forms.py @@ -27,7 +27,7 @@ from conftest import accept_initial from agent_comms.coordination_cohort import sealed_cohort_assignments from agent_comms.coordinator import Coordination -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.messages import InfoKind, Message from agent_comms.native_failures import NativePiUnavailable from agent_comms.selected_source_batch import SelectedSource, SelectedSourceBatch diff --git a/tests/test_selected_tool_broker.py b/tests/test_selected_tool_broker.py index 214461803c..dc0d557bee 100644 --- a/tests/test_selected_tool_broker.py +++ b/tests/test_selected_tool_broker.py @@ -18,7 +18,7 @@ from agent_comms.coordination_database import CoordinationStore from agent_comms.coordinator import Coordination from agent_comms.envelope_claim_transitions import WakeClaim -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( AssignmentId, ClaimId, FieldCodec, diff --git a/tests/test_session_bridge.py b/tests/test_session_bridge.py index ed95a239a3..bd30a2b600 100644 --- a/tests/test_session_bridge.py +++ b/tests/test_session_bridge.py @@ -8,7 +8,7 @@ from agent_comms.cli_bridges.monitor import AttachMonitor, InspectSession, SessionReady from agent_comms.cli_bridges.shared import BridgeLog -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms_hooks.watch import ( SessionConnectionClosed, SessionRequestTimeout, WatchClaim, WatchRecord, ) diff --git a/tests/test_session_components.py b/tests/test_session_components.py index c42a10ed5e..eaabb4fa93 100644 --- a/tests/test_session_components.py +++ b/tests/test_session_components.py @@ -10,7 +10,7 @@ def test_thread_service_tier_round_trips_legacy_rows(*, thread_registration): - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.pi_vocabulary import ServiceTier encoded = FieldCodec.encode(thread_registration.declare(Thread('legacy', frozenset(), Checkout(Path('.'))))) diff --git a/tests/test_session_load_plan.py b/tests/test_session_load_plan.py index 47f987fa6b..77c79ad95f 100644 --- a/tests/test_session_load_plan.py +++ b/tests/test_session_load_plan.py @@ -1,7 +1,7 @@ """Public type names may change; the existing ACP metadata must not.""" from agent_comms.child_process import ProcessIdentity -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.session_load import ( EnsuringSessionLoadPlan, ExistingSessionLoadPlan, diff --git a/tests/test_sidebar_observation.py b/tests/test_sidebar_observation.py index 27656fea0b..d00aa4bab0 100644 --- a/tests/test_sidebar_observation.py +++ b/tests/test_sidebar_observation.py @@ -10,7 +10,7 @@ from agent_comms.registry_document import ThreadRows from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import MalformedRecord +from agent_comms.nominal.field_codec import MalformedRecord from agent_comms.display_references import CurrentDisplayReferences, HistoricalDisplayReference from agent_comms.historical_views import HistorySource from agent_comms.registry_document import HistoricalRootPurpose diff --git a/tests/test_slop_owner_line.py b/tests/test_slop_owner_line.py index 5fc75356db..027120bae9 100644 --- a/tests/test_slop_owner_line.py +++ b/tests/test_slop_owner_line.py @@ -9,7 +9,7 @@ from agent_comms.build_identity import RecordedBuildIdentity from agent_comms.change_report import FileLine from agent_comms.commander.order import OrderFile -from agent_comms.field_codec import FieldCodec, MalformedRecord +from agent_comms.nominal.field_codec import FieldCodec, MalformedRecord from agent_comms.progress_claims import MergedClaim from agent_comms.slop import CreatedLine, DeclarationDerivation, ExistingLine, OwnerLine, Slop from agent_comms.thread_execution import CommanderForkExecution diff --git a/tests/test_source_revision.py b/tests/test_source_revision.py index a47f64e270..14777edff4 100644 --- a/tests/test_source_revision.py +++ b/tests/test_source_revision.py @@ -11,7 +11,7 @@ ) from agent_comms.repository_name import RepositoryName from agent_comms.errors import MissingSourceLine -from agent_comms.field_codec import OwnerRequestKey +from agent_comms.nominal.field_codec import OwnerRequestKey from agent_comms.goal_actions import OrderGoalAction from agent_comms.repo import GitCommandError from agent_comms.owner_requests import OwnerRequestId diff --git a/tests/test_sqlite_source_coverage.py b/tests/test_sqlite_source_coverage.py index 0dff0dc44e..acff868179 100644 --- a/tests/test_sqlite_source_coverage.py +++ b/tests/test_sqlite_source_coverage.py @@ -11,7 +11,7 @@ from agent_comms.coordination_session import NativeCapture from agent_comms.coordinator import Coordination from agent_comms.cursor_owner import UnstartedCursor -from agent_comms.field_codec import ThreadLookup +from agent_comms.nominal.field_codec import ThreadLookup from agent_comms.messages import InfoKind, Message from agent_comms.proven_source_coverage import SourceCoverage, SourcePrefix from bus_record_fixture import prepare_native_comms, record_from diff --git a/tests/test_stack_goal_cancel_resume.py b/tests/test_stack_goal_cancel_resume.py index 08c58579dd..a2a93abe7d 100644 --- a/tests/test_stack_goal_cancel_resume.py +++ b/tests/test_stack_goal_cancel_resume.py @@ -1,6 +1,6 @@ """Real native Pi and owner socket: cancelled goals need an explicit fresh grant.""" from agent_comms.controller import SessionUpdateSink -from agent_comms.field_codec import InputId +from agent_comms.nominal.field_codec import InputId from agent_comms.input_key import AcpInputKey import asyncio @@ -10,7 +10,7 @@ import pytest from acp.schema import SessionNotification -from agent_comms.field_codec import FieldCodec, GoalId +from agent_comms.nominal.field_codec import FieldCodec, GoalId from agent_comms.goal_attempts import GoalAttemptStore from agent_comms.goal_generation import BlockedGeneration, ReadyGeneration, ReservedGeneration from agent_comms.goals import Goal diff --git a/tests/test_stack_native_compaction.py b/tests/test_stack_native_compaction.py index 33400ba2d3..10aefd2e6f 100644 --- a/tests/test_stack_native_compaction.py +++ b/tests/test_stack_native_compaction.py @@ -1,7 +1,7 @@ """Pi's own compaction engine, seen through Core's turn path: pinned Pi + localhost provider.""" from __future__ import annotations -from agent_comms.field_codec import InputId +from agent_comms.nominal.field_codec import InputId from agent_comms.controller import SessionUpdateSink from agent_comms.lifecycle_capability import Unresolved diff --git a/tests/test_stack_persistent_compaction.py b/tests/test_stack_persistent_compaction.py index 8b53980280..f3437bbd68 100644 --- a/tests/test_stack_persistent_compaction.py +++ b/tests/test_stack_persistent_compaction.py @@ -23,7 +23,7 @@ from agent_comms.agent_events import CompactionEnd from agent_comms.comms import wire from agent_comms.controller import SessionUpdateSink -from agent_comms.field_codec import InputId +from agent_comms.nominal.field_codec import InputId from agent_comms.launch_runtime import RestartEnvironment from agent_comms.native_arguments import GivenArguments, GivenBinary from agent_comms.pi_vocabulary import ManualCompactionReason diff --git a/tests/test_stopped_claim_expiry.py b/tests/test_stopped_claim_expiry.py index 5fd71a9fd7..6f8b314173 100644 --- a/tests/test_stopped_claim_expiry.py +++ b/tests/test_stopped_claim_expiry.py @@ -11,7 +11,7 @@ from agent_comms.comms import wire from agent_comms.coordination_session import NativeCapture from agent_comms.envelope_claim_transitions import NativeClaim, WakeClaims -from agent_comms.field_codec import ClaimId, InputId, TurnId +from agent_comms.nominal.field_codec import ClaimId, InputId, TurnId from agent_comms.messages import ClaimNoticeKind from agent_comms.thread_status import RunningThreadStatus, StoppedThreadStatus from agent_comms.threads import Thread diff --git a/tests/test_storage_room.py b/tests/test_storage_room.py index 9a3f7ec1df..305eb9ce4f 100644 --- a/tests/test_storage_room.py +++ b/tests/test_storage_room.py @@ -19,7 +19,7 @@ from agent_comms.shell_effects import shell_storage_effects from agent_comms.thread_status import RunningThreadStatus from agent_comms.threads import Thread -from agent_comms.field_codec import RoomTicket +from agent_comms.nominal.field_codec import RoomTicket def test_host_ledger_writer_carries_old_schema_and_preserves_peaks_and_claims(tmp_path): diff --git a/tests/test_storage_rules.py b/tests/test_storage_rules.py index b8959a5b94..29b67a00fc 100644 --- a/tests/test_storage_rules.py +++ b/tests/test_storage_rules.py @@ -9,7 +9,7 @@ from agent_comms.comms import Comms, wire from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import FieldCodec, RecordProblems +from agent_comms.nominal.field_codec import FieldCodec, RecordProblems from agent_comms.repo import Checkout, DetachedStart, Repo from agent_comms.shell_effects import ( CreateCheckoutStorageEffect, diff --git a/tests/test_storage_violations.py b/tests/test_storage_violations.py index e0a9f58783..45317f0695 100644 --- a/tests/test_storage_violations.py +++ b/tests/test_storage_violations.py @@ -15,7 +15,7 @@ from agent_comms.change_report import FileLine from agent_comms.comms import wire -from agent_comms.field_codec import FieldCodec, GoalId +from agent_comms.nominal.field_codec import FieldCodec, GoalId from agent_comms.goals import OrderCheck from agent_comms.heartbeat_frame import HeartbeatFrame from agent_comms.order_runs import MechanicalOrderRun diff --git a/tests/test_strike_releases.py b/tests/test_strike_releases.py index 1700cda4ff..b4c786a7f8 100644 --- a/tests/test_strike_releases.py +++ b/tests/test_strike_releases.py @@ -2,7 +2,7 @@ import json from contextlib import closing -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.locked_store import LiveFilesRequest from agent_comms.todos import ReleaseTodo, StoredOrderStory, StrikeReason, TodoStore from cutover.carry_strike_releases import StrikeReleases diff --git a/tests/test_table_mutation_capabilities.py b/tests/test_table_mutation_capabilities.py index 557091ecb9..e66e263bbc 100644 --- a/tests/test_table_mutation_capabilities.py +++ b/tests/test_table_mutation_capabilities.py @@ -15,7 +15,7 @@ from agent_comms.coordination_schema import CoordinatorTable from agent_comms.coordination_tables.executions import ExecutionRecord from agent_comms.coordination_tables.participants import OwnerGenerations, Participants -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.execution_states import ( ActiveExecution, CompletedExecution, diff --git a/tests/test_task_decisions.py b/tests/test_task_decisions.py index 87f0727170..e24cb00958 100644 --- a/tests/test_task_decisions.py +++ b/tests/test_task_decisions.py @@ -16,7 +16,7 @@ from agent_comms.child_process import ProcessIdentity from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import FieldCodec, TurnId, GoalId +from agent_comms.nominal.field_codec import FieldCodec, TurnId, GoalId from agent_comms.goals import Goal from agent_comms.messages import Message, InfoKind from agent_comms.task_sources import Decision diff --git a/tests/test_terminal_file_claims.py b/tests/test_terminal_file_claims.py index 6f39b7a172..7303d6cac8 100644 --- a/tests/test_terminal_file_claims.py +++ b/tests/test_terminal_file_claims.py @@ -3,7 +3,7 @@ from dataclasses import replace -from agent_comms.field_codec import ClaimId +from agent_comms.nominal.field_codec import ClaimId from agent_comms.selected_claim import publish_selected_resource_claim from agent_comms.envelope_claim_transitions import ExistingFileClaim from test_claim_bus_read import claim_originals, settle_failed diff --git a/tests/test_thread_identity.py b/tests/test_thread_identity.py index 7a0afa1882..f803e6e9c2 100644 --- a/tests/test_thread_identity.py +++ b/tests/test_thread_identity.py @@ -11,7 +11,7 @@ from agent_comms.child_process import NoProcess, ProcessIdentity from agent_comms.comms import wire from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import FieldCodec, RootId, TurnId +from agent_comms.nominal.field_codec import FieldCodec, RootId, TurnId from agent_comms.read_basis import Conversation from agent_comms.read_ledger import ReadDocument from agent_comms.registration import Registration diff --git a/tests/test_thread_presentation.py b/tests/test_thread_presentation.py index 5679155b19..f4d278c1c6 100644 --- a/tests/test_thread_presentation.py +++ b/tests/test_thread_presentation.py @@ -6,8 +6,8 @@ from agent_comms.errors import RouteChangedError, UnregisteredThreadError from agent_comms.input_key import AcpInputKey -from agent_comms.field_codec import InputId -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import InputId +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.input_attempt import UnobservedInputDeliveryScope, UnresolvedInput from agent_comms.input_disposition import DeliveryOverview from agent_comms.notification_progress import SendingProgress diff --git a/tests/test_thread_status.py b/tests/test_thread_status.py index 08896fa1dd..868048c6e2 100644 --- a/tests/test_thread_status.py +++ b/tests/test_thread_status.py @@ -17,7 +17,7 @@ from agent_comms.cli_verbs.configure import ConfigureCliCommand from agent_comms.child_process import ProcessIdentity from agent_comms.errors import RelationViolationError, UnregisteredThreadError -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.presentation import CountedRead, ThreadView from agent_comms.registration import Registration from agent_comms.thread_status import ( diff --git a/tests/test_toad_contract.py b/tests/test_toad_contract.py index b8cf90759d..371a108699 100644 --- a/tests/test_toad_contract.py +++ b/tests/test_toad_contract.py @@ -13,7 +13,7 @@ from agent_comms.acp_extension import CoordinationChangedUpdate, TextRouteUpdate, decode_updates from agent_comms.comms import Comms, wire from agent_comms.goals import Goal -from agent_comms.field_codec import TurnId +from agent_comms.nominal.field_codec import TurnId from agent_comms.routing import MessageRoute from agent_comms.threads import Thread from agent_comms.transcripts import TranscriptCursor, TranscriptPage diff --git a/tests/test_todo_stories.py b/tests/test_todo_stories.py index 51a6a91dc5..4c3f6a40ff 100644 --- a/tests/test_todo_stories.py +++ b/tests/test_todo_stories.py @@ -10,7 +10,7 @@ from cutover.carry_todo_stories import INLINE_FIELDS, TodoStories from agent_comms.commander.order import Commander -from agent_comms.field_codec import ( +from agent_comms.nominal.field_codec import ( FieldCodec, GoalId, MessageId, diff --git a/tests/test_todos.py b/tests/test_todos.py index c3ce9bda5f..e21fa0f600 100644 --- a/tests/test_todos.py +++ b/tests/test_todos.py @@ -30,7 +30,7 @@ from agent_comms.commander.standing import RetainedHolderWheelSpin, UnownedOrderWatch, UnownedWheelSpin from agent_comms.commander_heartbeat import CommanderHeartbeat from agent_comms.comms import wire -from agent_comms.field_codec import FieldCodec, GoalId, OrderId +from agent_comms.nominal.field_codec import FieldCodec, GoalId, OrderId from agent_comms.goal_actions import SetGoalAction from agent_comms.held_orders import HeldOrders from agent_comms.goals import OrderCheck diff --git a/tests/test_tool_output.py b/tests/test_tool_output.py index 78d636c36d..64be77f382 100644 --- a/tests/test_tool_output.py +++ b/tests/test_tool_output.py @@ -11,7 +11,7 @@ from agent_comms.input_key import AcpInputKey, BusInputKey from agent_comms.child_process import ProcessIdentity -from agent_comms.field_codec import FieldCodec, InputId, TurnId +from agent_comms.nominal.field_codec import FieldCodec, InputId, TurnId from agent_comms.goal_actions import SetGoalAction from agent_comms.goal_waits import RecordedGoalWait from agent_comms.input_attempt import BoundUnknownInput diff --git a/tests/test_tool_refusal_reasons.py b/tests/test_tool_refusal_reasons.py index 3d5fc34e91..1948a42e8a 100644 --- a/tests/test_tool_refusal_reasons.py +++ b/tests/test_tool_refusal_reasons.py @@ -10,7 +10,7 @@ from agent_comms.coordinator import Coordination from agent_comms.coordination_database import CoordinationStore from agent_comms.envelope_claim_transitions import ClaimTransitionError -from agent_comms.field_codec import InputId +from agent_comms.nominal.field_codec import InputId from agent_comms.native_tool_call import SelectedToolBusy from agent_comms.tool_denial import SelectedToolDenied from agent_comms.selected_tool_broker import verify_sent_full_input diff --git a/tests/test_tracked_native_retry.py b/tests/test_tracked_native_retry.py index dc372800b7..ddf7624892 100644 --- a/tests/test_tracked_native_retry.py +++ b/tests/test_tracked_native_retry.py @@ -3,7 +3,7 @@ import pytest from agent_comms.agent_backend import SteerInputPolicy -from agent_comms.field_codec import InputId, TurnId +from agent_comms.nominal.field_codec import InputId, TurnId from agent_comms.input_disposition import InputDispositions from agent_comms.input_key import TurnInputKey from agent_comms.native_arguments import SelectedModel diff --git a/tests/test_transcript_event_time.py b/tests/test_transcript_event_time.py index b83e5b7943..f5115ae6bb 100644 --- a/tests/test_transcript_event_time.py +++ b/tests/test_transcript_event_time.py @@ -7,7 +7,7 @@ import pytest from transcript_record_fixture import transcript_record -from agent_comms.field_codec import MalformedRecord, RecordedTimestamp +from agent_comms.nominal.field_codec import MalformedRecord, RecordedTimestamp from agent_comms.native_entries import NativeEntry, TranscriptProjection from agent_comms.routing import TurnRouting from agent_comms.transcript_events import AssistantTranscript diff --git a/tests/test_transcript_pages.py b/tests/test_transcript_pages.py index f9e86fbf87..f9889d04f0 100644 --- a/tests/test_transcript_pages.py +++ b/tests/test_transcript_pages.py @@ -160,7 +160,7 @@ def test_wire_cursor_keeps_the_furthest_committed_native_prefix_within_it(): def test_never_started_native_child_keeps_no_native_cursor_and_no_read_mark(tmp_path): from agent_comms.cli_verbs.register import RegisterCliCommand - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.thread_execution import NativeThreadExecution from agent_comms.transcripts import NoNativeTranscriptCursor, TranscriptCursor diff --git a/tests/test_turn_context_wire.py b/tests/test_turn_context_wire.py index 1ddf10f381..06b75a7837 100644 --- a/tests/test_turn_context_wire.py +++ b/tests/test_turn_context_wire.py @@ -2,7 +2,7 @@ import hashlib import json -from agent_comms.field_codec import FieldCodec, InputId, TurnId +from agent_comms.nominal.field_codec import FieldCodec, InputId, TurnId from agent_comms.image_input import ImageInput from agent_comms.native_tool_call import OwnerToolConnection from agent_comms.pi_commands import Prompt diff --git a/tests/test_turn_declaration.py b/tests/test_turn_declaration.py index 912d4e4a81..654d32e5b7 100644 --- a/tests/test_turn_declaration.py +++ b/tests/test_turn_declaration.py @@ -4,7 +4,7 @@ from agent_comms.child_process import NoProcess, ProcessIdentity from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import FieldCodec, TurnId +from agent_comms.nominal.field_codec import FieldCodec, TurnId from agent_comms.thread_identity import ( NoObservedTurn, RecordedThreadIncarnation, diff --git a/tests/test_turn_digests.py b/tests/test_turn_digests.py index 06b5642a21..4ec42e2365 100644 --- a/tests/test_turn_digests.py +++ b/tests/test_turn_digests.py @@ -21,7 +21,7 @@ from agent_comms.context_store import ContextEntry from agent_comms.errors import ToolRefusedError from agent_comms.external_transcript import NoEarlierPage -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.runtime_updates import FinishedItem from agent_comms.thread_execution import ExternalThreadExecution from agent_comms.session_file import RegistrySessionLocation diff --git a/tests/test_turn_goal_account.py b/tests/test_turn_goal_account.py index 5e579c798e..2494d8bb38 100644 --- a/tests/test_turn_goal_account.py +++ b/tests/test_turn_goal_account.py @@ -5,7 +5,7 @@ from agent_comms.goal_attempts import GoalAttemptStore -from agent_comms.field_codec import TurnId, GoalId +from agent_comms.nominal.field_codec import TurnId, GoalId from agent_comms.goal_generation import ( CompletedGeneration, ReadyGeneration, ) diff --git a/tests/test_turn_goal_permission.py b/tests/test_turn_goal_permission.py index 2830a79099..0fad98cc57 100644 --- a/tests/test_turn_goal_permission.py +++ b/tests/test_turn_goal_permission.py @@ -2,7 +2,7 @@ from dataclasses import replace -from agent_comms.field_codec import FieldCodec, GoalId +from agent_comms.nominal.field_codec import FieldCodec, GoalId from agent_comms.goal_states import BlockedGoal, PausedGoal from agent_comms.goals import Goal, NoGoal, ProblemGoalOrder from agent_comms.native_tools import CoordinationCall, ReadTool diff --git a/tests/test_turn_identity_equality.py b/tests/test_turn_identity_equality.py index 4e7816841b..e9efcea934 100644 --- a/tests/test_turn_identity_equality.py +++ b/tests/test_turn_identity_equality.py @@ -1,5 +1,5 @@ """Different observations of one turn share its three-field identity.""" -from agent_comms.field_codec import TurnId +from agent_comms.nominal.field_codec import TurnId from agent_comms.thread_identity import RecordedThreadIncarnation, TurnFence, TurnIdentity from agent_comms.turn_lease import FinishedTurnFence, StoredTurnRecord, TurnLeaseFence diff --git a/tests/test_turn_inbox.py b/tests/test_turn_inbox.py index 72c598d676..972557b8f3 100644 --- a/tests/test_turn_inbox.py +++ b/tests/test_turn_inbox.py @@ -13,7 +13,7 @@ from agent_comms.thread_model import UndeclaredModel from agent_comms.turn_failure import QueuedInputMissing, QueuedInputNotSent from native_response_fixture import native_response_session -from agent_comms.field_codec import InputId +from agent_comms.nominal.field_codec import InputId from agent_comms.turn_inputs import InputForwarding diff --git a/tests/test_turn_lease_release.py b/tests/test_turn_lease_release.py index 35928cabe9..3a72488c9a 100644 --- a/tests/test_turn_lease_release.py +++ b/tests/test_turn_lease_release.py @@ -6,7 +6,7 @@ from agent_comms.comms import wire from agent_comms.child_process import ProcessIdentity -from agent_comms.field_codec import FieldCodec, TurnId +from agent_comms.nominal.field_codec import FieldCodec, TurnId from agent_comms.threads import Thread from agent_comms.turn_lease import FinishedTurnFence, NoFinishedTurn, NoTurn, NoTurnLease diff --git a/tests/test_turn_record.py b/tests/test_turn_record.py index 0569d345cb..56d99ebdfa 100644 --- a/tests/test_turn_record.py +++ b/tests/test_turn_record.py @@ -8,7 +8,7 @@ from shutil import copytree from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import TurnId +from agent_comms.nominal.field_codec import TurnId from agent_comms.registry_store import RegistryStore from agent_comms.child_process import ProcessIdentity from agent_comms.comms import wire diff --git a/tests/test_unit_instructions.py b/tests/test_unit_instructions.py index d9ebf785af..62c321e4fe 100644 --- a/tests/test_unit_instructions.py +++ b/tests/test_unit_instructions.py @@ -4,7 +4,7 @@ from agent_comms.commander.package import CommanderPackage from agent_comms.commander.rule_file import CommanderAudience, FleetAudience, RuleAudience, RuleFile -from agent_comms.field_codec import MalformedRecord +from agent_comms.nominal.field_codec import MalformedRecord from agent_comms.native_package import OWNER_INSTRUCTIONS from agent_comms.slop import Slop from agent_comms.unit_instructions import UnitInstructions diff --git a/tests/test_unit_state.py b/tests/test_unit_state.py index a66a42765f..cd0d5183d1 100644 --- a/tests/test_unit_state.py +++ b/tests/test_unit_state.py @@ -13,7 +13,7 @@ from agent_comms.commander_heartbeat import CommanderHeartbeat from agent_comms.commander_hud import CommanderFrame from agent_comms.external_transcript import ExternalTranscript -from agent_comms.field_codec import ToolCallId +from agent_comms.nominal.field_codec import ToolCallId from agent_comms.heartbeat_frame import HeartbeatFrame from agent_comms.installer.runtime_resolution import CorePackage from agent_comms.launch_runtime import LaunchRoot diff --git a/tests/test_unowned_checkout_work.py b/tests/test_unowned_checkout_work.py index dd16af14a5..0c562eab83 100644 --- a/tests/test_unowned_checkout_work.py +++ b/tests/test_unowned_checkout_work.py @@ -25,7 +25,7 @@ from agent_comms.commander_hud import CommanderHud, CodexUsage, UnreadableUsage from agent_comms.commander.vibe_check import OverloadDegradation from agent_comms.comms import Comms, wire -from agent_comms.field_codec import FieldCodec, GoalId +from agent_comms.nominal.field_codec import FieldCodec, GoalId from agent_comms.goals import OrderCheck from agent_comms.installer.practice import PracticeCopy from agent_comms.locked_store import RootFile diff --git a/tests/test_unreadable_history_observation.py b/tests/test_unreadable_history_observation.py index 3791deea7a..247dcc15a6 100644 --- a/tests/test_unreadable_history_observation.py +++ b/tests/test_unreadable_history_observation.py @@ -21,7 +21,7 @@ StaleRevision, TranscriptChanged, ) -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.errors import RelationViolationError, StoredHistoryUnreadable, ToolRefusedError from agent_comms.owner_connection import OwnerIdentityChangedError, OwnerReplyLostError from agent_comms.context_store import ContextRequest diff --git a/tests/test_unscoped_claim_history.py b/tests/test_unscoped_claim_history.py index 6a3fab0a7c..e81cea3e57 100644 --- a/tests/test_unscoped_claim_history.py +++ b/tests/test_unscoped_claim_history.py @@ -14,7 +14,7 @@ UnscopedClaims, WakeClaims, ) -from agent_comms.field_codec import ClaimId, FieldCodec, InputId, MalformedRecord, MessageId, TurnId +from agent_comms.nominal.field_codec import ClaimId, FieldCodec, InputId, MalformedRecord, MessageId, TurnId from agent_comms.thread_status import RunningThreadStatus from agent_comms.threads import Thread diff --git a/tests/test_user_thread_lookup.py b/tests/test_user_thread_lookup.py index 4222093b6a..5c165aa7f5 100644 --- a/tests/test_user_thread_lookup.py +++ b/tests/test_user_thread_lookup.py @@ -7,7 +7,7 @@ from dataclasses import replace from agent_comms.comms import wire -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.registry_document import NoUserThread, RegistryDocument from agent_comms.thread_identity import UserThreadRole from agent_comms.thread_text import GivenThreadText diff --git a/tests/test_wake.py b/tests/test_wake.py index 5fb3edeb9c..36b2f182c8 100644 --- a/tests/test_wake.py +++ b/tests/test_wake.py @@ -8,7 +8,7 @@ import pytest from agent_comms.audience_manifest import AudiencedMessage, FrozenRecipient, freeze_audience -from agent_comms.field_codec import ThreadLookup +from agent_comms.nominal.field_codec import ThreadLookup from agent_comms.mentions import ThreadMention from agent_comms.messages import ( AckKind, @@ -227,7 +227,7 @@ def test_system_control_must_be_explicit_not_guessed_from_body_or_ack_type() -> assert decide(direct, members=MEMBERS[:1], control=SystemControl) == ( WakeDecision(SENDER_LOOKUP, MessageAudience.DIRECT, PassiveWake()) ) - from agent_comms.field_codec import FieldCodec, MalformedRecord + from agent_comms.nominal.field_codec import FieldCodec, MalformedRecord assert FieldCodec.decode(type[MessageControl], "system_control") is SystemControl with pytest.raises(MalformedRecord): diff --git a/tests/test_wake_candidate_index.py b/tests/test_wake_candidate_index.py index a22dbbb632..590c2a18eb 100644 --- a/tests/test_wake_candidate_index.py +++ b/tests/test_wake_candidate_index.py @@ -5,7 +5,7 @@ import pytest -from agent_comms.field_codec import AssignmentId, GoalId, GoalWaitId +from agent_comms.nominal.field_codec import AssignmentId, GoalId, GoalWaitId from agent_comms.assignment_states import DeliveredAssignment, PendingDecision from agent_comms.bus import BusRecord, PublicRecord from agent_comms.coordination_tables.assignments import WakeAssignment diff --git a/tests/test_wake_lifetime.py b/tests/test_wake_lifetime.py index 2041e41980..7600a0c7bf 100644 --- a/tests/test_wake_lifetime.py +++ b/tests/test_wake_lifetime.py @@ -5,7 +5,7 @@ import asyncio import os -from agent_comms.field_codec import AcpSessionId +from agent_comms.nominal.field_codec import AcpSessionId from agent_comms.session_lifecycle import PublishedSession from agent_comms.acp import CommsAgent from agent_comms.child_process import ProcessIdentity diff --git a/tests/test_watched.py b/tests/test_watched.py index c953bea836..5cfb384981 100644 --- a/tests/test_watched.py +++ b/tests/test_watched.py @@ -11,7 +11,7 @@ import pytest -from agent_comms.field_codec import GoalId, GoalWaitId +from agent_comms.nominal.field_codec import GoalId, GoalWaitId from agent_comms.bus import Bus, PublicRecord from agent_comms.comms import wire from agent_comms.goal_attempts import Generation, GoalAttemptStore, StorageUncertainError diff --git a/tests/test_writer_owned_stores.py b/tests/test_writer_owned_stores.py index 8015db4ae2..9853b7aba3 100644 --- a/tests/test_writer_owned_stores.py +++ b/tests/test_writer_owned_stores.py @@ -11,7 +11,7 @@ from agent_comms.channel_targets import ChannelTarget, CommandTarget from agent_comms.cli import build_parser from agent_comms.cli_verbs.planned_reconcile import PlannedReconcileCliCommand -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.errors import RelationViolationError from agent_comms.installer.backup import StoreBackup from agent_comms.installer.practice import PracticeCopy diff --git a/tests/transcript_record_fixture.py b/tests/transcript_record_fixture.py index 4f11a71add..a89256d217 100644 --- a/tests/transcript_record_fixture.py +++ b/tests/transcript_record_fixture.py @@ -2,7 +2,7 @@ import uuid -from agent_comms.field_codec import FieldCodec, TranscriptRecordId +from agent_comms.nominal.field_codec import FieldCodec, TranscriptRecordId RECORDS = uuid.UUID("6f8e2a3c-1d4b-4c5a-9e7f-2b1c3d4e5f60") diff --git a/tests/verify_connector_tools.py b/tests/verify_connector_tools.py index b1ad3f01e6..e4bc637a24 100644 --- a/tests/verify_connector_tools.py +++ b/tests/verify_connector_tools.py @@ -30,7 +30,7 @@ from agent_comms.comms import Comms, wire from agent_comms.connector_caller import CALLER from agent_comms.connector_store import ConnectorStore -from agent_comms.field_codec import FieldCodec, TurnId, GoalId, OrderId +from agent_comms.nominal.field_codec import FieldCodec, TurnId, GoalId, OrderId from agent_comms.goal_actions import CreateProblemGoalAction, PausedGoalAction, SetGoalAction from agent_comms.goals import CountCheckResult, OrderCheck from agent_comms.owner_requests import NewestOpenRequest diff --git a/tools/cutover/carry_attempt_resolutions.py b/tools/cutover/carry_attempt_resolutions.py index 4f330feacd..221963077a 100644 --- a/tools/cutover/carry_attempt_resolutions.py +++ b/tools/cutover/carry_attempt_resolutions.py @@ -20,7 +20,7 @@ ) from agent_comms.bus import Bus from agent_comms.bus_tables import MessageIdentitySource -from agent_comms.field_codec import FieldCodec, GoalId, MessageId, OrderId, RetryDecisionId, TurnId +from agent_comms.nominal.field_codec import FieldCodec, GoalId, MessageId, OrderId, RetryDecisionId, TurnId from agent_comms.goal_attempts import AttemptRecord, GoalAttemptStore, GoalWorkDecision from agent_comms.installer.probes.carry import Carried, Carry from agent_comms.locked_store import RootFile diff --git a/tools/cutover/carry_commander_update_lines.py b/tools/cutover/carry_commander_update_lines.py index 7d93d0ad09..1b45190e50 100644 --- a/tools/cutover/carry_commander_update_lines.py +++ b/tools/cutover/carry_commander_update_lines.py @@ -14,8 +14,8 @@ from agent_comms.bus import Bus from agent_comms.task_attachments.commander_pings import CommanderDecisions, CommanderNotice, CommanderUpdate, Ping -from agent_comms.declared_family import DeclaredFamily -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.declared_family import DeclaredFamily +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.installer.probes.carry import Carried, Carry from agent_comms.locked_store import RootFile from agent_comms.messages import Message diff --git a/tools/cutover/carry_delivered_audience.py b/tools/cutover/carry_delivered_audience.py index a4c9e58f75..b0991fde58 100644 --- a/tools/cutover/carry_delivered_audience.py +++ b/tools/cutover/carry_delivered_audience.py @@ -14,7 +14,7 @@ from agent_comms.bus import Bus from agent_comms.bus_publication import Delivered from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import FieldCodec, MessageId, ThreadLookup +from agent_comms.nominal.field_codec import FieldCodec, MessageId, ThreadLookup from agent_comms.installer.probes.carry import Carried, Carry from agent_comms.locked_store import RootFile from agent_comms.messages import Message diff --git a/tools/cutover/carry_harness_delivery_attempts.py b/tools/cutover/carry_harness_delivery_attempts.py index c09c08cfc6..9c0e556ad2 100644 --- a/tools/cutover/carry_harness_delivery_attempts.py +++ b/tools/cutover/carry_harness_delivery_attempts.py @@ -19,7 +19,7 @@ from agent_comms.coordination_database import CoordinationStore from agent_comms.coordination_tables.harness_deliveries import HarnessDelivery, HarnessObservedPart from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import FieldCodec, MessageId, TranscriptRecordId +from agent_comms.nominal.field_codec import FieldCodec, MessageId, TranscriptRecordId from agent_comms.harness_delivery_states import EmittedOutcome, MonitorEvidence, Outcome, UnrecordedMonitor from agent_comms.installer.probes.carry import Carried, Carry from agent_comms.locked_store import RootFile diff --git a/tools/cutover/carry_hunt_record_ids.py b/tools/cutover/carry_hunt_record_ids.py index 9fecfc2711..6b8db2aea2 100644 --- a/tools/cutover/carry_hunt_record_ids.py +++ b/tools/cutover/carry_hunt_record_ids.py @@ -11,7 +11,7 @@ from contextlib import closing from typing import ClassVar -from agent_comms.field_codec import FieldCodec, HuntId, Id128Text +from agent_comms.nominal.field_codec import FieldCodec, HuntId, Id128Text from agent_comms.installer.probes.carry import Carried, Carry from agent_comms.locked_store import RootFile from agent_comms.maintenance_barrier import MaintenanceBarrier, MaintenanceHolder diff --git a/tools/cutover/carry_order_corrections.py b/tools/cutover/carry_order_corrections.py index 8fad2a0ca5..cd3f26334c 100644 --- a/tools/cutover/carry_order_corrections.py +++ b/tools/cutover/carry_order_corrections.py @@ -13,7 +13,7 @@ from pydantic import JsonValue -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.installer.probes.carry import Carried, Carry from agent_comms.locked_store import RootFile from agent_comms.maintenance_barrier import MaintenanceBarrier, MaintenanceHolder diff --git a/tools/cutover/carry_rule_ping_types.py b/tools/cutover/carry_rule_ping_types.py index 69f12bde28..2ac1282a51 100644 --- a/tools/cutover/carry_rule_ping_types.py +++ b/tools/cutover/carry_rule_ping_types.py @@ -10,7 +10,7 @@ from typing import ClassVar from agent_comms.bus import Bus -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.installer.probes.carry import Carried, Carry from agent_comms.locked_store import RootFile from agent_comms.messages import Message diff --git a/tools/cutover/carry_strike_releases.py b/tools/cutover/carry_strike_releases.py index 28c02fae5c..9059e4948f 100644 --- a/tools/cutover/carry_strike_releases.py +++ b/tools/cutover/carry_strike_releases.py @@ -10,7 +10,7 @@ from pydantic import JsonValue -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.installer.probes.carry import Carried, Carry from agent_comms.locked_store import RootFile from agent_comms.todos import ReleaseTodo, StoredOrderStory, TodoCommand, TodoStore diff --git a/tools/cutover/carry_toad_key_mode.py b/tools/cutover/carry_toad_key_mode.py index 42a7d3ae17..4e9ef320fe 100644 --- a/tools/cutover/carry_toad_key_mode.py +++ b/tools/cutover/carry_toad_key_mode.py @@ -6,7 +6,7 @@ from pydantic import JsonValue from agent_comms.errors import RelationViolationError -from agent_comms.field_codec import FieldCodec, WireName +from agent_comms.nominal.field_codec import FieldCodec, WireName from agent_comms.installer.probes.carry import Carried, Carry from agent_comms.locked_store import RootFile from agent_comms.store_files import AtomicFile diff --git a/tools/cutover/carry_todo_stories.py b/tools/cutover/carry_todo_stories.py index b4f90e1aef..94e3d591d2 100644 --- a/tools/cutover/carry_todo_stories.py +++ b/tools/cutover/carry_todo_stories.py @@ -8,7 +8,7 @@ from contextlib import closing from typing import ClassVar -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.installer.probes.carry import Carried, Carry from agent_comms.locked_store import RootFile from agent_comms.maintenance_barrier import MaintenanceBarrier, MaintenanceHolder diff --git a/tools/debt_ratchet.py b/tools/debt_ratchet.py index de0196c55b..82258ce9f3 100644 --- a/tools/debt_ratchet.py +++ b/tools/debt_ratchet.py @@ -47,10 +47,11 @@ from audit.measures import ForeignAbsenceProbe as AuditForeignAbsenceProbe import agent_comms -from agent_comms import coordination_schema, field_codec, locked_store, process_claim, store_files, typed_table +from agent_comms import coordination_schema, locked_store, process_claim, store_files, typed_table +from agent_comms.nominal import field_codec from agent_comms.child_process import ForkedProcessPool, SpawnedProcess from agent_comms.core_stamp import WheelStamp -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.installer.carry import STEPS from metaclass_registry.mro_dispatch import ( MroDispatch, @@ -59,7 +60,7 @@ from module_layers import PACKAGE, StackClient from stored_formats import StoredForm from typing_names import TypingImports, TypingReference -from agent_comms.field_codec import FieldCodec, ViewExclusion, boundary_decoder, projected +from agent_comms.nominal.field_codec import FieldCodec, ViewExclusion, boundary_decoder, projected from agent_comms.phase_evidence import MainTree, PlanReading from agent_comms.plan_phases import PlanPhase from agent_comms.repo import Repo diff --git a/tools/module_layers.py b/tools/module_layers.py index d64dbc316b..0bdedd9a55 100644 --- a/tools/module_layers.py +++ b/tools/module_layers.py @@ -41,7 +41,7 @@ from typing_names import TypingImports, TypingReference -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily ROOT = Path(__file__).resolve().parent.parent PACKAGE = "agent_comms" diff --git a/tools/render_native_file_artifact_schema.py b/tools/render_native_file_artifact_schema.py index a50034a2f2..7e4f88edd0 100644 --- a/tools/render_native_file_artifact_schema.py +++ b/tools/render_native_file_artifact_schema.py @@ -3,7 +3,7 @@ import sys from pathlib import Path -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.native_file_artifact import Utf8FileWriteArtifact from agent_comms.pi_payloads import FileMutationToolDetails, NativeToolDetails diff --git a/tools/repairs.py b/tools/repairs.py index 16f1fd9a71..ac41e5c84c 100644 --- a/tools/repairs.py +++ b/tools/repairs.py @@ -36,7 +36,7 @@ SourceTextReplacement, ) -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily type FunctionNode = ast.FunctionDef | ast.AsyncFunctionDef type ImportNode = ast.Import | ast.ImportFrom diff --git a/tools/stored_formats.py b/tools/stored_formats.py index cda05db30d..2265f4c76a 100644 --- a/tools/stored_formats.py +++ b/tools/stored_formats.py @@ -15,7 +15,7 @@ import json from dataclasses import dataclass -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec @dataclass(frozen=True)