diff --git a/plans/KEYMAP-PLAN.md b/plans/KEYMAP-PLAN.md index 0133a29f9..514eb7dd7 100644 --- a/plans/KEYMAP-PLAN.md +++ b/plans/KEYMAP-PLAN.md @@ -56,7 +56,7 @@ Each finding is stated as: pattern, the fact, where it is restated (at), the mec 3. **MEMB-2, exposure is a hand roster per surface.** Fact: which actions a user can discover. At: the footer reads `show` (49 hand flags). The palette reads the `PaletteAction` mixin (6 members, `application_actions.py:26`). The sidebar menu reads `MenuAction` (4 members, `widget_actions.py:33`). Textual's `HelpPanel` reads only the focused chain's `BINDINGS`. An action is invisible unless someone remembers each opt-in. Derive: every declared action is exposed. The surfaces are views over one registry. Hiding is the exception, declared once (`System`, for instance). - By: the family registry filled at `__init_subclass__` (`agent_comms.declared_family.DeclaredFamily`, already the root of `ApplicationAction`). + By: the family registry filled at `__init_subclass__` (`agent_comms.nominal.declared_family.DeclaredFamily`, already the root of `ApplicationAction`). 4. **Hand-numbered ranks.** Fact: menu order. At: `menu_order = 0/10/20/100` (6 sites: `application_actions.py:34, 72, 131`; `comms_transfer.py:66, 89, 107`). Derive: declaration order in the registry. diff --git a/src/toad/acp/agent.py b/src/toad/acp/agent.py index db02cf442..a6f9201e6 100644 --- a/src/toad/acp/agent.py +++ b/src/toad/acp/agent.py @@ -10,7 +10,7 @@ PromptRequest, ) from agent_comms.context_reading import UnmeasuredContext -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.goal_actions import GoalAction from agent_comms.goal_presentation import GoalSnapshot, IdleGoalExecution from agent_comms.goals import Goal, GoalDeclaration, NoGoal diff --git a/src/toad/acp/agent_configuration.py b/src/toad/acp/agent_configuration.py index 03c5d47d7..5942cfda9 100644 --- a/src/toad/acp/agent_configuration.py +++ b/src/toad/acp/agent_configuration.py @@ -12,7 +12,7 @@ SessionConfigSelectOption, ) from agent_comms.acp_failure import RequestFailure -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from metaclass_registry.mro_dispatch import MroDispatch, handles diff --git a/src/toad/acp/agent_session.py b/src/toad/acp/agent_session.py index de560fb4d..9709040dd 100644 --- a/src/toad/acp/agent_session.py +++ b/src/toad/acp/agent_session.py @@ -13,7 +13,7 @@ from agent_comms.acp_extension import HistoryOnlyQueueProjection from agent_comms.acp_failure import ACPFailure, RequestFailure from agent_comms.child_process import join_retirement -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.errors import RouteChangedError from agent_comms.input_attempt import NotSentInput from agent_comms.owner_protocol import IncompatibleOwner diff --git a/src/toad/acp/log_records.py b/src/toad/acp/log_records.py index 95892602d..b5e702c57 100644 --- a/src/toad/acp/log_records.py +++ b/src/toad/acp/log_records.py @@ -15,7 +15,7 @@ ) from pydantic import TypeAdapter, ValidationError from agent_comms.acp_failure import ACPFailure, RequestFailure -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily class LogSource(DeclaredFamily, affix="LogSource"): diff --git a/src/toad/acp/permission_controller.py b/src/toad/acp/permission_controller.py index 13c837c9e..5a4e561ac 100644 --- a/src/toad/acp/permission_controller.py +++ b/src/toad/acp/permission_controller.py @@ -3,7 +3,7 @@ import asyncio from abc import abstractmethod -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from acp import schema as protocol from .client_session import ClientRequestOwner, ClientSessionRequest from toad.answer import Answer diff --git a/src/toad/acp/prompt.py b/src/toad/acp/prompt.py index ebffd8689..214d0c049 100644 --- a/src/toad/acp/prompt.py +++ b/src/toad/acp/prompt.py @@ -3,7 +3,7 @@ from acp import schema from acp.helpers import ContentBlock -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.image_input import ImageInput from agent_comms.image_inputs import prompt_images diff --git a/src/toad/acp/sdk_boundary.py b/src/toad/acp/sdk_boundary.py index 9535bd615..f1cc1acc7 100644 --- a/src/toad/acp/sdk_boundary.py +++ b/src/toad/acp/sdk_boundary.py @@ -7,8 +7,8 @@ from acp.schema import SessionNotification, ToolCall from agent_comms.acp_extension import AgentCommsUpdate, decode_updates -from agent_comms.declared_family import DeclaredFamily -from agent_comms.field_codec import FieldRepresentation +from agent_comms.nominal.declared_family import DeclaredFamily +from agent_comms.nominal.field_codec import FieldRepresentation from toad.acp.notification_items import NotificationItems from toad.render_backend import RenderTask diff --git a/src/toad/acp/shell_command.py b/src/toad/acp/shell_command.py index 11828208e..59a818bf3 100644 --- a/src/toad/acp/shell_command.py +++ b/src/toad/acp/shell_command.py @@ -1,7 +1,7 @@ """Shell syntax is decoded at the command boundary, not at retirement.""" from abc import abstractmethod import os -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily class ShellCommand(DeclaredFamily, affix="ShellCommand"): diff --git a/src/toad/acp/status.py b/src/toad/acp/status.py index b3a2b1f32..afa149c28 100644 --- a/src/toad/acp/status.py +++ b/src/toad/acp/status.py @@ -3,7 +3,7 @@ from acp.schema import ToolCall from agent_comms.agent_event_updates import AcpToolAction -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from metaclass_registry.mro_dispatch import MroDispatch, handles from agent_comms.transcript_events import ( ToolEndTranscript, diff --git a/src/toad/acp/terminal_controller.py b/src/toad/acp/terminal_controller.py index 39baf32ec..efed378ef 100644 --- a/src/toad/acp/terminal_controller.py +++ b/src/toad/acp/terminal_controller.py @@ -1,6 +1,6 @@ """ACP terminal requests address operational executions, never mounted widgets.""" from abc import abstractmethod -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.child_process import join_retirement import asyncio diff --git a/src/toad/acp/tool_calls.py b/src/toad/acp/tool_calls.py index 8647f640d..b20bcef6d 100644 --- a/src/toad/acp/tool_calls.py +++ b/src/toad/acp/tool_calls.py @@ -2,7 +2,7 @@ from dataclasses import dataclass, field, replace from acp.schema import ToolCall, ToolCallStart, ToolCallUpdate -from agent_comms.field_codec import ToolCallId +from agent_comms.nominal.field_codec import ToolCallId from agent_comms.transcript_sources import AssignedSourceIdentity from agent_comms.transcripts import NativeCommittedPrefix from toad.core import events diff --git a/src/toad/agent_presentation.py b/src/toad/agent_presentation.py index 55d878b82..c8f049d7d 100644 --- a/src/toad/agent_presentation.py +++ b/src/toad/agent_presentation.py @@ -2,7 +2,7 @@ from abc import abstractmethod 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.acp_extension import PendingQueueProjection, QueueProjection from toad.private_native_cursor import CursorStatus, HiddenCursorStatus from toad.conversation_turn import TurnBinding, LocalTurnBinding, ManagedTurnBinding diff --git a/src/toad/agent_schema.py b/src/toad/agent_schema.py index 3bc114459..03f071430 100644 --- a/src/toad/agent_schema.py +++ b/src/toad/agent_schema.py @@ -2,8 +2,8 @@ from __future__ import annotations from dataclasses import dataclass, field from typing import Annotated, Literal -from agent_comms.declared_family import DeclaredFamily -from agent_comms.field_codec import FieldCodec, TextRepresentation, WireName +from agent_comms.nominal.declared_family import DeclaredFamily +from agent_comms.nominal.field_codec import FieldCodec, TextRepresentation, WireName from toad.platform import Platform diff --git a/src/toad/ansi/_ansi.py b/src/toad/ansi/_ansi.py index ed03bacf6..8418ea166 100644 --- a/src/toad/ansi/_ansi.py +++ b/src/toad/ansi/_ansi.py @@ -10,7 +10,7 @@ from typing import ClassVar, Literal, NamedTuple import rich.repr -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from rich.cells import chop_cells from rich.color import Color from rich.style import Style diff --git a/src/toad/application_actions.py b/src/toad/application_actions.py index fb485242d..ad0d7defc 100644 --- a/src/toad/application_actions.py +++ b/src/toad/application_actions.py @@ -7,7 +7,7 @@ from functools import partial from typing import TYPE_CHECKING, Literal from textual.command import DiscoveryHit, Hit, Hits, Provider -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from toad.preferences import SETTINGS from toad.screens.keymap import KeymapScreen from toad.widget_actions import ( diff --git a/src/toad/block_navigation.py b/src/toad/block_navigation.py index 83897a400..8c2980e6c 100644 --- a/src/toad/block_navigation.py +++ b/src/toad/block_navigation.py @@ -6,7 +6,7 @@ from functools import cached_property from typing import TYPE_CHECKING, Callable, ClassVar, cast -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.ui_model.message_category import MessageCategory, OtherCategory from textual.geometry import Region from textual.widget import Widget diff --git a/src/toad/cli.py b/src/toad/cli.py index bed9c66b2..a8b183ef5 100644 --- a/src/toad/cli.py +++ b/src/toad/cli.py @@ -5,7 +5,7 @@ import click -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.repo import Checkout from toad.session_scope import AgentAttached, AgentBinding, NoAgent diff --git a/src/toad/clipboard.py b/src/toad/clipboard.py index 87c5402b5..7ab795404 100644 --- a/src/toad/clipboard.py +++ b/src/toad/clipboard.py @@ -4,7 +4,7 @@ from abc import abstractmethod from collections.abc import Callable -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from pyperclip import PyperclipException from textual.app import App from textual._clipboard import ClipboardContent diff --git a/src/toad/conversation_kind.py b/src/toad/conversation_kind.py index a6e386cde..250731b68 100644 --- a/src/toad/conversation_kind.py +++ b/src/toad/conversation_kind.py @@ -19,7 +19,7 @@ ) from agent_comms.channels import AllChannel from agent_comms.comms import Comms -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.display_references import CurrentDisplayReferences from agent_comms.historical_views import ( ChannelDisplayHistory, diff --git a/src/toad/conversation_submission.py b/src/toad/conversation_submission.py index 8fa854b58..b37409814 100644 --- a/src/toad/conversation_submission.py +++ b/src/toad/conversation_submission.py @@ -16,7 +16,7 @@ QueueScope, SteerPromptRequest, ) -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from toad import messages from toad.acp.client_session import ClientSessionRequest diff --git a/src/toad/conversation_turn.py b/src/toad/conversation_turn.py index d8c39ec01..0647cb7b9 100644 --- a/src/toad/conversation_turn.py +++ b/src/toad/conversation_turn.py @@ -8,7 +8,7 @@ from typing import TYPE_CHECKING from agent_comms.activity import ActivityState -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.turn_lease import NoTurn as IdleTurn from agent_comms.turn_lease import TurnState from agent_comms.ui_model.status import ThreadStatusModel diff --git a/src/toad/core/context_inspection.py b/src/toad/core/context_inspection.py index bda453d71..e3a41a006 100644 --- a/src/toad/core/context_inspection.py +++ b/src/toad/core/context_inspection.py @@ -11,8 +11,8 @@ from agent_comms.coordination_errors import Refused from agent_comms.context_store import LATEST_CONTEXT, ContextManifestCursor from agent_comms.coordinator import Coordination -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.importing import ImportedSessionMetadata from metaclass_registry.mro_dispatch import handles from agent_comms.native_turn_context import NativeContextData diff --git a/src/toad/core/events.py b/src/toad/core/events.py index 5b32d4148..390a5563e 100644 --- a/src/toad/core/events.py +++ b/src/toad/core/events.py @@ -10,8 +10,8 @@ from typing import TYPE_CHECKING, Annotated, ClassVar from weakref import WeakMethod, WeakSet, WeakValueDictionary, ref -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.presentation import ReadState from agent_comms.transcript_sources import AssignedSourceIdentity from toad.plan import PlanItem diff --git a/src/toad/db.py b/src/toad/db.py index 7fa2c2624..850155f4d 100644 --- a/src/toad/db.py +++ b/src/toad/db.py @@ -9,7 +9,7 @@ from time import time_ns from typing import Annotated, Self -from agent_comms.field_codec import NullMember, RecordedTimestamp, TimestampText +from agent_comms.nominal.field_codec import NullMember, RecordedTimestamp, TimestampText from agent_comms.repo import Checkout from agent_comms.store_files import DEFAULT_ISOLATION from agent_comms.typed_table import ( diff --git a/src/toad/file_kind.py b/src/toad/file_kind.py index 480f6573d..7dc04bcee 100644 --- a/src/toad/file_kind.py +++ b/src/toad/file_kind.py @@ -1,6 +1,6 @@ """Accepted attachment and preview kinds have one declaration owner.""" from pathlib import Path -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from textual.widgets import Static diff --git a/src/toad/frame_presentation.py b/src/toad/frame_presentation.py index a8f17c4db..62ef52b32 100644 --- a/src/toad/frame_presentation.py +++ b/src/toad/frame_presentation.py @@ -10,7 +10,7 @@ from typing import TYPE_CHECKING, ClassVar from weakref import ref -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from textual._paint_state import PaintState from textual.app import ScreenStackError, UnknownModeError from textual.strip import Strip diff --git a/src/toad/goal_interaction.py b/src/toad/goal_interaction.py index 25838a437..433b4f7ed 100644 --- a/src/toad/goal_interaction.py +++ b/src/toad/goal_interaction.py @@ -5,7 +5,7 @@ from typing import ClassVar, TYPE_CHECKING from weakref import ref -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.goal_actions import ClearGoalAction, GoalAction from agent_comms.goal_presentation import ControlledExecution, GoalExecution from agent_comms.goal_history import RecordedGoalHistory diff --git a/src/toad/inline_spans.py b/src/toad/inline_spans.py index 28e073836..8085c4200 100644 --- a/src/toad/inline_spans.py +++ b/src/toad/inline_spans.py @@ -2,8 +2,8 @@ from abc import abstractmethod from dataclasses import dataclass, field -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 toad.line_blocks import CodeRole, EmphasisRole, Span, StrongRole, TextRole, UrlRole from toad.markdown_links import MessageMarkdownParser diff --git a/src/toad/input_history.py b/src/toad/input_history.py index 24e7b108e..ba8d6ee39 100644 --- a/src/toad/input_history.py +++ b/src/toad/input_history.py @@ -4,7 +4,7 @@ from pathlib import Path from typing import Literal, cast -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from toad.history import History, HistoryEntry diff --git a/src/toad/keymap.py b/src/toad/keymap.py index ce972614f..794aa3a17 100644 --- a/src/toad/keymap.py +++ b/src/toad/keymap.py @@ -13,8 +13,8 @@ import toad from objectstate import mark_ui_hidden_config -from agent_comms.declared_family import DeclaredFamily -from agent_comms.field_codec import NominalSpelling, NominalText +from agent_comms.nominal.declared_family import DeclaredFamily +from agent_comms.nominal.field_codec import NominalSpelling, NominalText from textual.binding import Binding, BindingsMap from textual.document._editing import EditorCommand from textual.keys import KeyInvocation diff --git a/src/toad/line_blocks.py b/src/toad/line_blocks.py index 11a2e8927..2a884daf9 100644 --- a/src/toad/line_blocks.py +++ b/src/toad/line_blocks.py @@ -13,9 +13,9 @@ import re from urllib.parse import quote, unquote -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.display_references import DisplayReference -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from typing import ClassVar diff --git a/src/toad/live_output.py b/src/toad/live_output.py index fcaee33fc..1df0e19e2 100644 --- a/src/toad/live_output.py +++ b/src/toad/live_output.py @@ -9,7 +9,7 @@ from dataclasses import dataclass, field from typing import TYPE_CHECKING -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from toad.response_delivery import ResponseDelivery, UnroutedResponse from toad.widgets.committed_presentation import CAPTURED_CLAIM, CapturedClaim diff --git a/src/toad/markdown_links.py b/src/toad/markdown_links.py index 9f34d2478..78a387824 100644 --- a/src/toad/markdown_links.py +++ b/src/toad/markdown_links.py @@ -10,9 +10,9 @@ from threading import local from typing import TYPE_CHECKING -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.display_references import ReferenceContext -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from markdown_it import MarkdownIt from markdown_it.rules_core import StateCore from markdown_it.token import Token diff --git a/src/toad/mcp_commands.py b/src/toad/mcp_commands.py index 7f6ede086..df741c95d 100644 --- a/src/toad/mcp_commands.py +++ b/src/toad/mcp_commands.py @@ -7,8 +7,8 @@ import os from agent_comms.command import Command -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 toad.mcp_declarations import Declaration, Inventory diff --git a/src/toad/mcp_declarations.py b/src/toad/mcp_declarations.py index 1c365cf63..de8f20d5a 100644 --- a/src/toad/mcp_declarations.py +++ b/src/toad/mcp_declarations.py @@ -8,8 +8,8 @@ import re from typing import Annotated, Literal -from agent_comms.declared_family import DeclaredFamily -from agent_comms.field_codec import WireName +from agent_comms.nominal.declared_family import DeclaredFamily +from agent_comms.nominal.field_codec import WireName class InventoryScope(DeclaredFamily, affix="Scope"): diff --git a/src/toad/mcp_inventory.py b/src/toad/mcp_inventory.py index 988d45326..72e023de2 100644 --- a/src/toad/mcp_inventory.py +++ b/src/toad/mcp_inventory.py @@ -12,7 +12,7 @@ import shutil from pathlib import Path -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.launch_runtime import LaunchRuntime from toad import mcp_declarations diff --git a/src/toad/mcp_outcomes.py b/src/toad/mcp_outcomes.py index e24be6ee2..ec61cddca 100644 --- a/src/toad/mcp_outcomes.py +++ b/src/toad/mcp_outcomes.py @@ -1,6 +1,6 @@ """Local process outcomes do not establish approval.""" -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily class DecisionOutcome(DeclaredFamily, affix="Outcome"): diff --git a/src/toad/message_rows.py b/src/toad/message_rows.py index 940143c2a..f357e5d6a 100644 --- a/src/toad/message_rows.py +++ b/src/toad/message_rows.py @@ -16,7 +16,7 @@ from agent_comms.channel_targets import CommandTarget, ChannelTarget, ThreadTarget from metaclass_registry.mro_dispatch import MroDispatch, handles -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.messages import Message from agent_comms.routing import MessageRoute diff --git a/src/toad/navigation_preparation.py b/src/toad/navigation_preparation.py index 1dd174caa..86e3d8644 100644 --- a/src/toad/navigation_preparation.py +++ b/src/toad/navigation_preparation.py @@ -10,7 +10,7 @@ from agent_comms.coordination_errors import Refused from agent_comms.comms import Comms -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.registry_document import RegistrySnapshot from agent_comms.session_load import ExistingSessionLoadPlan from agent_comms.thread_execution import ConversationPreparation diff --git a/src/toad/navigation_target.py b/src/toad/navigation_target.py index 1a4eb6769..8718733b4 100644 --- a/src/toad/navigation_target.py +++ b/src/toad/navigation_target.py @@ -9,7 +9,7 @@ from agent_comms.channel_targets import ChannelSelection, CommandTarget from agent_comms.channel_targets import ChannelTarget as CoreChannelTarget from agent_comms.channel_targets import ThreadTarget as CoreThreadTarget -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from toad.constants import ALL_COMMS_TARGET from toad.navigation_context import NavigationContext, NavigationOwner diff --git a/src/toad/permission_presentation.py b/src/toad/permission_presentation.py index 522cedf4c..feaa4aef4 100644 --- a/src/toad/permission_presentation.py +++ b/src/toad/permission_presentation.py @@ -4,7 +4,7 @@ from abc import abstractmethod from acp.schema import FileEditToolCallContent, ContentToolCallContent, TerminalToolCallContent from dataclasses import dataclass -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily @dataclass diff --git a/src/toad/plan.py b/src/toad/plan.py index 026067674..823a56fe6 100644 --- a/src/toad/plan.py +++ b/src/toad/plan.py @@ -6,7 +6,7 @@ from dataclasses import dataclass from typing import ClassVar -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from acp.schema import PlanEntry diff --git a/src/toad/preferences.py b/src/toad/preferences.py index aed4f1cbf..91c1ef4d5 100644 --- a/src/toad/preferences.py +++ b/src/toad/preferences.py @@ -17,7 +17,7 @@ from typing import TYPE_CHECKING, Annotated from uuid import uuid4 -from agent_comms.field_codec import FieldCodec, WireName +from agent_comms.nominal.field_codec import FieldCodec, WireName from agent_comms.locked_store import FilesRequest from agent_comms.typed_table import ExternalStore from annotated_types import Ge diff --git a/src/toad/private_native_cursor.py b/src/toad/private_native_cursor.py index 132b3a792..db78938eb 100644 --- a/src/toad/private_native_cursor.py +++ b/src/toad/private_native_cursor.py @@ -8,7 +8,7 @@ from typing import ClassVar -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.thread_presentation import ThreadPresentationStatus diff --git a/src/toad/project_link.py b/src/toad/project_link.py index 243c7b7d6..bf7963d19 100644 --- a/src/toad/project_link.py +++ b/src/toad/project_link.py @@ -11,7 +11,7 @@ from functools import partial from pathlib import Path from typing import Annotated, ClassVar -from agent_comms.field_codec import PathText +from agent_comms.nominal.field_codec import PathText from urllib.parse import SplitResult, quote, unquote, urlsplit from markdown_it.token import Token diff --git a/src/toad/prompt_cursor.py b/src/toad/prompt_cursor.py index c27746b57..bc7173459 100644 --- a/src/toad/prompt_cursor.py +++ b/src/toad/prompt_cursor.py @@ -6,7 +6,7 @@ from typing import TYPE_CHECKING from weakref import ref -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from textual.content import Content from textual.widgets.text_area import Selection diff --git a/src/toad/question_presentation.py b/src/toad/question_presentation.py index 94f5f6f96..8d03c70db 100644 --- a/src/toad/question_presentation.py +++ b/src/toad/question_presentation.py @@ -1,7 +1,7 @@ """A question mount owns its option view and timer for exactly that lifetime.""" from abc import abstractmethod from dataclasses import dataclass -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily class QuestionMount(DeclaredFamily, affix="QuestionMount"): diff --git a/src/toad/render_backend.py b/src/toad/render_backend.py index 5c20caf6f..323caab6b 100644 --- a/src/toad/render_backend.py +++ b/src/toad/render_backend.py @@ -10,7 +10,7 @@ from types import get_original_bases from typing import TYPE_CHECKING, ClassVar, Generic, TypeVar, cast, get_args, get_origin -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from toad.work_preparation import ( PreparationRuntime, diff --git a/src/toad/response_delivery.py b/src/toad/response_delivery.py index 353c29ad4..ecb3ca43a 100644 --- a/src/toad/response_delivery.py +++ b/src/toad/response_delivery.py @@ -5,7 +5,7 @@ from dataclasses import dataclass from typing import TYPE_CHECKING -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.routing import MessageRoute, NoMessageRoute if TYPE_CHECKING: diff --git a/src/toad/screens/main.py b/src/toad/screens/main.py index c7bbfb287..3c1d8b70c 100644 --- a/src/toad/screens/main.py +++ b/src/toad/screens/main.py @@ -9,7 +9,7 @@ from agent_comms.acp_extension import CoordinationChangedUpdate from agent_comms.coordination_errors import DMScopeChanged, Refused -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from metaclass_registry.mro_dispatch import handles from agent_comms.route_selection import RouteSelection from agent_comms.repo import Checkout diff --git a/src/toad/screens/session_resume_modal.py b/src/toad/screens/session_resume_modal.py index 6ffece308..0cffcda7c 100644 --- a/src/toad/screens/session_resume_modal.py +++ b/src/toad/screens/session_resume_modal.py @@ -1,5 +1,5 @@ from datetime import UTC, datetime -from agent_comms.field_codec import RecordedTimestamp +from agent_comms.nominal.field_codec import RecordedTimestamp from textual import containers, getters, on, widgets from textual.app import ComposeResult diff --git a/src/toad/screens/workspace.py b/src/toad/screens/workspace.py index 7e9eec6e1..b5ae877bc 100644 --- a/src/toad/screens/workspace.py +++ b/src/toad/screens/workspace.py @@ -6,7 +6,7 @@ from dataclasses import dataclass, replace from functools import cached_property -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from textual.binding import Binding, BindingsMap from textual.document._editing import EditingMode from textual.box_model import DEFAULT_LAYER diff --git a/src/toad/session_entry.py b/src/toad/session_entry.py index 8b7ba2326..c21895d5b 100644 --- a/src/toad/session_entry.py +++ b/src/toad/session_entry.py @@ -12,7 +12,7 @@ from agent_comms.repo import Checkout from typing import TYPE_CHECKING -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.display_references import CurrentDisplayReferences, ReferenceContext from metaclass_registry.mro_dispatch import handles from agent_comms.thread_identity import ThreadIncarnation diff --git a/src/toad/sidebar_layout.py b/src/toad/sidebar_layout.py index fde92b997..3f8f73e01 100644 --- a/src/toad/sidebar_layout.py +++ b/src/toad/sidebar_layout.py @@ -6,7 +6,7 @@ from typing import Literal from abc import abstractmethod -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily type Side = Literal["left", "right"] diff --git a/src/toad/slash_command.py b/src/toad/slash_command.py index b8bf55461..e96752a7b 100644 --- a/src/toad/slash_command.py +++ b/src/toad/slash_command.py @@ -10,7 +10,7 @@ from pathlib import Path from agent_comms.command import Command -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.goal_actions import ( ActiveGoalAction, ClearGoalAction, diff --git a/src/toad/surface_binding.py b/src/toad/surface_binding.py index 503744d9c..66f2ee169 100644 --- a/src/toad/surface_binding.py +++ b/src/toad/surface_binding.py @@ -1,7 +1,7 @@ """Native surface behavior borrowed by agent and shell operational owners.""" from abc import abstractmethod -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily class SurfaceBinding(DeclaredFamily, affix="SurfaceBinding"): diff --git a/src/toad/tab_identity/__init__.py b/src/toad/tab_identity/__init__.py index 04489b1ce..dd710da17 100644 --- a/src/toad/tab_identity/__init__.py +++ b/src/toad/tab_identity/__init__.py @@ -3,8 +3,8 @@ from abc import abstractmethod from functools import cached_property -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 TabTargetGone(Exception): diff --git a/src/toad/tab_identity/history_origin.py b/src/toad/tab_identity/history_origin.py index 4bb89285d..eca245921 100644 --- a/src/toad/tab_identity/history_origin.py +++ b/src/toad/tab_identity/history_origin.py @@ -3,7 +3,7 @@ from abc import abstractmethod from dataclasses import dataclass -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from toad.constants import WELCOME from toad.tab_identity import SessionTabIdentity diff --git a/src/toad/tab_identity/kinds.py b/src/toad/tab_identity/kinds.py index 0abcdeb31..b2354ec87 100644 --- a/src/toad/tab_identity/kinds.py +++ b/src/toad/tab_identity/kinds.py @@ -4,7 +4,7 @@ from pathlib import Path from typing import Annotated -from agent_comms.field_codec import PathText +from agent_comms.nominal.field_codec import PathText from agent_comms.repo import Checkout from agent_comms.thread_identity import ThreadIncarnation diff --git a/src/toad/terminal_attention.py b/src/toad/terminal_attention.py index d2be7239f..5d1ddffa8 100644 --- a/src/toad/terminal_attention.py +++ b/src/toad/terminal_attention.py @@ -7,7 +7,7 @@ import os from typing import TYPE_CHECKING -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from textual.content import Content from textual.notifications import Notification from textual.widget import Widget diff --git a/src/toad/terminal_execution.py b/src/toad/terminal_execution.py index b999d7ba0..c059524d3 100644 --- a/src/toad/terminal_execution.py +++ b/src/toad/terminal_execution.py @@ -26,7 +26,7 @@ TerminalChildStdio, join_retirement, ) -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from metaclass_registry.mro_dispatch import MroDispatch, handles from toad import ansi diff --git a/src/toad/textual_colours.py b/src/toad/textual_colours.py index be9083e62..6c0ffbcdd 100644 --- a/src/toad/textual_colours.py +++ b/src/toad/textual_colours.py @@ -19,7 +19,7 @@ from typing import TYPE_CHECKING, ClassVar from agent_comms.cli_result import ResultShower -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from rich.color import Color as RichColor from rich.console import RenderableType from rich.segment import Segment diff --git a/src/toad/tool_output.py b/src/toad/tool_output.py index 9e87b65ae..15907d6b8 100644 --- a/src/toad/tool_output.py +++ b/src/toad/tool_output.py @@ -15,7 +15,7 @@ import re from weakref import ref -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.transcript_events import SentTranscript, ToolEndTranscript from agent_comms.tool_results import ToolDiff, ToolText from agent_comms.sent_message import PublishedSentMessage @@ -190,7 +190,7 @@ class SentMessageToolOutputPart(ToolOutputPart): def capture(cls, message, literal=None): if literal is None: import json - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec literal = json.dumps(FieldCodec.encode(message)) return cls(message, literal) @@ -292,7 +292,7 @@ def text_resource(self, item): if item.mime_type == SENT_MESSAGE_MIME: import json - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec try: message = FieldCodec.decode(SentTranscript, json.loads(item.text)) except (TypeError, ValueError): diff --git a/src/toad/transcript_filter.py b/src/toad/transcript_filter.py index 2f58584ac..a22fc7a79 100644 --- a/src/toad/transcript_filter.py +++ b/src/toad/transcript_filter.py @@ -7,7 +7,7 @@ from functools import partial from typing import TYPE_CHECKING -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.ui_model.message_category import all_categories from toad.transcript_source_preparation import HistorySourceSnapshot from toad.widgets.presentation_window import OLDER_END, PageRequest diff --git a/src/toad/transcript_state.py b/src/toad/transcript_state.py index ec9cac2b5..1996c45fe 100644 --- a/src/toad/transcript_state.py +++ b/src/toad/transcript_state.py @@ -7,7 +7,7 @@ from time import monotonic from typing import TYPE_CHECKING, ClassVar, Literal, cast -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from agent_comms.lifecycle import LifecycleState from textual.widget import Widget diff --git a/src/toad/widget_actions.py b/src/toad/widget_actions.py index 53cb8021b..0f1af8f20 100644 --- a/src/toad/widget_actions.py +++ b/src/toad/widget_actions.py @@ -10,8 +10,8 @@ from typing import ClassVar, Generic, Literal, Self, TypeVar from agent_comms.command import Command -from agent_comms.declared_family import DeclaredFamily -from agent_comms.field_codec import FieldCodec, FieldPlan +from agent_comms.nominal.declared_family import DeclaredFamily +from agent_comms.nominal.field_codec import FieldCodec, FieldPlan from textual.binding import Binding, BindingsMap, CommandBinding, ModeBinding from textual import events from textual._activation import PrimaryActivation diff --git a/src/toad/widgets/comms_chat.py b/src/toad/widgets/comms_chat.py index 1caaeca1c..e5dd9a39b 100644 --- a/src/toad/widgets/comms_chat.py +++ b/src/toad/widgets/comms_chat.py @@ -14,7 +14,7 @@ from agent_comms.comms import Comms from agent_comms.repo import Checkout -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.display_references import CurrentDisplayReferences, ReferenceContext from metaclass_registry.mro_dispatch import handles from toad.core import events as core_events diff --git a/src/toad/widgets/comms_command_dialog.py b/src/toad/widgets/comms_command_dialog.py index 6be0dc43c..e16569884 100644 --- a/src/toad/widgets/comms_command_dialog.py +++ b/src/toad/widgets/comms_command_dialog.py @@ -8,7 +8,7 @@ from agent_comms.cli_command import TargetAction from agent_comms.target_fields import ChoiceTargetField, TargetField from agent_comms.config_options import ModelConfigOption -from agent_comms.field_codec import compile_decoder +from agent_comms.nominal.field_codec import compile_decoder from agent_comms.login import run_login from objectstate import ObjectState from python_introspect import AnnotationChoices, FieldLabel diff --git a/src/toad/widgets/comms_transfer.py b/src/toad/widgets/comms_transfer.py index 439d1308f..f7e62b8f2 100644 --- a/src/toad/widgets/comms_transfer.py +++ b/src/toad/widgets/comms_transfer.py @@ -10,8 +10,8 @@ import asyncio from functools import partial from abc import abstractmethod -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.route_selection import RouteSelection from agent_comms.exporting import ( diff --git a/src/toad/widgets/session_thread_panels.py b/src/toad/widgets/session_thread_panels.py index 9514ed29f..f08a3966f 100644 --- a/src/toad/widgets/session_thread_panels.py +++ b/src/toad/widgets/session_thread_panels.py @@ -1,7 +1,7 @@ """Thread panels own construction and reader state at their declarations.""" from abc import abstractmethod from typing import TYPE_CHECKING, ClassVar -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from textual.widget import Widget from toad.widgets.comms_sidebar import CoordinationStatus from toad.plan import PlanItem diff --git a/src/toad/widgets/transcript_fragments.py b/src/toad/widgets/transcript_fragments.py index 2d994d2fd..d032c0ec3 100644 --- a/src/toad/widgets/transcript_fragments.py +++ b/src/toad/widgets/transcript_fragments.py @@ -6,7 +6,7 @@ from functools import cached_property, partial from typing import TYPE_CHECKING, ClassVar -from agent_comms.field_codec import ToolCallId +from agent_comms.nominal.field_codec import ToolCallId from agent_comms.message_reference import MessageReference from agent_comms.turn_item import NativeItemId from metaclass_registry.mro_dispatch import handles diff --git a/src/toad/workspace_sessions.py b/src/toad/workspace_sessions.py index b38d4407c..2530a9c1c 100644 --- a/src/toad/workspace_sessions.py +++ b/src/toad/workspace_sessions.py @@ -5,7 +5,7 @@ from pathlib import Path from typing import TYPE_CHECKING -from agent_comms.declared_family import DeclaredFamily +from agent_comms.nominal.declared_family import DeclaredFamily from textual._time import after_input from textual.containers import Container diff --git a/tests/guards/test_acp_specification_ownership.py b/tests/guards/test_acp_specification_ownership.py index 32fb5c083..2858722e5 100644 --- a/tests/guards/test_acp_specification_ownership.py +++ b/tests/guards/test_acp_specification_ownership.py @@ -6,7 +6,7 @@ from acp import schema from toad.acp.status import StopReason, ToolCallStatus from toad.agent_schema import AgentDefinition -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec ROOT = Path(__file__).resolve().parents[2] diff --git a/tests/model/test_context_inspection_source.py b/tests/model/test_context_inspection_source.py index 8a236c27c..2e5627b8a 100644 --- a/tests/model/test_context_inspection_source.py +++ b/tests/model/test_context_inspection_source.py @@ -2,7 +2,7 @@ import json -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.pi_payloads import AssistantMessage, TextContent, ToolCallContent from toad.core.context_inspection import NativeMessageNode diff --git a/tests/model/test_queue_attachment.py b/tests/model/test_queue_attachment.py index aacc1c38f..018340508 100644 --- a/tests/model/test_queue_attachment.py +++ b/tests/model/test_queue_attachment.py @@ -63,7 +63,7 @@ def test_input_start_members_dispatch_before_queue_revision_checks(tmp_path): IdentifiedInputStarted, UnidentifiedInputStarted, ) - from agent_comms.field_codec import InputId + from agent_comms.nominal.field_codec import InputId _, scope = declared_scope(tmp_path) attachment = QueueAttachment() diff --git a/tests/model/test_saved_sessions_database.py b/tests/model/test_saved_sessions_database.py index 8d5955170..7ae152097 100644 --- a/tests/model/test_saved_sessions_database.py +++ b/tests/model/test_saved_sessions_database.py @@ -9,7 +9,7 @@ import pytest from agent_comms.repo import Checkout -from agent_comms.field_codec import RecordedTimestamp +from agent_comms.nominal.field_codec import RecordedTimestamp from agent_comms.errors import RelationViolationError from toad.agent_schema import AgentDefinition diff --git a/tests/model/test_saved_sessions_of_this_machine_read_back_typed.py b/tests/model/test_saved_sessions_of_this_machine_read_back_typed.py index 590d8e6c4..3e58cc827 100644 --- a/tests/model/test_saved_sessions_of_this_machine_read_back_typed.py +++ b/tests/model/test_saved_sessions_of_this_machine_read_back_typed.py @@ -5,7 +5,7 @@ import sqlite3 import pytest -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from toad.db import Session diff --git a/tests/model/test_saved_settings.py b/tests/model/test_saved_settings.py index 1c50bc55d..d9e3b8577 100644 --- a/tests/model/test_saved_settings.py +++ b/tests/model/test_saved_settings.py @@ -11,7 +11,7 @@ import pytest from acp.schema import ToolCall -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from python_introspect import AnnotatedDataclassValidationMixin from toad.acp.status import ToolCallStatus from toad.forms.kinds import Multiline diff --git a/tests/support/core_adapters/human_input_observer.py b/tests/support/core_adapters/human_input_observer.py index f98a59d3d..3717fe5ff 100644 --- a/tests/support/core_adapters/human_input_observer.py +++ b/tests/support/core_adapters/human_input_observer.py @@ -16,7 +16,7 @@ import shlex import sys -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.acp_extension import QueuePromptRequest from agent_comms.input_disposition import InputDispositions from agent_comms.native_entries import NativeEntry diff --git a/tests/support/core_adapters/mcp_turn_boundaries.py b/tests/support/core_adapters/mcp_turn_boundaries.py index 2388628a6..acfe14a44 100644 --- a/tests/support/core_adapters/mcp_turn_boundaries.py +++ b/tests/support/core_adapters/mcp_turn_boundaries.py @@ -16,7 +16,7 @@ ) from agent_comms.comms import wire from agent_comms.coordinator import Coordination -from agent_comms.field_codec import TurnId +from agent_comms.nominal.field_codec import TurnId from agent_comms.launch_runtime import ThreadLaunch from agent_comms.pi_payloads import ( McpLiveAcknowledgement, McpServerReceipt, ReadyMcpServerState, ConfirmMcpCallPolicy, diff --git a/tests/support/journals.py b/tests/support/journals.py index a5c8c5446..3b531850b 100644 --- a/tests/support/journals.py +++ b/tests/support/journals.py @@ -34,7 +34,7 @@ def user_entry(text: str, *, id: str, parent: str | None = None, input_id: str | def write_journal(path: Path, *entries: dict) -> Path: """Write `entries` as the lines of a session journal and return its path.""" - from agent_comms.field_codec import RecordedTimestamp + from agent_comms.nominal.field_codec import RecordedTimestamp from agent_comms.native_entries import MessageEntry, NativeEntry, SessionEntry from agent_comms.pi_payloads import ReportedText, UnknownMessage diff --git a/tests/support/native.py b/tests/support/native.py index ada187e02..b27e7b6fc 100644 --- a/tests/support/native.py +++ b/tests/support/native.py @@ -45,7 +45,7 @@ def last_user_texts(request: dict) -> tuple[str, ...]: def selected_triage_reply(request: dict, decision=None) -> dict | None: """The answer to Core's "should this thread respond" question, when `request` is one.""" - from agent_comms.field_codec import FieldCodec + from agent_comms.nominal.field_codec import FieldCodec from agent_comms.selected_triage import IgnoreSelectedTriage, SelectedTriage from agent_comms.turn_context import InstructionFile diff --git a/tests/support/peers/typed_turn_events.py b/tests/support/peers/typed_turn_events.py index 4c0a4afc6..671fc4cea 100644 --- a/tests/support/peers/typed_turn_events.py +++ b/tests/support/peers/typed_turn_events.py @@ -16,7 +16,7 @@ from agent_comms.agent_event_updates import AcpEventConsumer from agent_comms.controller import SessionUpdateSink from agent_comms.coordinator import Coordination -from agent_comms.field_codec import TurnId +from agent_comms.nominal.field_codec import TurnId from turn_source import turn_source SESSION = "pilot" diff --git a/tests/textual/test_arrival_fade.py b/tests/textual/test_arrival_fade.py index 2dfea5aca..9bfc21478 100644 --- a/tests/textual/test_arrival_fade.py +++ b/tests/textual/test_arrival_fade.py @@ -8,7 +8,7 @@ from agent_comms.acp_extension import CoordinationChangedUpdate, TurnChangedUpdate from agent_comms.child_process import ProcessIdentity from agent_comms.context_reading import UnmeasuredContext -from agent_comms.field_codec import TurnId +from agent_comms.nominal.field_codec import TurnId from agent_comms.turn_lease import ActiveTurn, FinishedTurn, TurnState from agent_comms.turn_phase import PublishingPhase from agent_comms.session_file import RegistrySessionLocation diff --git a/tests/textual/test_conversation_kind.py b/tests/textual/test_conversation_kind.py index 80df2a19b..febb5201a 100644 --- a/tests/textual/test_conversation_kind.py +++ b/tests/textual/test_conversation_kind.py @@ -9,7 +9,7 @@ from agent_comms.comms import Comms from agent_comms.active_route import resolve_comms_route from support.roots import installed_wire -from agent_comms.field_codec import FieldCodec +from agent_comms.nominal.field_codec import FieldCodec from agent_comms.installer.backup import StoreBackup from agent_comms.message_page import PageBounds from agent_comms.threads import Thread diff --git a/tests/textual/test_goal_owner_views.py b/tests/textual/test_goal_owner_views.py index 18a78e60c..d653ab043 100644 --- a/tests/textual/test_goal_owner_views.py +++ b/tests/textual/test_goal_owner_views.py @@ -4,7 +4,7 @@ from dataclasses import replace from agent_comms.acp_extension import GoalChangedUpdate -from agent_comms.field_codec import TurnId +from agent_comms.nominal.field_codec import TurnId from agent_comms.goal_failure_observation import FailedTurnEvidence from agent_comms.goal_history import ( RecordedGoalHistory, RecordedGoalRevision, BaselineRevision, TransitionRevision, ObservedGapRevision, diff --git a/tests/textual/test_late_live_answer.py b/tests/textual/test_late_live_answer.py index de08978ea..ea05d296c 100644 --- a/tests/textual/test_late_live_answer.py +++ b/tests/textual/test_late_live_answer.py @@ -11,7 +11,7 @@ ) from agent_comms.native_output import AssistantOutput, NativeOutputLocation from agent_comms.session_file import RegistrySessionLocation -from agent_comms.field_codec import FieldCodec, TurnId +from agent_comms.nominal.field_codec import FieldCodec, TurnId from agent_comms.turn_lease import ActiveTurn, FinishedTurn, TurnState from agent_comms.turn_phase import PublishingPhase diff --git a/tests/textual/test_queue_request_results.py b/tests/textual/test_queue_request_results.py index 51eefebc0..62c9240c9 100644 --- a/tests/textual/test_queue_request_results.py +++ b/tests/textual/test_queue_request_results.py @@ -8,7 +8,7 @@ from agent_comms.acp_extension import ( AvailableQueueProjection, QueueChangedUpdate, QueueItem, LiveQueueScope, encode_updates, ) -from agent_comms.field_codec import InputId +from agent_comms.nominal.field_codec import InputId from agent_comms.child_process import ProcessIdentity from agent_comms.thread_identity import ClaimedIdentity, RecordedThreadIncarnation diff --git a/tests/textual/test_sent_message_drawn_once.py b/tests/textual/test_sent_message_drawn_once.py index 10c5079f6..768358ef1 100644 --- a/tests/textual/test_sent_message_drawn_once.py +++ b/tests/textual/test_sent_message_drawn_once.py @@ -9,7 +9,7 @@ UnidentifiedInputStarted, encode_updates, ) -from agent_comms.field_codec import InputId +from agent_comms.nominal.field_codec import InputId from agent_comms.session_file import RegistrySessionLocation from agent_comms.threads import Thread from support import agents, journals diff --git a/tests/textual/test_wire_source.py b/tests/textual/test_wire_source.py index 59635665e..a780931eb 100644 --- a/tests/textual/test_wire_source.py +++ b/tests/textual/test_wire_source.py @@ -5,7 +5,7 @@ from agent_comms.repo import Checkout from agent_comms.channel_targets import ChannelTarget, ThreadTarget from agent_comms.child_process import ProcessIdentity -from agent_comms.field_codec import TurnId +from agent_comms.nominal.field_codec import TurnId from support.roots import installed_wire from agent_comms.historical_views import ConversationObservation from agent_comms.page_traversal import LiveCursor